From d69b11d7d720d487f5f4399dd2060be52850d204 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Wed, 18 Nov 2015 23:21:14 -0500 Subject: [PATCH] Convert "minimist" theme to FRESH format. --- themes/minimist/templates/doc.xml | 35 ++++++++++++++-------------- themes/minimist/templates/html.html | 36 ++++++++++++++--------------- themes/minimist/templates/md.txt | 34 +++++++++++++-------------- themes/minimist/templates/pdf.html | 36 ++++++++++++++--------------- themes/minimist/templates/txt.txt | 26 ++++++++++----------- 5 files changed, 83 insertions(+), 84 deletions(-) diff --git a/themes/minimist/templates/doc.xml b/themes/minimist/templates/doc.xml index 9362fa1..4dd28b1 100644 --- a/themes/minimist/templates/doc.xml +++ b/themes/minimist/templates/doc.xml @@ -3,8 +3,8 @@ - {{ r.basics.name|xml }} - {{ r.basics.name|xml }} + {{ r.name|xml }} + {{ r.name|xml }} 4 14 2015-08-28T04:22:00Z @@ -643,7 +643,7 @@ - + @@ -651,7 +651,7 @@ - {{ r.basics.email|xml }} + {{ r.contact.email|xml }} @@ -664,7 +664,7 @@ - + @@ -672,7 +672,7 @@ - {{ r.basics.website|xml }} + {{ r.contact.website|xml }} @@ -691,7 +691,7 @@ - {{ r.basics.phone|xml }} + {{ r.contact.phone|xml }} @@ -701,7 +701,7 @@ - {{ r.basics.name|xml }} + {{ r.name|xml }} @@ -714,7 +714,7 @@ - {{ r.basics.summary|xml }} + {{ r.summary|xml }} @@ -747,7 +747,6 @@ {% r.skills.forEach( function( skill, idx, ar) { %} - {% var kwords = skill.keywords.join(', '); %} @@ -768,7 +767,7 @@ - {{ kwords|xml }} + {{ skill.level|xml }} @@ -805,7 +804,7 @@ - {% r.work.forEach( function( proj, idx, ar) { %} + {% r.employment.history.forEach( function( proj, idx, ar) { %} @@ -823,7 +822,7 @@ - {{ proj.company|xml }} + {{ proj.employer|xml }} @@ -860,7 +859,7 @@ - {{ proj.startDate|xml }} — {{ proj.endDate|xml }} + {{ proj.safe.start.format('YYYY-MM')|xml }} — {{ proj.safe.end.format('YYYY-MM')|xml }} @@ -930,7 +929,7 @@ - {% r.education.forEach( function( edu, idx, ar) { %} + {% r.education.history.forEach( function( edu, idx, ar) { %} @@ -985,7 +984,7 @@ - {{ edu.startDate|xml }} — {{ edu.endDate|xml }} + {{ edu.safe.start.format('YYYY-MM')|xml }} — {{ edu.safe.end.format('YYYY-MM')|xml }} @@ -1005,10 +1004,10 @@ - {{ edu.area|xml }} + {% print(edu.summary || '') %} - {% edu.courses.forEach( function( course, idx, ar) { %} + {% edu.curriculum.forEach( function( course, idx, ar) { %} diff --git a/themes/minimist/templates/html.html b/themes/minimist/templates/html.html index 1009f91..6debf76 100644 --- a/themes/minimist/templates/html.html +++ b/themes/minimist/templates/html.html @@ -2,25 +2,25 @@ - {{ 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) { %}{% } %} + {% if (r.contact.email) { %}{% } %} + {% if (r.contact.phone) { %}
{{ r.contact.phone }}
{% } %} + {% if (r.contact.website) { %}{% } %}
-{% if ( r.basics.summary && r.basics.summary.length ) { %} +{% if ( r.summary && r.summary.length ) { %}
- {{ r.basics.summary|md }} + {{ r.summary|md }}
{% } %} @@ -41,7 +41,7 @@ {% r.skills.forEach( function( skill, idx, ar) { %} {{ skill.name }} - {% print( (skill.keywords && skill.keywords.length && skill.keywords.join(', ')) || '[None Specified]' ) %} + {{ skill.level }} {% }); %} @@ -51,14 +51,14 @@ -{% if ( r.work && r.work.length ) { %} +{% if ( r.employment && r.employment.history && r.employment.history.length ) { %}

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

{{ proj.employer }} {{ proj.safe.start.format('YYYY-MM') }}—{{ proj.safe.end.format('YYYY-MM') }}

+ {% if( proj.summary && proj.summary.length ) { %}

{{ proj.summary|md }}

{% } %} {% if( proj.highlights ) { %}
    {% proj.highlights.forEach( function( high, idx, ar) { %} @@ -73,17 +73,17 @@ -{% if ( r.education && r.education.length ) { %} +{% if ( r.education && r.education.history && r.education.history.length ) { %}

    Education


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

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

    -

    {{ edu.area|md }}

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

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

    + {% if( edu.summary && edu.summary.length ) { %}

    {{ edu.summary|md }}

    {% } %} + {% if( edu.curriculum ) { %}
      - {% edu.courses.forEach( function( course, idx, ar) { %} + {% edu.curriculum.forEach( function( course, idx, ar) { %}
    • {{ course|md }}
    • {% }); %}
    diff --git a/themes/minimist/templates/md.txt b/themes/minimist/templates/md.txt index 66c89f1..8400a4d 100644 --- a/themes/minimist/templates/md.txt +++ b/themes/minimist/templates/md.txt @@ -4,50 +4,50 @@ 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.summary && r.summary.length ) { %}{{ r.summary }}{% } %} {% if ( r.skills && r.skills.length ) { %} ## Skills {% r.skills.forEach( function( skill, idx, ar) { %} -- **{{ skill.name }}**: {% print( skill.keywords.join(', ') ); %} +- **{{ skill.name }}**: {{ skill.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 ) { %} ## Publications {% r.publications.forEach( function( pub, idx, ar) { %} -### {{ pub.name }} ({{ pub.safeReleaseDate.format('MMM YYYY') }}) +### {{ 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 }} {% }); } %} diff --git a/themes/minimist/templates/pdf.html b/themes/minimist/templates/pdf.html index 4168d94..584ff80 100644 --- a/themes/minimist/templates/pdf.html +++ b/themes/minimist/templates/pdf.html @@ -2,7 +2,7 @@ - {{ r.basics.name }} + {{ r.name }}