From 0cc64d51ceed3793db4972c2330c7621d896df1c Mon Sep 17 00:00:00 2001 From: devlinjd Date: Wed, 16 Dec 2015 12:08:32 -0500 Subject: [PATCH 01/10] Update Markdown formats. --- themes/compact/src/compact-md.txt | 54 +++++++++++++++++++++++++++++++ themes/minimist/src/md.txt | 11 ++----- themes/modern/src/md.txt | 11 ++----- 3 files changed, 60 insertions(+), 16 deletions(-) create mode 100644 themes/compact/src/compact-md.txt diff --git a/themes/compact/src/compact-md.txt b/themes/compact/src/compact-md.txt new file mode 100644 index 0000000..c22301b --- /dev/null +++ b/themes/compact/src/compact-md.txt @@ -0,0 +1,54 @@ +# {{ r.name }} + +{% if (r.contact.email) { %}Email: {{ r.contact.email }}{% } %} +{% if (r.contact.phone) { %}Tel: {{ r.contact.phone }}{% } %} +{% if (r.contact.website) { %}Web: {{ r.contact.website }}{% } %} + +{% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %} + +{% if ( r.skills && r.skills.sets ) { %} +## Skills +{% r.skills.sets.forEach( function( set, idx, ar) { %} +- **{{ set.name }}**: {{ set.skills.join(', ') }} +{% }); } %} + +{% if ( r.employment.history && r.employment.history.length ) { %} +## Employment +{% r.employment.history.forEach( function( proj, idx, ar) { %} +### *{{ proj.position }}*, {{ proj.employer }} +{{ proj.safe.start.format('MMM YYYY') }} — {{ proj.safe.end.format('MMM YYYY') }} +{{ proj.summary }} +{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high, idx, ar) { %} +- {{ high }} +{% }); } }); } %} + +{% if ( r.education.history && r.education.history.length ) { %} +## Education +{% r.education.history.forEach( function( edu, idx, ar) { %} +### {{ edu.institution }} ({{ edu.safe.start.format('MMM YYYY') }} — {{ edu.safe.end.format('MMM YYYY') }}) +{{ edu.area }} +{% if( edu.curriculum ) { %}{% edu.curriculum.forEach( function( course, idx, ar) { %} +- {{ course }} +{% }); } }); } %} + +{% if ( r.writing && r.writing.length ) { %} +## Publications +{% r.writing.forEach( function( pub, idx, ar) { %} +### {{ pub.title }} ({{ pub.safe.date.format('MMM YYYY') }}) +{{ pub.publisher }} +{{ pub.summary }} +{% }); } %} + +{% if ( r.service.history && r.service.history.length ) { %} +## Volunteer +{% r.service.history.forEach( function( vol, idx, ar) { %} +### {{ vol.organization }} ({{ vol.safe.start.format('MMM YYYY') }} — {{ vol.safe.end.format('MMM YYYY') }}) +{{ vol.summary }} +{% }); } %} + +{% if ( r.recognition && r.recognition.length ) { %} +## Recognition +{% r.recognition.forEach( function( awd, idx, ar) { %} +### *{{ awd.title }}*, {{ awd.from }} ({{ awd.safe.date.format('MMM YYYY') }}) +{{ awd.summary }} +{% }); } %} diff --git a/themes/minimist/src/md.txt b/themes/minimist/src/md.txt index 20cd2d0..c22301b 100644 --- a/themes/minimist/src/md.txt +++ b/themes/minimist/src/md.txt @@ -1,9 +1,3 @@ -{# - - minimist/md.txt - A Markdown resume template for FluentCV's "minimist" theme. - -#} # {{ r.name }} {% if (r.contact.email) { %}Email: {{ r.contact.email }}{% } %} @@ -15,13 +9,14 @@ {% if ( r.skills && r.skills.sets ) { %} ## Skills {% r.skills.sets.forEach( function( set, idx, ar) { %} -- **{{ set.name }}**: {{ set.level }} +- **{{ set.name }}**: {{ set.skills.join(', ') }} {% }); } %} {% if ( r.employment.history && r.employment.history.length ) { %} ## Employment {% r.employment.history.forEach( function( proj, idx, ar) { %} -### *{{ proj.position }}*, {{ proj.employer }} ({{ proj.safe.start.format('MMM YYYY') }} — {{ proj.safe.end.format('MMM YYYY') }}) +### *{{ proj.position }}*, {{ proj.employer }} +{{ proj.safe.start.format('MMM YYYY') }} — {{ proj.safe.end.format('MMM YYYY') }} {{ proj.summary }} {% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high, idx, ar) { %} - {{ high }} diff --git a/themes/modern/src/md.txt b/themes/modern/src/md.txt index edd2dd3..c22301b 100644 --- a/themes/modern/src/md.txt +++ b/themes/modern/src/md.txt @@ -1,9 +1,3 @@ -{# - - modern/md.txt - A Markdown resume template for FluentCV's "modern" theme. - -#} # {{ r.name }} {% if (r.contact.email) { %}Email: {{ r.contact.email }}{% } %} @@ -15,13 +9,14 @@ {% if ( r.skills && r.skills.sets ) { %} ## Skills {% r.skills.sets.forEach( function( set, idx, ar) { %} -- **{{ set.name }}**: {{ set.level }} +- **{{ set.name }}**: {{ set.skills.join(', ') }} {% }); } %} {% if ( r.employment.history && r.employment.history.length ) { %} ## Employment {% r.employment.history.forEach( function( proj, idx, ar) { %} -### *{{ proj.position }}*, {{ proj.employer }} ({{ proj.safe.start.format('MMM YYYY') }} — {{ proj.safe.end.format('MMM YYYY') }}) +### *{{ proj.position }}*, {{ proj.employer }} +{{ proj.safe.start.format('MMM YYYY') }} — {{ proj.safe.end.format('MMM YYYY') }} {{ proj.summary }} {% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high, idx, ar) { %} - {{ high }} From d08651a8032edddc9b26757eb4f40ba9b6ce6421 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Wed, 16 Dec 2015 12:08:43 -0500 Subject: [PATCH 02/10] Bump version to 0.6.2-beta. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eaf1034..547080a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fluent-themes", - "version": "0.6.1-beta", + "version": "0.6.2-beta", "description": "Resume themes for FluentCV.", "repository": { "type": "git", From c8687626bfbd7dce84b5f13bd200e1cede79942e Mon Sep 17 00:00:00 2001 From: devlinjd Date: Wed, 16 Dec 2015 16:18:56 -0500 Subject: [PATCH 03/10] Compact: Fix theme title. --- themes/compact/compact.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/compact/compact.json b/themes/compact/compact.json index e6887cd..ad03cad 100644 --- a/themes/compact/compact.json +++ b/themes/compact/compact.json @@ -1,6 +1,6 @@ { - "title": "hello-world", + "title": "compact", "description": "A compact résumé theme for FluentCV.", "author": "hacksalot ", - "engine": "underscore" + "engine": "handlebars" } From 57879adce39ec0c7e55223559ca97bd9f3c14488 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Wed, 16 Dec 2015 16:19:21 -0500 Subject: [PATCH 04/10] Compact: Add MS Word format. --- themes/compact/src/compact-doc.xml | 2145 ++++++++++++++++++++ themes/compact/src/partials/education.xml | 77 + themes/compact/src/partials/employment.xml | 77 + 3 files changed, 2299 insertions(+) create mode 100644 themes/compact/src/compact-doc.xml create mode 100644 themes/compact/src/partials/education.xml create mode 100644 themes/compact/src/partials/employment.xml diff --git a/themes/compact/src/compact-doc.xml b/themes/compact/src/compact-doc.xml new file mode 100644 index 0000000..3ec23bf --- /dev/null +++ b/themes/compact/src/compact-doc.xml @@ -0,0 +1,2145 @@ + + + + + + Resume for {{ r.name }} + {{ r.name }} + resume;CV + {{ r.name }} + 1 + 60 + 2015-12-16T17:38:00Z + 2015-12-16T18:32:00Z + 1 + 241 + 1379 + 11 + 3 + 1617 + 15 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ r.name }} + + + + + + + + + + + + + + + {{ r.contact.email }} + + + + + + + - + + + + + + {{ r.contact.phone }} + + + + + + - + + + + + + + + {{ r.contact.website }} + + + + + + + + + {{ r.info.brief }} + + + {{> employment }} + {{> education }} + + + + + + + + + diff --git a/themes/compact/src/partials/education.xml b/themes/compact/src/partials/education.xml new file mode 100644 index 0000000..e7fa3ca --- /dev/null +++ b/themes/compact/src/partials/education.xml @@ -0,0 +1,77 @@ + + + + + + + EDUCATION + + + + {{#each r.education.history}} + + + + + + + + + + + + + + + {{ this.institution }} + + + + + + + {{formatDate safe.start 'YYYY-MM' }} — 2015-10 + + + + + + + + + + + + + {{ area }}, {{ studyType }} + + + + {{#each highlights }} + + + + + + + + + + + + + + + + + + {{ this }} + + + {{/each}} + + + + {{/each}} + + diff --git a/themes/compact/src/partials/employment.xml b/themes/compact/src/partials/employment.xml new file mode 100644 index 0000000..ed83217 --- /dev/null +++ b/themes/compact/src/partials/employment.xml @@ -0,0 +1,77 @@ + + + + + + + EMPLOYMENT + + + + {{#each r.employment.history}} + + + + + + + + + + + + + + + {{ employer }} + + + + + + + {{formatDate safe.start 'YYYY-MM' }} — 2015-10 + + + + + + + + + + + + + {{ summary }} + + + + {{#each highlights }} + + + + + + + + + + + + + + + + + + {{ this }} + + + {{/each}} + + + + {{/each}} + + From 40e04afed48b219c2f1840c67741d0b2da39d2ee Mon Sep 17 00:00:00 2001 From: devlinjd Date: Wed, 16 Dec 2015 20:08:12 -0500 Subject: [PATCH 05/10] Compact: Migrate to Handlebars. --- themes/compact/src/compact-html.html | 145 ++++++++++++++------------- themes/compact/src/compact-md.txt | 122 +++++++++++++--------- themes/compact/src/compact-pdf.html | 145 ++++++++++++++------------- themes/compact/src/compact-txt.txt | 114 ++++++++++++++------- 4 files changed, 301 insertions(+), 225 deletions(-) diff --git a/themes/compact/src/compact-html.html b/themes/compact/src/compact-html.html index 7743069..933ef29 100644 --- a/themes/compact/src/compact-html.html +++ b/themes/compact/src/compact-html.html @@ -12,21 +12,21 @@

{{ r.name }}

- {% if (r.contact.email) { %}{% } %} - {% if (r.contact.phone) { %}
{{ r.contact.phone }}
{% } %} - {% if (r.contact.website) { %}
{{ RAW.contact.website }}
{% } %} + {{#if r.contact.email}}{{/if}} + {{#if r.contact.phone}}
{{ r.contact.phone }}
{{/if}} + {{#if r.contact.website}}
{{ r.contact.website }}
{{/if}}
-{% if ( r.info.brief && r.info.brief.length ) { %} +{{#if r.info.brief}}
{{ r.info.brief }}
-{% } %} +{{/if}} -{% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %} +{{#if r.skills}}

Skills

@@ -39,121 +39,124 @@ - {% r.skills.sets.forEach( function( skillset ) { %} + {{#each r.skills.sets}} - {{ skillset.name }} - {{ skillset.skills.join(', ') }} + {{ name }} + {{#each skills}}{{ this }} {{/each}} - {% }); %} + {{/each}}
-{% } %} +{{/if}} -{% if ( r.employment && r.employment.history ) { %} +{{#if r.employment}}

Employment

- - - {% r.employment.history.forEach( function( proj, idx, ar) { %} - {% if( idx < 4 ) { %} -

{{ proj.position }}, {{ filt.link( proj.employer, proj.url ) }} {{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }}

-

{{ proj.summary }}

- {% if( proj.highlights ) { %} + {{#each r.employment.history }} + {{#compare @index 4 operator="<"}} +

{{ position }}, + {{#if url }} + {{ employer }} + {{else}} + {{ employer }} + {{/if}} + {{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }}

+

{{ summary }}

+ {{#if highlights}}
    - {% proj.highlights.forEach( function( high, idx, ar) { %} -
  • {{ high }}
    • - {% }); %} + {{#each highlights}} +
  • {{ this }}
    • + {{/each}}
- {% } %} - {% } else { %} + {{/if}} + {{/compare}} + {{#compare @index 4 operator=">="}} - {% if( idx === 4 ) { %} -

Previously... {{ r.employment.history[ r.employment.history.length - 1 ].safe.start.format('YYYY') }} — {{ proj.safe.end.format('YYYY') }}

-

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

+ {{#compare @index 4 operator="=="}} +

Previously...

+

Prior to {{ employer }}, I worked on a range of projects for companies large and small.

    - {% } %} + {{/compare}} +
  • {{ position }}, {{ employer }}
    • -
  • {{ proj.position }}, {{ proj.employer }}
    • - - - {% if( idx === ar.length - 1 ) { %} + {{#if @last}}
- {% } %} - - {% } %} - {% }); %} - - + {{/if}} + {{/compare}} + {{/each}}
-{% } %} +{{/if}} - - -{% if ( r.education && r.education.history ) { %} +{{# if r.education}}

Education

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

{{ edu.institution }} {{ edu.safe.start.format('YYYY') }} — {{ edu.safe.end.format('YYYY') }}

- {% }); %} + {{#each r.education.history}} +

{{ institution }} {{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY' }}

+ {{/each}}
-{% } %} +{{/if}} -{% if ( r.service && r.service.history && r.service.history.length ) { %} +{{#if r.service}}

Service

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

{{ vol.position }}, {{ filt.link(vol.organization, vol.url) }} {{ vol.safe.start.format('YYYY') }} — {{ vol.safe.end.format('YYYY') }}

-

{{ vol.summary }}

- {% if( vol.highlights ) { %} + {{#each r.service.history}} +

{{ position }}, + {{#if url}} + {{ organization }} + {{else}} + {{ organization }} + {{/if}} + {{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY' }}

+

{{ summary }}

+ {{#if highlights}}
    - {% vol.highlights.forEach( function( high, idx, ar) { %} -
  • {{ high }}
    • - {% }); %} + {{#each highlights}} +
  • {{ this }}
    • + {{/each}}
- {% } %} - {% }); %} + {{/if}} + {{/each}}
-{% } %} +{{/if}} -{% if( r.writing && r.writing.length ) { %} +{{#if r.writing}}

Writing

- {% r.writing.forEach( function( pub, idx, ar ) { %} -

{{ filt.link( pub.title, pub.url ) }}, {{ pub.publisher }} {{ pub.safe.date.format('YYYY') }}

- - {% if (pub.summary) { %}{{ pub.summary }}{% } %} - - {% }); %} + {{#each r.writing }} +

{{#if url}}{{ title }}{{else}}{{ title }}{{/if}}, + {{ publisher }} {{formatDate safe.date 'YYYY'}}

+ {{# if summary}}{{ summary }}{{/if}} + {{/each}}
-{% } %} +{{/if}} -{% if( r.recognition && r.recognition.length ) { %} +{{# if r.recognition}}

Awards

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

{{ award.title }}, {{ award.from }} {{ award.safe.date.format('YYYY') }}

- {{ award.summary }} - {% }); %} + {{#each r.recognition}} +

{{ title }}, {{ from }} {{formatDate safe.date 'YYYY' }}

+ {{ summary }} + {{/each}}
-{% } %} +{{/if}} diff --git a/themes/compact/src/compact-md.txt b/themes/compact/src/compact-md.txt index c22301b..6c5bba0 100644 --- a/themes/compact/src/compact-md.txt +++ b/themes/compact/src/compact-md.txt @@ -1,54 +1,84 @@ -# {{ r.name }} +{{ r.name }} +============ +{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}} +{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}} +{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}} -{% if (r.contact.email) { %}Email: {{ r.contact.email }}{% } %} -{% if (r.contact.phone) { %}Tel: {{ r.contact.phone }}{% } %} -{% if (r.contact.website) { %}Web: {{ r.contact.website }}{% } %} +{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}} -{% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %} +{{#if r.skills}} +## SKILLS -{% if ( r.skills && r.skills.sets ) { %} -## Skills -{% r.skills.sets.forEach( function( set, idx, ar) { %} -- **{{ set.name }}**: {{ set.skills.join(', ') }} -{% }); } %} +{{#each r.skills.sets}} + - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}} +{{/each}} +{{/if}} -{% if ( r.employment.history && r.employment.history.length ) { %} -## Employment -{% r.employment.history.forEach( function( proj, idx, ar) { %} -### *{{ proj.position }}*, {{ proj.employer }} -{{ proj.safe.start.format('MMM YYYY') }} — {{ proj.safe.end.format('MMM YYYY') }} -{{ proj.summary }} -{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high, idx, ar) { %} -- {{ high }} -{% }); } }); } %} +{{#if r.employment}} +## EMPLOYMENT -{% if ( r.education.history && r.education.history.length ) { %} -## Education -{% r.education.history.forEach( function( edu, idx, ar) { %} -### {{ edu.institution }} ({{ edu.safe.start.format('MMM YYYY') }} — {{ edu.safe.end.format('MMM YYYY') }}) -{{ edu.area }} -{% if( edu.curriculum ) { %}{% edu.curriculum.forEach( function( course, idx, ar) { %} -- {{ course }} -{% }); } }); } %} +{{#each r.employment.history }} + {{#compare @index 4 operator="<"}} +### {{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }}) +{{{ summary }}} +{{#if highlights}} +{{#each highlights}} + - {{{ this }}} +{{/each}} +{{/if}} -{% if ( r.writing && r.writing.length ) { %} -## Publications -{% r.writing.forEach( function( pub, idx, ar) { %} -### {{ pub.title }} ({{ pub.safe.date.format('MMM YYYY') }}) -{{ pub.publisher }} -{{ pub.summary }} -{% }); } %} + {{/compare}} + {{#compare @index 4 operator=">="}} + {{#compare @index 4 operator="=="}} +### Previously... +Prior to {{{ employer }}}, I worked on a range of projects for companies large and small. + {{/compare}} + - {{{ position }}}, {{{ employer }}} + {{/compare}} +{{/each}} +{{/if}} -{% if ( r.service.history && r.service.history.length ) { %} -## Volunteer -{% r.service.history.forEach( function( vol, idx, ar) { %} -### {{ vol.organization }} ({{ vol.safe.start.format('MMM YYYY') }} — {{ vol.safe.end.format('MMM YYYY') }}) -{{ vol.summary }} -{% }); } %} +{{#if r.education}} +## EDUCATION -{% if ( r.recognition && r.recognition.length ) { %} -## Recognition -{% r.recognition.forEach( function( awd, idx, ar) { %} -### *{{ awd.title }}*, {{ awd.from }} ({{ awd.safe.date.format('MMM YYYY') }}) -{{ awd.summary }} -{% }); } %} +{{#each r.education.history}} +### {{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }}) +{{#if summary }} +{{{ summary }}} +{{/if}} +{{#if courses}} +{{#each courses}} + - {{{ this }}}{{/each}}{{/if}} +{{/each}} +{{/if}} +{{#if r.writing}} +## WRITING + +{{#each r.writing}} +### {{{ title }}} ({{formatDate safe.date 'YYYY-MM' }}) +{{{ summary }}} +{{/each}} +{{/if}} + +{{#if r.service }} +## SERVICE + +{{#each r.service.history}} +### {{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }}) +{{{ summary }}} +{{#if highlights}} +{{#each highlights}} + - {{{ this }}} +{{/each}} +{{/if}} + +{{/each}} +{{/if}} +{{#if r.recognition}} +## RECOGNITION + +{{#each r.recognition}} +### {{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }}) +{{{ summary }}} +{{/each}} +{{/if}} diff --git a/themes/compact/src/compact-pdf.html b/themes/compact/src/compact-pdf.html index 44a2c21..cf0c941 100644 --- a/themes/compact/src/compact-pdf.html +++ b/themes/compact/src/compact-pdf.html @@ -13,21 +13,21 @@

{{ r.name }}

- {% if (r.contact.email) { %}{% } %} - {% if (r.contact.phone) { %}
{{ r.contact.phone }}
{% } %} - {% if (r.contact.website) { %}
{{ r.contact.website }}
{% } %} + {{#if r.contact.email}}{{/if}} + {{#if r.contact.phone}}
{{ r.contact.phone }}
{{/if}} + {{#if r.contact.website}}
{{ r.contact.website }}
{{/if}}
-{% if ( r.info.brief && r.info.brief.length ) { %} +{{#if r.info.brief}}
{{ r.info.brief }}
-{% } %} +{{/if}} -{% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %} +{{#if r.skills}}

Skills

@@ -40,121 +40,124 @@ - {% r.skills.sets.forEach( function( skillset ) { %} + {{#each r.skills.sets}} - {{ skillset.name }} - {{ skillset.skills.join(', ') }} + {{ name }} + {{#each skills}}{{ this }} {{/each}} - {% }); %} + {{/each}}
-{% } %} +{{/if}} -{% if ( r.employment && r.employment.history ) { %} +{{#if r.employment}}

Employment

- - - {% r.employment.history.forEach( function( proj, idx, ar) { %} - {% if( idx < 4 ) { %} -

{{ proj.position }}, {{ filt.link( proj.employer, proj.url ) }} {{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }}

-

{{ proj.summary }}

- {% if( proj.highlights ) { %} + {{#each r.employment.history }} + {{#compare @index 4 operator="<"}} +

{{ position }}, + {{#if url }} + {{ employer }} + {{else}} + {{ employer }} + {{/if}} + {{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }}

+

{{ summary }}

+ {{#if highlights}}
    - {% proj.highlights.forEach( function( high, idx, ar) { %} -
  • {{ high }}
    • - {% }); %} + {{#each highlights}} +
  • {{ this }}
    • + {{/each}}
- {% } %} - {% } else { %} + {{/if}} + {{/compare}} + {{#compare @index 4 operator=">="}} - {% if( idx === 4 ) { %} -

Previously... {{ r.employment.history[ r.employment.history.length - 1 ].safe.start.format('YYYY') }} — {{ proj.safe.end.format('YYYY') }}

-

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

+ {{#compare @index 4 operator="=="}} +

Previously...

+

Prior to {{ employer }}, I worked on a range of projects for companies large and small.

    - {% } %} + {{/compare}} +
  • {{ position }}, {{ employer }}
    • -
  • {{ proj.position }}, {{ proj.employer }}
    • - - - {% if( idx === ar.length - 1 ) { %} + {{#if @last}}
- {% } %} - - {% } %} - {% }); %} - - + {{/if}} + {{/compare}} + {{/each}}
-{% } %} +{{/if}} - - -{% if ( r.education && r.education.history ) { %} +{{# if r.education}}

Education

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

{{ edu.institution }} {{ edu.safe.start.format('YYYY') }} — {{ edu.safe.end.format('YYYY') }}

- {% }); %} + {{#each r.education.history}} +

{{ institution }} {{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY' }}

+ {{/each}}
-{% } %} +{{/if}} -{% if ( r.service && r.service.history && r.service.history.length ) { %} +{{#if r.service}}

Service

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

{{ vol.position }}, {{ filt.link(vol.organization, vol.url) }} {{ vol.safe.start.format('YYYY') }} — {{ vol.safe.end.format('YYYY') }}

-

{{ vol.summary }}

- {% if( vol.highlights ) { %} + {{#each r.service.history}} +

{{ position }}, + {{#if url}} + {{ organization }} + {{else}} + {{ organization }} + {{/if}} + {{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY' }}

+

{{ summary }}

+ {{#if highlights}}
    - {% vol.highlights.forEach( function( high, idx, ar) { %} -
  • {{ high }}
    • - {% }); %} + {{#each highlights}} +
  • {{ this }}
    • + {{/each}}
- {% } %} - {% }); %} + {{/if}} + {{/each}}
-{% } %} +{{/if}} -{% if( r.writing && r.writing.length ) { %} +{{#if r.writing}}

Writing

- {% r.writing.forEach( function( pub, idx, ar ) { %} -

{{ filt.link( pub.title, pub.url ) }}, {{ pub.publisher }} {{ pub.safe.date.format('YYYY') }}

- - {% if (pub.summary) { %}{{ pub.summary }}{% } %} - - {% }); %} + {{#each r.writing }} +

{{#if url}}{{ title }}{{else}}{{ title }}{{/if}}, + {{ publisher }} {{formatDate safe.date 'YYYY'}}

+ {{# if summary}}{{ summary }}{{/if}} + {{/each}}
-{% } %} +{{/if}} -{% if( r.recognition && r.recognition.length ) { %} +{{# if r.recognition}}

Awards

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

{{ award.title }}, {{ award.from }} {{ award.safe.date.format('YYYY') }}

- {{ award.summary }} - {% }); %} + {{#each r.recognition}} +

{{ title }}, {{ from }} {{formatDate safe.date 'YYYY' }}

+ {{ summary }} + {{/each}}
-{% } %} +{{/if}} diff --git a/themes/compact/src/compact-txt.txt b/themes/compact/src/compact-txt.txt index a33c4eb..df3991b 100644 --- a/themes/compact/src/compact-txt.txt +++ b/themes/compact/src/compact-txt.txt @@ -1,50 +1,90 @@ -{# +{{! compact/txt.txt A plain text resume template for FluentCV's "compact" theme. -#} +}} {{ r.name }} -{% if (r.contact.email) { %}Email: {{ r.contact.email }}{% } %} -{% if (r.contact.phone) { %}Tel: {{ r.contact.phone }}{% } %} -{% if (r.contact.website) { %}Web: {{ r.contact.website }}{% } %} +{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}} +{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}} +{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}} +================================================================================ -*** +{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}} -{% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %} +{{#if r.skills}} +SKILLS ------------------------------------------------------------------------- +{{#each r.skills.sets}} + - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}} +{{/each}} +{{/if}} -{% if ( r.skills && r.skills.length ) { %}SKILLS -{% r.skills.forEach( function( skill ) { %} - - {{ skill.name }}: {{ skill.level }} -{% }); } %} +{{#if r.employment}} +EMPLOYMENT --------------------------------------------------------------------- -{% if ( r.employment.history && r.employment.history.length ) { %}EMPLOYMENT -{% r.employment.history.forEach( function( proj, idx, ar) { %} -{{ proj.employer }} ({{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }}) -{{ proj.summary }} -{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high ) { %} - - {{ high }} -{% }); } }); } %} +{{#each r.employment.history }} + {{#compare @index 4 operator="<"}} +{{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }}) +{{{ summary }}} +{{#if highlights}} +{{#each highlights}} + - {{{ this }}} +{{/each}} +{{/if}} -{% if ( r.education && r.education.history ) { %}EDUCATION -{% r.education.history.forEach( function( edu, idx, ar) { %} -{{ edu.institution }} ({{ edu.safe.start.format('YYYY-MM') }} — {{ edu.safe.end.format('YYYY-MM') }}) -{{ edu.summary }} -{% if( edu.courses ) { %}{% edu.courses.forEach( function( course ) { %} - - {{ course }} -{% }); } }); } %} + {{/compare}} + {{#compare @index 4 operator=">="}} + {{#compare @index 4 operator="=="}} +Previously... +Prior to {{{ employer }}}, I worked on a range of projects for companies large and small. + {{/compare}} + - {{{ position }}}, {{{ employer }}} + {{/compare}} +{{/each}} +{{/if}} -{% if ( r.service && r.service.history ) { %}VOLUNTEER -{% r.service.history.forEach( function( srv, idx, ar) { %} -{{ srv.organization }} ({{ srv.safe.start.format('YYYY-MM') }} — {{ srv.safe.end.format('YYYY-MM') }}) -{{ srv.summary }} -{% if( srv.highlights ) { %}{% srv.highlights.forEach( function( high ) { %} - - {{ high }} -{% }); } }); } %} +{{#if r.education}} +EDUCATION ---------------------------------------------------------------------- -{% if ( r.writing && r.writing.length ) { %}WRITING -{% r.writing.forEach( function( wri, idx, ar) { %} -{{ wri.title }} ({{ wri.safe.date.format('YYYY-MM') }}) -{{ wri.summary }} -{% }); } %} +{{#each r.education.history}} +{{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }}) +{{#if summary }} +{{{ summary }}} +{{/if}} +{{#if courses}} +{{#each courses}} + - {{{ this }}}{{/each}}{{/if}} +{{/each}} +{{/if}} +{{#if r.writing}} +WRITING ------------------------------------------------------------------------ + +{{#each r.writing}} +{{{ title }}} ({{formatDate safe.date 'YYYY-MM' }}) +{{{ summary }}} +{{/each}} +{{/if}} + +{{#if r.service }} +SERVICE ------------------------------------------------------------------------ + +{{#each r.service.history}} +{{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }}) +{{{ summary }}} +{{#if highlights}} +{{#each highlights}} + - {{{ this }}} +{{/each}} +{{/if}} + +{{/each}} +{{/if}} +{{#if r.recognition}} +RECOGNITION -------------------------------------------------------------------- + +{{#each r.recognition}} +{{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }}) +{{{ summary }}} +{{/each}} +{{/if}} From 6a05da39dd4bd934d998cc6b86505f4569ab0818 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Wed, 16 Dec 2015 21:12:10 -0500 Subject: [PATCH 06/10] Compact: Simplify Word 2003 XML template. --- themes/compact/src/compact-doc.xml | 1630 -------------------- themes/compact/src/partials/education.xml | 2 +- themes/compact/src/partials/employment.xml | 2 +- 3 files changed, 2 insertions(+), 1632 deletions(-) diff --git a/themes/compact/src/compact-doc.xml b/themes/compact/src/compact-doc.xml index 3ec23bf..041d73f 100644 --- a/themes/compact/src/compact-doc.xml +++ b/themes/compact/src/compact-doc.xml @@ -28,44 +28,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -73,994 +35,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1173,354 +150,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1665,198 +299,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1879,20 +321,6 @@ - - - - - - - - - - - - - - @@ -1972,64 +400,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/themes/compact/src/partials/education.xml b/themes/compact/src/partials/education.xml index e7fa3ca..eac0a30 100644 --- a/themes/compact/src/partials/education.xml +++ b/themes/compact/src/partials/education.xml @@ -53,7 +53,7 @@ - + diff --git a/themes/compact/src/partials/employment.xml b/themes/compact/src/partials/employment.xml index ed83217..2cbe43c 100644 --- a/themes/compact/src/partials/employment.xml +++ b/themes/compact/src/partials/employment.xml @@ -53,7 +53,7 @@ - + From c8844375a4c67efe7a0df5df7804efdc13d8e6bf Mon Sep 17 00:00:00 2001 From: devlinjd Date: Wed, 16 Dec 2015 21:35:54 -0500 Subject: [PATCH 07/10] Compact: Justify text in Word 2003 template. --- themes/compact/src/compact-doc.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/themes/compact/src/compact-doc.xml b/themes/compact/src/compact-doc.xml index 041d73f..722178a 100644 --- a/themes/compact/src/compact-doc.xml +++ b/themes/compact/src/compact-doc.xml @@ -164,6 +164,9 @@ + + + From 7364b92e0fdbf523a106f6f6214d948a58980fd7 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Wed, 16 Dec 2015 23:29:47 -0500 Subject: [PATCH 08/10] Compact: MS Word: Support Markdown. --- themes/compact/src/compact-doc.xml | 7 ++++--- themes/compact/src/partials/employment.xml | 10 ++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/themes/compact/src/compact-doc.xml b/themes/compact/src/compact-doc.xml index 722178a..15c32d5 100644 --- a/themes/compact/src/compact-doc.xml +++ b/themes/compact/src/compact-doc.xml @@ -166,7 +166,7 @@ - + @@ -497,14 +497,15 @@ - + + {{{wpml r.info.brief }}} {{> employment }} {{> education }} diff --git a/themes/compact/src/partials/employment.xml b/themes/compact/src/partials/employment.xml index 2cbe43c..dbd40b9 100644 --- a/themes/compact/src/partials/employment.xml +++ b/themes/compact/src/partials/employment.xml @@ -39,12 +39,13 @@ - + {{{wpml summary true }}} + {{#each highlights }} @@ -61,12 +62,13 @@ - + {{{wpml this true}}} + {{/each}} From 057fde9946ecdd9c423c2ddee76e84bfba2d5003 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Thu, 17 Dec 2015 07:38:11 -0500 Subject: [PATCH 09/10] Compact: Fix hyperlinks. Add label. --- themes/compact/src/compact-doc.xml | 13 ++++++ themes/compact/src/partials/education.xml | 6 ++- themes/compact/src/partials/employment.xml | 6 ++- themes/compact/src/partials/skills.xml | 52 ++++++++++++++++++++++ 4 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 themes/compact/src/partials/skills.xml diff --git a/themes/compact/src/compact-doc.xml b/themes/compact/src/compact-doc.xml index 15c32d5..0e1a7d1 100644 --- a/themes/compact/src/compact-doc.xml +++ b/themes/compact/src/compact-doc.xml @@ -449,10 +449,22 @@ + + + {{ r.name }} + + + + + + + + {{ r.info.label }} + @@ -506,6 +518,7 @@ --> {{{wpml r.info.brief }}} + {{> skills }} {{> employment }} {{> education }} diff --git a/themes/compact/src/partials/education.xml b/themes/compact/src/partials/education.xml index eac0a30..91d87a1 100644 --- a/themes/compact/src/partials/education.xml +++ b/themes/compact/src/partials/education.xml @@ -18,14 +18,16 @@ - + {{#if url}}{{/if}} + {{#if url }} + {{/if}} {{ this.institution }} - + {{#if url}}{{/if}} diff --git a/themes/compact/src/partials/employment.xml b/themes/compact/src/partials/employment.xml index dbd40b9..466383d 100644 --- a/themes/compact/src/partials/employment.xml +++ b/themes/compact/src/partials/employment.xml @@ -18,14 +18,16 @@ - + {{#if url}}{{/if}} + {{#if url}} + {{/if}} {{ employer }} - + {{#if url}}{{/if}} diff --git a/themes/compact/src/partials/skills.xml b/themes/compact/src/partials/skills.xml new file mode 100644 index 0000000..0008df5 --- /dev/null +++ b/themes/compact/src/partials/skills.xml @@ -0,0 +1,52 @@ +{{#if r.skills }} + + + + + + + SKILLS + + + + + + + + + + + + + {{#each r.skills.sets}} + + + + + + + + + + {{ name }}: + + + + + + + + + + + {{#each skills }}{{ this }}{{#unless @last}}, {{/unless}}{{/each}} + + + + + + {{/each}} + + + {{/if}} + From 38be09c2c63cffa95cd48556647af59af23f3bfe Mon Sep 17 00:00:00 2001 From: devlinjd Date: Thu, 17 Dec 2015 07:52:41 -0500 Subject: [PATCH 10/10] Update package.json desc and keywords. --- package.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 547080a..475e942 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,27 @@ { "name": "fluent-themes", "version": "0.6.2-beta", - "description": "Resume themes for FluentCV.", + "description": "Multiformat résumé themes and templates for FluentCV and JSON Resume.", "repository": { "type": "git", "url": "https://github.com/fluentdesk/fluent-themes.git" }, "main": "themes/README.md", "keywords": [ + "résumé", "resume", "CV", "portfolio", - "Markdown" + "Handlebars", + "Underscore", + "Markdown", + "LaTeX", + "HTML", + "Microsoft Word", + "PDF", + "Acrobat", + "JSON", + "YAML" ], "author": "James M. Devlin", "license": "MIT",