Update with FRESH format changes.

themes/modern/templates/doc.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 [[[
-title: Modern (PDF)
-description: An HTML-driven PDF resume template for FluentCV's "modern" theme.
+title: Modern (MS Word)
+description: An HTML-driven MS Word resume template for FluentCV's "modern" theme.
 engine: Underscore
 ]]]
 -->
@@ -753,8 +753,8 @@ engine: Underscore
             <w:gridCol w:w="4428"/>
           </w:tblGrid>
 
-          {% r.skills.forEach( function( skill, idx, ar) { %}
-          {% var kwords = skill.summary; %}
+          {% r.skills.sets.forEach( function( set, idx, ar) { %}
+          {% var kwords = set.skills.join(', '); %}
 
           <w:tr wsp:rsidR="00427ECC" wsp:rsidTr="00FD3B33">
             <w:tc>
@@ -764,7 +764,7 @@ engine: Underscore
               </w:tcPr>
               <w:p wsp:rsidR="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00427ECC">
                 <w:r>
-                  <w:t>{{ skill.name|xml }}:</w:t>
+                  <w:t>{{ set.name|xml }}:</w:t>
                 </w:r>
               </w:p>
             </w:tc>

themes/modern/templates/html.html

@@ -43,7 +43,7 @@ engine: Underscore
 {% } %}
 
 
-{% if ( r.skills && r.skills.length ) { %}
+{% if ( r.skills && r.skills.sets ) { %}
       <hr>
       <section id="skills">
         <header>
@@ -52,16 +52,16 @@ engine: Underscore
         <span class="fa fa-lg fa-code"></span>
 
         <ul class="list-unstyled">
-          {% r.skills.forEach( function(skill) { %}
+          {% r.skills.sets.forEach( function(set) { %}
             <li class="card card-nested card-skills">
-              <div class="skill-level" rel="tooltip" title="{{ skill.level }}" data-placement="left">
-                <div class="skill-progress {{ skill.level }}"></div>
+              <div class="skill-level" rel="tooltip" title="{{ set.level }}" data-placement="left">
+                <div class="skill-progress {{ set.level }}"></div>
               </div>
               <div class="skill-info">
-                <strong>{{ skill.name }}</strong>
+                <strong>{{ set.name }}</strong>
                 <div class="space-top labels">
-                  {% if( skill.keywords && skill.keywords.length ) { %}
-                    {% skill.keywords.forEach(function(kw) { %}
+                  {% if( set.skills && set.skills.length ) { %}
+                    {% set.skills.forEach(function(kw) { %}
                       <span class="label label-keyword">{{ kw }}</span>
                     {% }); %}
                   {% } %}
@@ -128,31 +128,31 @@ engine: Underscore
       </section>
 {% } %}
 
-{% if( r.awards && r.awards.length ) { %}
+{% if( r.recognition && r.recognition.length ) { %}
       <hr>
       <section id="awards">
         <header>
         <h3>Awards</h3>
         </header>
         <span class="fa fa-lg fa-trophy"></span>
-        {% r.awards.forEach( function( award, idx, ar) { %}
-          <h4><span class="res-label">{{ award.title }}</span>, {{ award.awarder }}</h4>
+        {% r.recognition.forEach( function( award, idx, ar) { %}
+          <h4><span class="res-label">{{ award.title }}</span>, {{ award.from }}</h4>
           <span class="tenure">{{ award.date }}</span>
           {{ award.summary|md }}
         {% }); %}
       </section>
 {% } %}
 
-{% if( r.publications && r.publications.length ) { %}
+{% if( r.writing && r.writing.length ) { %}
       <hr>
       <section id="publications">
         <header>
         <h3>Publications</h3>
         </header>
         <span class="fa fa-lg fa-trophy"></span>
-        {% r.publications.forEach( function( pub, idx, ar) { %}
+        {% r.writing.forEach( function( pub, idx, ar) { %}
           <h4>
-            {% if( pub.link ) { %}
+            {% if( pub.url ) { %}
               <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 }}
@@ -193,12 +193,6 @@ engine: Underscore
       </section>
 {% } %}
 
-{% if( r.elevatorPitch ) { %}
-      <hr>
-      <section id='elevator-pitch'>
-        {{ r.elevatorPitch }}
-      </section>
-{% } %}
 
       </div>
     </main>

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

themes/modern/templates/pdf.html

@@ -39,7 +39,7 @@ engine: Underscore
 {% } %}
 
 
-{% if ( r.skills && r.skills.length ) { %}
+{% if ( r.skills && r.skills.sets ) { %}
       <hr>
       <section id="skills">
         <header>
@@ -48,16 +48,16 @@ engine: Underscore
         <span class="fa fa-lg fa-code"></span>
 
         <ul class="list-unstyled">
-          {% r.skills.forEach( function(skill) { %}
+          {% r.skills.sets.forEach( function(set) { %}
             <li class="card card-nested card-skills">
-              <div class="skill-level" rel="tooltip" title="{{ skill.level }}" data-placement="left">
-                <div class="skill-progress {{ skill.level }}"></div>
+              <div class="skill-level" rel="tooltip" title="{{ set.level }}" data-placement="left">
+                <div class="skill-progress {{ set.level }}"></div>
               </div>
               <div class="skill-info">
-                <strong>{{ skill.name }}</strong>
+                <strong>{{ set.name }}</strong>
                 <div class="space-top labels">
-                  {% if( skill.keywords && skill.keywords.length ) { %}
-                    {% skill.keywords.forEach(function(kw) { %}
+                  {% if( set.skills && set.skills.length ) { %}
+                    {% set.skills.forEach(function(kw) { %}
                       <span class="label label-keyword">{{ kw }}</span>
                     {% }); %}
                   {% } %}
@@ -124,31 +124,31 @@ engine: Underscore
       </section>
 {% } %}
 
-{% if( r.awards && r.awards.length ) { %}
+{% if( r.recognition && r.recognition.length ) { %}
       <hr>
       <section id="awards">
         <header>
         <h3>Awards</h3>
         </header>
         <span class="fa fa-lg fa-trophy"></span>
-        {% r.awards.forEach( function( award, idx, ar) { %}
-          <h4><span class="res-label">{{ award.title }}</span>, {{ award.awarder }}</h4>
+        {% r.recognition.forEach( function( award, idx, ar) { %}
+          <h4><span class="res-label">{{ award.title }}</span>, {{ award.from }}</h4>
           <span class="tenure">{{ award.date }}</span>
           {{ award.summary|md }}
         {% }); %}
       </section>
 {% } %}
 
-{% if( r.publications && r.publications.length ) { %}
+{% if( r.writing && r.writing.length ) { %}
       <hr>
       <section id="publications">
         <header>
         <h3>Publications</h3>
         </header>
         <span class="fa fa-lg fa-trophy"></span>
-        {% r.publications.forEach( function( pub, idx, ar) { %}
+        {% r.writing.forEach( function( pub, idx, ar) { %}
           <h4>
-            {% if( pub.link ) { %}
+            {% if( pub.url ) { %}
               <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 }}
@@ -189,12 +189,6 @@ engine: Underscore
       </section>
 {% } %}
 
-{% if( r.elevatorPitch ) { %}
-      <hr>
-      <section id='elevator-pitch'>
-        {{ r.elevatorPitch }}
-      </section>
-{% } %}
 
       </div>
     </main>

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