Skip to content

Commit b0692b0

Browse files
santipalenquesantipalenque
committed
[spalenque] - #14540 * change table distribution for os components in marketplace admin
1 parent a87c0d7 commit b0692b0

4 files changed

Lines changed: 47 additions & 63 deletions

File tree

‎marketplace/templates/Layout/Includes/Components.ss‎

Lines changed: 36 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,53 @@
11
<% if OpenStackAvailableComponents %>
22
<hr>
3-
<form id="components_form" name="components_form">
4-
<div style="display: block;overflow-x:auto; width: 99%">
3+
<form id="components_form" name="components_form" style="margin-bottom: 30px">
4+
<div style="display: block;overflow-y:auto; height: 500px">
55
<table style="border: 1px solid #ccc; border-collapse:collapse;clear:both;max-width:99%" width="100%" >
66
<tbody style="width: auto">
77
<tr>
8-
<th style="border: 1px solid #ccc;min-width: 150px;">OpenStack-powered Capabilities Offered</th>
9-
<% loop OpenStackAvailableComponents %>
10-
<th style="border: 1px solid #ccc;background:#eaeaea;min-width: 150px" width="10%">
11-
$Name ($CodeName)
12-
</th>
13-
<% end_loop %>
8+
<th style="border: 1px solid #ccc;text-align: center;">OpenStack-powered Capabilities Offered</th>
9+
<th style="border: 1px solid #ccc;text-align: center;">Mark all that apply with an X</th>
10+
<th style="border: 1px solid #ccc;width:9%;text-align: center;">Version of OpenStack used (e..g Grizzly, Havana)</th>
11+
<th style="border: 1px solid #ccc;text-align: center;">API Version Supported</th>
12+
<th style="border: 1px solid #ccc;text-align: center;">API supported</th>
1413
</tr>
15-
<tr>
16-
<th style="border: 1px solid #ccc;">Mark all that apply with an X</th>
17-
<% loop OpenStackAvailableComponents %>
18-
<th style="border: 1px solid #ccc;background:#fff;text-align:center;">
19-
<input type="checkbox" class="checkbox available-component" id="component_{$ID}" value="{$ID}" data-supports-versioning="{$SupportsVersioning}" name="component_{$ID}">
20-
</th>
21-
<% end_loop %>
22-
</tr>
23-
<tr>
24-
<th style="border: 1px solid #ccc;width:9%;">Version of OpenStack used (e..g Grizzly, Havana)</th>
25-
<% loop OpenStackAvailableComponents %>
26-
<th style="border: 1px solid #ccc;background:#fff;width:9%;">
27-
<div style="display:inline-block;max-width:90%;">
28-
<select style="width:100%" id="releases_component_{$ID}" name="releases_component_{$ID}" class="component-releases" data-component-id="{$ID}" data-component-supports-versioning="{$SupportsVersioning}" data-component-codename="{$CodeName}">
29-
</select>
30-
</div>
31-
</th>
32-
<% end_loop %>
33-
</tr>
34-
<tr>
35-
<th style="border: 1px solid #ccc;">API Version Supported</th>
36-
<% loop OpenStackAvailableComponents %>
37-
<th style="border: 1px solid #ccc;background:#fff;">
38-
<div style="display:inline-block;max-width:90%;">
14+
<% loop OpenStackAvailableComponents %>
15+
<tr style="border: 1px solid #ccc;background:#eaeaea;" width="10%">
16+
<td style="padding-left: 10px">$Name ($CodeName)</td>
17+
<td style="border: 1px solid #ccc;background:#fff;text-align:center;">
18+
<input type="checkbox" class="checkbox available-component" id="component_{$ID}" value="{$ID}" data-supports-versioning="{$SupportsVersioning}" name="component_{$ID}">
19+
</td>
20+
<td style="border: 1px solid #ccc;background:#fff;width:9%;text-align: center">
21+
<div style="display:inline-block;max-width:90%;">
22+
<select style="width:100%" id="releases_component_{$ID}" name="releases_component_{$ID}" class="component-releases" data-component-id="{$ID}" data-component-supports-versioning="{$SupportsVersioning}" data-component-codename="{$CodeName}">
23+
</select>
24+
</div>
25+
</td>
26+
<td style="border: 1px solid #ccc;background:#fff;text-align: center">
27+
<div style="display:inline-block;max-width:90%;">
3928
<% if SupportsVersioning %>
4029
<select style="width:100%" id="release_api_version_component_{$ID}" name="release_api_version_component_{$ID}" class="release-api-versions" data-component-id="{$ID}">
4130
<option value="">-- select --</option>
4231
</select>
4332
<% else %>
4433
<input type="text" name="api_coverage_amount_{$ID}" id="api_coverage_amount_{$ID}" value="N/A" style="border:0; color:#f6931f; font-weight:bold;width: 100%; max-width: 90%;text-align:center;">
4534
<% end_if %>
46-
</div>
47-
</th>
48-
<% end_loop %>
49-
</tr>
50-
<tr>
51-
<th style="border: 1px solid #ccc;">API supported</th>
52-
<% loop OpenStackAvailableComponents %>
53-
<th style="border: 1px solid #ccc;background:#fff;">
54-
<% if SupportsVersioning %>
55-
<select style="width:100%" id="api_coverage_amount_{$ID}" name="api_coverage_amount_{$ID}" class="api-coverage">
56-
<option value="">-- select --</option>
57-
<option value="0">None</option>
58-
<option value="50">Partial</option>
59-
<option value="100">Full</option>
60-
</select>
61-
<% else %>
62-
<input type="text" name="api_coverage_amount_{$ID}" id="api_coverage_amount_{$ID}" value="N/A" style="border:0; color:#f6931f; font-weight:bold;width: 100%; max-width: 90%;text-align:center;">
63-
<% end_if %>
64-
</th>
65-
<% end_loop %>
35+
</div>
36+
</td>
37+
<td style="border: 1px solid #ccc;background:#fff;text-align: center">
38+
<% if SupportsVersioning %>
39+
<select id="api_coverage_amount_{$ID}" name="api_coverage_amount_{$ID}" class="api-coverage">
40+
<option value="">-- select --</option>
41+
<option value="0">None</option>
42+
<option value="50">Partial</option>
43+
<option value="100">Full</option>
44+
</select>
45+
<% else %>
46+
<input type="text" name="api_coverage_amount_{$ID}" id="api_coverage_amount_{$ID}" value="N/A" style="border:0; color:#f6931f; font-weight:bold;width: 100%; max-width: 90%;text-align:center;">
47+
<% end_if %>
48+
</td>
6649
</tr>
50+
<% end_loop %>
6751
</table>
6852
</div>
6953
</form>

‎marketplace/templates/Layout/Includes/GuestOSSupport.ss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<% if GuestsOS %>
22
<form name="guest_os_form" id="guest_os_form">
3-
<table style="border: 1px solid #ccc; border-collapse:collapse;clear:both;max-width:35%;" width="100%">
3+
<table style="border: 1px solid #ccc; border-collapse:collapse;clear:both;" width="100%">
44
<tbody>
55
<tr>
6-
<th style="border: 1px solid #ccc;width:20%;">Guest OS Support</th>
6+
<th style="text-align: center;border: 1px solid #ccc;background:#eaeaea;width:20%;">Guest OS Support</th>
77
<% loop getGuestsOS %>
8-
<th style="border: 1px solid #ccc;background:#eaeaea;width:10%;">$Type</th>
8+
<th style="text-align: center;border: 1px solid #ccc;background:#eaeaea;">$Type</th>
99
<% end_loop %>
1010
</tr>
1111
<tr>

‎marketplace/templates/Layout/Includes/Hypervisors.ss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<% if getHyperVisors %>
2-
<form name="hypervisors_form" id="hypervisors_form">
3-
<table class="admin-table" style="max-width:99%;" width="100%">
2+
<form name="hypervisors_form" id="hypervisors_form" style="margin-bottom: 30px">
3+
<table class="admin-table" width="100%">
44
<thead>
55
<tr>
6-
<th style=";width:20%;">Hypervisors</th>
6+
<th style="text-align: center;width:20%;">Hypervisors</th>
77
<% loop getHyperVisors %>
8-
<th style="width:10%;">$Type</th>
8+
<th style="text-align: center;width:8%;">$Type</th>
99
<% end_loop %>
1010
</tr>
1111
</thead>

‎marketplace/templates/Layout/Includes/PricingSchema.ss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<% if PricingSchemas %>
2-
<form id="pricing_schema_form" name="pricing_schema_form">
3-
<table class="admin-table" style="max-width:99%" width="100%">
2+
<form id="pricing_schema_form" name="pricing_schema_form" style="margin-bottom: 30px">
3+
<table class="admin-table" width="100%">
44
<thead>
55
<tr>
6-
<th style=";width:20%;">Pricing Scheme</th>
6+
<th style="text-align: center;width:20%;">Pricing Scheme</th>
77
<% loop PricingSchemas %>
8-
<th style="max-width:100px;" width="10%">
8+
<th style="text-align: center; width:16%;" >
99
$Type
1010
</th>
1111
<% end_loop %>

0 commit comments

Comments
 (0)