openinfra
/
openstackweb
Code Issues Proposed changes

[smarcet] - #7811 

* fixed marketplace css issues/links
This commit is contained in:
Sebastian Marcet 2014-12-01 19:37:48 -03:00
parent fd38946af3
commit 2855aa90d5
4 changed files with 22 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
marketplace/templates/Layout/Includes/TrainingDirectoryPage_CompanyTraining.ss
View File

@ -4,7 +4,7 @@
<div class="col-lg-6">
<div class="logo-area">
<span style="background-color: #{$Company.CompanyColor}" class="color-bar"></span>
<a href="$Top.Link{$Company.URLSegment}/{$ID}" >
<a href="$TrainingLink{$Company.URLSegment}/$ID" >
$Company.SmallLogoPreview(150)
</a>
</div>
@ -12,7 +12,7 @@
<div class="col-lg-6">
<div class="company-details-area">
<h1>
<a href="$Top.Link{$Company.URLSegment}/$ID" style="color: #{$Company.CompanyColor}">$ProgramName</a>
<a href="$TrainingLink{$Company.URLSegment}/$ID" style="color: #{$Company.CompanyColor}">$ProgramName</a>
</h1>
<div>$Description</div>
</div>
@ -26,22 +26,22 @@
<th class="level">Level</th>
<th class="location-date">Next Location / Date</th>
</tr>
<% loop Courses %>
<tr>
<td class="course"><a href="$Top.Link{$BookMark}" >$CourseName</a></td>
<td class="level">
<span class="$LwrLevel">$Level</span>
</td>
<% if IsOnline %>
<td class="location-date">Ongoing / Online Only</td>
<% else %>
<td class="location-date">$StartDateMonth $StartDateDay - $EndDateMonth $EndDateDay / $City</td>
<% end_if %>
</tr>
<% end_loop %>
<% loop Courses %>
<tr>
<td class="course"><a href="$TrainingLink{$BookMark}" >$CourseName</a></td>
<td class="level">
<span class="$LwrLevel">$Level</span>
</td>
<% if IsOnline %>
<td class="location-date">Ongoing / Online Only</td>
<% else %>
<td class="location-date">$StartDateMonth $StartDateDay - $EndDateMonth $EndDateDay / $City</td>
<% end_if %>
</tr>
<% end_loop %>
</tbody></table>
<a style="background-color: #{$Company.CompanyColor}" href="$Top.Link{$Company.URLSegment}/$ID" class="details-button">Details</a>
<a style="background-color: #{$Company.CompanyColor}" href="$TrainingLink{$Company.URLSegment}/$ID" class="details-button">Details</a>
</div>
</div>
</div>
<% end_if %>
<% end_if %>

5
marketplace/templates/Layout/Includes/TrainingDirectoryPage_CompanyTrainingList.ss
View File

@ -1,5 +0,0 @@
<% if Trainings %>
<% loop Trainings %>
<% include TrainingDirectoryPage_CompanyTraining %>
<% end_loop %>
<% end_if %>

7
marketplace/templates/Layout/TrainingDirectoryPage.ss
View File

@ -19,8 +19,11 @@
</div>
<div class='container'>
<div id="training-list" class='col-lg-8 col-md-8 col-sm-8'>
<% include TrainingDirectoryPage_CompanyTrainingList %>
&nbsp;
<% if Trainings %>
<% loop Trainings %>
<% include TrainingDirectoryPage_CompanyTraining TrainingLink=$Top.Link%>
<% end_loop %>
<% end_if %>
</div>
<div class="col-lg-4 col-md-4 col-sm-4">
<h3>OpenStack Online Help</h3>

73
themes/openstack/templates/MarketplacePage.ss
View File

@ -1,73 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="globalsign-domain-verification" content="tWFOHNAA_WMHmHfBMq38uTgupHFugV_dZ2rqyRxNMx" />
<title>$Title &raquo; OpenStack Open Source Cloud Computing Software</title>
<% base_tag %>
<link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="http://www.openstack.org/blog/feed/" />
<!-- Fonts -->
<link href="http://maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
<link href='http://fonts.googleapis.com/css?family=Open+Sans:300,400,700' rel='stylesheet' type='text/css'>
<!-- Framework CSS -->
<link rel="stylesheet" href="/themes/openstack/css/blueprint/screen.css" type="text/css" media="screen, projection">
<link rel="stylesheet" href="/themes/openstack/css/bootstrap.min.css" type="text/css" media="screen, projection">
<!-- OpenStack Specific CSS -->
<% if BootstrapConverted %>
<% else %>
<link href="/themes/openstack/css/main.css" rel="stylesheet">
<% end_if %>
<link href="/themes/openstack/css/combined.css" rel="stylesheet">
<link rel="stylesheet" href="/themes/openstack/css/dropdown.css" type="text/css" media="screen, projection, print">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
<% include Analytics %>
</head>
<body id="$URLSegment">
<% include SiteBanner %>
<% include Navigation %>
<!-- Page Content -->
<% if BootstrapConverted %>
<div class="container">
<% include MarketPlaceFrontendNav %>
</div>
<div class="container">
$Message
$Layout
</div>
<% else %>
<div class="container">
<% include MarketPlaceFrontendNav %>
</div>
<div class="container">
$Layout
</div>
<% end_if %>
<% include Footer %>
<% include Quantcast %>
</body>
</html>