openinfra
/
openstackweb
Code Issues Proposed changes

[spalenque] - #6968 *QA CHANGES

This commit is contained in:
santipalenque 2014-11-18 15:42:26 -03:00 committed by Sebastian Marcet
parent 70b97e2e0e
commit 48d1f4f09e
12 changed files with 161 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
elections/code/infrastructure/repositories/SapphireElectionRepository.php
View File

@ -39,9 +39,13 @@ final class SapphireElectionRepository extends SapphireRepository
public function getEarliestElectionSince($years) public function getEarliestElectionSince($years)
{ {
$sql = 'select * from Election where ElectionsClose >= date_add(now(), interval -'.$years.' year) ORDER BY ElectionsClose ASC LIMIT 0,1;'; $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 // 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(); return $elections->first();
} }
} }

2
marketplace/code/ui/frontend/DistributionsDirectoryPage.php
View File

@ -174,7 +174,7 @@ class DistributionsDirectoryPage_Controller extends MarketPlaceDirectoryPage_Con
$appliance = $this->appliance_repository->getBy($query); $appliance = $this->appliance_repository->getBy($query);
if(!$appliance) throw new NotFoundEntityException('',''); if(!$appliance) throw new NotFoundEntityException('','');
if($appliance->getCompany()->URLSegment != $company_url_segment) 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(); return $render->draw();
} }
catch (Exception $ex) { catch (Exception $ex) {

7
marketplace/code/ui/frontend/css/marketplace.css
View File

@ -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); background:url("/marketplace/code/ui/frontend/images/api/full.png") no-repeat scroll center center rgba(0,0,0,0);
display:inline-block; display:inline-block;
height:20px; height:20px;
color: black; text-indent:-3000px;
/*text-indent:-3000px; uncomment this to hide text inside icon*/
font-size: 7px;
text-align: center;
line-height: 19px;
font-weight: bold;
width:20px; width:20px;
} }

4
marketplace/code/ui/utils/ConsultantSapphireRender.php
View File

@ -64,8 +64,8 @@ final class ConsultantSapphireRender {
return Controller::curr()->Customise( return Controller::curr()->Customise(
array( array(
'Consultant' => $this->consultant, 'Consultant' => $this->consultant,
'Services' => new DataObjectSet(array_values($unique_services)), 'Services' => new ArrayList(array_values($unique_services)),
'Regions' => new DataObjectSet(array_values($unique_regions)), 'Regions' => new ArrayList(array_values($unique_regions)),
) )
)->renderWith(array('ConsultantsDirectoryPage_pdf')); )->renderWith(array('ConsultantsDirectoryPage_pdf'));
} }

56
marketplace/templates/Layout/CloudsDirectoryPage_cloud.ss
View File

@ -19,24 +19,24 @@
<th>Service</th> <th>Service</th>
<th>OpenStack Version</th> <th>OpenStack Version</th>
</tr> </tr>
<% control Capabilities %> <% loop Capabilities %>
<tr> <tr>
<td> <td>
<% control ReleaseSupportedApiVersion %> <% loop ReleaseSupportedApiVersion %>
<% control OpenStackComponent %> <% loop OpenStackComponent %>
$Name $Name
<% end_control %> <% end_loop %>
<% end_control %> <% end_loop %>
</td> </td>
<td> <td>
<% control ReleaseSupportedApiVersion %> <% loop ReleaseSupportedApiVersion %>
<% control Release %> <% loop Release %>
$Name $Name
<% end_control %> <% end_loop %>
<% end_control %> <% end_loop %>
</td> </td>
</tr> </tr>
<% end_control %> <% end_loop %>
</tbody> </tbody>
</table> </table>
<% end_if %> <% end_if %>
@ -45,13 +45,13 @@
<h3 style="color: #{$Company.CompanyColor} !important;">Pricing Options</h3> <h3 style="color: #{$Company.CompanyColor} !important;">Pricing Options</h3>
<table class="pricing"> <table class="pricing">
<tbody> <tbody>
<% control Top.PricingSchemas %> <% loop Top.PricingSchemas %>
<tr> <tr>
<td>$Type</td> <td>$Type</td>
<td id="enabled_{$ID}"></td> <td id="enabled_{$ID}"></td>
</tr> </tr>
<% end_control %> <% end_loop %>
</tbody> </tbody>
</table> </table>
<script> <script>
@ -65,10 +65,10 @@
<% if HyperVisors %> <% if HyperVisors %>
<h3 style="color: #{$Company.CompanyColor} !important;">Supported Hypervisors</h3> <h3 style="color: #{$Company.CompanyColor} !important;">Supported Hypervisors</h3>
<p> <p>
<% control HyperVisors %> <% loop HyperVisors %>
<% if First == 0 %>,<% end_if %> <% if First == 0 %>,<% end_if %>
$Type $Type
<% end_control %> <% end_loop %>
</p> </p>
<% end_if %> <% end_if %>
@ -76,10 +76,10 @@
<hr> <hr>
<h3 style="color: #{$Company.CompanyColor} !important;">Supported Guests</h3> <h3 style="color: #{$Company.CompanyColor} !important;">Supported Guests</h3>
<p> <p>
<% control Guests %> <% loop Guests %>
<% if First == 0 %>,<% end_if %> <% if First == 0 %>,<% end_if %>
$Type $Type
<% end_control %> <% end_loop %>
</p> </p>
<% end_if %> <% end_if %>
@ -88,14 +88,14 @@
<h3 style="color: #{$Company.CompanyColor} !important;">Regions</h3> <h3 style="color: #{$Company.CompanyColor} !important;">Regions</h3>
<table class="regions"> <table class="regions">
<tbody> <tbody>
<% control DataCenterRegions %> <% loop DataCenterRegions %>
<tr> <tr>
<td class="region-key"> <td class="region-key">
<span style="background-color: #{$Color}"></span> <span style="background-color: #{$Color}"></span>
</td> </td>
<td>$Name</td> <td>$Name</td>
</tr> </tr>
<% end_control %> <% end_loop %>
</tbody> </tbody>
</table> </table>
<% end_if %> <% end_if %>
@ -110,10 +110,10 @@
<hr> <hr>
<h3 style="color: #{$Company.CompanyColor} !important;" >Data Center Locations</h3> <h3 style="color: #{$Company.CompanyColor} !important;" >Data Center Locations</h3>
<p> <p>
<% control DataCenters %> <% loop DataCenters %>
<% if First == 0 %>,<% end_if %> <% if First == 0 %>,<% end_if %>
$City $City
<% end_control %> <% end_loop %>
</p> </p>
<div style="width: 300px; height: 200px; position: relative;" id="mini-map" tabindex="0"> <div style="width: 300px; height: 200px; position: relative;" id="mini-map" tabindex="0">
</div> </div>
@ -124,13 +124,13 @@
<h3 style="color: #{$Company.CompanyColor} !important;">Regions where support is offered</h3> <h3 style="color: #{$Company.CompanyColor} !important;">Regions where support is offered</h3>
<table class="regions"> <table class="regions">
<tbody> <tbody>
<% control RegionalSupports %> <% loop RegionalSupports %>
<tr> <tr>
<% control Region %> <% loop Region %>
<td>$Name</td> <td>$Name</td>
<% end_control %> <% end_loop %>
</tr> </tr>
<% end_control %> <% end_loop %>
</tbody> </tbody>
</table> </table>
<% end_if %> <% end_if %>
@ -145,12 +145,12 @@
<% end_if %> <% end_if %>
<% if Videos %> <% if Videos %>
<div id="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> <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="" <iframe frameborder="0" width="250" height="200" allowfullscreen=""
src="//www.youtube.com/embed/{$YouTubeId}?rel=0&amp;showinfo=0&amp;modestbranding=1&amp;controls=2"> src="//www.youtube.com/embed/{$YouTubeId}?rel=0&amp;showinfo=0&amp;modestbranding=1&amp;controls=2">
</iframe> </iframe>
<% end_control %> <% end_loop %>
</div> </div>
<% end_if %> <% end_if %>
@ -158,9 +158,9 @@
<div id="more-resources"> <div id="more-resources">
<h3 style="color: #{$Company.CompanyColor} !important;">More Resources</h3> <h3 style="color: #{$Company.CompanyColor} !important;">More Resources</h3>
<ul> <ul>
<% control Resources %> <% loop Resources %>
<li><a href="{$Uri}" style="color: #{$Company.CompanyColor} !important;" target="_blank" class="outbound-link">$Name</a></li> <li><a href="{$Uri}" style="color: #{$Company.CompanyColor} !important;" target="_blank" class="outbound-link">$Name</a></li>
<% end_control %> <% end_loop %>
</ul> </ul>
</div> </div>
<% end_if %> <% end_if %>

74
marketplace/templates/Layout/CloudsDirectoryPage_pdf.ss
View File

@ -32,19 +32,19 @@
<% if HyperVisors %> <% if HyperVisors %>
<h3 style="color: {$Company.CompanyColorRGB} !important;">Supported Hypervisors</h3> <h3 style="color: {$Company.CompanyColorRGB} !important;">Supported Hypervisors</h3>
<p> <p>
<% control HyperVisors %> <% loop HyperVisors %>
<% if First == 0 %>,<% end_if %> <% if First == 0 %>,<% end_if %>
$Type $Type
<% end_control %> <% end_loop %>
</p> </p>
<% end_if %> <% end_if %>
<% if Guests %> <% if Guests %>
<h3 style="color: {$Company.CompanyColorRGB} !important;">Supported Guests</h3> <h3 style="color: {$Company.CompanyColorRGB} !important;">Supported Guests</h3>
<p> <p>
<% control Guests %> <% loop Guests %>
<% if First == 0 %>,<% end_if %> <% if First == 0 %>,<% end_if %>
$Type $Type
<% end_control %> <% end_loop %>
</p> </p>
<% end_if %> <% end_if %>
<% if DataCenterRegions %> <% if DataCenterRegions %>
@ -52,14 +52,14 @@
<h3 style="color: {$Company.CompanyColorRGB} !important;">Regions</h3> <h3 style="color: {$Company.CompanyColorRGB} !important;">Regions</h3>
<table class="regions"> <table class="regions">
<tbody> <tbody>
<% control DataCenterRegions %> <% loop DataCenterRegions %>
<tr> <tr>
<td class="region-key"> <td class="region-key">
<span style="background-color: #{$Color}"></span> <span style="background-color: #{$Color}"></span>
</td> </td>
<td>$Name</td> <td>$Name</td>
</tr> </tr>
<% end_control %> <% end_loop %>
</tbody> </tbody>
</table> </table>
<% end_if %> <% end_if %>
@ -67,10 +67,10 @@
<hr> <hr>
<h3 style="color: {$Company.CompanyColorRGB} !important;" >Data Center Locations</h3> <h3 style="color: {$Company.CompanyColorRGB} !important;" >Data Center Locations</h3>
<p> <p>
<% control DataCenters %> <% loop DataCenters %>
<% if First == 0 %>,<% end_if %> <% if First == 0 %>,<% end_if %>
$City $City
<% end_control %> <% end_loop %>
</p> </p>
<div style="width: 300px; height: 200px; position: relative;" tabindex="0"> <div style="width: 300px; height: 200px; position: relative;" tabindex="0">
<% if IsDraft %> <% if IsDraft %>
@ -86,13 +86,13 @@
<h3 style="color: {$Company.CompanyColorRGB} !important;">Regions where support is offered</h3> <h3 style="color: {$Company.CompanyColorRGB} !important;">Regions where support is offered</h3>
<table class="regions"> <table class="regions">
<tbody> <tbody>
<% control RegionalSupports %> <% loop RegionalSupports %>
<tr> <tr>
<% control Region %> <% loop Region %>
<td>$Name</td> <td>$Name</td>
<% end_control %> <% end_loop %>
</tr> </tr>
<% end_control %> <% end_loop %>
</tbody> </tbody>
</table> </table>
<% end_if %> <% end_if %>
@ -101,11 +101,11 @@
<h3 style="color: {$Company.CompanyColorRGB} !important;">OpenStack API Coverage</h3> <h3 style="color: {$Company.CompanyColorRGB} !important;">OpenStack API Coverage</h3>
<table class="api-coverage"> <table class="api-coverage">
<tbody> <tbody>
<% control Capabilities %> <% loop Capabilities %>
<% if SupportsVersioning %> <% if SupportsVersioning %>
<% control ReleaseSupportedApiVersion %> <% loop ReleaseSupportedApiVersion %>
<% if ApiVersion %> <% if ApiVersion %>
<% control OpenStackComponent %> <% loop OpenStackComponent %>
<tr> <tr>
<td> <td>
$Name API $Name API
@ -113,18 +113,18 @@
</td> </td>
<td> <td>
$CodeName $CodeName
<% end_control %> <% end_loop %>
<% control ApiVersion %> $Version<% end_control %> <% loop ApiVersion %> $Version<% end_loop %>
</td> </td>
<% end_if %> <% end_if %>
<% end_control %> <% end_loop %>
<td class="coverage"> <td class="coverage">
<span>$CoveragePercent %</span> <span>$CoveragePercent %</span>
</td> </td>
</tr> </tr>
<% end_if %> <% end_if %>
<% end_control %> <% end_loop %>
</tbody> </tbody>
</table> </table>
<% end_if %> <% end_if %>
@ -139,24 +139,24 @@
<th width="50%">Service</th> <th width="50%">Service</th>
<th>OpenStack Version</th> <th>OpenStack Version</th>
</tr> </tr>
<% control Capabilities %> <% loop Capabilities %>
<tr> <tr>
<td> <td>
<% control ReleaseSupportedApiVersion %> <% loop ReleaseSupportedApiVersion %>
<% control OpenStackComponent %> <% loop OpenStackComponent %>
$Name $Name
<% end_control %> <% end_loop %>
<% end_control %> <% end_loop %>
</td> </td>
<td> <td>
<% control ReleaseSupportedApiVersion %> <% loop ReleaseSupportedApiVersion %>
<% control Release %> <% loop Release %>
$Name $Name
<% end_control %> <% end_loop %>
<% end_control %> <% end_loop %>
</td> </td>
</tr> </tr>
<% end_control %> <% end_loop %>
</tbody> </tbody>
</table> </table>
<hr> <hr>
@ -166,19 +166,19 @@
<table class="pricing"> <table class="pricing">
<tbody> <tbody>
<% if IsDraft %> <% if IsDraft %>
<% control Top.PricingSchemasDraftForPDF %> <% loop Top.PricingSchemasDraftForPDF %>
<tr> <tr>
<td>$Type</td> <td>$Type</td>
<td id="enabled_{$ID}"><% if Enabled==1 %>Yes<% else %>No<% end_if %></td> <td id="enabled_{$ID}"><% if Enabled==1 %>Yes<% else %>No<% end_if %></td>
</tr> </tr>
<% end_control %> <% end_loop %>
<% else %> <% else %>
<% control Top.PricingSchemasForPDF %> <% loop Top.PricingSchemasForPDF %>
<tr> <tr>
<td>$Type</td> <td>$Type</td>
<td id="enabled_{$ID}"><% if Enabled==1 %>Yes<% else %>No<% end_if %></td> <td id="enabled_{$ID}"><% if Enabled==1 %>Yes<% else %>No<% end_if %></td>
</tr> </tr>
<% end_control %> <% end_loop %>
<% end_if %> <% end_if %>
</tbody> </tbody>
@ -195,10 +195,10 @@
<% if Videos %> <% if Videos %>
<hr> <hr>
<div id="videos"> <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> <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> <a href="//www.youtube.com/embed/{$YouTubeId}"> Video </a>
<% end_control %> <% end_loop %>
</div> </div>
<% end_if %> <% end_if %>
<% if Resources %> <% if Resources %>
@ -206,9 +206,9 @@
<div id="more-resources"> <div id="more-resources">
<h3 style="color: {$Company.CompanyColorRGB} !important;">More Resources</h3> <h3 style="color: {$Company.CompanyColorRGB} !important;">More Resources</h3>
<ul> <ul>
<% control Resources %> <% loop Resources %>
<li style="color: {$Company.CompanyColorRGB}>$Name</li> <li style="color: {$Company.CompanyColorRGB}>$Name</li>
<% end_control %> <% end_loop %>
</ul> </ul>
</div> </div>
<% end_if %> <% end_if %>

44
marketplace/templates/Layout/ConsultantsDirectoryPage_consultant.ss
View File

@ -6,7 +6,7 @@
<h1>$Name</h1> <h1>$Name</h1>
</div> </div>
</div> </div>
<% control Consultant %> <% loop Consultant %>
<div class="container marketplace-content"> <div class="container marketplace-content">
<% include MarketPlaceCompany %> <% include MarketPlaceCompany %>
<div class="col-lg-6"> <div class="col-lg-6">
@ -15,12 +15,12 @@
<h3 style="color: #{$Company.CompanyColor} !important;">Areas of OpenStack Expertise</h3> <h3 style="color: #{$Company.CompanyColor} !important;">Areas of OpenStack Expertise</h3>
<table> <table>
<tbody> <tbody>
<% control ExpertiseAreas %> <% loop ExpertiseAreas %>
<tr> <tr>
<td>$Name</td> <td>$Name</td>
<td>$CodeName</td> <td>$CodeName</td>
</tr> </tr>
<% end_control %> <% end_loop %>
</tbody> </tbody>
</table> </table>
<% end_if %> <% end_if %>
@ -28,45 +28,45 @@
<hr> <hr>
<h3 style="color: #{$Company.CompanyColor} !important;">Services Offered</h3> <h3 style="color: #{$Company.CompanyColor} !important;">Services Offered</h3>
<ul> <ul>
<% control Top.Services %> <% loop Top.Services %>
<li>$Type</li> <li>$Type</li>
<% end_control %> <% end_loop %>
</ul> </ul>
<% end_if %> <% end_if %>
<% if PreviousClients %> <% if PreviousClients %>
<hr> <hr>
<h3 style="color: #{$Company.CompanyColor} !important;">Select Clients</h3> <h3 style="color: #{$Company.CompanyColor} !important;">Select Clients</h3>
<ul> <ul>
<% control PreviousClients %> <% loop PreviousClients %>
<li>$Name</li> <li>$Name</li>
<% end_control %> <% end_loop %>
</ul> </ul>
<% end_if %> <% end_if %>
<% if ConfigurationManagementExpertises %> <% if ConfigurationManagementExpertises %>
<hr> <hr>
<h3 style="color: #{$Company.CompanyColor} !important;">Configuration Management Expertise</h3> <h3 style="color: #{$Company.CompanyColor} !important;">Configuration Management Expertise</h3>
<ul> <ul>
<% control ConfigurationManagementExpertises %> <% loop ConfigurationManagementExpertises %>
<li>$Type</li> <li>$Type</li>
<% end_control %> <% end_loop %>
</ul> </ul>
<% end_if %> <% end_if %>
<% if SpokenLanguages %> <% if SpokenLanguages %>
<hr> <hr>
<h3 style="color: #{$Company.CompanyColor} !important;">Languages</h3> <h3 style="color: #{$Company.CompanyColor} !important;">Languages</h3>
<ul> <ul>
<% control SpokenLanguages %> <% loop SpokenLanguages %>
<li>$Name</li> <li>$Name</li>
<% end_control %> <% end_loop %>
</ul> </ul>
<% end_if %> <% end_if %>
<% if Top.Regions %> <% if Top.Regions %>
<hr> <hr>
<h3 style="color: #{$Company.CompanyColor} !important;">Regions with local offices</h3> <h3 style="color: #{$Company.CompanyColor} !important;">Regions with local offices</h3>
<ul> <ul>
<% control Top.Regions %> <% loop Top.Regions %>
<li>$Name</li> <li>$Name</li>
<% end_control %> <% end_loop %>
</ul> </ul>
<% end_if %> <% end_if %>
<% if Offices %> <% if Offices %>
@ -90,13 +90,13 @@
<h3 style="color: #{$Company.CompanyColor} !important;">Regions where support is offered</h3> <h3 style="color: #{$Company.CompanyColor} !important;">Regions where support is offered</h3>
<table class="regions"> <table class="regions">
<tbody> <tbody>
<% control RegionalSupports %> <% loop RegionalSupports %>
<tr> <tr>
<% control Region %> <% loop Region %>
<td>$Name</td> <td>$Name</td>
<% end_control %> <% end_loop %>
</tr> </tr>
<% end_control %> <% end_loop %>
</tbody> </tbody>
</table> </table>
<% end_if %> <% end_if %>
@ -110,12 +110,12 @@
<% end_if %> <% end_if %>
<% if Videos %> <% if Videos %>
<div id="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> <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="" <iframe frameborder="0" width="250" height="200" allowfullscreen=""
src="//www.youtube.com/embed/{$YouTubeId}?rel=0&amp;showinfo=0&amp;modestbranding=1&amp;controls=2"> src="//www.youtube.com/embed/{$YouTubeId}?rel=0&amp;showinfo=0&amp;modestbranding=1&amp;controls=2">
</iframe> </iframe>
<% end_control %> <% end_loop %>
</div> </div>
<% end_if %> <% end_if %>
@ -123,9 +123,9 @@
<div id="more-resources"> <div id="more-resources">
<h3 style="color: #{$Company.CompanyColor} !important;">More Resources</h3> <h3 style="color: #{$Company.CompanyColor} !important;">More Resources</h3>
<ul> <ul>
<% control Resources %> <% loop Resources %>
<li><a href="{$Uri}" style="color: #{$Company.CompanyColor} !important;" class="outbound-link" target="_blank">$Name</a></li> <li><a href="{$Uri}" style="color: #{$Company.CompanyColor} !important;" class="outbound-link" target="_blank">$Name</a></li>
<% end_control %> <% end_loop %>
</ul> </ul>
</div> </div>
<% end_if %> <% end_if %>
@ -133,4 +133,4 @@
</div> </div>
</div> </div>
</div> </div>
<% end_control %> <% end_loop %>

44
marketplace/templates/Layout/ConsultantsDirectoryPage_pdf.ss
View File

@ -1,7 +1,7 @@
<div class="grey-bar"> <div class="grey-bar">
<h1>$Name</h1> <h1>$Name</h1>
</div> </div>
<% control Consultant %> <% loop Consultant %>
<div class="container marketplace-content"> <div class="container marketplace-content">
<table width="540px"> <table width="540px">
<tr> <tr>
@ -33,36 +33,36 @@
<% if PreviousClients %> <% if PreviousClients %>
<h3 style="color: #{$Company.CompanyColorRGB} !important;">Select Clients</h3> <h3 style="color: #{$Company.CompanyColorRGB} !important;">Select Clients</h3>
<ul> <ul>
<% control PreviousClients %> <% loop PreviousClients %>
<li>$Name</li> <li>$Name</li>
<% end_control %> <% end_loop %>
</ul> </ul>
<% end_if %> <% end_if %>
<% if ConfigurationManagementExpertises %> <% if ConfigurationManagementExpertises %>
<hr> <hr>
<h3 style="color: #{$Company.CompanyColorRGB} !important;">Configuration Management Expertise</h3> <h3 style="color: #{$Company.CompanyColorRGB} !important;">Configuration Management Expertise</h3>
<ul> <ul>
<% control ConfigurationManagementExpertises %> <% loop ConfigurationManagementExpertises %>
<li>$Type</li> <li>$Type</li>
<% end_control %> <% end_loop %>
</ul> </ul>
<% end_if %> <% end_if %>
<% if SpokenLanguages %> <% if SpokenLanguages %>
<hr> <hr>
<h3 style="color: #{$Company.CompanyColorRGB} !important;">Languages</h3> <h3 style="color: #{$Company.CompanyColorRGB} !important;">Languages</h3>
<ul> <ul>
<% control SpokenLanguages %> <% loop SpokenLanguages %>
<li>$Name</li> <li>$Name</li>
<% end_control %> <% end_loop %>
</ul> </ul>
<% end_if %> <% end_if %>
<% if Top.Regions %> <% if Top.Regions %>
<hr> <hr>
<h3 style="color: #{$Company.CompanyColorRGB} !important;">Regions with local offices</h3> <h3 style="color: #{$Company.CompanyColorRGB} !important;">Regions with local offices</h3>
<ul> <ul>
<% control Top.Regions %> <% loop Top.Regions %>
<li>$Name</li> <li>$Name</li>
<% end_control %> <% end_loop %>
</ul> </ul>
<% end_if %> <% end_if %>
<% if Offices %> <% if Offices %>
@ -84,13 +84,13 @@
<h3 style="color: #{$Company.CompanyColorRGB} !important;">Regions where support is offered</h3> <h3 style="color: #{$Company.CompanyColorRGB} !important;">Regions where support is offered</h3>
<table class="regions"> <table class="regions">
<tbody> <tbody>
<% control RegionalSupports %> <% loop RegionalSupports %>
<tr> <tr>
<% control Region %> <% loop Region %>
<td>$Name</td> <td>$Name</td>
<% end_control %> <% end_loop %>
</tr> </tr>
<% end_control %> <% end_loop %>
</tbody> </tbody>
</table> </table>
<% end_if %> <% end_if %>
@ -101,12 +101,12 @@
<h3 style="color: #{$Company.CompanyColorRGB} !important;">Areas of OpenStack Expertise</h3> <h3 style="color: #{$Company.CompanyColorRGB} !important;">Areas of OpenStack Expertise</h3>
<table> <table>
<tbody> <tbody>
<% control ExpertiseAreas %> <% loop ExpertiseAreas %>
<tr> <tr>
<td>$Name</td> <td>$Name</td>
<td>$CodeName</td> <td>$CodeName</td>
</tr> </tr>
<% end_control %> <% end_loop %>
</tbody> </tbody>
</table> </table>
<hr> <hr>
@ -114,9 +114,9 @@
<% if Top.Services %> <% if Top.Services %>
<h3 style="color: #{$Company.CompanyColorRGB} !important;">Services Offered</h3> <h3 style="color: #{$Company.CompanyColorRGB} !important;">Services Offered</h3>
<ul> <ul>
<% control Top.Services %> <% loop Top.Services %>
<li>$Type</li> <li>$Type</li>
<% end_control %> <% end_loop %>
</ul> </ul>
<hr> <hr>
<% end_if %> <% end_if %>
@ -130,10 +130,10 @@
<% if Videos %> <% if Videos %>
<hr> <hr>
<div id="videos"> <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> <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> <a href="//www.youtube.com/embed/{$YouTubeId}"> Video </a>
<% end_control %> <% end_loop %>
</div> </div>
<% end_if %> <% end_if %>
<% if Resources %> <% if Resources %>
@ -141,9 +141,9 @@
<div id="more-resources"> <div id="more-resources">
<h3 style="color: {$Company.CompanyColorRGB} !important;">More Resources</h3> <h3 style="color: {$Company.CompanyColorRGB} !important;">More Resources</h3>
<ul> <ul>
<% control Resources %> <% loop Resources %>
<li style="color: {$Company.CompanyColorRGB}>$Name</li> <li style="color: {$Company.CompanyColorRGB}>$Name</li>
<% end_control %> <% end_loop %>
</ul> </ul>
</div> </div>
<% end_if %> <% end_if %>
@ -155,4 +155,4 @@
<tr><td></td><td></td></tr> <tr><td></td><td></td></tr>
</table> </table>
</div> </div>
<% end_control %> <% end_loop %>

58
marketplace/templates/Layout/DistributionsDirectoryPage_pdf.ss
View File

@ -37,24 +37,24 @@
<th width="50%">Service</th> <th width="50%">Service</th>
<th>OpenStack Version</th> <th>OpenStack Version</th>
</tr> </tr>
<% control Capabilities %> <% loop Capabilities %>
<tr> <tr>
<td> <td>
<% control ReleaseSupportedApiVersion %> <% loop ReleaseSupportedApiVersion %>
<% control OpenStackComponent %> <% loop OpenStackComponent %>
$Name $Name
<% end_control %> <% end_loop %>
<% end_control %> <% end_loop %>
</td> </td>
<td> <td>
<% control ReleaseSupportedApiVersion %> <% loop ReleaseSupportedApiVersion %>
<% control Release %> <% loop Release %>
$Name $Name
<% end_control %> <% end_loop %>
<% end_control %> <% end_loop %>
</td> </td>
</tr> </tr>
<% end_control %> <% end_loop %>
</tbody> </tbody>
</table> </table>
<% end_if %> <% end_if %>
@ -62,19 +62,19 @@
<hr> <hr>
<h3 style="color: {$Company.CompanyColorRGB} !important;">Supported Hypervisors</h3> <h3 style="color: {$Company.CompanyColorRGB} !important;">Supported Hypervisors</h3>
<p> <p>
<% control HyperVisors %> <% loop HyperVisors %>
<% if First == 0 %>,<% end_if %> <% if First == 0 %>,<% end_if %>
$Type $Type
<% end_control %> <% end_loop %>
</p> </p>
<% end_if %> <% end_if %>
<% if Guests %> <% if Guests %>
<h3 style="color: {$Company.CompanyColorRGB} !important;">Supported Guests</h3> <h3 style="color: {$Company.CompanyColorRGB} !important;">Supported Guests</h3>
<p> <p>
<% control Guests %> <% loop Guests %>
<% if First == 0 %>,<% end_if %> <% if First == 0 %>,<% end_if %>
$Type $Type
<% end_control %> <% end_loop %>
</p> </p>
<% end_if %> <% end_if %>
<% if RegionalSupports %> <% if RegionalSupports %>
@ -82,13 +82,13 @@
<h3 style="color: {$Company.CompanyColorRGB} !important;">Regions where support is offered</h3> <h3 style="color: {$Company.CompanyColorRGB} !important;">Regions where support is offered</h3>
<table class="regions"> <table class="regions">
<tbody> <tbody>
<% control RegionalSupports %> <% loop RegionalSupports %>
<tr> <tr>
<% control Region %> <% loop Region %>
<td>$Name</td> <td>$Name</td>
<% end_control %> <% end_loop %>
</tr> </tr>
<% end_control %> <% end_loop %>
</tbody> </tbody>
</table> </table>
<% end_if %> <% end_if %>
@ -97,11 +97,11 @@
<h3 style="color: {$Company.CompanyColorRGB} !important;">OpenStack API Coverage</h3> <h3 style="color: {$Company.CompanyColorRGB} !important;">OpenStack API Coverage</h3>
<table class="api-coverage"> <table class="api-coverage">
<tbody> <tbody>
<% control Capabilities %> <% loop Capabilities %>
<% if SupportsVersioning %> <% if SupportsVersioning %>
<% control ReleaseSupportedApiVersion %> <% loop ReleaseSupportedApiVersion %>
<% if ApiVersion %> <% if ApiVersion %>
<% control OpenStackComponent %> <% loop OpenStackComponent %>
<tr> <tr>
<td> <td>
$Name API $Name API
@ -109,18 +109,18 @@
</td> </td>
<td> <td>
$CodeName $CodeName
<% end_control %> <% end_loop %>
<% control ApiVersion %> $Version<% end_control %> <% loop ApiVersion %> $Version<% end_loop %>
</td> </td>
<% end_if %> <% end_if %>
<% end_control %> <% end_loop %>
<td class="coverage"> <td class="coverage">
<span>$CoveragePercent %</span> <span>$CoveragePercent %</span>
</td> </td>
</tr> </tr>
<% end_if %> <% end_if %>
<% end_control %> <% end_loop %>
</tbody> </tbody>
</table> </table>
<% end_if %> <% end_if %>
@ -137,10 +137,10 @@
<% if Videos %> <% if Videos %>
<hr> <hr>
<div id="videos"> <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> <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> <a href="//www.youtube.com/embed/{$YouTubeId}"> Video </a>
<% end_control %> <% end_loop %>
</div> </div>
<% end_if %> <% end_if %>
@ -149,9 +149,9 @@
<div id="more-resources"> <div id="more-resources">
<h3 style="color: {$Company.CompanyColorRGB} !important;">More Resources</h3> <h3 style="color: {$Company.CompanyColorRGB} !important;">More Resources</h3>
<ul> <ul>
<% control Resources %> <% loop Resources %>
<li style="color: {$Company.CompanyColorRGB}>$Name</li> <li style="color: {$Company.CompanyColorRGB}>$Name</li>
<% end_control %> <% end_loop %>
</ul> </ul>
</div> </div>
<% end_if %> <% end_if %>

24
marketplace/templates/Layout/Includes/MarketPlaceAdminPage_implementations_list.ss
View File

@ -20,9 +20,9 @@
<select name="implementation_type_id" id="implementation_type_id"> <select name="implementation_type_id" id="implementation_type_id">
<option value="">--select--</option> <option value="">--select--</option>
<% if DistributionMarketPlaceTypes %> <% if DistributionMarketPlaceTypes %>
<% control DistributionMarketPlaceTypes %> <% loop DistributionMarketPlaceTypes %>
<option value="$ID">$Name</option> <option value="$ID">$Name</option>
<% end_control %> <% end_loop %>
<% end_if %> <% end_if %>
</select> </select>
</td> </td>
@ -30,9 +30,9 @@
<select name="company_id" id="company_id"> <select name="company_id" id="company_id">
<option value="">--select--</option> <option value="">--select--</option>
<% if Companies %> <% if Companies %>
<% control Companies %> <% loop Companies %>
<option value="$ID">$Name</option> <option value="$ID">$Name</option>
<% end_control %> <% end_loop %>
<% end_if %> <% end_if %>
</select> </select>
</td> </td>
@ -64,7 +64,7 @@
</thead> </thead>
<tbody> <tbody>
<% if Distributions %> <% if Distributions %>
<% control Distributions %> <% loop Distributions %>
<tr> <tr>
<td> <td>
$Company.Name $Company.Name
@ -85,25 +85,25 @@
<% if Top.isSuperAdmin %> <% if Top.isSuperAdmin %>
<td> <td>
<% if EditedBy %> <% if EditedBy %>
<% control EditedBy %> <% with EditedBy %>
$Email ($CurrentCompany) $Email ($CurrentCompany)
<% end_control %> <% end_with %>
<% else %> <% else %>
N/A N/A
<% end_if %> <% end_if %>
</td> </td>
<% end_if %> <% end_if %>
<td style="min-width: 200px" width="30%"> <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 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="<% 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="<% 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="<% 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 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="#" <a class="roundedButton delete-implementation product-button addDeploymentBtn" href="#"
data-id="{$ID}" data-id="{$ID}"
data-is_draft="{$isDraft}" 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> </td>
</tr> </tr>
<% end_control %> <% end_loop %>
<% end_if %> <% end_if %>
</tbody> </tbody>
</table> </table>

2
openstack/code/sangria/SangriaPage.php
View File

@ -231,7 +231,7 @@ final class SangriaPage_Controller extends Page_Controller {
$filterWhereClause = self::generateFilterWhereClause(); $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); $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++) { for( $i=0; $i < $results->numRecords(); $i++) {
$record = $results->nextRecord(); $record = $results->nextRecord();

2
openstack/code/user-stories/UserStory.php
View File

@ -11,8 +11,6 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
**/ **/
$include_path = Director::baseFolder() . '/html2pdf_v4.03/html2pdf.class.php';
require_once($include_path);
class UserStory extends Page class UserStory extends Page
{ {