[spalenque] - #6968 *QA CHANGES
This commit is contained in:
santipalenque
Sebastian Marcet
parent
70b97e2e0e
commit
48d1f4f09e
|
|
@ -39,9 +39,13 @@ final class SapphireElectionRepository extends SapphireRepository
|
|||
public function getEarliestElectionSince($years)
|
||||
{
|
||||
$sql = 'select * from Election where ElectionsClose >= date_add(now(), interval -'.$years.' year) ORDER BY ElectionsClose ASC LIMIT 0,1;';
|
||||
$res = DB::query($sql);
|
||||
$result = DB::query($sql);
|
||||
// let Silverstripe work the magic
|
||||
$elections = singleton('Election')->buildDataObjectSet($res);
|
||||
$elections = new ArrayList();
|
||||
foreach($result as $rowArray) {
|
||||
// concept: new Product($rowArray)
|
||||
$elections->push(new $rowArray['ClassName']($rowArray));
|
||||
}
|
||||
return $elections->first();
|
||||
}
|
||||
}
|
||||
|
|
@ -174,7 +174,7 @@ class DistributionsDirectoryPage_Controller extends MarketPlaceDirectoryPage_Con
|
|||
$appliance = $this->appliance_repository->getBy($query);
|
||||
if(!$appliance) throw new NotFoundEntityException('','');
|
||||
if($appliance->getCompany()->URLSegment != $company_url_segment) throw new NotFoundEntityException('','');
|
||||
$render = new ApplianceSapphirgit eRender($appliance);
|
||||
$render = new ApplianceSapphireRender($appliance);
|
||||
return $render->draw();
|
||||
}
|
||||
catch (Exception $ex) {
|
||||
|
|
|
|||
|
|
@ -490,12 +490,7 @@ h1.marketplace a,h1.marketplace a.visited{
|
|||
background:url("/marketplace/code/ui/frontend/images/api/full.png") no-repeat scroll center center rgba(0,0,0,0);
|
||||
display:inline-block;
|
||||
height:20px;
|
||||
color: black;
|
||||
/*text-indent:-3000px; uncomment this to hide text inside icon*/
|
||||
font-size: 7px;
|
||||
text-align: center;
|
||||
line-height: 19px;
|
||||
font-weight: bold;
|
||||
text-indent:-3000px;
|
||||
width:20px;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -64,8 +64,8 @@ final class ConsultantSapphireRender {
|
|||
return Controller::curr()->Customise(
|
||||
array(
|
||||
'Consultant' => $this->consultant,
|
||||
'Services' => new DataObjectSet(array_values($unique_services)),
|
||||
'Regions' => new DataObjectSet(array_values($unique_regions)),
|
||||
'Services' => new ArrayList(array_values($unique_services)),
|
||||
'Regions' => new ArrayList(array_values($unique_regions)),
|
||||
)
|
||||
)->renderWith(array('ConsultantsDirectoryPage_pdf'));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,24 +19,24 @@
|
|||
<th>Service</th>
|
||||
<th>OpenStack Version</th>
|
||||
</tr>
|
||||
<% control Capabilities %>
|
||||
<% loop Capabilities %>
|
||||
<tr>
|
||||
<td>
|
||||
<% control ReleaseSupportedApiVersion %>
|
||||
<% control OpenStackComponent %>
|
||||
<% loop ReleaseSupportedApiVersion %>
|
||||
<% loop OpenStackComponent %>
|
||||
$Name
|
||||
<% end_control %>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
<% end_loop %>
|
||||
</td>
|
||||
<td>
|
||||
<% control ReleaseSupportedApiVersion %>
|
||||
<% control Release %>
|
||||
<% loop ReleaseSupportedApiVersion %>
|
||||
<% loop Release %>
|
||||
$Name
|
||||
<% end_control %>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
<% end_loop %>
|
||||
</td>
|
||||
</tr>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% end_if %>
|
||||
|
|
@ -45,13 +45,13 @@
|
|||
<h3 style="color: #{$Company.CompanyColor} !important;">Pricing Options</h3>
|
||||
<table class="pricing">
|
||||
<tbody>
|
||||
<% control Top.PricingSchemas %>
|
||||
<% loop Top.PricingSchemas %>
|
||||
|
||||
<tr>
|
||||
<td>$Type</td>
|
||||
<td id="enabled_{$ID}"></td>
|
||||
</tr>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tbody>
|
||||
</table>
|
||||
<script>
|
||||
|
|
@ -65,10 +65,10 @@
|
|||
<% if HyperVisors %>
|
||||
<h3 style="color: #{$Company.CompanyColor} !important;">Supported Hypervisors</h3>
|
||||
<p>
|
||||
<% control HyperVisors %>
|
||||
<% loop HyperVisors %>
|
||||
<% if First == 0 %>,<% end_if %>
|
||||
$Type
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</p>
|
||||
<% end_if %>
|
||||
|
||||
|
|
@ -76,10 +76,10 @@
|
|||
<hr>
|
||||
<h3 style="color: #{$Company.CompanyColor} !important;">Supported Guests</h3>
|
||||
<p>
|
||||
<% control Guests %>
|
||||
<% loop Guests %>
|
||||
<% if First == 0 %>,<% end_if %>
|
||||
$Type
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</p>
|
||||
<% end_if %>
|
||||
|
||||
|
|
@ -88,14 +88,14 @@
|
|||
<h3 style="color: #{$Company.CompanyColor} !important;">Regions</h3>
|
||||
<table class="regions">
|
||||
<tbody>
|
||||
<% control DataCenterRegions %>
|
||||
<% loop DataCenterRegions %>
|
||||
<tr>
|
||||
<td class="region-key">
|
||||
<span style="background-color: #{$Color}"></span>
|
||||
</td>
|
||||
<td>$Name</td>
|
||||
</tr>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% end_if %>
|
||||
|
|
@ -110,10 +110,10 @@
|
|||
<hr>
|
||||
<h3 style="color: #{$Company.CompanyColor} !important;" >Data Center Locations</h3>
|
||||
<p>
|
||||
<% control DataCenters %>
|
||||
<% loop DataCenters %>
|
||||
<% if First == 0 %>,<% end_if %>
|
||||
$City
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</p>
|
||||
<div style="width: 300px; height: 200px; position: relative;" id="mini-map" tabindex="0">
|
||||
</div>
|
||||
|
|
@ -124,13 +124,13 @@
|
|||
<h3 style="color: #{$Company.CompanyColor} !important;">Regions where support is offered</h3>
|
||||
<table class="regions">
|
||||
<tbody>
|
||||
<% control RegionalSupports %>
|
||||
<% loop RegionalSupports %>
|
||||
<tr>
|
||||
<% control Region %>
|
||||
<% loop Region %>
|
||||
<td>$Name</td>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tr>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% end_if %>
|
||||
|
|
@ -145,12 +145,12 @@
|
|||
<% end_if %>
|
||||
<% if Videos %>
|
||||
<div id="videos">
|
||||
<% control Videos %>
|
||||
<% loop Videos %>
|
||||
<h3 style="color: #{$Top.Company.CompanyColor} !important;" class="video-title">$Name<span class="video-duration">($FormattedLength)</span></h3>
|
||||
<iframe frameborder="0" width="250" height="200" allowfullscreen=""
|
||||
src="//www.youtube.com/embed/{$YouTubeId}?rel=0&showinfo=0&modestbranding=1&controls=2">
|
||||
</iframe>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</div>
|
||||
<% end_if %>
|
||||
|
||||
|
|
@ -158,9 +158,9 @@
|
|||
<div id="more-resources">
|
||||
<h3 style="color: #{$Company.CompanyColor} !important;">More Resources</h3>
|
||||
<ul>
|
||||
<% control Resources %>
|
||||
<% loop Resources %>
|
||||
<li><a href="{$Uri}" style="color: #{$Company.CompanyColor} !important;" target="_blank" class="outbound-link">$Name</a></li>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</ul>
|
||||
</div>
|
||||
<% end_if %>
|
||||
|
|
|
|||
|
|
@ -32,19 +32,19 @@
|
|||
<% if HyperVisors %>
|
||||
<h3 style="color: {$Company.CompanyColorRGB} !important;">Supported Hypervisors</h3>
|
||||
<p>
|
||||
<% control HyperVisors %>
|
||||
<% loop HyperVisors %>
|
||||
<% if First == 0 %>,<% end_if %>
|
||||
$Type
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</p>
|
||||
<% end_if %>
|
||||
<% if Guests %>
|
||||
<h3 style="color: {$Company.CompanyColorRGB} !important;">Supported Guests</h3>
|
||||
<p>
|
||||
<% control Guests %>
|
||||
<% loop Guests %>
|
||||
<% if First == 0 %>,<% end_if %>
|
||||
$Type
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</p>
|
||||
<% end_if %>
|
||||
<% if DataCenterRegions %>
|
||||
|
|
@ -52,14 +52,14 @@
|
|||
<h3 style="color: {$Company.CompanyColorRGB} !important;">Regions</h3>
|
||||
<table class="regions">
|
||||
<tbody>
|
||||
<% control DataCenterRegions %>
|
||||
<% loop DataCenterRegions %>
|
||||
<tr>
|
||||
<td class="region-key">
|
||||
<span style="background-color: #{$Color}"></span>
|
||||
</td>
|
||||
<td>$Name</td>
|
||||
</tr>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% end_if %>
|
||||
|
|
@ -67,10 +67,10 @@
|
|||
<hr>
|
||||
<h3 style="color: {$Company.CompanyColorRGB} !important;" >Data Center Locations</h3>
|
||||
<p>
|
||||
<% control DataCenters %>
|
||||
<% loop DataCenters %>
|
||||
<% if First == 0 %>,<% end_if %>
|
||||
$City
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</p>
|
||||
<div style="width: 300px; height: 200px; position: relative;" tabindex="0">
|
||||
<% if IsDraft %>
|
||||
|
|
@ -86,13 +86,13 @@
|
|||
<h3 style="color: {$Company.CompanyColorRGB} !important;">Regions where support is offered</h3>
|
||||
<table class="regions">
|
||||
<tbody>
|
||||
<% control RegionalSupports %>
|
||||
<% loop RegionalSupports %>
|
||||
<tr>
|
||||
<% control Region %>
|
||||
<% loop Region %>
|
||||
<td>$Name</td>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tr>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% end_if %>
|
||||
|
|
@ -101,11 +101,11 @@
|
|||
<h3 style="color: {$Company.CompanyColorRGB} !important;">OpenStack API Coverage</h3>
|
||||
<table class="api-coverage">
|
||||
<tbody>
|
||||
<% control Capabilities %>
|
||||
<% loop Capabilities %>
|
||||
<% if SupportsVersioning %>
|
||||
<% control ReleaseSupportedApiVersion %>
|
||||
<% loop ReleaseSupportedApiVersion %>
|
||||
<% if ApiVersion %>
|
||||
<% control OpenStackComponent %>
|
||||
<% loop OpenStackComponent %>
|
||||
<tr>
|
||||
<td>
|
||||
$Name API
|
||||
|
|
@ -113,18 +113,18 @@
|
|||
</td>
|
||||
<td>
|
||||
$CodeName
|
||||
<% end_control %>
|
||||
<% control ApiVersion %> $Version<% end_control %>
|
||||
<% end_loop %>
|
||||
<% loop ApiVersion %> $Version<% end_loop %>
|
||||
</td>
|
||||
|
||||
<% end_if %>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
<td class="coverage">
|
||||
<span>$CoveragePercent %</span>
|
||||
</td>
|
||||
</tr>
|
||||
<% end_if %>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% end_if %>
|
||||
|
|
@ -139,24 +139,24 @@
|
|||
<th width="50%">Service</th>
|
||||
<th>OpenStack Version</th>
|
||||
</tr>
|
||||
<% control Capabilities %>
|
||||
<% loop Capabilities %>
|
||||
<tr>
|
||||
<td>
|
||||
<% control ReleaseSupportedApiVersion %>
|
||||
<% control OpenStackComponent %>
|
||||
<% loop ReleaseSupportedApiVersion %>
|
||||
<% loop OpenStackComponent %>
|
||||
$Name
|
||||
<% end_control %>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
<% end_loop %>
|
||||
</td>
|
||||
<td>
|
||||
<% control ReleaseSupportedApiVersion %>
|
||||
<% control Release %>
|
||||
<% loop ReleaseSupportedApiVersion %>
|
||||
<% loop Release %>
|
||||
$Name
|
||||
<% end_control %>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
<% end_loop %>
|
||||
</td>
|
||||
</tr>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tbody>
|
||||
</table>
|
||||
<hr>
|
||||
|
|
@ -166,19 +166,19 @@
|
|||
<table class="pricing">
|
||||
<tbody>
|
||||
<% if IsDraft %>
|
||||
<% control Top.PricingSchemasDraftForPDF %>
|
||||
<% loop Top.PricingSchemasDraftForPDF %>
|
||||
<tr>
|
||||
<td>$Type</td>
|
||||
<td id="enabled_{$ID}"><% if Enabled==1 %>Yes<% else %>No<% end_if %></td>
|
||||
</tr>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
<% else %>
|
||||
<% control Top.PricingSchemasForPDF %>
|
||||
<% loop Top.PricingSchemasForPDF %>
|
||||
<tr>
|
||||
<td>$Type</td>
|
||||
<td id="enabled_{$ID}"><% if Enabled==1 %>Yes<% else %>No<% end_if %></td>
|
||||
</tr>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
<% end_if %>
|
||||
|
||||
</tbody>
|
||||
|
|
@ -195,10 +195,10 @@
|
|||
<% if Videos %>
|
||||
<hr>
|
||||
<div id="videos">
|
||||
<% control Videos %>
|
||||
<% loop Videos %>
|
||||
<h3 style="color: {$Top.Company.CompanyColorRGB} !important;" class="video-title">$Name<span class="video-duration">($FormattedLength)</span></h3>
|
||||
<a href="//www.youtube.com/embed/{$YouTubeId}"> Video </a>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</div>
|
||||
<% end_if %>
|
||||
<% if Resources %>
|
||||
|
|
@ -206,9 +206,9 @@
|
|||
<div id="more-resources">
|
||||
<h3 style="color: {$Company.CompanyColorRGB} !important;">More Resources</h3>
|
||||
<ul>
|
||||
<% control Resources %>
|
||||
<% loop Resources %>
|
||||
<li style="color: {$Company.CompanyColorRGB}>$Name</li>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</ul>
|
||||
</div>
|
||||
<% end_if %>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<h1>$Name</h1>
|
||||
</div>
|
||||
</div>
|
||||
<% control Consultant %>
|
||||
<% loop Consultant %>
|
||||
<div class="container marketplace-content">
|
||||
<% include MarketPlaceCompany %>
|
||||
<div class="col-lg-6">
|
||||
|
|
@ -15,12 +15,12 @@
|
|||
<h3 style="color: #{$Company.CompanyColor} !important;">Areas of OpenStack Expertise</h3>
|
||||
<table>
|
||||
<tbody>
|
||||
<% control ExpertiseAreas %>
|
||||
<% loop ExpertiseAreas %>
|
||||
<tr>
|
||||
<td>$Name</td>
|
||||
<td>$CodeName</td>
|
||||
</tr>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% end_if %>
|
||||
|
|
@ -28,45 +28,45 @@
|
|||
<hr>
|
||||
<h3 style="color: #{$Company.CompanyColor} !important;">Services Offered</h3>
|
||||
<ul>
|
||||
<% control Top.Services %>
|
||||
<% loop Top.Services %>
|
||||
<li>$Type</li>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</ul>
|
||||
<% end_if %>
|
||||
<% if PreviousClients %>
|
||||
<hr>
|
||||
<h3 style="color: #{$Company.CompanyColor} !important;">Select Clients</h3>
|
||||
<ul>
|
||||
<% control PreviousClients %>
|
||||
<% loop PreviousClients %>
|
||||
<li>$Name</li>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</ul>
|
||||
<% end_if %>
|
||||
<% if ConfigurationManagementExpertises %>
|
||||
<hr>
|
||||
<h3 style="color: #{$Company.CompanyColor} !important;">Configuration Management Expertise</h3>
|
||||
<ul>
|
||||
<% control ConfigurationManagementExpertises %>
|
||||
<% loop ConfigurationManagementExpertises %>
|
||||
<li>$Type</li>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</ul>
|
||||
<% end_if %>
|
||||
<% if SpokenLanguages %>
|
||||
<hr>
|
||||
<h3 style="color: #{$Company.CompanyColor} !important;">Languages</h3>
|
||||
<ul>
|
||||
<% control SpokenLanguages %>
|
||||
<% loop SpokenLanguages %>
|
||||
<li>$Name</li>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</ul>
|
||||
<% end_if %>
|
||||
<% if Top.Regions %>
|
||||
<hr>
|
||||
<h3 style="color: #{$Company.CompanyColor} !important;">Regions with local offices</h3>
|
||||
<ul>
|
||||
<% control Top.Regions %>
|
||||
<% loop Top.Regions %>
|
||||
<li>$Name</li>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</ul>
|
||||
<% end_if %>
|
||||
<% if Offices %>
|
||||
|
|
@ -90,13 +90,13 @@
|
|||
<h3 style="color: #{$Company.CompanyColor} !important;">Regions where support is offered</h3>
|
||||
<table class="regions">
|
||||
<tbody>
|
||||
<% control RegionalSupports %>
|
||||
<% loop RegionalSupports %>
|
||||
<tr>
|
||||
<% control Region %>
|
||||
<% loop Region %>
|
||||
<td>$Name</td>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tr>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% end_if %>
|
||||
|
|
@ -110,12 +110,12 @@
|
|||
<% end_if %>
|
||||
<% if Videos %>
|
||||
<div id="videos">
|
||||
<% control Videos %>
|
||||
<% loop Videos %>
|
||||
<h3 style="color: #{$Top.Company.CompanyColor} !important;" class="video-title">$Name<span class="video-duration">($FormattedLength)</span></h3>
|
||||
<iframe frameborder="0" width="250" height="200" allowfullscreen=""
|
||||
src="//www.youtube.com/embed/{$YouTubeId}?rel=0&showinfo=0&modestbranding=1&controls=2">
|
||||
</iframe>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</div>
|
||||
<% end_if %>
|
||||
|
||||
|
|
@ -123,9 +123,9 @@
|
|||
<div id="more-resources">
|
||||
<h3 style="color: #{$Company.CompanyColor} !important;">More Resources</h3>
|
||||
<ul>
|
||||
<% control Resources %>
|
||||
<% loop Resources %>
|
||||
<li><a href="{$Uri}" style="color: #{$Company.CompanyColor} !important;" class="outbound-link" target="_blank">$Name</a></li>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</ul>
|
||||
</div>
|
||||
<% end_if %>
|
||||
|
|
@ -133,4 +133,4 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<div class="grey-bar">
|
||||
<h1>$Name</h1>
|
||||
</div>
|
||||
<% control Consultant %>
|
||||
<% loop Consultant %>
|
||||
<div class="container marketplace-content">
|
||||
<table width="540px">
|
||||
<tr>
|
||||
|
|
@ -33,36 +33,36 @@
|
|||
<% if PreviousClients %>
|
||||
<h3 style="color: #{$Company.CompanyColorRGB} !important;">Select Clients</h3>
|
||||
<ul>
|
||||
<% control PreviousClients %>
|
||||
<% loop PreviousClients %>
|
||||
<li>$Name</li>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</ul>
|
||||
<% end_if %>
|
||||
<% if ConfigurationManagementExpertises %>
|
||||
<hr>
|
||||
<h3 style="color: #{$Company.CompanyColorRGB} !important;">Configuration Management Expertise</h3>
|
||||
<ul>
|
||||
<% control ConfigurationManagementExpertises %>
|
||||
<% loop ConfigurationManagementExpertises %>
|
||||
<li>$Type</li>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</ul>
|
||||
<% end_if %>
|
||||
<% if SpokenLanguages %>
|
||||
<hr>
|
||||
<h3 style="color: #{$Company.CompanyColorRGB} !important;">Languages</h3>
|
||||
<ul>
|
||||
<% control SpokenLanguages %>
|
||||
<% loop SpokenLanguages %>
|
||||
<li>$Name</li>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</ul>
|
||||
<% end_if %>
|
||||
<% if Top.Regions %>
|
||||
<hr>
|
||||
<h3 style="color: #{$Company.CompanyColorRGB} !important;">Regions with local offices</h3>
|
||||
<ul>
|
||||
<% control Top.Regions %>
|
||||
<% loop Top.Regions %>
|
||||
<li>$Name</li>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</ul>
|
||||
<% end_if %>
|
||||
<% if Offices %>
|
||||
|
|
@ -84,13 +84,13 @@
|
|||
<h3 style="color: #{$Company.CompanyColorRGB} !important;">Regions where support is offered</h3>
|
||||
<table class="regions">
|
||||
<tbody>
|
||||
<% control RegionalSupports %>
|
||||
<% loop RegionalSupports %>
|
||||
<tr>
|
||||
<% control Region %>
|
||||
<% loop Region %>
|
||||
<td>$Name</td>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tr>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% end_if %>
|
||||
|
|
@ -101,12 +101,12 @@
|
|||
<h3 style="color: #{$Company.CompanyColorRGB} !important;">Areas of OpenStack Expertise</h3>
|
||||
<table>
|
||||
<tbody>
|
||||
<% control ExpertiseAreas %>
|
||||
<% loop ExpertiseAreas %>
|
||||
<tr>
|
||||
<td>$Name</td>
|
||||
<td>$CodeName</td>
|
||||
</tr>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tbody>
|
||||
</table>
|
||||
<hr>
|
||||
|
|
@ -114,9 +114,9 @@
|
|||
<% if Top.Services %>
|
||||
<h3 style="color: #{$Company.CompanyColorRGB} !important;">Services Offered</h3>
|
||||
<ul>
|
||||
<% control Top.Services %>
|
||||
<% loop Top.Services %>
|
||||
<li>$Type</li>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</ul>
|
||||
<hr>
|
||||
<% end_if %>
|
||||
|
|
@ -130,10 +130,10 @@
|
|||
<% if Videos %>
|
||||
<hr>
|
||||
<div id="videos">
|
||||
<% control Videos %>
|
||||
<% loop Videos %>
|
||||
<h3 style="color: {$Top.Company.CompanyColorRGB} !important;" class="video-title">$Name<span class="video-duration">($FormattedLength)</span></h3>
|
||||
<a href="//www.youtube.com/embed/{$YouTubeId}"> Video </a>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</div>
|
||||
<% end_if %>
|
||||
<% if Resources %>
|
||||
|
|
@ -141,9 +141,9 @@
|
|||
<div id="more-resources">
|
||||
<h3 style="color: {$Company.CompanyColorRGB} !important;">More Resources</h3>
|
||||
<ul>
|
||||
<% control Resources %>
|
||||
<% loop Resources %>
|
||||
<li style="color: {$Company.CompanyColorRGB}>$Name</li>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</ul>
|
||||
</div>
|
||||
<% end_if %>
|
||||
|
|
@ -155,4 +155,4 @@
|
|||
<tr><td></td><td></td></tr>
|
||||
</table>
|
||||
</div>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
|
|
|
|||
|
|
@ -37,24 +37,24 @@
|
|||
<th width="50%">Service</th>
|
||||
<th>OpenStack Version</th>
|
||||
</tr>
|
||||
<% control Capabilities %>
|
||||
<% loop Capabilities %>
|
||||
<tr>
|
||||
<td>
|
||||
<% control ReleaseSupportedApiVersion %>
|
||||
<% control OpenStackComponent %>
|
||||
<% loop ReleaseSupportedApiVersion %>
|
||||
<% loop OpenStackComponent %>
|
||||
$Name
|
||||
<% end_control %>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
<% end_loop %>
|
||||
</td>
|
||||
<td>
|
||||
<% control ReleaseSupportedApiVersion %>
|
||||
<% control Release %>
|
||||
<% loop ReleaseSupportedApiVersion %>
|
||||
<% loop Release %>
|
||||
$Name
|
||||
<% end_control %>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
<% end_loop %>
|
||||
</td>
|
||||
</tr>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% end_if %>
|
||||
|
|
@ -62,19 +62,19 @@
|
|||
<hr>
|
||||
<h3 style="color: {$Company.CompanyColorRGB} !important;">Supported Hypervisors</h3>
|
||||
<p>
|
||||
<% control HyperVisors %>
|
||||
<% loop HyperVisors %>
|
||||
<% if First == 0 %>,<% end_if %>
|
||||
$Type
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</p>
|
||||
<% end_if %>
|
||||
<% if Guests %>
|
||||
<h3 style="color: {$Company.CompanyColorRGB} !important;">Supported Guests</h3>
|
||||
<p>
|
||||
<% control Guests %>
|
||||
<% loop Guests %>
|
||||
<% if First == 0 %>,<% end_if %>
|
||||
$Type
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</p>
|
||||
<% end_if %>
|
||||
<% if RegionalSupports %>
|
||||
|
|
@ -82,13 +82,13 @@
|
|||
<h3 style="color: {$Company.CompanyColorRGB} !important;">Regions where support is offered</h3>
|
||||
<table class="regions">
|
||||
<tbody>
|
||||
<% control RegionalSupports %>
|
||||
<% loop RegionalSupports %>
|
||||
<tr>
|
||||
<% control Region %>
|
||||
<% loop Region %>
|
||||
<td>$Name</td>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tr>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% end_if %>
|
||||
|
|
@ -97,11 +97,11 @@
|
|||
<h3 style="color: {$Company.CompanyColorRGB} !important;">OpenStack API Coverage</h3>
|
||||
<table class="api-coverage">
|
||||
<tbody>
|
||||
<% control Capabilities %>
|
||||
<% loop Capabilities %>
|
||||
<% if SupportsVersioning %>
|
||||
<% control ReleaseSupportedApiVersion %>
|
||||
<% loop ReleaseSupportedApiVersion %>
|
||||
<% if ApiVersion %>
|
||||
<% control OpenStackComponent %>
|
||||
<% loop OpenStackComponent %>
|
||||
<tr>
|
||||
<td>
|
||||
$Name API
|
||||
|
|
@ -109,18 +109,18 @@
|
|||
</td>
|
||||
<td>
|
||||
$CodeName
|
||||
<% end_control %>
|
||||
<% control ApiVersion %> $Version<% end_control %>
|
||||
<% end_loop %>
|
||||
<% loop ApiVersion %> $Version<% end_loop %>
|
||||
</td>
|
||||
|
||||
<% end_if %>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
<td class="coverage">
|
||||
<span>$CoveragePercent %</span>
|
||||
</td>
|
||||
</tr>
|
||||
<% end_if %>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% end_if %>
|
||||
|
|
@ -137,10 +137,10 @@
|
|||
<% if Videos %>
|
||||
<hr>
|
||||
<div id="videos">
|
||||
<% control Videos %>
|
||||
<% loop Videos %>
|
||||
<h3 style="color: {$Top.Company.CompanyColorRGB} !important;" class="video-title">$Name<span class="video-duration">($FormattedLength)</span></h3>
|
||||
<a href="//www.youtube.com/embed/{$YouTubeId}"> Video </a>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</div>
|
||||
<% end_if %>
|
||||
|
||||
|
|
@ -149,9 +149,9 @@
|
|||
<div id="more-resources">
|
||||
<h3 style="color: {$Company.CompanyColorRGB} !important;">More Resources</h3>
|
||||
<ul>
|
||||
<% control Resources %>
|
||||
<% loop Resources %>
|
||||
<li style="color: {$Company.CompanyColorRGB}>$Name</li>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
</ul>
|
||||
</div>
|
||||
<% end_if %>
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@
|
|||
<select name="implementation_type_id" id="implementation_type_id">
|
||||
<option value="">--select--</option>
|
||||
<% if DistributionMarketPlaceTypes %>
|
||||
<% control DistributionMarketPlaceTypes %>
|
||||
<% loop DistributionMarketPlaceTypes %>
|
||||
<option value="$ID">$Name</option>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
<% end_if %>
|
||||
</select>
|
||||
</td>
|
||||
|
|
@ -30,9 +30,9 @@
|
|||
<select name="company_id" id="company_id">
|
||||
<option value="">--select--</option>
|
||||
<% if Companies %>
|
||||
<% control Companies %>
|
||||
<% loop Companies %>
|
||||
<option value="$ID">$Name</option>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
<% end_if %>
|
||||
</select>
|
||||
</td>
|
||||
|
|
@ -64,7 +64,7 @@
|
|||
</thead>
|
||||
<tbody>
|
||||
<% if Distributions %>
|
||||
<% control Distributions %>
|
||||
<% loop Distributions %>
|
||||
<tr>
|
||||
<td>
|
||||
$Company.Name
|
||||
|
|
@ -85,25 +85,25 @@
|
|||
<% if Top.isSuperAdmin %>
|
||||
<td>
|
||||
<% if EditedBy %>
|
||||
<% control EditedBy %>
|
||||
<% with EditedBy %>
|
||||
$Email ($CurrentCompany)
|
||||
<% end_control %>
|
||||
<% end_with %>
|
||||
<% else %>
|
||||
N/A
|
||||
<% end_if %>
|
||||
</td>
|
||||
<% end_if %>
|
||||
<td style="min-width: 200px" width="30%">
|
||||
<a class="product-button roundedButton addDeploymentBtn" href="<% control MarketPlace %><% if Name == "Appliance" %>$Top.Link(appliance)<% end_if %><% if Name == "Distribution" %>$Top.Link(distribution)<% end_if %><% end_control %>?id=$ID&is_draft=$isDraft">Edit Product Details</a>
|
||||
<a target="_blank" class="product-button roundedButton addDeploymentBtn" href="<% control MarketPlace %><% if Name == "Appliance" %>$Top.Link(appliance)<% end_if %><% if Name == "Distribution" %>$Top.Link(distribution)<% end_if %><% end_control %>/$ID/<% if isDraft %>draft_<% end_if %>preview">Preview Product</a>
|
||||
<a target="_blank" class="product-button roundedButton addDeploymentBtn" href="<% control MarketPlace %><% if Name == "Appliance" %>$Top.Link(appliance)<% end_if %><% if Name == "Distribution" %>$Top.Link(distribution)<% end_if %><% end_control %>/$ID/<% if isDraft %>draft_<% end_if %>pdf">PDF</a>
|
||||
<a class="product-button roundedButton addDeploymentBtn" href="<% with MarketPlace %><% if Name == "Appliance" %>$Top.Link(appliance)<% end_if %><% if Name == "Distribution" %>$Top.Link(distribution)<% end_if %><% end_with %>?id=$ID&is_draft=$isDraft">Edit Product Details</a>
|
||||
<a target="_blank" class="product-button roundedButton addDeploymentBtn" href="<% with MarketPlace %><% if Name == "Appliance" %>$Top.Link(appliance)<% end_if %><% if Name == "Distribution" %>$Top.Link(distribution)<% end_if %><% end_with %>/$ID/<% if isDraft %>draft_<% end_if %>preview">Preview Product</a>
|
||||
<a target="_blank" class="product-button roundedButton addDeploymentBtn" href="<% with MarketPlace %><% if Name == "Appliance" %>$Top.Link(appliance)<% end_if %><% if Name == "Distribution" %>$Top.Link(distribution)<% end_if %><% end_with %>/$ID/<% if isDraft %>draft_<% end_if %>pdf">PDF</a>
|
||||
<a class="roundedButton delete-implementation product-button addDeploymentBtn" href="#"
|
||||
data-id="{$ID}"
|
||||
data-is_draft="{$isDraft}"
|
||||
data-class="<% control MarketPlace %><% if Name == "Appliance" %>appliance<% end_if %><% if Name == "Distribution" %>distribution<% end_if %><% end_control %>">Delete Product</a>
|
||||
data-class="<% with MarketPlace %><% if Name == "Appliance" %>appliance<% end_if %><% if Name == "Distribution" %>distribution<% end_if %><% end_with %>">Delete Product</a>
|
||||
</td>
|
||||
</tr>
|
||||
<% end_control %>
|
||||
<% end_loop %>
|
||||
<% end_if %>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ final class SangriaPage_Controller extends Page_Controller {
|
|||
$filterWhereClause = self::generateFilterWhereClause();
|
||||
|
||||
$results = DB::query("select o.Name from Deployment d join DeploymentSurvey s on (d.DeploymentSurveyID = s.ID) join Org o on (s.OrgID = o.ID) where 1=1".$filterWhereClause);
|
||||
$list = new DataObjectSet();
|
||||
$list = new ArrayList();
|
||||
|
||||
for( $i=0; $i < $results->numRecords(); $i++) {
|
||||
$record = $results->nextRecord();
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@
|
|||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
**/
|
||||
$include_path = Director::baseFolder() . '/html2pdf_v4.03/html2pdf.class.php';
|
||||
require_once($include_path);
|
||||
|
||||
class UserStory extends Page
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue