From e9de689a7db51ea9afc771aaef5ef0f73b9fe974 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Wed, 18 Nov 2015 22:40:40 -0500 Subject: [PATCH 01/12] Convert "modern" theme to FRESH format. --- themes/compact/templates/doc.xml | 1041 +++++++++++++++++++++++++++++ themes/modern/templates/doc.xml | 34 +- themes/modern/templates/html.html | 58 +- themes/modern/templates/md.txt | 34 +- themes/modern/templates/pdf.html | 58 +- themes/modern/templates/txt.txt | 26 +- 6 files changed, 1142 insertions(+), 109 deletions(-) create mode 100644 themes/compact/templates/doc.xml diff --git a/themes/compact/templates/doc.xml b/themes/compact/templates/doc.xml new file mode 100644 index 0000000..9362fa1 --- /dev/null +++ b/themes/compact/templates/doc.xml @@ -0,0 +1,1041 @@ + + + + + + {{ r.basics.name|xml }} + {{ r.basics.name|xml }} + 4 + 14 + 2015-08-28T04:22:00Z + 2015-08-28T04:49:00Z + 1 + 32 + 186 + 1 + 1 + 217 + 15 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ r.basics.email|xml }} + + + + + + + + + + + + + + + + + + + + + {{ r.basics.website|xml }} + + + + + + + + + + + + + + + + + + + {{ r.basics.phone|xml }} + + + + + + + + + + {{ r.basics.name|xml }} + + + + + + + + + + + + + {{ r.basics.summary|xml }} + + + + + + + + + + + + + + + + + + + Skills + + + + + + + + + + + + + {% r.skills.forEach( function( skill, idx, ar) { %} + {% var kwords = skill.keywords.join(', '); %} + + + + + + + + + + {{ skill.name|xml }}: + + + + + + + + + + + {{ kwords|xml }} + + + + + + {% }); %} + + + + + + + + + + + Employment + + + + + + + + + + + + + + + + + + + + {% r.work.forEach( function( proj, idx, ar) { %} + + + + + + + + + + + + + + + + + + {{ proj.company|xml }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ proj.startDate|xml }} — {{ proj.endDate|xml }} + + + + + + + + + + + + + + + + + + + + {{ proj.summary|xml }} + + + {% proj.highlights.forEach( function( high, idx, ar) { %} + + + + + + + + + + + {{ high|xml }} + + + {% }); %} + + + {% }); %} + + + + + + + + + + Education + + + + + + + + + + + + + + + + + + + + {% r.education.forEach( function( edu, idx, ar) { %} + + + + + + + + + + + + + + + + + + {{ edu.institution|xml }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ edu.startDate|xml }} — {{ edu.endDate|xml }} + + + + + + + + + + + + + + + + + + + + {{ edu.area|xml }} + + + {% edu.courses.forEach( function( course, idx, ar) { %} + + + + + + + + + + + {{ course|xml }} + + + {% }); %} + + + + {% }); %} + + + + + + + + + + + + diff --git a/themes/modern/templates/doc.xml b/themes/modern/templates/doc.xml index d755536..0dc3724 100644 --- a/themes/modern/templates/doc.xml +++ b/themes/modern/templates/doc.xml @@ -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.summary|xml }} @@ -754,7 +754,7 @@ engine: Underscore {% r.skills.forEach( function( skill, idx, ar) { %} - {% var kwords = skill.keywords.join(', '); %} + {% var kwords = skill.summary; %} @@ -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..f797856 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,20 +25,20 @@ 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.summary && r.summary.length ) { %}

About

- {{ r.basics.summary|md }} + {{ r.summary|md }}
{% } %} @@ -54,15 +54,12 @@ engine: Underscore
    {% r.skills.forEach( function(skill) { %}
  • - {% if( r.display_progress_bar ) { %} -
    -
    -
    +
    +
    - {% } %} +
    {{ skill.name }} -
    {% if( skill.keywords && skill.keywords.length ) { %} {% skill.keywords.forEach(function(kw) { %} @@ -81,20 +78,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 +107,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) { %} @@ -157,34 +153,34 @@ engine: Underscore {% r.publications.forEach( function( pub, idx, ar) { %}

        - {% if( pub.website ) { %} - {{ pub.name }}, {{ pub.publisher }} + {% if( pub.link ) { %} + {{ pub.title }}, {{ pub.publisher }} {% } else { %} {{ pub.name }}, {{ 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 ) { %}
        diff --git a/themes/modern/templates/md.txt b/themes/modern/templates/md.txt index 2db581a..2bdd243 100644 --- a/themes/modern/templates/md.txt +++ b/themes/modern/templates/md.txt @@ -4,50 +4,50 @@ 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.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/modern/templates/pdf.html b/themes/modern/templates/pdf.html index eb36706..d5b7adb 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,20 +21,20 @@ 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.summary && r.summary.length ) { %}

        About

        - {{ r.basics.summary|md }} + {{ r.summary|md }}
        {% } %} @@ -50,15 +50,12 @@ engine: Underscore
          {% r.skills.forEach( function(skill) { %}
        • - {% if( r.display_progress_bar ) { %} -
          -
          -
          +
          +
          - {% } %} +
          {{ skill.name }} -
          {% if( skill.keywords && skill.keywords.length ) { %} {% skill.keywords.forEach(function(kw) { %} @@ -77,20 +74,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 +103,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) { %} @@ -153,34 +149,34 @@ engine: Underscore {% r.publications.forEach( function( pub, idx, ar) { %}

              - {% if( pub.website ) { %} - {{ pub.name }}, {{ pub.publisher }} + {% if( pub.link ) { %} + {{ pub.title }}, {{ pub.publisher }} {% } else { %} {{ pub.name }}, {{ 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 ) { %}
              diff --git a/themes/modern/templates/txt.txt b/themes/modern/templates/txt.txt index ad96ebb..d1d6e0b 100644 --- a/themes/modern/templates/txt.txt +++ b/themes/modern/templates/txt.txt @@ -4,33 +4,33 @@ 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.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 ) { %}EMPLOYMENT -{% r.work.forEach( function( proj, idx, ar) { %} -{{ proj.company }} ({{ proj.startDate }} — {{ proj.endDate }}) +{% 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, idx, ar) { %} - {{ high }} {% }); } }); } %} -{% if ( r.education && r.education.length ) { %}EDUCATION -{% r.education.forEach( function( edu, idx, ar) { %} -{{ edu.institution }} ({{ edu.startDate }} — {{ edu.endDate }}) -{{ edu.area }} +{% 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, idx, ar) { %} - {{ course }} {% }); } }); } %} From 303e0d0adf050950fbd260b535dd38a7708d53d2 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Wed, 18 Nov 2015 23:06:25 -0500 Subject: [PATCH 02/12] Convert "compact" theme to FRESH format. --- themes/compact/templates/doc.xml | 41 +++++++++++++---------- themes/compact/templates/html.html | 52 +++++++++++++++--------------- themes/compact/templates/pdf.html | 52 +++++++++++++++--------------- themes/compact/templates/txt.txt | 26 +++++++-------- 4 files changed, 89 insertions(+), 82 deletions(-) diff --git a/themes/compact/templates/doc.xml b/themes/compact/templates/doc.xml index 9362fa1..0dc3724 100644 --- a/themes/compact/templates/doc.xml +++ b/themes/compact/templates/doc.xml @@ -1,10 +1,17 @@ + - {{ r.basics.name|xml }} - {{ r.basics.name|xml }} + {{ r.name|xml }} + {{ r.name|xml }} 4 14 2015-08-28T04:22:00Z @@ -643,7 +650,7 @@ - + @@ -651,7 +658,7 @@ - {{ r.basics.email|xml }} + {{ r.contact.email|xml }} @@ -664,7 +671,7 @@ - + @@ -672,7 +679,7 @@ - {{ r.basics.website|xml }} + {{ r.contact.website|xml }} @@ -691,7 +698,7 @@ - {{ r.basics.phone|xml }} + {{ r.contact.phone|xml }} @@ -701,7 +708,7 @@ - {{ r.basics.name|xml }} + {{ r.name|xml }} @@ -714,7 +721,7 @@ - {{ r.basics.summary|xml }} + {{ r.summary|xml }} @@ -747,7 +754,7 @@ {% r.skills.forEach( function( skill, idx, ar) { %} - {% var kwords = skill.keywords.join(', '); %} + {% var kwords = skill.summary; %} @@ -805,7 +812,7 @@ - {% r.work.forEach( function( proj, idx, ar) { %} + {% r.employment.history.forEach( function( proj, idx, ar) { %} @@ -823,7 +830,7 @@ - {{ proj.company|xml }} + {{ proj.employer|xml }} @@ -860,7 +867,7 @@ - {{ proj.startDate|xml }} — {{ proj.endDate|xml }} + {{ proj.safe.start.format('YYYY-MM')|xml }} — {{ proj.safe.end.format('YYYY-MM')|xml }} @@ -930,7 +937,7 @@ - {% r.education.forEach( function( edu, idx, ar) { %} + {% r.education.history.forEach( function( edu, idx, ar) { %} @@ -985,7 +992,7 @@ - {{ edu.startDate|xml }} — {{ edu.endDate|xml }} + {{ edu.safe.start.format('YYYY-MM')|xml }} — {{ edu.safe.end.format('YYYY-MM')|xml }} @@ -1005,10 +1012,10 @@ - {{ edu.area|xml }} + TODO - {% edu.courses.forEach( function( course, idx, ar) { %} + {% edu.curriculum.forEach( function( course, idx, ar) { %} diff --git a/themes/compact/templates/html.html b/themes/compact/templates/html.html index b572789..21d3f80 100644 --- a/themes/compact/templates/html.html +++ b/themes/compact/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) { %}
              {{ 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.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,7 +51,7 @@ -{% if ( r.work && r.work.length ) { %} +{% if ( r.employment && r.employment.history ) { %}

              Employment

              @@ -59,9 +59,9 @@ - {% 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 }}, {{ proj.employer }} {{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }}

              {{ proj.summary|md }}

              {% if( proj.highlights ) { %}
                @@ -73,13 +73,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 +96,26 @@ -{% if ( r.education && r.education.length ) { %} +{% if ( r.education && r.education.history ) { %}

                  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(edu.summary) { %}

                  {{ edu.summary|md }}

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

                  Volunteer

                  - {% 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.organization }} {{ vol.safe.start.format('YYYY') }} — {{ vol.safe.end.format('YYYY') }}

                  {{ vol.summary|md }}

                  {% if( vol.highlights ) { %}
                    @@ -137,15 +137,15 @@ {% r.publications.forEach( function( pub, idx, ar) { %}

                    - {% if( pub.website ) { %} - {{ pub.name }}, {{ pub.publisher }} + {% if( pub.link ) { %} + {{ pub.title }}, {{ pub.publisher }} {% } else { %} - {{ pub.name }}, {{ pub.publisher }} + {{ pub.title }}, {{ pub.publisher }} {% } %} - {{ pub.safeReleaseDate.format('YYYY') }} + {{ pub.safe.date.format('YYYY') }}

                    - {{ pub.summary|md }} + {% if (pub.summary) { %}{{ pub.summary|md }}{% } %} {% }); %}
                  diff --git a/themes/compact/templates/pdf.html b/themes/compact/templates/pdf.html index 747e5d1..8326475 100644 --- a/themes/compact/templates/pdf.html +++ b/themes/compact/templates/pdf.html @@ -2,7 +2,7 @@ - {{ r.basics.name }} + {{ r.name }} + {% } %} -
                  +
                  +

                  {{ r.name }}

                  @@ -17,52 +33,69 @@
                  - {% if ( r.info.brief && r.info.brief.length ) { %} +
                  +

                  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 }}{{ skill.level }}
                  + + +
                    + {% r.skills.sets.forEach( function(set) { %} +
                  • +
                    +
                    +
                    +
                    + {{ set.name }} +
                    + {% if( set.skills && set.skills.length ) { %} + {% set.skills.forEach(function(kw) { %} + {{ kw }} + {% }); %} + {% } %} +
                    +
                    +
                    • + {% }); %} +
                  + +
                  {% } %} -{% if ( r.employment && r.employment.history && r.employment.history.length ) { %} +{% if ( r.employment.history && r.employment.history.length ) { %} +
                  -

                  Employment

                  +

                  Employment

                  + {% 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.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 }}
                    • {% }); %}
                  {% } %} @@ -73,18 +106,85 @@ -{% if ( r.education && r.education.history && r.education.history.length ) { %} +{% if ( r.education.history && r.education.history.length ) { %} +
                  -

                  Education

                  +

                  Education

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

                  + {{ edu.safe.start.format('YYYY-MM') }}—{{ edu.safe.end.format('YYYY-MM') }} + {% if( edu.courses ) { %}
                    - {% edu.curriculum.forEach( function( course, idx, ar) { %} -
                  • {{ course|md }}
                    • + {% edu.courses.forEach( function( course, idx, ar) { %} +
                  • {{ 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 c31024a..20cd2d0 100644 --- a/themes/minimist/templates/md.txt +++ b/themes/minimist/templates/md.txt @@ -1,6 +1,6 @@ {# - modern/md.txt + minimist/md.txt A Markdown resume template for FluentCV's "minimist" theme. #} @@ -12,10 +12,10 @@ {% 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 }}**: {{ skill.level }} +{% r.skills.sets.forEach( function( set, idx, ar) { %} +- **{{ set.name }}**: {{ set.level }} {% }); } %} {% if ( r.employment.history && r.employment.history.length ) { %} @@ -36,9 +36,9 @@ - {{ course }} {% }); } }); } %} -{% 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) { %} ### {{ pub.title }} ({{ pub.safe.date.format('MMM YYYY') }}) {{ pub.publisher }} {{ pub.summary }} @@ -51,9 +51,9 @@ {{ 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 4887df4..bc3b90f 100644 --- a/themes/minimist/templates/pdf.html +++ b/themes/minimist/templates/pdf.html @@ -1,15 +1,25 @@ + + + {{ r.name }} - + + + {{ headFragment }} -
                  +
                  +

                  {{ r.name }}

                  @@ -19,52 +29,69 @@
                  - {% if ( r.info.brief && r.info.brief.length ) { %} +
                  +

                  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 }}{{ skill.level }}
                  + + +
                    + {% r.skills.sets.forEach( function(set) { %} +
                  • +
                    +
                    +
                    +
                    + {{ set.name }} +
                    + {% if( set.skills && set.skills.length ) { %} + {% set.skills.forEach(function(kw) { %} + {{ kw }} + {% }); %} + {% } %} +
                    +
                    +
                    • + {% }); %} +
                  + +
                  {% } %} -{% if ( r.employment && r.employment.history && r.employment.history.length ) { %} +{% if ( r.employment.history && r.employment.history.length ) { %} +
                  -

                  Employment

                  +

                  Employment

                  + {% 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.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.history && r.education.history.length ) { %} +{% if ( r.education.history && r.education.history.length ) { %} +
                  -

                  Education

                  +

                  Education

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

                  + {{ edu.safe.start.format('YYYY-MM') }}—{{ edu.safe.end.format('YYYY-MM') }} + {% if( edu.courses ) { %}
                    - {% edu.curriculum.forEach( function( course, idx, ar) { %} -
                  • {{ course|md }}
                    • + {% edu.courses.forEach( function( course, idx, ar) { %} +
                  • {{ 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 de721ec..cac2da1 100644 --- a/themes/minimist/templates/txt.txt +++ b/themes/minimist/templates/txt.txt @@ -14,16 +14,20 @@ {% 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 }}: {{ skill.level }} -{% }); } %} +{% 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.employment.history && r.employment.history.length ) { %}EMPLOYMENT +{% } %} + +{% 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 }} {% }); } }); } %} @@ -31,6 +35,20 @@ {% 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, idx, ar) { %} +{% 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 4cba013..d1d10e9 100644 --- a/themes/modern/templates/doc.xml +++ b/themes/modern/templates/doc.xml @@ -1,8 +1,8 @@ @@ -753,8 +753,8 @@ engine: Underscore - {% r.skills.forEach( function( skill, idx, ar) { %} - {% var kwords = skill.summary; %} + {% 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 }}: diff --git a/themes/modern/templates/html.html b/themes/modern/templates/html.html index 87d22d3..4c27207 100644 --- a/themes/modern/templates/html.html +++ b/themes/modern/templates/html.html @@ -43,7 +43,7 @@ engine: Underscore {% } %} -{% if ( r.skills && r.skills.length ) { %} +{% if ( r.skills && r.skills.sets ) { %}
                  @@ -52,16 +52,16 @@ engine: Underscore
                    - {% r.skills.forEach( function(skill) { %} + {% r.skills.sets.forEach( function(set) { %}
                  • -
                    -
                    +
                    +
                    - {{ 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 }} {% }); %} {% } %} @@ -128,31 +128,31 @@ 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.link ) { %} + {% if( pub.url ) { %} {{ pub.title }}, {{ pub.publisher }} {% } else { %} {{ pub.name }}, {{ pub.publisher }} @@ -193,12 +193,6 @@ engine: Underscore

                  {% } %} -{% if( r.elevatorPitch ) { %} -
                  -
                  - {{ r.elevatorPitch }} -
                  -{% } %}
        diff --git a/themes/modern/templates/md.txt b/themes/modern/templates/md.txt index ab875c4..edd2dd3 100644 --- a/themes/modern/templates/md.txt +++ b/themes/modern/templates/md.txt @@ -12,10 +12,10 @@ {% 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 }}**: {{ skill.level }} +{% r.skills.sets.forEach( function( set, idx, ar) { %} +- **{{ set.name }}**: {{ set.level }} {% }); } %} {% if ( r.employment.history && r.employment.history.length ) { %} @@ -36,9 +36,9 @@ - {{ course }} {% }); } }); } %} -{% 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) { %} ### {{ pub.title }} ({{ pub.safe.date.format('MMM YYYY') }}) {{ pub.publisher }} {{ pub.summary }} @@ -51,9 +51,9 @@ {{ 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 262fe17..c428a7f 100644 --- a/themes/modern/templates/pdf.html +++ b/themes/modern/templates/pdf.html @@ -39,7 +39,7 @@ engine: Underscore {% } %} -{% if ( r.skills && r.skills.length ) { %} +{% if ( r.skills && r.skills.sets ) { %}
        @@ -48,16 +48,16 @@ engine: Underscore
          - {% r.skills.forEach( function(skill) { %} + {% r.skills.sets.forEach( function(set) { %}
        • -
          -
          +
          +
          - {{ 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 }} {% }); %} {% } %} @@ -124,31 +124,31 @@ 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.link ) { %} + {% if( pub.url ) { %} {{ pub.title }}, {{ pub.publisher }} {% } else { %} {{ pub.name }}, {{ pub.publisher }} @@ -189,12 +189,6 @@ engine: Underscore

        {% } %} -{% if( r.elevatorPitch ) { %} -
        -
        - {{ r.elevatorPitch }} -
        -{% } %}
diff --git a/themes/modern/templates/txt.txt b/themes/modern/templates/txt.txt index ec4eb1a..572e439 100644 --- a/themes/modern/templates/txt.txt +++ b/themes/modern/templates/txt.txt @@ -14,16 +14,20 @@ {% 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 }}: {{ skill.level }} -{% }); } %} +{% 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.employment.history && r.employment.history.length ) { %}EMPLOYMENT +{% } %} + +{% 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 }} {% }); } }); } %} @@ -31,6 +35,20 @@ {% 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, idx, ar) { %} +{% 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 }} +{% }); } %} From c2498a14213192ef0caa751b7087f60ec51ece94 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Sat, 21 Nov 2015 09:12:18 -0500 Subject: [PATCH 09/12] Enhance "compact" theme. --- themes/compact/templates/html.css | 5 +++++ themes/compact/templates/html.html | 35 +++++++++++------------------- themes/compact/templates/pdf.css | 5 +++++ themes/compact/templates/pdf.html | 35 +++++++++++------------------- 4 files changed, 36 insertions(+), 44 deletions(-) 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 c9b3ca0..c2b2e35 100644 --- a/themes/compact/templates/html.html +++ b/themes/compact/templates/html.html @@ -4,6 +4,7 @@ {{ r.name }} + @@ -11,7 +12,7 @@

{{ r.name }}

- {% if (r.contact.email) { %}{% } %} + {% if (r.contact.email) { %}{% } %} {% if (r.contact.phone) { %}
{{ r.contact.phone }}
{% } %} {% if (r.contact.website) { %}
{{ r.contact.website }}
{% } %}
@@ -28,7 +29,7 @@ {% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %}
-

Skills

+

Skills

@@ -41,7 +42,7 @@ {% r.skills.sets.forEach( function( skillset ) { %} - + {% }); %} @@ -54,14 +55,14 @@ {% if ( r.employment && r.employment.history ) { %}
-

Employment

+

Employment

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

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

+

{{ 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 ) { %}
    @@ -99,11 +100,10 @@ {% if ( r.education && r.education.history ) { %}
    -

    Education

    +

    Education

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

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

    - {% if(edu.summary) { %}

    {{ edu.summary|md }}

    {% } %} {% }); %}
    @@ -112,10 +112,10 @@ {% if ( r.service && r.service.history && r.service.history.length ) { %}
    -

    Volunteer

    +

    Service

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

    {{ vol.organization }} {{ vol.safe.start.format('YYYY') }} — {{ vol.safe.end.format('YYYY') }}

    +

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

    {{ vol.summary|md }}

    {% if( vol.highlights ) { %}
      @@ -132,18 +132,10 @@ {% if( r.writing && r.writing.length ) { %}
      -

      Publications

      +

      Writing

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

      - {% if( pub.url ) { %} - {{ pub.title }}, {{ pub.publisher }} - {% } else { %} - {{ pub.title }}, {{ pub.publisher }} - {% } %} - {{ pub.safe.date.format('YYYY') }} -

      + {% 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|md }}{% } %} @@ -154,9 +146,8 @@ {% if( r.recognition && r.recognition.length ) { %}
      -

      Awards

      +

      Awards

      - {% 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 bffec4d..e29bc72 100644 --- a/themes/compact/templates/pdf.html +++ b/themes/compact/templates/pdf.html @@ -13,7 +13,7 @@

      {{ r.name }}

      - {% if (r.contact.email) { %}{% } %} + {% if (r.contact.email) { %}{% } %} {% if (r.contact.phone) { %}
      {{ r.contact.phone }}
      {% } %} {% if (r.contact.website) { %}
      {{ r.contact.website }}
      {% } %}
      @@ -30,7 +30,7 @@ {% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %}
      -

      Skills

      +

      Skills

{{ skillset.name }}{{ skillset.skills.join(',') }}{{ skillset.skills.join(', ') }}
@@ -43,7 +43,7 @@ {% r.skills.sets.forEach( function( skillset ) { %} - + {% }); %} @@ -56,14 +56,14 @@ {% if ( r.employment && r.employment.history ) { %}
-

Employment

+

Employment

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

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

+

{{ 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 ) { %}
    @@ -101,11 +101,10 @@ {% if ( r.education && r.education.history ) { %}
    -

    Education

    +

    Education

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

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

    - {% if(edu.summary) { %}

    {{ edu.summary|md }}

    {% } %} {% }); %}
    @@ -114,10 +113,10 @@ {% if ( r.service && r.service.history && r.service.history.length ) { %}
    -

    Volunteer

    +

    Service

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

    {{ vol.organization }} {{ vol.safe.start.format('YYYY') }} — {{ vol.safe.end.format('YYYY') }}

    +

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

    {{ vol.summary|md }}

    {% if( vol.highlights ) { %}
      @@ -134,18 +133,10 @@ {% if( r.writing && r.writing.length ) { %}
      -

      Publications

      +

      Writing

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

      - {% if( pub.url ) { %} - {{ pub.title }}, {{ pub.publisher }} - {% } else { %} - {{ pub.title }}, {{ pub.publisher }} - {% } %} - {{ pub.safe.date.format('YYYY') }} -

      + {% 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|md }}{% } %} @@ -156,9 +147,8 @@ {% if( r.recognition && r.recognition.length ) { %}
      -

      Awards

      +

      Awards

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

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

      {{ award.summary|md }} @@ -168,3 +158,4 @@ + From f2623bee9da7dac05303404223fd0cc813c1ea32 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Sat, 21 Nov 2015 09:12:32 -0500 Subject: [PATCH 10/12] Fix icon typo in "modern" theme. --- themes/modern/templates/html.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/modern/templates/html.html b/themes/modern/templates/html.html index 4c27207..85de949 100644 --- a/themes/modern/templates/html.html +++ b/themes/modern/templates/html.html @@ -149,7 +149,7 @@ engine: Underscore

      Publications

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

      {% if( pub.url ) { %} From 36ad9e2b7ea375f4d305cfc9c0074c8530407912 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Sat, 21 Nov 2015 09:29:17 -0500 Subject: [PATCH 11/12] Themes: Modern: Update PDF format from HTML. --- themes/modern/templates/pdf.html | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/themes/modern/templates/pdf.html b/themes/modern/templates/pdf.html index c428a7f..41a3654 100644 --- a/themes/modern/templates/pdf.html +++ b/themes/modern/templates/pdf.html @@ -145,14 +145,10 @@ engine: Underscore

      Publications

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

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

      Published on: {{ pub.safe.date.format('YYYY-MM') }} From 16b61c6155ab8e4469e71f5ff41e7ed9bae61d64 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Sat, 21 Nov 2015 09:29:46 -0500 Subject: [PATCH 12/12] Themes: Modern: Use filt.link convenience method. --- themes/modern/templates/html.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/themes/modern/templates/html.html b/themes/modern/templates/html.html index 85de949..f493542 100644 --- a/themes/modern/templates/html.html +++ b/themes/modern/templates/html.html @@ -152,11 +152,7 @@ engine: Underscore {% r.writing.forEach( function( pub, idx, ar) { %}

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

      Published on: {{ pub.safe.date.format('YYYY-MM') }}

{{ skillset.name }}{{ skillset.skills.join(',') }}{{ skillset.skills.join(', ') }}