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