Convert "modern" theme to FRESH format.

2015-11-18 22:40:40 -05:00 · 2015-11-18 22:40:40 -05:00 · e9de689a7d
parent 5439bd5385
commit e9de689a7d
6 changed files with 1142 additions and 109 deletions
--- a/themes/compact/templates/doc.xml
+++ b/themes/compact/templates/doc.xml
--- a/themes/modern/templates/doc.xml
+++ b/themes/modern/templates/doc.xml
@ -10,8 +10,8 @@ engine: Underscore
 <w:wordDocument xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2" xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve">
  <w:ignoreSubtree w:val="http://schemas.microsoft.com/office/word/2003/wordml/sp2"/>
  <o:DocumentProperties>
-    <o:Author>{{ r.basics.name|xml }}</o:Author>
-    <o:LastAuthor>{{ r.basics.name|xml }}</o:LastAuthor>
+    <o:Author>{{ r.name|xml }}</o:Author>
+    <o:LastAuthor>{{ r.name|xml }}</o:LastAuthor>
    <o:Revision>4</o:Revision>
    <o:TotalTime>14</o:TotalTime>
    <o:Created>2015-08-28T04:22:00Z</o:Created>
@ -650,7 +650,7 @@ engine: Underscore
                        <w:sz-cs w:val="16"/>
                      </w:rPr>
                    </w:pPr>
-                    <w:hlink w:dest="mailto:{{ r.basics.email }}">
+                    <w:hlink w:dest="mailto:{{ r.contact.email }}">
                      <w:r wsp:rsidRPr="00D76150">
                        <w:rPr>
                          <w:rStyle w:val="Hyperlink"/>
@ -658,7 +658,7 @@ engine: Underscore
                          <w:sz-cs w:val="16"/>
                          <w:u w:val="none"/>
                        </w:rPr>
-                        <w:t>{{ r.basics.email|xml }}</w:t>
+                        <w:t>{{ r.contact.email|xml }}</w:t>
                      </w:r>
                    </w:hlink>
                  </w:p>
@ -671,7 +671,7 @@ engine: Underscore
                        <w:sz-cs w:val="16"/>
                      </w:rPr>
                    </w:pPr>
-                    <w:hlink w:dest="{{ r.basics.website }}">
+                    <w:hlink w:dest="{{ r.contact.website }}">
                      <w:r wsp:rsidRPr="00D76150">
                        <w:rPr>
                          <w:rStyle w:val="Hyperlink"/>
@ -679,7 +679,7 @@ engine: Underscore
                          <w:sz-cs w:val="16"/>
                          <w:u w:val="none"/>
                        </w:rPr>
-                        <w:t>{{ r.basics.website|xml }}</w:t>
+                        <w:t>{{ r.contact.website|xml }}</w:t>
                      </w:r>
                    </w:hlink>
                  </w:p>
@ -698,7 +698,7 @@ engine: Underscore
                        <w:sz-cs w:val="16"/>
                        <w:u w:val="none"/>
                      </w:rPr>
-                      <w:t>{{ r.basics.phone|xml }}</w:t>
+                      <w:t>{{ r.contact.phone|xml }}</w:t>
                    </w:r>
                  </w:p>
                </w:txbxContent>
@ -708,7 +708,7 @@ engine: Underscore
          </w:pict>
        </w:r>
        <w:r wsp:rsidRPr="00C61794">
-          <w:t>{{ r.basics.name|xml }}</w:t>
+          <w:t>{{ r.name|xml }}</w:t>
        </w:r>
      </w:p>
      <w:p wsp:rsidR="00657B14" wsp:rsidRPr="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00657B14">
@ -721,7 +721,7 @@ engine: Underscore
          <w:rPr>
            <w:rStyle w:val="IntenseEmphasis"/>
          </w:rPr>
-          <w:t>{{ r.basics.summary|xml }}</w:t>
+          <w:t>{{ r.summary|xml }}</w:t>
        </w:r>
      </w:p>
      <wx:sub-section>
@ -754,7 +754,7 @@ engine: Underscore
          </w:tblGrid>

          {% r.skills.forEach( function( skill, idx, ar) { %}
-          {% var kwords = skill.keywords.join(', '); %}
+          {% var kwords = skill.summary; %}

          <w:tr wsp:rsidR="00427ECC" wsp:rsidTr="00FD3B33">
            <w:tc>
@ -812,7 +812,7 @@ engine: Underscore
            <w:gridCol w:w="4428"/>
            <w:gridCol w:w="4428"/>
          </w:tblGrid>
-          {% r.work.forEach( function( proj, idx, ar) { %}
+          {% r.employment.history.forEach( function( proj, idx, ar) { %}
          <w:tr wsp:rsidR="00C61794" wsp:rsidTr="00C61794">
            <w:tc>
              <w:tcPr>
@ -830,7 +830,7 @@ engine: Underscore
                  <w:pStyle w:val="Heading2"/>
                </w:pPr>
                <w:r>
-                  <w:t>{{ proj.company|xml }}</w:t>
+                  <w:t>{{ proj.employer|xml }}</w:t>
                </w:r>
              </w:p>
            </w:tc>
@ -867,7 +867,7 @@ engine: Underscore
                    <w:sz w:val="28"/>
                    <w:sz-cs w:val="28"/>
                  </w:rPr>
-                  <w:t>{{ proj.startDate|xml }} — {{ proj.endDate|xml }}</w:t>
+                  <w:t>{{ proj.safe.start.format('YYYY-MM')|xml }} — {{ proj.safe.end.format('YYYY-MM')|xml }}</w:t>
                </w:r>
              </w:p>
            </w:tc>
@ -937,7 +937,7 @@ engine: Underscore
            <w:gridCol w:w="4428"/>
            <w:gridCol w:w="4428"/>
          </w:tblGrid>
-          {% r.education.forEach( function( edu, idx, ar) { %}
+          {% r.education.history.forEach( function( edu, idx, ar) { %}
          <w:tr wsp:rsidR="00C61794" wsp:rsidTr="00C61794">
            <w:tc>
              <w:tcPr>
@ -992,7 +992,7 @@ engine: Underscore
                    <w:sz w:val="28"/>
                    <w:sz-cs w:val="28"/>
                  </w:rPr>
-                  <w:t>{{ edu.startDate|xml }} — {{ edu.endDate|xml }}</w:t>
+                  <w:t>{{ edu.safe.start.format('YYYY-MM')|xml }} — {{ edu.safe.end.format('YYYY-MM')|xml }}</w:t>
                </w:r>
              </w:p>
            </w:tc>
@ -1012,10 +1012,10 @@ engine: Underscore
              </w:tcPr>
              <w:p wsp:rsidR="00C61794" wsp:rsidRDefault="00C61794" wsp:rsidP="00023F41">
                <w:r>
-                  <w:t>{{ edu.area|xml }}</w:t>
+                  <w:t>TODO</w:t>
                </w:r>
              </w:p>
-              {% edu.courses.forEach( function( course, idx, ar) { %}
+              {% edu.curriculum.forEach( function( course, idx, ar) { %}
              <w:p wsp:rsidR="00C61794" wsp:rsidRDefault="00C61794" wsp:rsidP="00C61794">
                <w:pPr>
                  <w:listPr>
--- a/themes/modern/templates/html.html
+++ b/themes/modern/templates/html.html
@ -9,7 +9,7 @@ engine: Underscore
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{{ r.basics.name }}</title>
+    <title>{{ r.name }}</title>
    <link href='https://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
    {{ headFragment }}
@ -25,20 +25,20 @@ engine: Underscore
    <main id="main">
      <div id="container">
      <header>
-        <h1>{{ r.basics.name }}</h1>
+        <h1>{{ r.name }}</h1>
        <div id="contact">
-          {% if (r.basics.email) { %}<div class="email">{{ r.basics.email }}</div>{% } %}
-          {% if (r.basics.phone) { %}<div class="phone">{{ r.basics.phone }}</div>{% } %}
-          {% if (r.basics.website) { %}<div class="website"><a href="{{ r.basics.website }}">{{ r.basics.website }}</a></div>{% } %}
+          {% if (r.contact.email) { %}<div class="email">{{ r.contact.email }}</div>{% } %}
+          {% if (r.contact.phone) { %}<div class="phone">{{ r.contact.phone }}</div>{% } %}
+          {% if (r.contact.website) { %}<div class="website"><a href="{{ r.contact.website }}">{{ r.contact.website }}</a></div>{% } %}
        </div>
      </header>

-{% if ( r.basics.summary && r.basics.summary.length ) { %}
+{% if ( r.summary && r.summary.length ) { %}
      <hr>
      <section id="summary">
        <h3>About</h3>
        <span class="fa fa-lg fa-user"></span>
-        {{ r.basics.summary|md }}
+        {{ r.summary|md }}
      </section>
 {% } %}

@ -54,15 +54,12 @@ engine: Underscore
        <ul class="list-unstyled">
          {% r.skills.forEach( function(skill) { %}
            <li class="card card-nested card-skills">
-              {% if( r.display_progress_bar ) { %}
-                <div class="skill-level" rel="tooltip" title="{{ skill.level }}" data-placement="left">
-                  <div class="skill-progress {{ skill.level|lower }}">
-                  </div>
+              <div class="skill-level" rel="tooltip" title="{{ skill.level }}" data-placement="left">
+                <div class="skill-progress {{ skill.level|lower }}">
                </div>
-              {% } %}
+              </div>
              <div class="skill-info">
                <strong>{{ skill.name }}</strong>
-
                <div class="space-top labels">
                  {% 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 ) { %}
      <hr>
      <section id="employment">
        <header>
        <h3>Employment</h3>
        </header>
        <span class="fa fa-lg fa-building"></span>
-        {% r.work.forEach( function( proj, idx, ar) { %}
-          {% if( proj.website && proj.website.length ) { %}
-          <h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ proj.website|raw }}">{{ proj.company }}</a></h4>
+        {% r.employment.history.forEach( function( proj, idx, ar) { %}
+          {% if( proj.url && proj.url.length ) { %}
+          <h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ proj.url|raw }}">{{ proj.employer }}</a></h4>
          {% } else { %}
-          <h4><span class="res-label">{{ proj.position }}</span>, <span class="defunct">{{ proj.company }}</span></h4>
+          <h4><span class="res-label">{{ proj.position }}</span>, <span class="defunct">{{ proj.employer }}</span></h4>
          {% } %}
-          <span class="tenure">{{ proj.startDate }}&mdash;{{ proj.endDate }}</span>
+          <span class="tenure">{{ proj.safe.start.format('YYYY-MM') }}&mdash;{{ proj.safe.end.format('YYYY-MM') }}</span>
          {{ proj.summary|md }}
          {% if( proj.highlights ) { %}
            <ul>
@ -110,17 +107,16 @@ engine: Underscore



-{% if ( r.education && r.education.length ) { %}
+{% if ( r.education.history && r.education.history.length ) { %}
      <hr>
      <section id="education">
        <header>
        <h3>Education</h3>
        </header>
        <span class="fa fa-lg fa-mortar-board"></span>
-        {% r.education.forEach( function( edu, idx, ar) { %}
+        {% r.education.history.forEach( function( edu, idx, ar) { %}
          <h4>{{ edu.institution }}</h4>
-          <span class="tenure">{{ edu.startDate }}&mdash;{{ edu.endDate }}</span>
-          {{ edu.area|md }}
+          <span class="tenure">{{ edu.safe.start.format('YYYY-MM') }}&mdash;{{ edu.safe.end.format('YYYY-MM') }}</span>
          {% if( edu.courses ) { %}
            <ul>
            {% edu.courses.forEach( function( course, idx, ar) { %}
@ -157,34 +153,34 @@ engine: Underscore
        <span class="fa fa-lg fa-trophy"></span>
        {% r.publications.forEach( function( pub, idx, ar) { %}
          <h4>
-            {% if( pub.website ) { %}
-              <span class="res-label"><a href="{{ pub.website }}" ></span>{{ pub.name }}</a>,&nbsp;{{ pub.publisher }}
+            {% if( pub.link ) { %}
+              <span class="res-label"><a href="{{ pub.link[0].url }}" ></span>{{ pub.title }}</a>,&nbsp;{{ pub.publisher }}
            {% } else { %}
              <span class="res-label">{{ pub.name }}</span>,&nbsp;{{ pub.publisher }}
            {% } %}
          </h4>
-        <span class="tenure">Published on: {{ pub.releaseDate }}</span>
+        <span class="tenure">Published on: {{ pub.safe.date.format('YYYY-MM') }}</span>

-        {{ pub.summary|md }}
+        

        {% }); %}
      </section>
 {% } %}

-{% if ( r.volunteer && r.volunteer.length ) { %}
+{% if ( r.service.history && r.service.history.length ) { %}
      <hr>
      <section id="volunteer">
        <header>
        <h3>Volunteer Work</h3>
        </header>
        <span class="fa fa-lg fa-child"></span>
-        {% 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 ) { %}
          <h4><span class="res-label">{{ vol.position }}</span>, <a href="{{ vol.website|raw }}">{{ vol.organization }}</a></h4>
          {% } else { %}
          <h4><span class="res-label">{{ vol.position }}</span>, <span class="defunct">{{ vol.organization }}</span></h4>
          {% } %}
-          <span class="tenure">{{ vol.startDate }}&mdash;{{ vol.endDate }}</span>
+          <span class="tenure">{{ vol.safe.start.format('YYYY-MM') }}&mdash;{{ vol.safe.end.format('YYYY-MM') }}</span>
          {{ vol.summary|md }}
          {% if( vol.highlights ) { %}
            <ul>
--- 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 }}
 {% }); } %}

--- a/themes/modern/templates/pdf.html
+++ b/themes/modern/templates/pdf.html
@ -9,7 +9,7 @@ engine: Underscore
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{{ r.basics.name }}</title>
+    <title>{{ r.name }}</title>
    <link href='https://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
    {{ headFragment }}
@ -21,20 +21,20 @@ engine: Underscore
    <main id="main">
      <div id="container">
      <header>
-        <h1>{{ r.basics.name }}</h1>
+        <h1>{{ r.name }}</h1>
        <div id="contact">
-          {% if (r.basics.email) { %}<div class="email">{{ r.basics.email }}</div>{% } %}
-          {% if (r.basics.phone) { %}<div class="phone">{{ r.basics.phone }}</div>{% } %}
-          {% if (r.basics.website) { %}<div class="website"><a href="{{ r.basics.website }}">{{ r.basics.website }}</a></div>{% } %}
+          {% if (r.contact.email) { %}<div class="email">{{ r.contact.email }}</div>{% } %}
+          {% if (r.contact.phone) { %}<div class="phone">{{ r.contact.phone }}</div>{% } %}
+          {% if (r.contact.website) { %}<div class="website"><a href="{{ r.contact.website }}">{{ r.contact.website }}</a></div>{% } %}
        </div>
      </header>

-{% if ( r.basics.summary && r.basics.summary.length ) { %}
+{% if ( r.summary && r.summary.length ) { %}
      <hr>
      <section id="summary">
        <h3>About</h3>
        <span class="fa fa-lg fa-user"></span>
-        {{ r.basics.summary|md }}
+        {{ r.summary|md }}
      </section>
 {% } %}

@ -50,15 +50,12 @@ engine: Underscore
        <ul class="list-unstyled">
          {% r.skills.forEach( function(skill) { %}
            <li class="card card-nested card-skills">
-              {% if( r.display_progress_bar ) { %}
-                <div class="skill-level" rel="tooltip" title="{{ skill.level }}" data-placement="left">
-                  <div class="skill-progress {{ skill.level|lower }}">
-                  </div>
+              <div class="skill-level" rel="tooltip" title="{{ skill.level }}" data-placement="left">
+                <div class="skill-progress {{ skill.level|lower }}">
                </div>
-              {% } %}
+              </div>
              <div class="skill-info">
                <strong>{{ skill.name }}</strong>
-
                <div class="space-top labels">
                  {% 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 ) { %}
      <hr>
      <section id="employment">
        <header>
        <h3>Employment</h3>
        </header>
        <span class="fa fa-lg fa-building"></span>
-        {% r.work.forEach( function( proj, idx, ar) { %}
-          {% if( proj.website && proj.website.length ) { %}
-          <h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ proj.website|raw }}">{{ proj.company }}</a></h4>
+        {% r.employment.history.forEach( function( proj, idx, ar) { %}
+          {% if( proj.url && proj.url.length ) { %}
+          <h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ proj.url|raw }}">{{ proj.employer }}</a></h4>
          {% } else { %}
-          <h4><span class="res-label">{{ proj.position }}</span>, <span class="defunct">{{ proj.company }}</span></h4>
+          <h4><span class="res-label">{{ proj.position }}</span>, <span class="defunct">{{ proj.employer }}</span></h4>
          {% } %}
-          <span class="tenure">{{ proj.startDate }}&mdash;{{ proj.endDate }}</span>
+          <span class="tenure">{{ proj.safe.start.format('YYYY-MM') }}&mdash;{{ proj.safe.end.format('YYYY-MM') }}</span>
          {{ proj.summary|md }}
          {% if( proj.highlights ) { %}
            <ul>
@ -106,17 +103,16 @@ engine: Underscore



-{% if ( r.education && r.education.length ) { %}
+{% if ( r.education.history && r.education.history.length ) { %}
      <hr>
      <section id="education">
        <header>
        <h3>Education</h3>
        </header>
        <span class="fa fa-lg fa-mortar-board"></span>
-        {% r.education.forEach( function( edu, idx, ar) { %}
+        {% r.education.history.forEach( function( edu, idx, ar) { %}
          <h4>{{ edu.institution }}</h4>
-          <span class="tenure">{{ edu.startDate }}&mdash;{{ edu.endDate }}</span>
-          {{ edu.area|md }}
+          <span class="tenure">{{ edu.safe.start.format('YYYY-MM') }}&mdash;{{ edu.safe.end.format('YYYY-MM') }}</span>
          {% if( edu.courses ) { %}
            <ul>
            {% edu.courses.forEach( function( course, idx, ar) { %}
@ -153,34 +149,34 @@ engine: Underscore
        <span class="fa fa-lg fa-trophy"></span>
        {% r.publications.forEach( function( pub, idx, ar) { %}
          <h4>
-            {% if( pub.website ) { %}
-              <span class="res-label"><a href="{{ pub.website }}" ></span>{{ pub.name }}</a>,&nbsp;{{ pub.publisher }}
+            {% if( pub.link ) { %}
+              <span class="res-label"><a href="{{ pub.link[0].url }}" ></span>{{ pub.title }}</a>,&nbsp;{{ pub.publisher }}
            {% } else { %}
              <span class="res-label">{{ pub.name }}</span>,&nbsp;{{ pub.publisher }}
            {% } %}
          </h4>
-        <span class="tenure">Published on: {{ pub.releaseDate }}</span>
+        <span class="tenure">Published on: {{ pub.safe.date.format('YYYY-MM') }}</span>
+

-        {{ pub.summary|md }}

        {% }); %}
      </section>
 {% } %}

-{% if ( r.volunteer && r.volunteer.length ) { %}
+{% if ( r.service.history && r.service.history.length ) { %}
      <hr>
      <section id="volunteer">
        <header>
        <h3>Volunteer Work</h3>
        </header>
        <span class="fa fa-lg fa-child"></span>
-        {% 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 ) { %}
          <h4><span class="res-label">{{ vol.position }}</span>, <a href="{{ vol.website|raw }}">{{ vol.organization }}</a></h4>
          {% } else { %}
          <h4><span class="res-label">{{ vol.position }}</span>, <span class="defunct">{{ vol.organization }}</span></h4>
          {% } %}
-          <span class="tenure">{{ vol.startDate }}&mdash;{{ vol.endDate }}</span>
+          <span class="tenure">{{ vol.safe.start.format('YYYY-MM') }}&mdash;{{ vol.safe.end.format('YYYY-MM') }}</span>
          {{ vol.summary|md }}
          {% if( vol.highlights ) { %}
            <ul>
--- 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 }}
 {% }); } }); } %}