Skip to content

Commit 66b69a0

Browse files
bfederlebfederle
committed
bug 13210: User dashboard layout cleanup
-Replace broken 'My projects' with latest events listing -Show real network stats; replace with 'Owned networks' and 'Owned IP addresses' status 13210: resolved fixed
1 parent 8b13faf commit 66b69a0

4 files changed

Lines changed: 139 additions & 35 deletions

File tree

‎ui/css/cloudstack3.css‎

Lines changed: 79 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3469,6 +3469,35 @@ Dialogs*/
34693469
position: relative;
34703470
}
34713471

3472+
.dashboard.user .button.view-all {
3473+
float: right;
3474+
border: 1px solid #4B5B6B;
3475+
/*+border-radius:4px;*/
3476+
-moz-border-radius: 4px;
3477+
-webkit-border-radius: 4px;
3478+
-khtml-border-radius: 4px;
3479+
border-radius: 4px 4px 4px 4px;
3480+
color: #FFFFFF;
3481+
/*+text-shadow:0px -1px 2px #13293E;*/
3482+
-moz-text-shadow: 0px -1px 2px #13293E;
3483+
-webkit-text-shadow: 0px -1px 2px #13293E;
3484+
-o-text-shadow: 0px -1px 2px #13293E;
3485+
text-shadow: 0px -1px 2px #13293E;
3486+
padding: 2px 3px 3px;
3487+
margin: -4px 4px -4px 0;
3488+
text-indent: 0;
3489+
background: url(../images/bg-gradients.png) 0px -147px;
3490+
}
3491+
3492+
.dashboard.user .button.view-all:hover {
3493+
background-position: 0px 0px;
3494+
/*+text-shadow:0px 1px 1px #000000;*/
3495+
-moz-text-shadow: 0px 1px 1px #000000;
3496+
-webkit-text-shadow: 0px 1px 1px #000000;
3497+
-o-text-shadow: 0px 1px 1px #000000;
3498+
text-shadow: 0px 1px 1px #000000;
3499+
}
3500+
34723501
/**** Actions*/
34733502
.dashboard.user .dashboard-actions {
34743503
}
@@ -3634,6 +3663,42 @@ Dialogs*/
36343663
margin: 15px 0 0 8px;
36353664
}
36363665

3666+
.dashboard.user .status-lists ul li.events {
3667+
width: 512px;
3668+
}
3669+
3670+
.dashboard.user .status-lists ul li.events .content li {
3671+
width: 97%;
3672+
cursor: pointer;
3673+
margin: 6px 11px 0 0;
3674+
font-size: 11px;
3675+
padding: 13px 0 12px 16px;
3676+
color: #495A76;
3677+
/*+text-shadow:0px 1px #FFFFFF;*/
3678+
-moz-text-shadow: 0px 1px #FFFFFF;
3679+
-webkit-text-shadow: 0px 1px #FFFFFF;
3680+
-o-text-shadow: 0px 1px #FFFFFF;
3681+
text-shadow: 0px 1px #FFFFFF;
3682+
border: 1px solid #DBDBDB;
3683+
/*+box-shadow:0px 2px 4px #C0C0C0;*/
3684+
-moz-box-shadow: 0px 2px 4px #C0C0C0;
3685+
-webkit-box-shadow: 0px 2px 4px #C0C0C0;
3686+
-o-box-shadow: 0px 2px 4px #C0C0C0;
3687+
box-shadow: 0px 2px 4px #C0C0C0;
3688+
background: #EFEFEF url(../images/bg-gradients.png) repeat-x 0px -29px;
3689+
/*+border-radius:4px;*/
3690+
-moz-border-radius: 4px;
3691+
-webkit-border-radius: 4px;
3692+
-khtml-border-radius: 4px;
3693+
border-radius: 4px 4px 4px 4px;
3694+
}
3695+
3696+
.dashboard.user .status-lists ul li.events .content li .title {
3697+
font-weight: bold;
3698+
color: #4A5A6A;
3699+
margin-bottom: 9px;
3700+
}
3701+
36373702
.dashboard.user .status-lists ul li {
36383703
float: left;
36393704
margin: 0 10px 0 0;
@@ -3649,8 +3714,12 @@ Dialogs*/
36493714
padding: 8px 0px 6px;
36503715
}
36513716

3717+
.dashboard.user .status-lists .events table {
3718+
width: 515px;
3719+
}
3720+
36523721
.dashboard.user .status-lists table tbody {
3653-
height: 150px;
3722+
height: 256px;
36543723
display: block;
36553724
overflow: auto;
36563725
padding: 0 0px;
@@ -3666,6 +3735,14 @@ Dialogs*/
36663735
cursor: default;
36673736
}
36683737

3738+
.dashboard.user .status-lists .my-account table tbody tr {
3739+
}
3740+
3741+
.dashboard.user .status-lists .my-account table tbody tr td {
3742+
padding-top: 19px;
3743+
padding-bottom: 19px;
3744+
}
3745+
36693746
.dashboard.user .status-lists table thead {
36703747
background: url(../images/bg-gradients.png) 0px -351px;
36713748
border-top: 1px solid #C4C5C5;
@@ -3684,8 +3761,8 @@ Dialogs*/
36843761
}
36853762

36863763
.dashboard.user .status-lists li.ip-addresses td {
3687-
padding: 13px 0;
36883764
width: 250px;
3765+
padding: 28px 0 51px;
36893766
}
36903767

36913768
.dashboard.user .status-lists li.ip-addresses .desc {

‎ui/index.jsp‎

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,62 +1155,43 @@
11551155

11561156
<div class="status-lists">
11571157
<ul>
1158-
<li class="recent-errors">
1158+
<li class="events">
11591159
<table>
11601160
<thead>
11611161
<tr>
1162-
<th>My Projects</th>
1162+
<th>Latest events <div class="button view-all events">view all</div></th>
11631163
</tr>
11641164
</thead>
11651165
</table>
11661166
<div class="content">
1167-
<table>
1168-
<tbody>
1169-
<tr><td class="desc"></td><td class="value"></td></tr>
1170-
</tbody>
1171-
</table>
1172-
</div>
1173-
</li>
1174-
<li class="my-account">
1175-
<table>
1176-
<thead>
1177-
<tr>
1178-
<th>My Account</th>
1179-
</tr>
1180-
</thead>
1181-
</table>
1182-
<div class="content">
1183-
<table>
1184-
<tbody>
1185-
<tr class="odd"><td class="desc">Account</td><td class="value" data-item="accountName"></td></tr>
1186-
<tr><td class="desc">User</td><td class="value" data-item="userName"></td></tr>
1187-
<tr class="odd"><td class="desc">Role</td><td class="value" data-item="accountType"></td></tr>
1188-
<tr><td class="desc">Account ID</td><td class="value" data-item="accountID"></td></tr>
1189-
<tr class="odd"><td class="desc">Domain ID</td><td class="value" data-item="accountDomainID"></td></tr>
1190-
</tbody>
1191-
</table>
1167+
<ul data-item="events">
1168+
<li data-list-item="description">
1169+
<div class="title" data-list-item="type"></div>
1170+
<span data-list-item="description"></span>
1171+
</li>
1172+
</ul>
11921173
</div>
11931174
</li>
11941175
<li class="ip-addresses">
11951176
<table>
11961177
<thead>
11971178
<tr>
1198-
<th>IP Addresses</th>
1179+
<th>Network <div class="button view-all network">view all</div></th>
11991180
</tr>
12001181
</thead>
12011182
</table>
12021183
<table>
12031184
<tbody>
12041185
<tr>
12051186
<td>
1206-
<div class="desc"><span>Available public IP addresses:</span></div>
1207-
<div class="value"><span>18</span></div>
1187+
<div class="desc"><span>Owned isolated networks:</span></div>
1188+
<div class="value"><span data-item="netTotal"></span></div>
12081189
</td>
12091190
</tr>
12101191
<tr class="odd">
12111192
<td>
12121193
<div class="desc"><span>Owned public IP addresses:</span></div>
1213-
<div class="value"><span>03</span></div>
1194+
<div class="value"><span data-item="ipTotal"></span></div>
12141195
</td>
12151196
</tr>
12161197
</tbody>

‎ui/scripts/dashboard.js‎

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,58 @@
3434

3535
account: function(data) {
3636
var user = cloudStack.context.users[0];
37-
complete($.extend(data, {
37+
dataFns.events($.extend(data, {
3838
accountID: user.userid,
3939
accountName: user.account,
4040
userName: user.username,
4141
accountType: cloudStack.converters.toRole(user.type),
4242
accountDomainID: user.domainid
4343
}));
44+
},
45+
46+
events: function(data) {
47+
$.ajax({
48+
url: createURL('listEvents'),
49+
data: {
50+
listAll: true,
51+
page: 1,
52+
pageSize: 4
53+
},
54+
success: function(json) {
55+
dataFns.ipAddresses($.extend(data, {
56+
events: json.listeventsresponse.event ?
57+
json.listeventsresponse.event : []
58+
}));
59+
}
60+
});
61+
},
62+
63+
ipAddresses: function(data) {
64+
$.ajax({
65+
url: createURL('listNetworks'),
66+
data: {
67+
listAll: true,
68+
type: 'isolated',
69+
supportedServices: 'SourceNat'
70+
},
71+
success: function(json) {
72+
var netTotal = json.listnetworksresponse.count ?
73+
json.listnetworksresponse.count : 0;
74+
75+
$.ajax({
76+
url: createURL('listPublicIpAddresses'),
77+
success: function(json) {
78+
var ipTotal = json.listpublicipaddressesresponse.count ?
79+
json.listpublicipaddressesresponse.count : 0;
80+
81+
complete($.extend(data, {
82+
netTotal: netTotal,
83+
ipTotal: ipTotal
84+
}));
85+
}
86+
});
87+
}
88+
});
4489
}
4590
};
4691

‎ui/scripts/ui-custom/dashboard.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@
127127

128128
// View all action
129129
$dashboard.find('.view-all').click(function() {
130-
$('#navigation li.events').click();
130+
if ($(this).hasClass('network')) $('#navigation li.network').click();
131+
else $('#navigation li.events').click();
131132
});
132133

133134

0 commit comments

Comments
 (0)