From 7435ea4aaa05f129fbeb33fd8e12faba55c65515 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Thu, 5 Nov 2015 01:02:25 -0500 Subject: [PATCH 1/7] Bump version to 0.4.0. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9376ee6..0e71f12 100644 --- a/package.json +++ b/package.json @@ -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", From d99a99b3dc105b60b1449c8c4bb3d76990e27a45 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Thu, 5 Nov 2015 01:13:31 -0500 Subject: [PATCH 2/7] Update CSS filename for "compact" theme. --- themes/compact/templates/html.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/compact/templates/html.html b/themes/compact/templates/html.html index 644b17d..71be053 100644 --- a/themes/compact/templates/html.html +++ b/themes/compact/templates/html.html @@ -4,7 +4,7 @@ {{ r.basics.name }} - +
From 05a875b837f28348aaab1d4b10fc21eeb66a5fe1 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Thu, 5 Nov 2015 11:21:00 -0500 Subject: [PATCH 3/7] Theme: Compact: Exclude empty pubs / awards. --- themes/compact/templates/html.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/compact/templates/html.html b/themes/compact/templates/html.html index 71be053..a7c8f34 100644 --- a/themes/compact/templates/html.html +++ b/themes/compact/templates/html.html @@ -129,7 +129,7 @@ {% } %} -{% if( r.publications ) { %} +{% if( r.publications && r.publications.length ) { %}

Publications

@@ -151,7 +151,7 @@
{% } %} -{% if( r.awards ) { %} +{% if( r.awards && r.awards.length ) { %}

Awards

From e23a1ed0a48b6953ad39356df0249989437210c0 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Thu, 5 Nov 2015 11:21:17 -0500 Subject: [PATCH 4/7] Theme: Compact: Update PDF format from HTML. --- themes/compact/templates/pdf.css | 14 +++++++++ themes/compact/templates/pdf.html | 48 ++++++++++++++++++++++--------- 2 files changed, 49 insertions(+), 13 deletions(-) diff --git a/themes/compact/templates/pdf.css b/themes/compact/templates/pdf.css index 4eebd3e..33b6129 100644 --- a/themes/compact/templates/pdf.css +++ b/themes/compact/templates/pdf.css @@ -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; diff --git a/themes/compact/templates/pdf.html b/themes/compact/templates/pdf.html index 7ebff8e..9fce8de 100644 --- a/themes/compact/templates/pdf.html +++ b/themes/compact/templates/pdf.html @@ -58,18 +58,41 @@

Employment

+ + + {% r.work.forEach( function( proj, idx, ar) { %} -

{{ proj.position }}, {{ proj.company }} {{ proj.startDate }} — {{ proj.endDate }}

-

{{ proj.summary|md }}

- {% if( proj.highlights ) { %} + {% if( idx < 4 ) { %} +

{{ proj.position }}, {{ proj.company }} {{ proj.startDate }} — {{ proj.endDate }}

+

{{ proj.summary|md }}

+ {% if( proj.highlights ) { %} +
    + {% proj.highlights.forEach( function( high, idx, ar) { %} +
  • {{ high|mdin }}
    • + {% }); %} +
+ {% } %} + {% } else { %} + + {% if( idx === 4 ) { %} +

Previously... {{ r.work[ r.work.length - 1 ].safeStartDate.format('YYYY') }} — {{ proj.safeEndDate.format('YYYY') }}

+

Prior to {{ r.work[ 3 ].company }}, I worked on a range of projects for companies large and small.

    - {% proj.highlights.forEach( function( high, idx, ar) { %} -
  • {{ high|md }}
    • - {% }); %} + {% } %} + + +
  • {{ proj.position }}, {{ proj.company }}
    • + + + {% if( idx === ar.length - 1 ) { %}
+ {% } %} + {% } %} {% }); %} + +
{% } %} @@ -81,7 +104,7 @@

Education

{% r.education.forEach( function( edu, idx, ar) { %} -

{{ edu.institution }} {{ edu.startDate }} — {{ edu.endDate }}

+

{{ edu.institution }} {{ edu.safeStartDate.format('YYYY') }} — {{ edu.safeEndDate.format('YYYY') }}

{{ edu.area|md }}

{% }); %} @@ -94,7 +117,7 @@

Volunteer

{% r.volunteer.forEach( function( vol, idx, ar ) { %} -

{{ vol.organization }} {{ vol.startDate }} — {{ vol.endDate }}

+

{{ vol.organization }} {{ vol.safeStartDate.format('YYYY') }} — {{ vol.safeEndDate.format('YYYY') }}

{{ vol.summary|md }}

{% if( vol.highlights ) { %}
    @@ -108,7 +131,7 @@ {% } %} -{% if( r.publications ) { %} +{% if( r.publications && r.publications.length ) { %}

    Publications

    @@ -121,8 +144,8 @@ {% } else { %} {{ pub.name }}, {{ pub.publisher }} {% } %} + {{ pub.safeReleaseDate.format('YYYY') }} - Published on: {{ pub.releaseDate }} {{ pub.summary|md }} @@ -130,15 +153,14 @@
    {% } %} -{% if( r.awards ) { %} +{% if( r.awards && r.awards.length ) { %}

    Awards

    {% r.awards.forEach( function( award, idx, ar) { %} -

    {{ award.title }}, {{ award.awarder }}

    - {{ award.date }} +

    {{ award.title }}, {{ award.awarder }} {{ award.safeDate.format('YYYY') }}

    {{ award.summary|md }} {% }); %}
    From 9552eda254d3e97b3b1662e830d51a4dc6c8c157 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Thu, 5 Nov 2015 11:36:11 -0500 Subject: [PATCH 5/7] Modern: Exclude empty pubs / awards. --- themes/modern/templates/html.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/modern/templates/html.html b/themes/modern/templates/html.html index 85c09ed..b0ecbd5 100644 --- a/themes/modern/templates/html.html +++ b/themes/modern/templates/html.html @@ -131,7 +131,7 @@ engine: Underscore {% } %} -{% if( r.awards ) { %} +{% if( r.awards && r.awards.length ) { %}
    @@ -146,7 +146,7 @@ engine: Underscore
    {% } %} -{% if( r.publications ) { %} +{% if( r.publications && r.publications.length ) { %}
    From 2261537724673b340a7bde818a6070b7ed8f26d5 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Thu, 5 Nov 2015 11:36:24 -0500 Subject: [PATCH 6/7] Modern: Update PDF template from HTML. --- themes/modern/templates/pdf.html | 39 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/themes/modern/templates/pdf.html b/themes/modern/templates/pdf.html index 2d17d2a..13aef3c 100644 --- a/themes/modern/templates/pdf.html +++ b/themes/modern/templates/pdf.html @@ -7,15 +7,18 @@ engine: Underscore + + {{ r.basics.name }} - + + {{ headFragment }} - -
    + +

    {{ r.basics.name }}

    @@ -81,9 +84,9 @@ engine: Underscore {% r.work.forEach( function( proj, idx, ar) { %} {% if( proj.website && proj.website.length ) { %} -

    {{ proj.position }}, {{ proj.company }}

    +

    {{ proj.position }}, {{ proj.company }}

    {% } else { %} -

    {{ proj.position }}, {{ proj.company }}

    +

    {{ proj.position }}, {{ proj.company }}

    {% } %} {{ proj.startDate }}—{{ proj.endDate }} {{ proj.summary|md }} @@ -124,7 +127,7 @@ engine: Underscore
    {% } %} -{% if( r.awards ) { %} +{% if( r.awards && r.awards.length ) { %}
    @@ -132,14 +135,14 @@ engine: Underscore
    {% r.awards.forEach( function( award, idx, ar) { %} -

    {{ award.title }}, {{ award.awarder }}

    +

    {{ award.title }}, {{ award.awarder }}

    {{ award.date }} {{ award.summary|md }} {% }); %}
    {% } %} -{% if( r.publications ) { %} +{% if( r.publications && r.publications.length ) { %}
    @@ -149,20 +152,19 @@ engine: Underscore {% r.publications.forEach( function( pub, idx, ar) { %}

    {% if( pub.website ) { %} - {{ pub.name }} + {{ pub.name }}, {{ pub.publisher }} {% } else { %} - {{ pub.name }} + {{ pub.name }}, {{ pub.publisher }} {% } %} - ,  - {{ pub.publisher }}

    Published on: {{ pub.releaseDate }} -

    {{ pub.summary }}

    + + {{ pub.summary|md }} + {% }); %}
    {% } %} - {% if ( r.volunteer && r.volunteer.length ) { %}
    @@ -172,9 +174,9 @@ engine: Underscore {% r.volunteer.forEach( function( vol, idx, ar) { %} {% if( vol.website && vol.website.length ) { %} -

    {{ vol.position }}, {{ vol.organization }}

    +

    {{ vol.position }}, {{ vol.organization }}

    {% } else { %} -

    {{ vol.position }}, {{ vol.organization }}

    +

    {{ vol.position }}, {{ vol.organization }}

    {% } %} {{ vol.startDate }}—{{ vol.endDate }} {{ vol.summary|md }} @@ -190,7 +192,6 @@ engine: Underscore
    {% } %} - {% if( r.elevatorPitch ) { %}
    @@ -198,7 +199,7 @@ engine: Underscore
    {% } %} - - + +
From 7be839bdbfcef8470b032d7dd2f43b2154acaa76 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Thu, 5 Nov 2015 11:53:17 -0500 Subject: [PATCH 7/7] Multiple: Fix skill keywords collection glitches. --- themes/compact/templates/html.html | 2 +- themes/compact/templates/pdf.html | 2 +- themes/minimist/templates/html.html | 2 +- themes/minimist/templates/pdf.html | 2 +- themes/modern/templates/html.html | 8 +++++--- themes/modern/templates/pdf.html | 8 +++++--- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/themes/compact/templates/html.html b/themes/compact/templates/html.html index a7c8f34..b572789 100644 --- a/themes/compact/templates/html.html +++ b/themes/compact/templates/html.html @@ -41,7 +41,7 @@ {% r.skills.forEach( function( skill, idx, ar) { %} {{ skill.name }} - {% print( skill.keywords.join(', ') ) %} + {% print( (skill.keywords && skill.keywords.length && skill.keywords.join(', ')) || '[None Specified]' ) %} {% }); %} diff --git a/themes/compact/templates/pdf.html b/themes/compact/templates/pdf.html index 9fce8de..747e5d1 100644 --- a/themes/compact/templates/pdf.html +++ b/themes/compact/templates/pdf.html @@ -43,7 +43,7 @@ {% r.skills.forEach( function( skill, idx, ar) { %} {{ skill.name }} - {% print( skill.keywords.join(', ') ) %} + {% print( (skill.keywords && skill.keywords.length && skill.keywords.join(', ')) || '[None Specified]' ) %} {% }); %} diff --git a/themes/minimist/templates/html.html b/themes/minimist/templates/html.html index e7a9349..1009f91 100644 --- a/themes/minimist/templates/html.html +++ b/themes/minimist/templates/html.html @@ -41,7 +41,7 @@ {% r.skills.forEach( function( skill, idx, ar) { %} {{ skill.name }} - {% print( skill.keywords.join(', ') ) %} + {% print( (skill.keywords && skill.keywords.length && skill.keywords.join(', ')) || '[None Specified]' ) %} {% }); %} diff --git a/themes/minimist/templates/pdf.html b/themes/minimist/templates/pdf.html index 5ae3777..4168d94 100644 --- a/themes/minimist/templates/pdf.html +++ b/themes/minimist/templates/pdf.html @@ -43,7 +43,7 @@ {% r.skills.forEach( function( skill, idx, ar) { %} {{ skill.name }} - {% print(skill.keywords.join(', ')); %} + {% print( (skill.keywords && skill.keywords.length && skill.keywords.join(', ')) || '[None Specified]' ) %} {% }); %} diff --git a/themes/modern/templates/html.html b/themes/modern/templates/html.html index b0ecbd5..40421cb 100644 --- a/themes/modern/templates/html.html +++ b/themes/modern/templates/html.html @@ -64,9 +64,11 @@ engine: Underscore {{ skill.name }}
- {% skill.keywords.forEach(function(kw) { %} - {{ kw }} - {% }); %} + {% if( skill.keywords && skill.keywords.length ) { %} + {% skill.keywords.forEach(function(kw) { %} + {{ kw }} + {% }); %} + {% } %}
diff --git a/themes/modern/templates/pdf.html b/themes/modern/templates/pdf.html index 13aef3c..eb36706 100644 --- a/themes/modern/templates/pdf.html +++ b/themes/modern/templates/pdf.html @@ -60,9 +60,11 @@ engine: Underscore {{ skill.name }}
- {% skill.keywords.forEach(function(kw) { %} - {{ kw }} - {% }); %} + {% if( skill.keywords && skill.keywords.length ) { %} + {% skill.keywords.forEach(function(kw) { %} + {{ kw }} + {% }); %} + {% } %}