diff --git a/package.json b/package.json index 0e71f12..9e340d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fluent-themes", - "version": "0.4.0-beta", + "version": "0.5.0-beta", "description": "Resume themes for FluentCV.", "repository": { "type": "git", diff --git a/themes/compact/templates/html.css b/themes/compact/templates/html.css index 33b6129..cf4fa4c 100644 --- a/themes/compact/templates/html.css +++ b/themes/compact/templates/html.css @@ -75,3 +75,8 @@ main > header > h1 { display: inline-block; margin-left: 5px; } + +h2 > span.fa { + text-align: left; + margin-right: 3px; +} diff --git a/themes/compact/templates/html.html b/themes/compact/templates/html.html index b572789..c2b2e35 100644 --- a/themes/compact/templates/html.html +++ b/themes/compact/templates/html.html @@ -2,33 +2,34 @@ - {{ r.basics.name }} + {{ r.name }} +
-

{{ r.basics.name }}

+

{{ r.name }}

- {% if (r.basics.email) { %}{% } %} - {% if (r.basics.phone) { %}
{{ r.basics.phone }}
{% } %} - {% if (r.basics.website) { %}
{{ r.basics.website }}
{% } %} + {% if (r.contact.email) { %}{% } %} + {% if (r.contact.phone) { %}
{{ r.contact.phone }}
{% } %} + {% if (r.contact.website) { %}
{{ r.contact.website }}
{% } %}
-{% if ( r.basics.summary && r.basics.summary.length ) { %} +{% if ( r.info.brief && r.info.brief.length ) { %}
- {{ r.basics.summary|md }} + {{ r.info.brief|md }}
{% } %} -{% if ( r.skills && r.skills.length ) { %} +{% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %}
-

Skills

+

Skills

@@ -38,10 +39,10 @@ - {% r.skills.forEach( function( skill, idx, ar) { %} + {% r.skills.sets.forEach( function( skillset ) { %} - - + + {% }); %} @@ -51,17 +52,17 @@ -{% if ( r.work && r.work.length ) { %} +{% if ( r.employment && r.employment.history ) { %}
-

Employment

+

Employment

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

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

+

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

{{ proj.summary|md }}

{% if( proj.highlights ) { %}
    @@ -73,13 +74,13 @@ {% } 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.

    +

    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.

      {% } %} -
    • {{ proj.position }}, {{ proj.company }}
      • +
    • {{ proj.position }}, {{ proj.employer }}
      • {% if( idx === ar.length - 1 ) { %} @@ -96,26 +97,25 @@ -{% if ( r.education && r.education.length ) { %} +{% if ( r.education && r.education.history ) { %}
      -

      Education

      +

      Education

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

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

      -

      {{ edu.area|md }}

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

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

      {% }); %}
      {% } %} -{% if ( r.volunteer && r.volunteer.length ) { %} +{% if ( r.service && r.service.history && r.service.history.length ) { %}
      -

      Volunteer

      +

      Service

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

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

      + {% 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|md }}

      {% if( vol.highlights ) { %}
        @@ -129,36 +129,27 @@
      {% } %} -{% if( r.publications && r.publications.length ) { %} +{% if( r.writing && r.writing.length ) { %}
      -

      Publications

      +

      Writing

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

      - {% if( pub.website ) { %} - {{ pub.name }}, {{ pub.publisher }} - {% } else { %} - {{ pub.name }}, {{ pub.publisher }} - {% } %} - {{ pub.safeReleaseDate.format('YYYY') }} -

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

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

      - {{ pub.summary|md }} + {% if (pub.summary) { %}{{ pub.summary|md }}{% } %} {% }); %}
      {% } %} -{% if( r.awards && r.awards.length ) { %} +{% if( r.recognition && r.recognition.length ) { %}
      -

      Awards

      +

      Awards

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

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

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

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

      {{ award.summary|md }} {% }); %}
      diff --git a/themes/compact/templates/pdf.css b/themes/compact/templates/pdf.css index 33b6129..cf4fa4c 100644 --- a/themes/compact/templates/pdf.css +++ b/themes/compact/templates/pdf.css @@ -75,3 +75,8 @@ main > header > h1 { display: inline-block; margin-left: 5px; } + +h2 > span.fa { + text-align: left; + margin-right: 3px; +} diff --git a/themes/compact/templates/pdf.html b/themes/compact/templates/pdf.html index 747e5d1..e29bc72 100644 --- a/themes/compact/templates/pdf.html +++ b/themes/compact/templates/pdf.html @@ -2,7 +2,7 @@ - {{ r.basics.name }} + {{ r.name }} + {% } %} -
      +
      +
      -

      {{ r.basics.name }}

      +

      {{ r.name }}

      - {% if (r.basics.email) { %}{% } %} - {% if (r.basics.phone) { %}
      {{ r.basics.phone }}
      {% } %} - {% if (r.basics.website) { %}
      {{ r.basics.website }}
      {% } %} + {% if (r.contact.email) { %}{% } %} + {% if (r.contact.phone) { %}
      {{ r.contact.phone }}
      {% } %} + {% if (r.contact.website) { %}
      {{ r.contact.website }}
      {% } %}
      - -{% if ( r.basics.summary && r.basics.summary.length ) { %} +{% if ( r.info.brief && r.info.brief.length ) { %} +
      - {{ r.basics.summary|md }} +

      About

      + + {{ r.info.brief|md }}
      {% } %} -{% if ( r.skills && r.skills.length ) { %} +{% if ( r.skills && r.skills.sets ) { %} +
      -

      Skills

      +

      Skills

      -
{{ skill.name }}{% print( (skill.keywords && skill.keywords.length && skill.keywords.join(', ')) || '[None Specified]' ) %}{{ skillset.name }}{{ skillset.skills.join(', ') }}
- - - - - - - - {% r.skills.forEach( function( skill, idx, ar) { %} - - - - - {% }); %} - -
SkillKeywords
{{ skill.name }}{% print( (skill.keywords && skill.keywords.length && skill.keywords.join(', ')) || '[None Specified]' ) %}
+ + + + +
{% } %} -{% if ( r.work && r.work.length ) { %} +{% if ( r.employment.history && r.employment.history.length ) { %} +
-

Employment

+

Employment

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

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

-

{{ proj.summary|md }}

+ + {% r.employment.history.forEach( function( proj, idx, ar) { %} + {% if( proj.url && proj.url.length ) { %} +

{{ proj.position }}, {{ proj.employer }}

+ {% } else { %} +

{{ proj.position }}, {{ proj.employer }}

+ {% } %} + {{ proj.safe.start.format('YYYY-MM') }}—{{ proj.safe.end.format('YYYY-MM') }} + {{ proj.summary|md }} {% if( proj.highlights ) { %} {% } %} @@ -73,18 +106,85 @@ -{% if ( r.education && r.education.length ) { %} +{% if ( r.education.history && r.education.history.length ) { %} +
-

Education

+

Education

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

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

-

{{ edu.area|md }}

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

{{ edu.institution }}

+ {{ edu.safe.start.format('YYYY-MM') }}—{{ edu.safe.end.format('YYYY-MM') }} {% if( edu.courses ) { %}
    {% edu.courses.forEach( function( course, idx, ar) { %} -
  • {{ course|md }}
    • +
  • {{ course|mdin }}
    • + {% }); %} +
+ {% } %} + {% }); %} + +
+{% } %} + +{% if( r.recognition && r.recognition.length ) { %} +
+
+
+

Awards

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

{{ award.title }}, {{ award.from }}

+ {{ award.date }} + {{ award.summary|md }} + {% }); %} +
+{% } %} + +{% if( r.writing && r.writing.length ) { %} +
+
+
+

Publications

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

+ {% if( pub.url ) { %} + {{ pub.title }}, {{ pub.publisher }} + {% } else { %} + {{ pub.name }}, {{ pub.publisher }} + {% } %} +

+ Published on: {{ pub.safe.date.format('YYYY-MM') }} + + + + {% }); %} +
+{% } %} + +{% if ( r.service.history && r.service.history.length ) { %} +
+
+
+

Volunteer Work

+
+ + {% r.service.history.forEach( function( vol, idx, ar) { %} + {% if( vol.url && vol.url.length ) { %} +

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

+ {% } else { %} +

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

+ {% } %} + {{ vol.safe.start.format('YYYY-MM') }}—{{ vol.safe.end.format('YYYY-MM') }} + {{ vol.summary|md }} + {% if( vol.highlights ) { %} +
    + {% vol.highlights.forEach( function( high, idx, ar) { %} +
  • {{ high|mdin }}
    • {% }); %}
{% } %} @@ -94,6 +194,7 @@ {% } %} +
diff --git a/themes/minimist/templates/md.txt b/themes/minimist/templates/md.txt index 66c89f1..20cd2d0 100644 --- a/themes/minimist/templates/md.txt +++ b/themes/minimist/templates/md.txt @@ -1,59 +1,59 @@ {# - modern/md.txt + minimist/md.txt A Markdown resume template for FluentCV's "minimist" theme. #} -# {{ r.basics.name }} +# {{ r.name }} -{% if (r.basics.email) { %}Email: {{ r.basics.email }}{% } %} -{% if (r.basics.phone) { %}Tel: {{ r.basics.phone }}{% } %} -{% if (r.basics.website) { %}Web: {{ r.basics.website }}{% } %} +{% 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.basics.summary && r.basics.summary.length ) { %}{{ r.basics.summary }}{% } %} +{% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %} -{% if ( r.skills && r.skills.length ) { %} +{% if ( r.skills && r.skills.sets ) { %} ## Skills -{% r.skills.forEach( function( skill, idx, ar) { %} -- **{{ skill.name }}**: {% print( skill.keywords.join(', ') ); %} +{% r.skills.sets.forEach( function( set, idx, ar) { %} +- **{{ set.name }}**: {{ set.level }} {% }); } %} -{% if ( r.work && r.work.length ) { %} +{% if ( r.employment.history && r.employment.history.length ) { %} ## Employment -{% r.work.forEach( function( proj, idx, ar) { %} -### *{{ proj.position }}*, {{ proj.company }} ({{ proj.safeStartDate.format('MMM YYYY') }} — {{ proj.safeEndDate.format('MMM YYYY') }}) +{% 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 && r.education.length ) { %} +{% if ( r.education.history && r.education.history.length ) { %} ## Education -{% r.education.forEach( function( edu, idx, ar) { %} -### {{ edu.institution }} ({{ edu.safeStartDate.format('MMM YYYY') }} — {{ edu.safeEndDate.format('MMM YYYY') }}) +{% 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.courses ) { %}{% edu.courses.forEach( function( course, idx, ar) { %} +{% if( edu.curriculum ) { %}{% edu.curriculum.forEach( function( course, idx, ar) { %} - {{ course }} {% }); } }); } %} -{% if ( r.publications && r.publications.length ) { %} +{% if ( r.writing && r.writing.length ) { %} ## Publications -{% r.publications.forEach( function( pub, idx, ar) { %} -### {{ pub.name }} ({{ pub.safeReleaseDate.format('MMM YYYY') }}) +{% r.writing.forEach( function( pub, idx, ar) { %} +### {{ pub.title }} ({{ pub.safe.date.format('MMM YYYY') }}) {{ pub.publisher }} {{ pub.summary }} {% }); } %} -{% if ( r.volunteer && r.volunteer.length ) { %} +{% if ( r.service.history && r.service.history.length ) { %} ## Volunteer -{% r.volunteer.forEach( function( vol, idx, ar) { %} -### {{ vol.organization }} ({{ vol.safeStartDate.format('MMM YYYY') }} — {{ vol.safeEndDate.format('MMM YYYY') }}) +{% 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.awards && r.awards.length ) { %} -## Awards -{% r.awards.forEach( function( awd, idx, ar) { %} -### *{{ awd.title }}*, {{ awd.awarder }} ({{ awd.safeDate.format('MMM YYYY') }}) +{% 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/templates/pdf.html b/themes/minimist/templates/pdf.html index 4168d94..bc3b90f 100644 --- a/themes/minimist/templates/pdf.html +++ b/themes/minimist/templates/pdf.html @@ -1,70 +1,97 @@ + - {{ r.basics.name }} - + + + {{ r.name }} + + + {{ headFragment }} -
+
+
-

{{ r.basics.name }}

+

{{ r.name }}

- {% if (r.basics.email) { %}{% } %} - {% if (r.basics.phone) { %}
{{ r.basics.phone }}
{% } %} - {% if (r.basics.website) { %}
{{ r.basics.website }}
{% } %} + {% if (r.contact.email) { %}{% } %} + {% if (r.contact.phone) { %}
{{ r.contact.phone }}
{% } %} + {% if (r.contact.website) { %}
{{ r.contact.website }}
{% } %}
- -{% if ( r.basics.summary && r.basics.summary.length ) { %} +{% if ( r.info.brief && r.info.brief.length ) { %} +
- {{ r.basics.summary|md }} +

About

+ + {{ r.info.brief|md }}
{% } %} -{% if ( r.skills && r.skills.length ) { %} +{% if ( r.skills && r.skills.sets ) { %} +
-

Skills

+

Skills

- - - - - - - - - {% r.skills.forEach( function( skill, idx, ar) { %} - - - - - {% }); %} - -
SkillKeywords
{{ skill.name }}{% print( (skill.keywords && skill.keywords.length && skill.keywords.join(', ')) || '[None Specified]' ) %}
+ + +
    + {% r.skills.sets.forEach( function(set) { %} +
  • +
    +
    +
    +
    + {{ set.name }} +
    + {% if( set.skills && set.skills.length ) { %} + {% set.skills.forEach(function(kw) { %} + {{ kw }} + {% }); %} + {% } %} +
    +
    +
    • + {% }); %} +
+ +
{% } %} -{% if ( r.work && r.work.length ) { %} +{% if ( r.employment.history && r.employment.history.length ) { %} +
-

Employment

+

Employment

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

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

-

{{ proj.summary|md }}

+ + {% r.employment.history.forEach( function( proj, idx, ar) { %} + {% if( proj.url && proj.url.length ) { %} +

{{ proj.position }}, {{ proj.employer }}

+ {% } else { %} +

{{ proj.position }}, {{ proj.employer }}

+ {% } %} + {{ proj.safe.start.format('YYYY-MM') }}—{{ proj.safe.end.format('YYYY-MM') }} + {{ proj.summary|md }} {% if( proj.highlights ) { %}
    {% proj.highlights.forEach( function( high, idx, ar) { %} -
  • {{ high|md }}
    • +
  • {{ high|mdin }}
    • {% }); %}
{% } %} @@ -75,18 +102,85 @@ -{% if ( r.education && r.education.length ) { %} +{% if ( r.education.history && r.education.history.length ) { %} +
-

Education

+

Education

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

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

-

{{ edu.area|md }}

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

{{ edu.institution }}

+ {{ edu.safe.start.format('YYYY-MM') }}—{{ edu.safe.end.format('YYYY-MM') }} {% if( edu.courses ) { %}
    {% edu.courses.forEach( function( course, idx, ar) { %} -
  • {{ course|md }}
    • +
  • {{ course|mdin }}
    • + {% }); %} +
+ {% } %} + {% }); %} + +
+{% } %} + +{% if( r.recognition && r.recognition.length ) { %} +
+
+
+

Awards

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

{{ award.title }}, {{ award.from }}

+ {{ award.date }} + {{ award.summary|md }} + {% }); %} +
+{% } %} + +{% if( r.writing && r.writing.length ) { %} +
+
+
+

Publications

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

+ {% if( pub.url ) { %} + {{ pub.title }}, {{ pub.publisher }} + {% } else { %} + {{ pub.name }}, {{ pub.publisher }} + {% } %} +

+ Published on: {{ pub.safe.date.format('YYYY-MM') }} + + + + {% }); %} +
+{% } %} + +{% if ( r.service.history && r.service.history.length ) { %} +
+
+
+

Volunteer Work

+
+ + {% r.service.history.forEach( function( vol, idx, ar) { %} + {% if( vol.url && vol.url.length ) { %} +

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

+ {% } else { %} +

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

+ {% } %} + {{ vol.safe.start.format('YYYY-MM') }}—{{ vol.safe.end.format('YYYY-MM') }} + {{ vol.summary|md }} + {% if( vol.highlights ) { %} +
    + {% vol.highlights.forEach( function( high, idx, ar) { %} +
  • {{ high|mdin }}
    • {% }); %}
{% } %} @@ -96,6 +190,7 @@ {% } %} +
diff --git a/themes/minimist/templates/txt.txt b/themes/minimist/templates/txt.txt index 922562f..cac2da1 100644 --- a/themes/minimist/templates/txt.txt +++ b/themes/minimist/templates/txt.txt @@ -1,30 +1,54 @@ -{{ r.basics.name }} -{% if (r.basics.email) { %}Email: {{ r.basics.email }}{% } %} -{% if (r.basics.phone) { %}Tel: {{ r.basics.phone }}{% } %} -{% if (r.basics.website) { %}Web: {{ r.basics.website }}{% } %} +{# + + minimist/txt.txt + A plain text resume template for FluentCV's "minimist" 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.basics.summary && r.basics.summary.length ) { %}{{ r.basics.summary }}{% } %} +{% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %} -{% if ( r.skills && r.skills.length ) { %}SKILLS -{% r.skills.forEach( function( skill, idx, ar) { %} - - {{ skill.name }}: {% print( skill.keywords.join(', ') ); %} -{% }); } %} +{% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %}SKILLS +{% r.skills.sets.forEach( function( set ) { %} + - {{ set.name }}: {% set.skills.forEach(function(sk){ %}{{ sk }}, {% }); %} + {{ set.level }} +{% }); %} +{% } else if( r.skills && r.skills.list && r.skills.list.length ) { %} -{% if ( r.work && r.work.length ) { %}EMPLOYMENT -{% r.work.forEach( function( proj, idx, ar) { %} -{{ proj.company }} ({{ proj.startDate }} — {{ proj.endDate }}) +{% } %} + +{% if ( r.employment && r.employment.history ) { %}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, idx, ar) { %} +{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high ) { %} - {{ high }} {% }); } }); } %} -{% if ( r.education && r.education.length ) { %}EDUCATION -{% r.education.forEach( function( edu, idx, ar) { %} -{{ edu.institution }} ({{ edu.startDate }} — {{ edu.endDate }}) -{{ edu.area }} -{% if( edu.courses ) { %}{% edu.courses.forEach( function( course, idx, ar) { %} +{% 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 }} {% }); } }); } %} + +{% 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.writing && r.writing.length ) { %}WRITING +{% r.writing.forEach( function( wri, idx, ar) { %} +{{ wri.title }} ({{ wri.safe.date.format('YYYY-MM') }}) +{{ wri.summary }} +{% }); } %} diff --git a/themes/modern/templates/doc.xml b/themes/modern/templates/doc.xml index d755536..d1d10e9 100644 --- a/themes/modern/templates/doc.xml +++ b/themes/modern/templates/doc.xml @@ -1,8 +1,8 @@ @@ -10,8 +10,8 @@ engine: Underscore - {{ r.basics.name|xml }} - {{ r.basics.name|xml }} + {{ r.name|xml }} + {{ r.name|xml }} 4 14 2015-08-28T04:22:00Z @@ -650,7 +650,7 @@ engine: Underscore - + @@ -658,7 +658,7 @@ engine: Underscore - {{ r.basics.email|xml }} + {{ r.contact.email|xml }} @@ -671,7 +671,7 @@ engine: Underscore - + @@ -679,7 +679,7 @@ engine: Underscore - {{ r.basics.website|xml }} + {{ r.contact.website|xml }} @@ -698,7 +698,7 @@ engine: Underscore - {{ r.basics.phone|xml }} + {{ r.contact.phone|xml }} @@ -708,7 +708,7 @@ engine: Underscore - {{ r.basics.name|xml }} + {{ r.name|xml }} @@ -721,7 +721,7 @@ engine: Underscore - {{ r.basics.summary|xml }} + {{ r.info.brief|xml }} @@ -753,8 +753,8 @@ engine: Underscore - {% r.skills.forEach( function( skill, idx, ar) { %} - {% var kwords = skill.keywords.join(', '); %} + {% r.skills.sets.forEach( function( set, idx, ar) { %} + {% var kwords = set.skills.join(', '); %} @@ -764,7 +764,7 @@ engine: Underscore - {{ skill.name|xml }}: + {{ set.name|xml }}: @@ -812,7 +812,7 @@ engine: Underscore - {% r.work.forEach( function( proj, idx, ar) { %} + {% r.employment.history.forEach( function( proj, idx, ar) { %} @@ -830,7 +830,7 @@ engine: Underscore - {{ proj.company|xml }} + {{ proj.employer|xml }} @@ -867,7 +867,7 @@ engine: Underscore - {{ proj.startDate|xml }} — {{ proj.endDate|xml }} + {{ proj.safe.start.format('YYYY-MM')|xml }} — {{ proj.safe.end.format('YYYY-MM')|xml }} @@ -937,7 +937,7 @@ engine: Underscore - {% r.education.forEach( function( edu, idx, ar) { %} + {% r.education.history.forEach( function( edu, idx, ar) { %} @@ -992,7 +992,7 @@ engine: Underscore - {{ edu.startDate|xml }} — {{ edu.endDate|xml }} + {{ edu.safe.start.format('YYYY-MM')|xml }} — {{ edu.safe.end.format('YYYY-MM')|xml }} @@ -1012,10 +1012,10 @@ engine: Underscore - {{ edu.area|xml }} + TODO - {% edu.courses.forEach( function( course, idx, ar) { %} + {% edu.curriculum.forEach( function( course, idx, ar) { %} diff --git a/themes/modern/templates/html.html b/themes/modern/templates/html.html index 40421cb..f493542 100644 --- a/themes/modern/templates/html.html +++ b/themes/modern/templates/html.html @@ -9,7 +9,7 @@ engine: Underscore - {{ r.basics.name }} + {{ r.name }} {{ headFragment }} @@ -25,25 +25,25 @@ engine: Underscore
-

{{ r.basics.name }}

+

{{ r.name }}

- {% if (r.basics.email) { %}{% } %} - {% if (r.basics.phone) { %}
{{ r.basics.phone }}
{% } %} - {% if (r.basics.website) { %}
{{ r.basics.website }}
{% } %} + {% if (r.contact.email) { %}{% } %} + {% if (r.contact.phone) { %}
{{ r.contact.phone }}
{% } %} + {% if (r.contact.website) { %}
{{ r.contact.website }}
{% } %}
-{% if ( r.basics.summary && r.basics.summary.length ) { %} +{% if ( r.info.brief && r.info.brief.length ) { %}

About

- {{ r.basics.summary|md }} + {{ r.info.brief|md }}
{% } %} -{% if ( r.skills && r.skills.length ) { %} +{% if ( r.skills && r.skills.sets ) { %}
@@ -52,20 +52,16 @@ engine: Underscore
    - {% r.skills.forEach( function(skill) { %} + {% r.skills.sets.forEach( function(set) { %}
  • - {% if( r.display_progress_bar ) { %} -
    -
    -
    -
    - {% } %} +
    +
    +
    - {{ skill.name }} - + {{ set.name }}
    - {% if( skill.keywords && skill.keywords.length ) { %} - {% skill.keywords.forEach(function(kw) { %} + {% if( set.skills && set.skills.length ) { %} + {% set.skills.forEach(function(kw) { %} {{ kw }} {% }); %} {% } %} @@ -81,20 +77,20 @@ engine: Underscore -{% if ( r.work && r.work.length ) { %} +{% if ( r.employment.history && r.employment.history.length ) { %}

    Employment

    - {% r.work.forEach( function( proj, idx, ar) { %} - {% if( proj.website && proj.website.length ) { %} -

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

    + {% r.employment.history.forEach( function( proj, idx, ar) { %} + {% if( proj.url && proj.url.length ) { %} +

    {{ proj.position }}, {{ proj.employer }}

    {% } else { %} -

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

    +

    {{ proj.position }}, {{ proj.employer }}

    {% } %} - {{ proj.startDate }}—{{ proj.endDate }} + {{ proj.safe.start.format('YYYY-MM') }}—{{ proj.safe.end.format('YYYY-MM') }} {{ proj.summary|md }} {% if( proj.highlights ) { %}
      @@ -110,17 +106,16 @@ engine: Underscore -{% if ( r.education && r.education.length ) { %} +{% if ( r.education.history && r.education.history.length ) { %}

      Education

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

      {{ edu.institution }}

      - {{ edu.startDate }}—{{ edu.endDate }} - {{ edu.area|md }} + {{ edu.safe.start.format('YYYY-MM') }}—{{ edu.safe.end.format('YYYY-MM') }} {% if( edu.courses ) { %}
        {% edu.courses.forEach( function( course, idx, ar) { %} @@ -133,58 +128,54 @@ engine: Underscore
      {% } %} -{% if( r.awards && r.awards.length ) { %} +{% if( r.recognition && r.recognition.length ) { %}

      Awards

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

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

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

      {{ award.title }}, {{ award.from }}

      {{ award.date }} {{ award.summary|md }} {% }); %}
      {% } %} -{% if( r.publications && r.publications.length ) { %} +{% if( r.writing && r.writing.length ) { %}

      Publications

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

      - {% if( pub.website ) { %} - {{ pub.name }}, {{ pub.publisher }} - {% } else { %} - {{ pub.name }}, {{ pub.publisher }} - {% } %} + {{ filt.link(pub.title, pub.url) }} {{ pub.publisher }}

      - Published on: {{ pub.releaseDate }} + Published on: {{ pub.safe.date.format('YYYY-MM') }} + - {{ pub.summary|md }} {% }); %}
      {% } %} -{% if ( r.volunteer && r.volunteer.length ) { %} +{% if ( r.service.history && r.service.history.length ) { %}

      Volunteer Work

      - {% r.volunteer.forEach( function( vol, idx, ar) { %} - {% if( vol.website && vol.website.length ) { %} + {% r.service.history.forEach( function( vol, idx, ar) { %} + {% if( vol.url && vol.url.length ) { %}

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

      {% } else { %}

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

      {% } %} - {{ vol.startDate }}—{{ vol.endDate }} + {{ vol.safe.start.format('YYYY-MM') }}—{{ vol.safe.end.format('YYYY-MM') }} {{ vol.summary|md }} {% if( vol.highlights ) { %}
        @@ -198,12 +189,6 @@ engine: Underscore
      {% } %} -{% if( r.elevatorPitch ) { %} -
      -
      - {{ r.elevatorPitch }} -
      -{% } %}
diff --git a/themes/modern/templates/md.txt b/themes/modern/templates/md.txt index 2db581a..edd2dd3 100644 --- a/themes/modern/templates/md.txt +++ b/themes/modern/templates/md.txt @@ -4,56 +4,56 @@ A Markdown resume template for FluentCV's "modern" theme. #} -# {{ r.basics.name }} +# {{ r.name }} -{% if (r.basics.email) { %}Email: {{ r.basics.email }}{% } %} -{% if (r.basics.phone) { %}Tel: {{ r.basics.phone }}{% } %} -{% if (r.basics.website) { %}Web: {{ r.basics.website }}{% } %} +{% 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.basics.summary && r.basics.summary.length ) { %}{{ r.basics.summary }}{% } %} +{% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %} -{% if ( r.skills && r.skills.length ) { %} +{% if ( r.skills && r.skills.sets ) { %} ## Skills -{% r.skills.forEach( function( skill, idx, ar) { %} -- **{{ skill.name }}**: {% print( skill.keywords.join(', ') ); %} +{% r.skills.sets.forEach( function( set, idx, ar) { %} +- **{{ set.name }}**: {{ set.level }} {% }); } %} -{% if ( r.work && r.work.length ) { %} +{% if ( r.employment.history && r.employment.history.length ) { %} ## Employment -{% r.work.forEach( function( proj, idx, ar) { %} -### *{{ proj.position }}*, {{ proj.company }} ({{ proj.safeStartDate.format('MMM YYYY') }} — {{ proj.safeEndDate.format('MMM YYYY') }}) +{% 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 && r.education.length ) { %} +{% if ( r.education.history && r.education.history.length ) { %} ## Education -{% r.education.forEach( function( edu, idx, ar) { %} -### {{ edu.institution }} ({{ edu.safeStartDate.format('MMM YYYY') }} — {{ edu.safeEndDate.format('MMM YYYY') }}) +{% 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.courses ) { %}{% edu.courses.forEach( function( course, idx, ar) { %} +{% if( edu.curriculum ) { %}{% edu.curriculum.forEach( function( course, idx, ar) { %} - {{ course }} {% }); } }); } %} -{% if ( r.publications && r.publications.length ) { %} +{% if ( r.writing && r.writing.length ) { %} ## Publications -{% r.publications.forEach( function( pub, idx, ar) { %} -### {{ pub.name }} ({{ pub.safeReleaseDate.format('MMM YYYY') }}) +{% r.writing.forEach( function( pub, idx, ar) { %} +### {{ pub.title }} ({{ pub.safe.date.format('MMM YYYY') }}) {{ pub.publisher }} {{ pub.summary }} {% }); } %} -{% if ( r.volunteer && r.volunteer.length ) { %} +{% if ( r.service.history && r.service.history.length ) { %} ## Volunteer -{% r.volunteer.forEach( function( vol, idx, ar) { %} -### {{ vol.organization }} ({{ vol.safeStartDate.format('MMM YYYY') }} — {{ vol.safeEndDate.format('MMM YYYY') }}) +{% 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.awards && r.awards.length ) { %} -## Awards -{% r.awards.forEach( function( awd, idx, ar) { %} -### *{{ awd.title }}*, {{ awd.awarder }} ({{ awd.safeDate.format('MMM YYYY') }}) +{% 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/modern/templates/pdf.html b/themes/modern/templates/pdf.html index eb36706..41a3654 100644 --- a/themes/modern/templates/pdf.html +++ b/themes/modern/templates/pdf.html @@ -9,7 +9,7 @@ engine: Underscore - {{ r.basics.name }} + {{ r.name }} {{ headFragment }} @@ -21,25 +21,25 @@ engine: Underscore
-

{{ r.basics.name }}

+

{{ r.name }}

- {% if (r.basics.email) { %}{% } %} - {% if (r.basics.phone) { %}
{{ r.basics.phone }}
{% } %} - {% if (r.basics.website) { %}
{{ r.basics.website }}
{% } %} + {% if (r.contact.email) { %}{% } %} + {% if (r.contact.phone) { %}
{{ r.contact.phone }}
{% } %} + {% if (r.contact.website) { %}
{{ r.contact.website }}
{% } %}
-{% if ( r.basics.summary && r.basics.summary.length ) { %} +{% if ( r.info.brief && r.info.brief.length ) { %}

About

- {{ r.basics.summary|md }} + {{ r.info.brief|md }}
{% } %} -{% if ( r.skills && r.skills.length ) { %} +{% if ( r.skills && r.skills.sets ) { %}
@@ -48,20 +48,16 @@ engine: Underscore
    - {% r.skills.forEach( function(skill) { %} + {% r.skills.sets.forEach( function(set) { %}
  • - {% if( r.display_progress_bar ) { %} -
    -
    -
    -
    - {% } %} +
    +
    +
    - {{ skill.name }} - + {{ set.name }}
    - {% if( skill.keywords && skill.keywords.length ) { %} - {% skill.keywords.forEach(function(kw) { %} + {% if( set.skills && set.skills.length ) { %} + {% set.skills.forEach(function(kw) { %} {{ kw }} {% }); %} {% } %} @@ -77,20 +73,20 @@ engine: Underscore -{% if ( r.work && r.work.length ) { %} +{% if ( r.employment.history && r.employment.history.length ) { %}

    Employment

    - {% r.work.forEach( function( proj, idx, ar) { %} - {% if( proj.website && proj.website.length ) { %} -

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

    + {% r.employment.history.forEach( function( proj, idx, ar) { %} + {% if( proj.url && proj.url.length ) { %} +

    {{ proj.position }}, {{ proj.employer }}

    {% } else { %} -

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

    +

    {{ proj.position }}, {{ proj.employer }}

    {% } %} - {{ proj.startDate }}—{{ proj.endDate }} + {{ proj.safe.start.format('YYYY-MM') }}—{{ proj.safe.end.format('YYYY-MM') }} {{ proj.summary|md }} {% if( proj.highlights ) { %}
      @@ -106,17 +102,16 @@ engine: Underscore -{% if ( r.education && r.education.length ) { %} +{% if ( r.education.history && r.education.history.length ) { %}

      Education

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

      {{ edu.institution }}

      - {{ edu.startDate }}—{{ edu.endDate }} - {{ edu.area|md }} + {{ edu.safe.start.format('YYYY-MM') }}—{{ edu.safe.end.format('YYYY-MM') }} {% if( edu.courses ) { %}
        {% edu.courses.forEach( function( course, idx, ar) { %} @@ -129,58 +124,54 @@ engine: Underscore
      {% } %} -{% if( r.awards && r.awards.length ) { %} +{% if( r.recognition && r.recognition.length ) { %}

      Awards

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

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

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

      {{ award.title }}, {{ award.from }}

      {{ award.date }} {{ award.summary|md }} {% }); %}
      {% } %} -{% if( r.publications && r.publications.length ) { %} +{% if( r.writing && r.writing.length ) { %}

      Publications

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

      - {% if( pub.website ) { %} - {{ pub.name }}, {{ pub.publisher }} - {% } else { %} - {{ pub.name }}, {{ pub.publisher }} - {% } %} + {{ filt.link(pub.title, pub.url) }} {{ pub.publisher }}

      - Published on: {{ pub.releaseDate }} + Published on: {{ pub.safe.date.format('YYYY-MM') }} + - {{ pub.summary|md }} {% }); %}
      {% } %} -{% if ( r.volunteer && r.volunteer.length ) { %} +{% if ( r.service.history && r.service.history.length ) { %}

      Volunteer Work

      - {% r.volunteer.forEach( function( vol, idx, ar) { %} - {% if( vol.website && vol.website.length ) { %} + {% r.service.history.forEach( function( vol, idx, ar) { %} + {% if( vol.url && vol.url.length ) { %}

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

      {% } else { %}

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

      {% } %} - {{ vol.startDate }}—{{ vol.endDate }} + {{ vol.safe.start.format('YYYY-MM') }}—{{ vol.safe.end.format('YYYY-MM') }} {{ vol.summary|md }} {% if( vol.highlights ) { %}
        @@ -194,12 +185,6 @@ engine: Underscore
      {% } %} -{% if( r.elevatorPitch ) { %} -
      -
      - {{ r.elevatorPitch }} -
      -{% } %}
diff --git a/themes/modern/templates/txt.txt b/themes/modern/templates/txt.txt index ad96ebb..572e439 100644 --- a/themes/modern/templates/txt.txt +++ b/themes/modern/templates/txt.txt @@ -4,33 +4,51 @@ A plain text resume template for FluentCV's "modern" theme. #} -{{ r.basics.name }} -{% if (r.basics.email) { %}Email: {{ r.basics.email }}{% } %} -{% if (r.basics.phone) { %}Tel: {{ r.basics.phone }}{% } %} -{% if (r.basics.website) { %}Web: {{ r.basics.website }}{% } %} +{{ 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.basics.summary && r.basics.summary.length ) { %}{{ r.basics.summary }}{% } %} +{% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %} -{% if ( r.skills && r.skills.length ) { %}SKILLS -{% r.skills.forEach( function( skill, idx, ar) { %} - - {{ skill.name }}: {% print( skill.keywords.join(', ') ); %} -{% }); } %} +{% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %}SKILLS +{% r.skills.sets.forEach( function( set ) { %} + - {{ set.name }}: {% set.skills.forEach(function(sk){ %}{{ sk }}, {% }); %} + {{ set.level }} +{% }); %} +{% } else if( r.skills && r.skills.list && r.skills.list.length ) { %} -{% if ( r.work && r.work.length ) { %}EMPLOYMENT -{% r.work.forEach( function( proj, idx, ar) { %} -{{ proj.company }} ({{ proj.startDate }} — {{ proj.endDate }}) +{% } %} + +{% if ( r.employment && r.employment.history ) { %}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, idx, ar) { %} +{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high ) { %} - {{ high }} {% }); } }); } %} -{% if ( r.education && r.education.length ) { %}EDUCATION -{% r.education.forEach( function( edu, idx, ar) { %} -{{ edu.institution }} ({{ edu.startDate }} — {{ edu.endDate }}) -{{ edu.area }} -{% if( edu.courses ) { %}{% edu.courses.forEach( function( course, idx, ar) { %} +{% 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 }} {% }); } }); } %} + +{% 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.writing && r.writing.length ) { %}WRITING +{% r.writing.forEach( function( wri, idx, ar) { %} +{{ wri.title }} ({{ wri.safe.date.format('YYYY-MM') }}) +{{ wri.summary }} +{% }); } %}