Merge pull request #7 from fluentdesk/rel/v0.4.0-beta

rel/v0.4.0 beta
This commit is contained in:
JD 2015-11-18 04:47:36 -05:00
commit 5439bd5385
8 changed files with 89 additions and 48 deletions

View File

@ -1,6 +1,6 @@
{
"name": "fluent-themes",
"version": "0.3.0-beta",
"version": "0.4.0-beta",
"description": "Resume themes for FluentCV.",
"repository": {
"type": "git",

View File

@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>{{ r.basics.name }}</title>
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
<link href="resume.css" rel="stylesheet" type="text/css">
<link href="html.css" rel="stylesheet" type="text/css">
</head>
<body>
<main>
@ -41,7 +41,7 @@
{% r.skills.forEach( function( skill, idx, ar) { %}
<tr>
<td style="width: 25%;">{{ skill.name }}</td>
<td class="keywords">{% print( skill.keywords.join(', ') ) %}</td>
<td class="keywords">{% print( (skill.keywords && skill.keywords.length && skill.keywords.join(', ')) || '[None Specified]' ) %}</td>
</tr>
{% }); %}
</tbody>
@ -129,7 +129,7 @@
</section>
{% } %}
{% if( r.publications ) { %}
{% if( r.publications && r.publications.length ) { %}
<section id="publications">
<header>
<h2>Publications</h2><hr>
@ -151,7 +151,7 @@
</section>
{% } %}
{% if( r.awards ) { %}
{% if( r.awards && r.awards.length ) { %}
<section id="awards">
<header>
<h2>Awards</h2><hr>

View File

@ -5,6 +5,19 @@ html, body, main, section, header, ul, p, h1, h2, h3 {
display: block;
}
a {
color: #0064BD;
text-decoration: none;
}
a:visited {
color: #7B0796;
}
a:hover {
text-decoration: underline;
}
h2 {
text-transform: uppercase;
}
@ -52,6 +65,7 @@ main > header {
main > header > h1 {
float: left;
font-size: 1.5em;
}
#contact {
float: right;

View File

@ -43,7 +43,7 @@
{% r.skills.forEach( function( skill, idx, ar) { %}
<tr>
<td style="width: 25%;">{{ skill.name }}</td>
<td class="keywords">{% print( skill.keywords.join(', ') ) %}</td>
<td class="keywords">{% print( (skill.keywords && skill.keywords.length && skill.keywords.join(', ')) || '[None Specified]' ) %}</td>
</tr>
{% }); %}
</tbody>
@ -58,18 +58,41 @@
<header>
<h2>Employment</h2><hr>
</header>
{% r.work.forEach( function( proj, idx, ar) { %}
<h3><em>{{ proj.position }}</em>, {{ proj.company }} <span class="tenure">{{ proj.startDate }} &mdash; {{ proj.endDate }}<span></h3>
<p style="clear: both;">{{ proj.summary|md }}</p>
{% if( proj.highlights ) { %}
{% if( idx < 4 ) { %}
<h3><em>{{ proj.position }}</em>, {{ proj.company }} <span class="tenure">{{ proj.startDate }} &mdash; {{ proj.endDate }}<span></h3>
<p style="clear: both;">{{ proj.summary|md }}</p>
{% if( proj.highlights ) { %}
<ul>
{% proj.highlights.forEach( function( high, idx, ar) { %}
<li>{{ high|mdin }}</li>
{% }); %}
</ul>
{% } %}
{% } else { %}
{% if( idx === 4 ) { %}
<h3>Previously... <span class="tenure">{{ r.work[ r.work.length - 1 ].safeStartDate.format('YYYY') }} &mdash; {{ proj.safeEndDate.format('YYYY') }}<span></h3>
<p style="clear: both;">Prior to {{ r.work[ 3 ].company }}, I worked on a range of projects for companies large and small.</p>
<ul>
{% proj.highlights.forEach( function( high, idx, ar) { %}
<li>{{ high|md }}</li>
{% }); %}
{% } %}
<li>{{ proj.position }}, {{ proj.company }}</li>
{% if( idx === ar.length - 1 ) { %}
</ul>
{% } %}
{% } %}
{% }); %}
</section>
{% } %}
@ -81,7 +104,7 @@
<h2>Education</h2><hr>
</header>
{% r.education.forEach( function( edu, idx, ar) { %}
<h3>{{ edu.institution }} <span class="tenure">{{ edu.startDate }} &mdash; {{ edu.endDate }}<span></h3>
<h3>{{ edu.institution }} <span class="tenure">{{ edu.safeStartDate.format('YYYY') }} &mdash; {{ edu.safeEndDate.format('YYYY') }}<span></h3>
<p style="clear: both;">{{ edu.area|md }}</p>
{% }); %}
@ -94,7 +117,7 @@
<h2>Volunteer</h2><hr>
</header>
{% r.volunteer.forEach( function( vol, idx, ar ) { %}
<h3>{{ vol.organization }} <span class="tenure">{{ vol.startDate }} &mdash; {{ vol.endDate }}<span></h3>
<h3>{{ vol.organization }} <span class="tenure">{{ vol.safeStartDate.format('YYYY') }} &mdash; {{ vol.safeEndDate.format('YYYY') }}<span></h3>
<p style="clear: both;">{{ vol.summary|md }}</p>
{% if( vol.highlights ) { %}
<ul>
@ -108,7 +131,7 @@
</section>
{% } %}
{% if( r.publications ) { %}
{% if( r.publications && r.publications.length ) { %}
<section id="publications">
<header>
<h2>Publications</h2><hr>
@ -121,8 +144,8 @@
{% } else { %}
<span class="res-label">{{ pub.name }}</span>,&nbsp;{{ pub.publisher }}
{% } %}
<span class="tenure">{{ pub.safeReleaseDate.format('YYYY') }}</span>
</h4>
<span class="tenure">Published on: {{ pub.releaseDate }}</span>
{{ pub.summary|md }}
@ -130,15 +153,14 @@
</section>
{% } %}
{% if( r.awards ) { %}
{% if( r.awards && r.awards.length ) { %}
<section id="awards">
<header>
<h2>Awards</h2><hr>
</header>
<span class="fa fa-lg fa-trophy"></span>
{% r.awards.forEach( function( award, idx, ar) { %}
<h4><span class="res-label">{{ award.title }}</span>, {{ award.awarder }}</h4>
<span class="tenure">{{ award.date }}</span>
<h4><span class="res-label">{{ award.title }}</span>, {{ award.awarder }} <span class="tenure">{{ award.safeDate.format('YYYY') }}</span></h4>
{{ award.summary|md }}
{% }); %}
</section>

View File

@ -41,7 +41,7 @@
{% r.skills.forEach( function( skill, idx, ar) { %}
<tr>
<td style="width: 25%;">{{ skill.name }}</td>
<td class="keywords">{% print( skill.keywords.join(', ') ) %}</td>
<td class="keywords">{% print( (skill.keywords && skill.keywords.length && skill.keywords.join(', ')) || '[None Specified]' ) %}</td>
</tr>
{% }); %}
</tbody>

View File

@ -43,7 +43,7 @@
{% r.skills.forEach( function( skill, idx, ar) { %}
<tr>
<td style="width: 25%;">{{ skill.name }}</td>
<td class="keywords">{% print(skill.keywords.join(', ')); %}</td>
<td class="keywords">{% print( (skill.keywords && skill.keywords.length && skill.keywords.join(', ')) || '[None Specified]' ) %}</td>
</tr>
{% }); %}
</tbody>

View File

@ -64,9 +64,11 @@ engine: Underscore
<strong>{{ skill.name }}</strong>
<div class="space-top labels">
{% skill.keywords.forEach(function(kw) { %}
<span class="label label-keyword">{{ kw }}</span>
{% }); %}
{% if( skill.keywords && skill.keywords.length ) { %}
{% skill.keywords.forEach(function(kw) { %}
<span class="label label-keyword">{{ kw }}</span>
{% }); %}
{% } %}
</div>
</div>
</li>
@ -131,7 +133,7 @@ engine: Underscore
</section>
{% } %}
{% if( r.awards ) { %}
{% if( r.awards && r.awards.length ) { %}
<hr>
<section id="awards">
<header>
@ -146,7 +148,7 @@ engine: Underscore
</section>
{% } %}
{% if( r.publications ) { %}
{% if( r.publications && r.publications.length ) { %}
<hr>
<section id="publications">
<header>

View File

@ -7,15 +7,18 @@ engine: Underscore
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{ r.basics.name }}</title>
<link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet" type="text/css">
<link href='https://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
{{ headFragment }}
<style>
{{ cssInfo.data }}
</style>
</head>
<body class="pdf">
<div id="main">
<body>
<main id="main">
<div id="container">
<header>
<h1>{{ r.basics.name }}</h1>
@ -57,9 +60,11 @@ engine: Underscore
<strong>{{ skill.name }}</strong>
<div class="space-top labels">
{% skill.keywords.forEach(function(kw) { %}
<span class="label label-keyword">{{ kw }}</span>
{% }); %}
{% if( skill.keywords && skill.keywords.length ) { %}
{% skill.keywords.forEach(function(kw) { %}
<span class="label label-keyword">{{ kw }}</span>
{% }); %}
{% } %}
</div>
</div>
</li>
@ -81,9 +86,9 @@ engine: Underscore
<span class="fa fa-lg fa-building"></span>
{% r.work.forEach( function( proj, idx, ar) { %}
{% if( proj.website && proj.website.length ) { %}
<h4>{{ proj.position }}, <a href="{{ proj.website|raw }}">{{ proj.company }}</a></h4>
<h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ proj.website|raw }}">{{ proj.company }}</a></h4>
{% } else { %}
<h4>{{ proj.position }}, <span class="defunct">{{ proj.company }}</span></h4>
<h4><span class="res-label">{{ proj.position }}</span>, <span class="defunct">{{ proj.company }}</span></h4>
{% } %}
<span class="tenure">{{ proj.startDate }}&mdash;{{ proj.endDate }}</span>
{{ proj.summary|md }}
@ -124,7 +129,7 @@ engine: Underscore
</section>
{% } %}
{% if( r.awards ) { %}
{% if( r.awards && r.awards.length ) { %}
<hr>
<section id="awards">
<header>
@ -132,14 +137,14 @@ engine: Underscore
</header>
<span class="fa fa-lg fa-trophy"></span>
{% r.awards.forEach( function( award, idx, ar) { %}
<h4><em>{{ award.title }}</em>, {{ award.awarder }}</h4>
<h4><span class="res-label">{{ award.title }}</span>, {{ award.awarder }}</h4>
<span class="tenure">{{ award.date }}</span>
{{ award.summary|md }}
{% }); %}
</section>
{% } %}
{% if( r.publications ) { %}
{% if( r.publications && r.publications.length ) { %}
<hr>
<section id="publications">
<header>
@ -149,20 +154,19 @@ engine: Underscore
{% r.publications.forEach( function( pub, idx, ar) { %}
<h4>
{% if( pub.website ) { %}
<a href="{{ pub.website }}" >{{ pub.name }}</a>
<span class="res-label"><a href="{{ pub.website }}" ></span>{{ pub.name }}</a>,&nbsp;{{ pub.publisher }}
{% } else { %}
{{ pub.name }}
<span class="res-label">{{ pub.name }}</span>,&nbsp;{{ pub.publisher }}
{% } %}
,&nbsp;
{{ pub.publisher }}
</h4>
<span class="tenure">Published on: {{ pub.releaseDate }}</span>
<p>{{ pub.summary }}</p>
{{ pub.summary|md }}
{% }); %}
</section>
{% } %}
{% if ( r.volunteer && r.volunteer.length ) { %}
<hr>
<section id="volunteer">
@ -172,9 +176,9 @@ engine: Underscore
<span class="fa fa-lg fa-child"></span>
{% r.volunteer.forEach( function( vol, idx, ar) { %}
{% if( vol.website && vol.website.length ) { %}
<h4>{{ vol.position }}, <a href="{{ vol.website|raw }}">{{ vol.organization }}</a></h4>
<h4><span class="res-label">{{ vol.position }}</span>, <a href="{{ vol.website|raw }}">{{ vol.organization }}</a></h4>
{% } else { %}
<h4>{{ vol.position }}, <span class="defunct">{{ vol.organization }}</span></h4>
<h4><span class="res-label">{{ vol.position }}</span>, <span class="defunct">{{ vol.organization }}</span></h4>
{% } %}
<span class="tenure">{{ vol.startDate }}&mdash;{{ vol.endDate }}</span>
{{ vol.summary|md }}
@ -190,7 +194,6 @@ engine: Underscore
</section>
{% } %}
{% if( r.elevatorPitch ) { %}
<hr>
<section id='elevator-pitch'>
@ -198,7 +201,7 @@ engine: Underscore
</section>
{% } %}
</div>
</div>
</div>
</main>
</body>
</html>