etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 12344: Updates to system section 

-Move System VMs section to relevant are on zone chart
-Make Virtual Router provider a detail view
-Move Virtual Appliances listing to 'virtual routers' detail tab
This commit is contained in:
Brian Federle 2011-12-05 14:22:44 -08:00
parent 5648499183
commit b03a8b5939
7 changed files with 2186 additions and 2064 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/css/cloudstack3.css
View File

@ -3701,6 +3701,14 @@ Dialogs*/
position: absolute;
}
.zone-chart .resources.naas ul.system-main li.main.system-vms {
/*+placement:shift 0px 239px;*/
position: relative;
left: 0px;
top: 239px;
position: absolute;
}
.zone-chart .resources.naas ul.system-main li.main.guest {
/*+placement:shift 309px 153px;*/
position: relative;

BIN
ui/images/bg-naas.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 11 KiB

127
ui/index-test.html
View File

@ -179,7 +179,7 @@
<div class="network" wizard-step-id="network">
<!-- 5a: Network description -->
<div class="wizard-step-conditional nothing-to-select">
<p>Either your selected hypervisor does not have any additional network features or you don't have any zone that has security group enabled.</p>
<p>Either you select a basic zone whose guest network does not include security group service or your selected hypervisor does not have any additional network features or you don't have any zone that has security group enabled.</p>
<p>Thus, no additional network features.</p>
<p>Please proceed to the next step.</p>
</div>
@ -790,7 +790,6 @@
</div>
<div class="head">
<span>Zone Configuration</span>
<div class="add">Add Network</div>
</div>
<ul class="system-main">
<li class="main public" rel="public">
@ -801,6 +800,10 @@
<div class="name">Management</div>
<div class="view-all configure">Configure</div>
</li>
<li class="main system-vms">
<div class="name"><span>System VMs</span></div>
<div class="view-all" zone-target="systemVMs">View All</div>
</li>
<li class="main guest" rel="guest">
<div class="name">Guest</div>
<div class="view-all configure">Configure</div>
@ -811,7 +814,7 @@
<!-- Zone resources -->
<div class="resources zone">
<div class="head">
<div class="add">Add Resource</div>
<div class="add" id="add_resource_button">Add Resource</div>
</div>
<ul>
<li class="pod">
@ -1118,65 +1121,65 @@
<div class="name">Timezone</div>
<div class="value">
<select name="timezone">
<option value="Etc/GMT+12">[UTC-12:00] GMT-12:00</option>
<option value="Etc/GMT+11">[UTC-11:00] GMT-11:00</option>
<option value="Pacific/Samoa">[UTC-11:00] Samoa Standard Time</option>
<option value="Pacific/Honolulu">[UTC-10:00] Hawaii Standard Time</option>
<option value="US/Alaska">[UTC-09:00] Alaska Standard Time</option>
<option value="America/Los_Angeles">[UTC-08:00] Pacific Standard Time</option>
<option value="Mexico/BajaNorte">[UTC-08:00] Baja California</option>
<option value="US/Arizona">[UTC-07:00] Arizona</option>
<option value="US/Mountain">[UTC-07:00] Mountain Standard Time</option>
<option value="America/Chihuahua">[UTC-07:00] Chihuahua, La Paz</option>
<option value="America/Chicago">[UTC-06:00] Central Standard Time</option>
<option value="America/Costa_Rica">[UTC-06:00] Central America</option>
<option value="America/Mexico_City">[UTC-06:00] Mexico City, Monterrey</option>
<option value="Canada/Saskatchewan">[UTC-06:00] Saskatchewan</option>
<option value="America/Bogota">[UTC-05:00] Bogota, Lima</option>
<option value="America/New_York">[UTC-05:00] Eastern Standard Time</option>
<option value="America/Caracas">[UTC-04:00] Venezuela Time</option>
<option value="America/Asuncion">[UTC-04:00] Paraguay Time</option>
<option value="America/Cuiaba">[UTC-04:00] Amazon Time</option>
<option value="America/Halifax">[UTC-04:00] Atlantic Standard Time</option>
<option value="America/La_Paz">[UTC-04:00] Bolivia Time</option>
<option value="America/Santiago">[UTC-04:00] Chile Time</option>
<option value="America/St_Johns">[UTC-03:30] Newfoundland Standard Time</option>
<option value="America/Araguaina">[UTC-03:00] Brasilia Time</option>
<option value="America/Argentina/Buenos_Aires">[UTC-03:00] Argentine Time</option>
<option value="America/Cayenne">[UTC-03:00] French Guiana Time</option>
<option value="America/Godthab">[UTC-03:00] Greenland Time</option>
<option value="America/Montevideo">[UTC-03:00] Uruguay Time]</option>
<option value="Etc/GMT+2">[UTC-02:00] GMT-02:00</option>
<option value="Atlantic/Azores">[UTC-01:00] Azores Time</option>
<option value="Atlantic/Cape_Verde">[UTC-01:00] Cape Verde Time</option>
<option value="Africa/Casablanca">[UTC] Casablanca</option>
<option value="Etc/UTC">[UTC] Coordinated Universal Time</option>
<option value="Atlantic/Reykjavik">[UTC] Reykjavik</option>
<option value="Europe/London">[UTC] Western European Time</option>
<option value="CET">[UTC+01:00] Central European Time</option>
<option value="Europe/Bucharest">[UTC+02:00] Eastern European Time</option>
<option value="Africa/Johannesburg">[UTC+02:00] South Africa Standard Time</option>
<option value="Asia/Beirut">[UTC+02:00] Beirut</option>
<option value="Africa/Cairo">[UTC+02:00] Cairo</option>
<option value="Asia/Jerusalem">[UTC+02:00] Israel Standard Time</option>
<option value="Europe/Minsk">[UTC+02:00] Minsk</option>
<option value="Europe/Moscow">[UTC+03:00] Moscow Standard Time</option>
<option value="Africa/Nairobi">[UTC+03:00] Eastern African Time</option>
<option value="Asia/Karachi">[UTC+05:00] Pakistan Time</option>
<option value="Asia/Kolkata">[UTC+05:30] India Standard Time</option>
<option value="Asia/Bangkok">[UTC+05:30] Indochina Time</option>
<option value="Asia/Shanghai">[UTC+08:00] China Standard Time</option>
<option value="Asia/Kuala_Lumpur">[UTC+08:00] Malaysia Time</option>
<option value="Australia/Perth">[UTC+08:00] Western Standard Time (Australia)</option>
<option value="Asia/Taipei">[UTC+08:00] Taiwan</option>
<option value="Asia/Tokyo">[UTC+09:00] Japan Standard Time</option>
<option value="Asia/Seoul">[UTC+09:00] Korea Standard Time</option>
<option value="Australia/Adelaide">[UTC+09:30] Central Standard Time (South Australia)</option>
<option value="Australia/Darwin">[UTC+09:30] Central Standard Time (Northern Territory)</option>
<option value="Australia/Brisbane">[UTC+10:00] Eastern Standard Time (Queensland)</option>
<option value="Australia/Canberra">[UTC+10:00] Eastern Standard Time (New South Wales)</option>
<option value="Pacific/Guam">[UTC+10:00] Chamorro Standard Time</option>
<option value="Pacific/Auckland">[UTC+12:00] New Zealand Standard Time</option>
<option value="Etc/GMT+12">[UTC-12:00] GMT-12:00</option>
<option value="Etc/GMT+11">[UTC-11:00] GMT-11:00</option>
<option value="Pacific/Samoa">[UTC-11:00] Samoa Standard Time</option>
<option value="Pacific/Honolulu">[UTC-10:00] Hawaii Standard Time</option>
<option value="US/Alaska">[UTC-09:00] Alaska Standard Time</option>
<option value="America/Los_Angeles">[UTC-08:00] Pacific Standard Time</option>
<option value="Mexico/BajaNorte">[UTC-08:00] Baja California</option>
<option value="US/Arizona">[UTC-07:00] Arizona</option>
<option value="US/Mountain">[UTC-07:00] Mountain Standard Time</option>
<option value="America/Chihuahua">[UTC-07:00] Chihuahua, La Paz</option>
<option value="America/Chicago">[UTC-06:00] Central Standard Time</option>
<option value="America/Costa_Rica">[UTC-06:00] Central America</option>
<option value="America/Mexico_City">[UTC-06:00] Mexico City, Monterrey</option>
<option value="Canada/Saskatchewan">[UTC-06:00] Saskatchewan</option>
<option value="America/Bogota">[UTC-05:00] Bogota, Lima</option>
<option value="America/New_York">[UTC-05:00] Eastern Standard Time</option>
<option value="America/Caracas">[UTC-04:00] Venezuela Time</option>
<option value="America/Asuncion">[UTC-04:00] Paraguay Time</option>
<option value="America/Cuiaba">[UTC-04:00] Amazon Time</option>
<option value="America/Halifax">[UTC-04:00] Atlantic Standard Time</option>
<option value="America/La_Paz">[UTC-04:00] Bolivia Time</option>
<option value="America/Santiago">[UTC-04:00] Chile Time</option>
<option value="America/St_Johns">[UTC-03:30] Newfoundland Standard Time</option>
<option value="America/Araguaina">[UTC-03:00] Brasilia Time</option>
<option value="America/Argentina/Buenos_Aires">[UTC-03:00] Argentine Time</option>
<option value="America/Cayenne">[UTC-03:00] French Guiana Time</option>
<option value="America/Godthab">[UTC-03:00] Greenland Time</option>
<option value="America/Montevideo">[UTC-03:00] Uruguay Time]</option>
<option value="Etc/GMT+2">[UTC-02:00] GMT-02:00</option>
<option value="Atlantic/Azores">[UTC-01:00] Azores Time</option>
<option value="Atlantic/Cape_Verde">[UTC-01:00] Cape Verde Time</option>
<option value="Africa/Casablanca">[UTC] Casablanca</option>
<option value="Etc/UTC">[UTC] Coordinated Universal Time</option>
<option value="Atlantic/Reykjavik">[UTC] Reykjavik</option>
<option value="Europe/London">[UTC] Western European Time</option>
<option value="CET">[UTC+01:00] Central European Time</option>
<option value="Europe/Bucharest">[UTC+02:00] Eastern European Time</option>
<option value="Africa/Johannesburg">[UTC+02:00] South Africa Standard Time</option>
<option value="Asia/Beirut">[UTC+02:00] Beirut</option>
<option value="Africa/Cairo">[UTC+02:00] Cairo</option>
<option value="Asia/Jerusalem">[UTC+02:00] Israel Standard Time</option>
<option value="Europe/Minsk">[UTC+02:00] Minsk</option>
<option value="Europe/Moscow">[UTC+03:00] Moscow Standard Time</option>
<option value="Africa/Nairobi">[UTC+03:00] Eastern African Time</option>
<option value="Asia/Karachi">[UTC+05:00] Pakistan Time</option>
<option value="Asia/Kolkata">[UTC+05:30] India Standard Time</option>
<option value="Asia/Bangkok">[UTC+05:30] Indochina Time</option>
<option value="Asia/Shanghai">[UTC+08:00] China Standard Time</option>
<option value="Asia/Kuala_Lumpur">[UTC+08:00] Malaysia Time</option>
<option value="Australia/Perth">[UTC+08:00] Western Standard Time (Australia)</option>
<option value="Asia/Taipei">[UTC+08:00] Taiwan</option>
<option value="Asia/Tokyo">[UTC+09:00] Japan Standard Time</option>
<option value="Asia/Seoul">[UTC+09:00] Korea Standard Time</option>
<option value="Australia/Adelaide">[UTC+09:30] Central Standard Time (South Australia)</option>
<option value="Australia/Darwin">[UTC+09:30] Central Standard Time (Northern Territory)</option>
<option value="Australia/Brisbane">[UTC+10:00] Eastern Standard Time (Queensland)</option>
<option value="Australia/Canberra">[UTC+10:00] Eastern Standard Time (New South Wales)</option>
<option value="Pacific/Guam">[UTC+10:00] Chamorro Standard Time</option>
<option value="Pacific/Auckland">[UTC+12:00] New Zealand Standard Time</option>
</select>
</div>
</div>

12
ui/index.jsp
View File

@ -789,13 +789,7 @@
</div>
</div>
<div class="head">
<span>Zone Configuration</span>
<!--
<div class="add">Add Physical Network</div>
-->
<div class="add">&nbsp;</div>
<span>Zone Configuration</span>
</div>
<ul class="system-main">
<li class="main public" rel="public">
@ -806,6 +800,10 @@
<div class="name">Management</div>
<div class="view-all configure">Configure</div>
</li>
<li class="main system-vms">
<div class="name"><span>System VMs</span></div>
<div class="view-all" zone-target="systemVMs">View All</div>
</li>
<li class="main guest" rel="guest">
<div class="name">Guest</div>
<div class="view-all configure">Configure</div>

110
ui/scripts-test/system.js
View File

@ -257,6 +257,7 @@
types: {
// Virtual router list view
virtualRouter: {
type: 'detailView',
id: 'virtualRouter-providers',
label: 'Virtual Router',
fields: {
@ -306,29 +307,76 @@
},
notification: { poll: testData.notifications.testPoll }
}
},
dataProvider: function(args) {
setTimeout(function() {
args.response.success({
data: [
{
name: 'Router0001S',
ipaddress: '192.168.1.1',
state: 'Enabled'
},
{
name: 'Router0001B',
ipaddress: '192.168.1.155',
state: 'Enabled'
},
{
name: 'Router0002',
ipaddress: '192.168.1.13',
state: 'Enabled'
}
]
});
}, 500);
},
tabs: {
network: {
title: 'Network',
fields: [
{
name: { label: 'Name' }
},
{
id: { label: 'ID' },
ipaddress: { label: 'IP Address' },
state: { label: 'State' }
},
{
accounts: { label: 'Accounts' },
instances: { label: 'Instances' },
volumes: { label: 'Volumes' }
},
{
Vpn: { label: 'VPN' },
Dhcp: { label: 'DHCP' },
Dns: { label: 'DNS' },
Gateway: { label: 'Gateway' },
Firewall: { label: 'Firewall' },
Lb: { label: 'Load Balancer' },
UserData: { label: 'UserData' },
SourceNat: { label: 'Source NAT' },
StaticNat: { label: 'Static NAT' }
}
],
dataProvider: function(args) {
setTimeout(function() {
args.response.success({
data: {
id: '123918801030a-s-d-s123',
name: 'Router0001B',
ipaddress: '192.168.1.155',
state: 'Enabled',
accounts: 12,
instances: 14,
volumes: 23,
Vpn: 'On',
Dhcp: 'On',
Dns: 'On',
Gateway: 'On',
Firewall: 'On',
Lb: 'On',
UserData: 'On',
SourceNat: 'On',
StaticNat: 'On'
}
});
}, 500);
}
},
instances: {
title: 'Instances',
listView: {
label: 'Virtual Appliances',
fields: {
name: { label: 'Name' },
hostname: { label: 'Hostname' },
publicip: { label: 'Public IP' },
publicmacaddress: { label: 'Public MAC' },
state: { label: 'Status', indicator: { 'Running': 'on', 'Stopped': 'off' } }
},
dataProvider: testData.dataProvider.listView('virtualAppliances')
}
}
}
},
@ -885,6 +933,22 @@
}
}),
subsections: {
systemVMs: {
type: 'select',
title: 'System VMs',
listView: {
label: 'System VMs',
fields: {
name: { label: 'Name' },
zonename: { label: 'Zone' },
hostname: { label: 'Hostname' },
privateip: { label: 'Private IP' },
publicip: { label: 'Public IP' },
state: { label: 'Status' }
},
dataProvider: testData.dataProvider.listView('systemVMs')
}
},
networks: {
sectionSelect: { label: 'Network type' },
sections: {

3979
ui/scripts/system.js
View File

File diff suppressed because it is too large Load Diff

14
ui/scripts/ui-custom/zoneChart.js
View File

@ -404,11 +404,17 @@
)
);
} else {
var $listView = $newPanel.listView({
listView: naas.networkProviders.types[itemID]
});
var provider = naas.networkProviders.types[itemID];
loadProviderActions($listView);
if (provider.type == 'detailView') {
var $detailView = $newPanel.detailView(provider);
} else {
var $listView = $newPanel.listView({
listView: provider
});
loadProviderActions($listView);
}
}
}
});