...

Themes will now inherit these formats from the Basis theme by default.

LICENSE.md

@@ -1,7 +1,7 @@
 The MIT License
 ===============
 
-Copyright (c) 2015 James M. Devlin (https://github.com/hacksalot)
+Copyright (c) 2015 Sir Hacksalot (https://github.com/hacksalot)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,5 +1,5 @@
-fluent-themes
+fresh-themes
-=============
+============
 
 Stylized templates for your résumé and/or CV, compatible with [FRESH][f] and
 [JSON Resume][jrs] formats.
@@ -18,7 +18,7 @@ You don't need to install this repository to use the themes; just install
 [FluentCV Desktop][1] or [Command Line][2]. Otherwise you can install the latest
 official standalone version of the theme repository over NPM...
 
-`[sudo] npm install fluent-themes --save`
+`[sudo] npm install fresh-themes --save`
 
 ...or fork and clone it as usual.
 
@@ -51,13 +51,13 @@ MIT. See [LICENSE.md][1] for details.
 
 [1]: http://fluentcv.com
 [2]: https://github.com/fluentdesk/fluentcv
-[3]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[3]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
 [f]: https://github.com/fluentdesk/FRESCA
 [jrs]: http://jsonresume.org
 [awe]: https://github.com/posquit0/Awesome-CV
-[t-awesome]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/awesome
+[t-awesome]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/awesome
-[t-minimist]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/minimist
+[t-minimist]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/minimist
-[t-modern]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/modern
+[t-modern]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/modern
-[t-hello]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/hello-world
+[t-hello]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/hello-world
-[t-compact]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/compact
+[t-compact]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/compact
-[t-positive]: https://github.com/fluentdesk/fluent-themes/tree/master/themes/positive
+[t-positive]: https://github.com/fluentdesk/fresh-themes/tree/master/themes/positive

package.json

@@ -1,10 +1,10 @@
 {
-  "name": "fluent-themes",
+  "name": "fresh-themes",
-  "version": "0.8.0-beta",
+  "version": "0.11.0-beta",
-  "description": "Multiformat résumé themes and templates for FluentCV and JSON Resume.",
+  "description": "Multiformat résumé themes and templates for HackMyResume and FluentCV.",
   "repository": {
     "type": "git",
-    "url": "https://github.com/fluentdesk/fluent-themes.git"
+    "url": "https://github.com/fluentdesk/fresh-themes.git"
   },
   "main": "themes/README.md",
   "keywords": [
@@ -23,11 +23,11 @@
     "JSON",
     "YAML"
   ],
-  "author": "James M. Devlin",
+  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/fluentdesk/fluent-themes/issues"
+    "url": "https://github.com/fluentdesk/fresh-themes/issues"
   },
-  "homepage": "https://github.com/fluentdesk/fluent-themes",
+  "homepage": "https://github.com/fluentdesk/fresh-themes",
   "dependencies": { }
 }

themes/README.md

@@ -1,6 +1,6 @@
 /themes/
 ========
-FluentCV themes live here, one per folder.
+FRESH resume themes live here, one per folder.
 
 - [`minimist`](minimist): A no-frills theme.
 - [`modern`](modern): A middle of the road theme with a modern look 'n feel.

themes/awesome/README.md

@@ -5,8 +5,9 @@ An experimental resume theme based on [Byungjin Park's][author] awesome
 
 ## Use
 
-1. Run `fluentcv build my-resume.json to out/my-resume.all -t awesome` to create
+1. Run `hackmyresume build my-resume.json to out/my-resume.all -t awesome` to
-a LaTeX résumé in the Awesome-CV style using your FRESH or JSON Resume resume.
+create a LaTeX résumé in the Awesome-CV style using your FRESH or JSON Resume
+resume.
 
 2. Generate a styled PDF by running `xelatex my-resume.tex` in the `examples`
 folder generated in Step 1. You'll need a valid and updated LaTeX environment on
@@ -21,19 +22,18 @@ are 3 symlinks in the `examples` folder that need to exist:
 - `fontawesome.sty` should link to `../fontawesome.sty`.
 - `fonts` should link to `../fonts` (folder).
 
-FluentCV creates these by default when it generates a resume under the `awesome`
+HackMyResume creates these by default when it generates a resume under the
-theme. To create these symlinks manually, either use the Linux / OS X symlink
+`awesome` theme. To create these symlinks manually, either use the Linux / OS X
-command for all three or, if on Windows, run use `mklink /H` for the first two
+symlink command for all three or, if on Windows, run use `mklink /H` for the
-and `mklink /J` for the last.
+first two and `mklink /J` for the last.
 
 ## License
 
 MIT. See [LICENSE.md][lic].
 
-
 [acv]: https://github.com/posquit0/Awesome-CV
 [m]: http://miktex.org/download
 [desk]: http://fluentcv.com
 [cli]: https://github.com/fluentdesk/fluentcv
-[lic]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md
 [author]: https://github.com/posquit0

themes/awesome/theme.json

@@ -1,5 +1,5 @@
 {
-  "title": "compact",
+  "title": "awesome",
   "description": "A technical résumé theme based on Awesome-CV for LaTeX.",
   "engine": "underscore",
   "url": "https://github.com/posquit0/Awesome-CV",
@@ -10,6 +10,7 @@
     "evaluate": "\\[~([\\s\\S]+?)~]",
     "comment": "\\[\\#([\\s\\S]+?)\\#\\]"
   },
+  "leaf": true,
   "formats": {
     "latex": {
       "transform": [
@@ -38,5 +39,5 @@
       }
     }
   },
-  "message": "Don't forget to run 'xelatex <myresume.tex>' in the generated latex/examples folder to complete your resume build! For more info, see the theme README at https://github.com/fluentdesk/fluent-themes/blob/master/themes/awesome/README.md."
+  "message": "Don't forget to run 'xelatex <myresume.tex>' in the generated latex/examples folder to complete your resume build! For more info, see the theme README at https://github.com/fluentdesk/fresh-themes/blob/master/themes/awesome/README.md."
 }

themes/basis/README.md

@@ -0,0 +1,16 @@
+Theme: Basis
+============
+A basis résumé theme for HackMyResume, FluentCV, and other FRESH-compatible
+resume tools.
+
+## Use
+
+The basis theme contains default theme files for use in other themes. Other
+FRESH themes can inherit from the basis theme (or any theme) in order to provide
+default formats that the theme author(s) may not necessarily be interested in.
+
+## License
+
+MIT. See [LICENSE.md][lic] for details.
+
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md

themes/basis/src/html.css

@@ -0,0 +1 @@
+/* An empty CSS file. */

themes/basis/src/html.html

@@ -0,0 +1,171 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>{{ RAW.name }}</title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+    {{{styleSheet "html.css"}}}
+  </head>
+  <body>
+    <main>
+      <header>
+        <h1>{{{ r.name }}}</h1>
+        <div id="contact">
+          {{#has 'contact.email'}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/has}}
+          {{#has 'contact.phone'}}<div class="phone">{{ RAW.contact.phone }}</div>{{/has}}
+          {{#has 'contact.website'}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/has}}
+        </div>
+      </header>
+
+{{#has "info.brief"}}
+<section id="summary">
+  {{{ r.info.brief }}}
+</section>
+{{/has}}
+
+
+{{#section "skills"}}
+<section id="skills">
+  <header>
+  <h2>{{{sectionTitle "Skills"}}}</h2><hr>
+  </header>
+  <table>
+    <thead>
+      <tr>
+        <th>Skill</th>
+        <th>Keywords</th>
+      </tr>
+    </thead>
+    <tbody>
+      {{#each r.skills.sets}}
+      <tr>
+        <td style="width: 25%;">{{ name }}</td>
+        <td class="keywords">{{#each skills}}{{ this }} {{/each}}</td>
+      </tr>
+      {{/each}}
+    </tbody>
+  </table>
+</section>
+{{/section}}
+
+
+
+{{#section "employment"}}
+<section id="employment">
+  <header>
+  <h2>{{{sectionTitle "Employment"}}}</h2><hr>
+  </header>
+
+  {{#each r.employment.history}}
+      <h3><em>{{ position }}</em>,
+        {{#if url }}
+        <a href="{{ url }}">{{ employer }}</a>
+        {{else}}
+        {{ employer }}
+        {{/if}}
+        <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
+      <p style="clear: both;">{{{ summary }}}</p>
+      {{#if highlights}}
+        <ul>
+        {{#each highlights}}
+          <li>{{{ this }}}</li>
+        {{/each}}
+        </ul>
+      {{/if}}
+  {{/each}}
+
+</section>
+{{/section}}
+
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  <header>
+  <h2>{{{sectionTitle "Projects"}}}</h2>
+  </header>
+  {{#each r.projects}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/section}}
+
+{{#section "education"}}
+<section id="education">
+  <header>
+  <h2>{{{sectionTitle "Education"}}}</h2><hr>
+  </header>
+  {{#each r.education.history}}
+    <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+  {{/each}}
+
+</section>
+{{/section}}
+
+{{#section "service"}}
+<section id="volunteer">
+  <header>
+  <h2>{{{sectionTitle "Service"}}}</h2><hr>
+  </header>
+  {{#each r.service.history}}
+    <h3><em>{{ position }}</em>,
+      {{#if url}}
+      <a href="{{ url }}">{{ organization }}</a>
+      {{else}}
+      {{ organization }}
+      {{/if}}
+      <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+    <p style="clear: both;">{{{ summary }}}</p>
+    {{#if highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/section}}
+
+{{#section "writing"}}
+<section id="publications">
+  <header>
+  <h2>{{{sectionTitle "Writing"}}}</h2><hr>
+  </header>
+  {{#each r.writing }}
+    <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
+      {{ publisher }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
+  {{# if summary}}{{{ summary }}}{{/if}}
+  {{/each}}
+</section>
+{{/section}}
+
+{{#section "recognition"}}
+<section id="awards">
+  <header>
+  <h2>{{{sectionTitle "recognition" "Awards"}}}</h2><hr>
+  </header>
+  {{#each r.recognition}}
+    <h4><span class="res-label">{{ title }}</span>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h4>
+    {{ summary }}
+  {{/each}}
+</section>
+{{/section}}
+
+    </main>
+  </body>
+</html>

themes/basis/src/md.txt

@@ -0,0 +1,108 @@
+{{ r.name }}
+============
+{{#has 'contact.email' }}Email: {{{ r.contact.email }}}{{/has}}
+{{#has 'contact.phone' }}Tel: {{{ r.contact.phone }}}{{/has}}
+{{#has 'contact.website' }}Web: {{{ r.contact.website }}}{{/has}}
+
+{{#has "info.brief" }}{{{ r.info.brief }}}{{/has}}
+
+{{#section "skills"}}
+## {{{sectionTitle "SKILLS"}}}
+
+{{#each r.skills.sets}}
+  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
+{{/each}}
+{{/section}}
+
+{{#section "employment"}}
+## {{{sectionTitle "EMPLOYMENT"}}}
+
+{{#each r.employment.history }}
+
+{{#if url}}
+### *{{{ position }}}*, [{{{ employer }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{else}}
+### *{{{ position }}}*, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{/if}}
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
+
+{{#section 'projects'}}
+## {{{sectionTitle "PROJECTS"}}}
+
+{{#each r.projects }}
+{{#if url }}
+### *{{{camelCase role }}}*, [{{{ title }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{else}}
+### *{{{camelCase role }}}*, {{{ title }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{/if}}
+{{{ description }}}
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ . }}}
+
+{{/each}}
+{{/if}}
+{{/each}}
+{{/section}}
+
+{{#section 'education'}}
+## {{{sectionTitle "EDUCATION"}}}
+
+{{#each r.education.history}}
+{{#if url}}
+### [{{{ institution }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{else}}
+### {{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{/if}}
+{{#if summary }}
+{{{ summary }}}
+{{/if}}
+{{#if courses}}
+{{#each courses}}
+  - {{{ this }}}{{/each}}{{/if}}
+{{/each}}
+{{/section}}
+{{#section 'writing'}}
+## WRITING
+
+{{#each r.writing}}
+### {{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
+{{{ summary }}}
+{{/each}}
+{{/section}}
+
+{{#section 'service'}}
+## {{{sectionTitle "SERVICE"}}}
+
+{{#each r.service.history }}
+{{#if url}}
+### [{{{ organization }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{else}}
+### {{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{/if}}
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ this }}}
+{{/each}}
+{{/if}}
+{{/each}}
+{{/section}}
+
+{{#section 'recognition'}}
+## {{{sectionTitle "RECOGNITION"}}}
+
+{{#each r.recognition}}
+### *{{{ title }}}*, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
+{{{ summary }}}
+{{/each}}
+{{/section}}

themes/basis/src/txt.txt

@@ -0,0 +1,94 @@
+{{ r.name }}
+{{#has 'contact.email' }}Email: {{{ r.contact.email }}}{{/has}}
+{{#has 'contact.phone' }}Tel: {{{ r.contact.phone }}}{{/has}}
+{{#has 'contact.website' }}Web: {{{ r.contact.website }}}{{/has}}
+================================================================================
+
+{{#has 'info.brief' }}{{{ r.info.brief }}}{{/has}}
+
+{{#section "skills"}}
+{{{sectionTitle "SKILLS"}}} -------------------------------------------------------------------------
+
+{{#each r.skills.sets}}
+- {{{ name }}}: {{#each skills}}{{{ this }}} {{/each}}
+{{/each}}
+{{/section}}
+
+{{#section "employment"}}
+{{{sectionTitle "EMPLOYMENT"}}} ---------------------------------------------------------------------
+
+{{#each r.employment.history }}
+{{{ position }}}, {{{ employer }}} ({{dateRange .}})
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+- {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
+
+{{#section 'projects'}}
+{{{sectionTitle "PROJECTS"}}} -----------------------------------------------------------------------
+
+{{#each r.projects }}
+{{{ title }}}, {{{ role }}} ({{dateRange .}})
+{{{ description }}}
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+- {{{ this }}}
+{{/each}}
+{{/if}}
+{{/each}}
+{{/section}}
+
+{{#section "education"}}
+{{{sectionTitle "EDUCATION"}}} ----------------------------------------------------------------------
+
+{{#each r.education.history}}
+{{{ institution }}} ({{dateRange .}})
+{{#if summary }}
+{{{ summary }}}
+{{/if}}
+{{#if courses}}
+{{#each courses}}
+- {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
+
+{{#section "writing"}}
+{{{sectionTitle "WRITING"}}} ------------------------------------------------------------------------
+
+{{#each r.writing}}
+{{{ title }}}{{#has 'safe.date'}} ({{formatDate safe.date 'YYYY-MM' }}){{/has}}
+{{{ summary }}}
+{{/each}}
+{{/section}}
+
+{{#section "service" }}
+{{{sectionTitle "SERVICE"}}} ------------------------------------------------------------------------
+
+{{#each r.service.history}}
+{{{ organization }}} ({{dateRange .}})
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+- {{{ this }}}
+{{/each}}
+{{/if}}
+{{/each}}
+{{/section}}
+
+{{#section "recognition"}}
+{{{sectionTitle "RECOGNITION"}}} --------------------------------------------------------------------
+
+{{#each r.recognition}}
+{{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
+{{{ summary }}}
+{{/each}}
+{{/section}}

themes/basis/theme.json

@@ -0,0 +1,7 @@
+{
+  "title": "basis",
+  "description": "A theme that is a basis for other themes.",
+  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
+  "engine": "handlebars",
+  "message": "This theme contains default unstyled formats that can be used by other themes or as a starting point for a custom theme."
+}

themes/compact/README.md

@@ -1,6 +1,7 @@
 Theme: Compact
 ==============
-A compact, no-frills résumé theme for FluentCV.
+A compact, no-frills résumé theme for candidates with lengthy work histories.
+Collapses older work history into a single summary entry.
 
 ![](compact.png)
 
@@ -14,4 +15,4 @@ job entries in order for this theme to make sense.
 
 MIT. See [LICENSE.md][lic] for details.
 
-[lic]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md

themes/compact/compact.json

@@ -1,6 +0,0 @@
-{
-  "title": "compact",
-  "description": "A compact résumé theme for FluentCV.",
-  "author": "hacksalot <hacksalot@fluentdesk.com>",
-  "engine": "handlebars"
-}

themes/compact/src/compact-doc.xml

@@ -512,10 +512,10 @@
           <w:t>{{ r.info.brief }}</w:t>
         </w:r>
       </w:p> -->
-      {{{wpml r.info.brief }}}
+      {{{wpml RAW.info.brief }}}
-      {{> skills }}
+      {{#section "skills"}}{{> skills }}{{/section}}
-      {{> employment }}
+      {{#section "employment"}}{{> employment }}{{/section}}
-      {{> education }}
+      {{#section "education"}}{{> education }}{{/section}}
       <w:sectPr wsp:rsidR="00B43FDC" wsp:rsidRPr="000A3AF0" wsp:rsidSect="001B7422">
         <w:pgSz w:w="12240" w:h="15840"/>
         <w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/>

themes/compact/src/compact-html.html

@@ -4,158 +4,167 @@
     <meta charset="utf-8">
     <title>{{ RAW.name }}</title>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
-    <link href="compact-html.css" rel="stylesheet" type="text/css">
+    {{{styleSheet "html.css"}}}
   </head>
   <body>
     <main>
       <header>
         <h1>{{{ r.name }}}</h1>
         <div id="contact">
-          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
+          {{#has 'contact.email'}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/has}}
-          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
+          {{#has 'contact.phone'}}<div class="phone">{{ RAW.contact.phone }}</div>{{/has}}
-          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/if}}
+          {{#has 'contact.website'}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/has}}
         </div>
       </header>
 
-
+{{#has "info.brief"}}
-{{#if r.info.brief}}
+<section id="summary">
-      <section id="summary">
+  {{{ r.info.brief }}}
-        {{{ r.info.brief }}}
+</section>
-      </section>
+{{/has}}
-{{/if}}
 
 
-{{#if r.skills}}
+{{#section "skills"}}
-      <section id="skills">
+<section id="skills">
-        <header>
+  <header>
-        <h2><span class="fa fa-code"></span> Skills</h2><hr>
+  <h2><span class="fa fa-code"></span> {{{sectionTitle "Skills"}}}</h2><hr>
-        </header>
+  </header>
-        <table>
+  <table>
-          <thead>
+    <thead>
-            <tr>
+      <tr>
-              <th>Skill</th>
+        <th>Skill</th>
-              <th>Keywords</th>
+        <th>Keywords</th>
-            </tr>
+      </tr>
-          </thead>
+    </thead>
-          <tbody>
+    <tbody>
-            {{#each r.skills.sets}}
+      {{#each r.skills.sets}}
-            <tr>
+      <tr>
-              <td style="width: 25%;">{{ name }}</td>
+        <td style="width: 25%;">{{ name }}</td>
-              <td class="keywords">{{#each skills}}{{ this }} {{/each}}</td>
+        <td class="keywords">{{#each skills}}{{ this }} {{/each}}</td>
-            </tr>
+      </tr>
-            {{/each}}
+      {{/each}}
-          </tbody>
+    </tbody>
-        </table>
+  </table>
-      </section>
+</section>
-{{/if}}
+{{/section}}
 
 
 
-{{#if r.employment}}
+{{#section "employment"}}
-      <section id="employment">
+<section id="employment">
-        <header>
+  <header>
-        <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2><hr>
+  <h2><span class="fa fa-building" style="vertical-align: top;"></span> {{{sectionTitle "Employment"}}}</h2><hr>
-        </header>
+  </header>
 
-        {{#each r.employment.history}}
+  {{#each r.employment.history}}
-          {{#compare @index 4 operator="<"}}
+      <h3><em>{{ position }}</em>,
-            <h3><em>{{ position }}</em>,
+        {{#if url }}
-              {{#if url }}
+        <a href="{{ url }}">{{ employer }}</a>
-              <a href="{{ url }}">{{ employer }}</a>
+        {{else}}
-              {{else}}
+        {{ employer }}
-              {{ employer }}
+        {{/if}}
-              {{/if}}
+        <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
-              <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
+      <p style="clear: both;">{{{ summary }}}</p>
-            <p style="clear: both;">{{{ summary }}}</p>
+      {{#if highlights}}
-            {{#if highlights}}
+        <ul>
-              <ul>
+        {{#each highlights}}
-              {{#each highlights}}
+          <li>{{{ this }}}</li>
-                <li>{{{ this }}}</li>
-              {{/each}}
-              </ul>
-            {{/if}}
-          {{/compare}}
-          {{#compare @index 4 operator=">="}}
-
-            {{#compare @index 4 operator="=="}}
-            <h3>Previously...</h3>
-            <p style="clear: both;">Prior to {{ employer }}, I worked on a range of projects for companies large and small.</p>
-            <ul>
-            {{/compare}}
-
-            <li>{{{ position }}}, {{{ employer }}}</li>
-
-            {{#if @last}}
-            </ul>
-            {{/if}}
-          {{/compare}}
         {{/each}}
+        </ul>
+      {{/if}}
+  {{/each}}
 
-      </section>
+</section>
-{{/if}}
+{{/section}}
 
-{{# if r.education}}
+{{#section 'projects'}}
-      <section id="education">
+<hr>
-        <header>
+<section id="projects">
-        <h2><span class="fa fa-mortar-board"></span> Education</h2><hr>
+  <header>
-        </header>
+  <h2><span class="fa fa-star"></span>{{{sectionTitle "Projects"}}}</h2>
-        {{#each r.education.history}}
+  </header>
-          <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+  {{#each r.projects}}
-        {{/each}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
 
-      </section>
+</section>
-{{/if}}
+{{/section}}
 
-{{#if r.service}}
+{{#section "education"}}
-      <section id="volunteer">
+<section id="education">
-        <header>
+  <header>
-        <h2><span class="fa fa-child" style="vertical-align: top;"></span> Service</h2><hr>
+  <h2><span class="fa fa-mortar-board"></span> {{{sectionTitle "Education"}}}</h2><hr>
-        </header>
+  </header>
-        {{#each r.service.history}}
+  {{#each r.education.history}}
-          <h3><em>{{ position }}</em>,
+    <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-            {{#if url}}
+  {{/each}}
-            <a href="{{ url }}">{{ organization }}</a>
-            {{else}}
-            {{ organization }}
-            {{/if}}
-            <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-          <p style="clear: both;">{{{ summary }}}</p>
-          {{#if highlights}}
-            <ul>
-            {{#each highlights}}
-              <li>{{{ this }}}</li>
-            {{/each}}
-            </ul>
-          {{/if}}
-        {{/each}}
 
-      </section>
+</section>
-{{/if}}
+{{/section}}
 
-{{#if r.writing}}
+{{#section "service"}}
-      <section id="publications">
+<section id="volunteer">
-        <header>
+  <header>
-        <h2><span class="fa fa-book"></span> Writing</h2><hr>
+  <h2><span class="fa fa-child" style="vertical-align: top;"></span> {{{sectionTitle "Service"}}}</h2><hr>
-        </header>
+  </header>
-        {{#each r.writing }}
+  {{#each r.service.history}}
-          <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
+    <h3><em>{{ position }}</em>,
-            {{ publisher }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
+      {{#if url}}
-        {{# if summary}}{{{ summary }}}{{/if}}
+      <a href="{{ url }}">{{ organization }}</a>
-        {{/each}}
+      {{else}}
-      </section>
+      {{ organization }}
-{{/if}}
+      {{/if}}
+      <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+    <p style="clear: both;">{{{ summary }}}</p>
+    {{#if highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
 
-{{# if r.recognition}}
+</section>
-      <section id="awards">
+{{/section}}
-        <header>
+
-        <h2><span class="fa fa-trophy"></span> Awards</h2><hr>
+{{#section "writing"}}
-        </header>
+<section id="publications">
-        {{#each r.recognition}}
+  <header>
-          <h4><span class="res-label">{{ title }}</span>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h4>
+  <h2><span class="fa fa-book"></span> {{{sectionTitle "Writing"}}}</h2><hr>
-          {{ summary }}
+  </header>
-        {{/each}}
+  {{#each r.writing }}
-      </section>
+    <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
-{{/if}}
+      {{ publisher }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
+  {{# if summary}}{{{ summary }}}{{/if}}
+  {{/each}}
+</section>
+{{/section}}
+
+{{#section "recognition"}}
+<section id="awards">
+  <header>
+  <h2><span class="fa fa-trophy"></span> {{{sectionTitle "recognition" "Awards"}}}</h2><hr>
+  </header>
+  {{#each r.recognition}}
+    <h4><span class="res-label">{{ title }}</span>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h4>
+    {{ summary }}
+  {{/each}}
+</section>
+{{/section}}
 
     </main>
   </body>

themes/compact/src/compact-md.txt

@@ -1,84 +0,0 @@
-{{ r.name }}
-============
-{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
-{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
-{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
-
-{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
-
-{{#if r.skills}}
-## SKILLS
-
-{{#each r.skills.sets}}
-  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
-{{/each}}
-{{/if}}
-
-{{#if r.employment}}
-## EMPLOYMENT
-
-{{#each r.employment.history }}
-  {{#compare @index 4 operator="<"}}
-### {{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-  {{/compare}}
-  {{#compare @index 4 operator=">="}}
-    {{#compare @index 4 operator="=="}}
-### Previously...
-Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.
-    {{/compare}}
-  - {{{ position }}}, {{{ employer }}}
-  {{/compare}}
-{{/each}}
-{{/if}}
-
-{{#if r.education}}
-## EDUCATION
-
-{{#each r.education.history}}
-### {{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{#if summary }}
-{{{ summary }}}
-{{/if}}
-{{#if courses}}
-{{#each courses}}
-  - {{{ this }}}{{/each}}{{/if}}
-{{/each}}
-{{/if}}
-{{#if r.writing}}
-## WRITING
-
-{{#each r.writing}}
-### {{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
-
-{{#if r.service }}
-## SERVICE
-
-{{#each r.service.history}}
-### {{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-{{/each}}
-{{/if}}
-{{#if r.recognition}}
-## RECOGNITION
-
-{{#each r.recognition}}
-### {{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}

themes/compact/src/compact-pdf.html

@@ -12,151 +12,160 @@
       <header>
         <h1>{{{ r.name }}}</h1>
         <div id="contact">
-          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
+          {{#has 'contact.email'}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/has}}
-          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
+          {{#has 'contact.phone'}}<div class="phone">{{ RAW.contact.phone }}</div>{{/has}}
-          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/if}}
+          {{#has 'contact.website'}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/has}}
         </div>
       </header>
 
-
+{{#has "info.brief"}}
-{{#if r.info.brief}}
+<section id="summary">
-      <section id="summary">
+  {{{ r.info.brief }}}
-        {{{ r.info.brief }}}
+</section>
-      </section>
+{{/has}}
-{{/if}}
 
 
-{{#if r.skills}}
+{{#section "skills"}}
-      <section id="skills">
+<section id="skills">
-        <header>
+  <header>
-        <h2><span class="fa fa-code"></span> Skills</h2><hr>
+  <h2><span class="fa fa-code"></span> {{{sectionTitle "Skills"}}}</h2><hr>
-        </header>
+  </header>
-        <table>
+  <table>
-          <thead>
+    <thead>
-            <tr>
+      <tr>
-              <th>Skill</th>
+        <th>Skill</th>
-              <th>Keywords</th>
+        <th>Keywords</th>
-            </tr>
+      </tr>
-          </thead>
+    </thead>
-          <tbody>
+    <tbody>
-            {{#each r.skills.sets}}
+      {{#each r.skills.sets}}
-            <tr>
+      <tr>
-              <td style="width: 25%;">{{ name }}</td>
+        <td style="width: 25%;">{{ name }}</td>
-              <td class="keywords">{{#each skills}}{{ this }} {{/each}}</td>
+        <td class="keywords">{{#each skills}}{{ this }} {{/each}}</td>
-            </tr>
+      </tr>
-            {{/each}}
+      {{/each}}
-          </tbody>
+    </tbody>
-        </table>
+  </table>
-      </section>
+</section>
-{{/if}}
+{{/section}}
 
 
 
-{{#if r.employment}}
+{{#section "employment"}}
-      <section id="employment">
+<section id="employment">
-        <header>
+  <header>
-        <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2><hr>
+  <h2><span class="fa fa-building" style="vertical-align: top;"></span> {{{sectionTitle "Employment"}}}</h2><hr>
-        </header>
+  </header>
 
-        {{#each r.employment.history}}
+  {{#each r.employment.history}}
-          {{#compare @index 4 operator="<"}}
+      <h3><em>{{ position }}</em>,
-            <h3><em>{{ position }}</em>,
+        {{#if url }}
-              {{#if url }}
+        <a href="{{ url }}">{{ employer }}</a>
-              <a href="{{ url }}">{{ employer }}</a>
+        {{else}}
-              {{else}}
+        {{ employer }}
-              {{ employer }}
+        {{/if}}
-              {{/if}}
+        <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
-              <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
+      <p style="clear: both;">{{{ summary }}}</p>
-            <p style="clear: both;">{{{ summary }}}</p>
+      {{#if highlights}}
-            {{#if highlights}}
+        <ul>
-              <ul>
+        {{#each highlights}}
-              {{#each highlights}}
+          <li>{{{ this }}}</li>
-                <li>{{{ this }}}</li>
-              {{/each}}
-              </ul>
-            {{/if}}
-          {{/compare}}
-          {{#compare @index 4 operator=">="}}
-
-            {{#compare @index 4 operator="=="}}
-            <h3>Previously...</h3>
-            <p style="clear: both;">Prior to {{ employer }}, I worked on a range of projects for companies large and small.</p>
-            <ul>
-            {{/compare}}
-
-            <li>{{{ position }}}, {{{ employer }}}</li>
-
-            {{#if @last}}
-            </ul>
-            {{/if}}
-          {{/compare}}
         {{/each}}
+        </ul>
+      {{/if}}
+  {{/each}}
 
-      </section>
+</section>
-{{/if}}
+{{/section}}
 
-{{# if r.education}}
+{{#section 'projects'}}
-      <section id="education">
+<hr>
-        <header>
+<section id="projects">
-        <h2><span class="fa fa-mortar-board"></span> Education</h2><hr>
+  <header>
-        </header>
+  <h2><span class="fa fa-star"></span>{{{sectionTitle "Projects"}}}</h2>
-        {{#each r.education.history}}
+  </header>
-          <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+  {{#each r.projects}}
-        {{/each}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
 
-      </section>
+</section>
-{{/if}}
+{{/section}}
 
-{{#if r.service}}
+{{#section "education"}}
-      <section id="volunteer">
+<section id="education">
-        <header>
+  <header>
-        <h2><span class="fa fa-child" style="vertical-align: top;"></span> Service</h2><hr>
+  <h2><span class="fa fa-mortar-board"></span> {{{sectionTitle "Education"}}}</h2><hr>
-        </header>
+  </header>
-        {{#each r.service.history}}
+  {{#each r.education.history}}
-          <h3><em>{{ position }}</em>,
+    <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-            {{#if url}}
+  {{/each}}
-            <a href="{{ url }}">{{ organization }}</a>
-            {{else}}
-            {{ organization }}
-            {{/if}}
-            <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-          <p style="clear: both;">{{{ summary }}}</p>
-          {{#if highlights}}
-            <ul>
-            {{#each highlights}}
-              <li>{{{ this }}}</li>
-            {{/each}}
-            </ul>
-          {{/if}}
-        {{/each}}
 
-      </section>
+</section>
-{{/if}}
+{{/section}}
 
-{{#if r.writing}}
+{{#section "service"}}
-      <section id="publications">
+<section id="volunteer">
-        <header>
+  <header>
-        <h2><span class="fa fa-book"></span> Writing</h2><hr>
+  <h2><span class="fa fa-child" style="vertical-align: top;"></span> {{{sectionTitle "Service"}}}</h2><hr>
-        </header>
+  </header>
-        {{#each r.writing }}
+  {{#each r.service.history}}
-          <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
+    <h3><em>{{ position }}</em>,
-            {{ publisher }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
+      {{#if url}}
-        {{# if summary}}{{{ summary }}}{{/if}}
+      <a href="{{ url }}">{{ organization }}</a>
-        {{/each}}
+      {{else}}
-      </section>
+      {{ organization }}
-{{/if}}
+      {{/if}}
+      <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+    <p style="clear: both;">{{{ summary }}}</p>
+    {{#if highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
 
-{{# if r.recognition}}
+</section>
-      <section id="awards">
+{{/section}}
-        <header>
+
-        <h2><span class="fa fa-trophy"></span> Awards</h2><hr>
+{{#section "writing"}}
-        </header>
+<section id="publications">
-        {{#each r.recognition}}
+  <header>
-          <h4><span class="res-label">{{ title }}</span>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h4>
+  <h2><span class="fa fa-book"></span> {{{sectionTitle "Writing"}}}</h2><hr>
-          {{ summary }}
+  </header>
-        {{/each}}
+  {{#each r.writing }}
-      </section>
+    <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
-{{/if}}
+      {{ publisher }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
+  {{# if summary}}{{{ summary }}}{{/if}}
+  {{/each}}
+</section>
+{{/section}}
+
+{{#section "recognition"}}
+<section id="awards">
+  <header>
+  <h2><span class="fa fa-trophy"></span> {{{sectionTitle "recognition" "Awards"}}}</h2><hr>
+  </header>
+  {{#each r.recognition}}
+    <h4><span class="res-label">{{ title }}</span>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h4>
+    {{ summary }}
+  {{/each}}
+</section>
+{{/section}}
 
     </main>
   </body>

themes/compact/src/compact-txt.txt

@@ -1,90 +0,0 @@
-{{!
-
-  compact/txt.txt
-  A plain text resume template for FluentCV's "compact" theme.
-
-}}
-{{ r.name }}
-{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
-{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
-{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
-================================================================================
-
-{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
-
-{{#if r.skills}}
-SKILLS -------------------------------------------------------------------------
-
-{{#each r.skills.sets}}
-  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
-{{/each}}
-{{/if}}
-
-{{#if r.employment}}
-EMPLOYMENT ---------------------------------------------------------------------
-
-{{#each r.employment.history }}
-  {{#compare @index 4 operator="<"}}
-{{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-  {{/compare}}
-  {{#compare @index 4 operator=">="}}
-    {{#compare @index 4 operator="=="}}
-Previously...
-Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.
-    {{/compare}}
-  - {{{ position }}}, {{{ employer }}}
-  {{/compare}}
-{{/each}}
-{{/if}}
-
-{{#if r.education}}
-EDUCATION ----------------------------------------------------------------------
-
-{{#each r.education.history}}
-{{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{#if summary }}
-{{{ summary }}}
-{{/if}}
-{{#if courses}}
-{{#each courses}}
-  - {{{ this }}}{{/each}}{{/if}}
-{{/each}}
-{{/if}}
-{{#if r.writing}}
-WRITING ------------------------------------------------------------------------
-
-{{#each r.writing}}
-{{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
-
-{{#if r.service }}
-SERVICE ------------------------------------------------------------------------
-
-{{#each r.service.history}}
-{{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-{{/each}}
-{{/if}}
-{{#if r.recognition}}
-RECOGNITION --------------------------------------------------------------------
-
-{{#each r.recognition}}
-{{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}

themes/compact/src/partials/education.xml

@@ -4,7 +4,7 @@
       <w:pStyle w:val="Heading1"/>
     </w:pPr>
     <w:r wsp:rsidRPr="00C146CA">
-      <w:t>EDUCATION</w:t>
+      <w:t>{{{sectionTitle "EDUCATION"}}}</w:t>
     </w:r>
   </w:p>
 

themes/compact/src/partials/employment.xml

@@ -4,7 +4,7 @@
       <w:pStyle w:val="Heading1"/>
     </w:pPr>
     <w:r wsp:rsidRPr="00C146CA">
-      <w:t>EMPLOYMENT</w:t>
+      <w:t>{{{sectionTitle "EMPLOYMENT"}}}</w:t>
     </w:r>
   </w:p>
 

themes/compact/src/partials/skills.xml

@@ -5,7 +5,7 @@
       <w:pStyle w:val="Heading1"/>
     </w:pPr>
     <w:r wsp:rsidRPr="00C146CA">
-      <w:t>SKILLS</w:t>
+      <w:t>{{{sectionTitle "SKILLS"}}}</w:t>
     </w:r>
   </w:p>
   <w:tbl>

themes/compact/theme.json

@@ -0,0 +1,10 @@
+{
+  "title": "compact",
+  "description": "A compact résumé theme for FluentCV.",
+  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
+  "engine": "handlebars",
+  "inherits": {
+    "txt": "basis",
+    "md": "basis"
+  }
+}

themes/hello-world/README.md

@@ -6,4 +6,4 @@ A simple résumé theme for example purposes.
 
 MIT. See [LICENSE.md][lic] for details.
 
-[lic]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md

themes/hello-world/hello-world.json

@@ -1,6 +0,0 @@
-{
-  "title": "minimist",
-  "description": "An unstyled starter résumé theme for FluentCV.",
-  "author": "hacksalot <hacksalot@fluentdesk.com>",  
-  "engine": "handlebars"
-}

themes/hello-world/src/html.html

@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ r.name }}</title>
-    <link type="text/css" rel="stylesheet" href="css/style.css">
+    {{{styleSheet "css/style.css"}}}
   </head>
   <body>
     <h1>Hello, world! My name is {{ r.name }}</h1>

themes/hello-world/theme.json

@@ -0,0 +1,6 @@
+{
+  "title": "hello-world",
+  "description": "An unstyled starter résumé theme for FluentCV.",
+  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
+  "engine": "handlebars"
+}

themes/minimist/README.md

@@ -1,9 +1,10 @@
 Theme: Minimist
 ===============
-An unstyled résumé theme for FluentCV.
+An unstyled résumé theme. Unlike most other FRESH themes, Minimist uses the
+Underscore.js templating engine (instead of Handlebars).
 
 ## License
 
 MIT. See [LICENSE.md][lic] for details.
 
-[lic]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md

themes/minimist/minimist.json

@@ -1,6 +0,0 @@
-{
-  "title": "awesome",
-  "description": "A visually compact résumé theme for FluentCV.",
-  "author": "hacksalot <hacksalot@fluentdesk.com>",  
-  "engine": "underscore"
-}

themes/minimist/src/doc.xml

@@ -740,7 +740,7 @@ engine: Underscore
               <w:i w:val="off"/>
               <w:i-cs w:val="off"/>
             </w:rPr>
-            <w:t>Skills</w:t>
+            <w:t>{% print(h.sectionTitle('Skills')) %}</w:t>
           </w:r>
         </w:p>
         <w:tbl>
@@ -792,7 +792,7 @@ engine: Underscore
             <w:pStyle w:val="Heading1"/>
           </w:pPr>
           <w:r>
-            <w:t>Employment</w:t>
+            <w:t>{% print(h.sectionTitle('Employment')) %}</w:t>
           </w:r>
         </w:p>
         <w:tbl>
@@ -917,7 +917,7 @@ engine: Underscore
             <w:pStyle w:val="Heading1"/>
           </w:pPr>
           <w:r>
-            <w:t>Education</w:t>
+            <w:t>{% print(h.sectionTitle('Education')) %}</w:t>
           </w:r>
         </w:p>
         <w:tbl>

themes/minimist/src/html.html

@@ -13,13 +13,7 @@ engine: Underscore
     <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 }}
-    {% if( cssInfo.file ) { %}
+    {% print( h.styleSheet('html.css') ) %}
-    <link href="{{ cssInfo.file }}" rel="stylesheet" type="text/css">
-    {% } else { %}
-    <style>
-    {{ cssInfo.data }}
-    </style>
-    {% } %}
   </head>
   <body>
     <main id="main">
@@ -36,7 +30,7 @@ engine: Underscore
 {% if ( r.info.brief && r.info.brief.length ) { %}
       <hr>
       <section id="summary">
-        <h3>About</h3>
+        <h3>{% print(h.sectionTitle('info', 'About')) %}</h3>
         <span class="fa fa-lg fa-user"></span>
         {{ r.info.brief }}
       </section>
@@ -47,7 +41,7 @@ engine: Underscore
       <hr>
       <section id="skills">
         <header>
-        <h3>Skills</h3>
+        <h3>{% print(h.sectionTitle('Skills')) %}</h3>
         </header>
         <span class="fa fa-lg fa-code"></span>
 
@@ -81,7 +75,7 @@ engine: Underscore
       <hr>
       <section id="employment">
         <header>
-        <h3>Employment</h3>
+        <h3>{% print(h.sectionTitle("Employment")) %}</h3>
         </header>
         <span class="fa fa-lg fa-building"></span>
         {% r.employment.history.forEach( function( proj, idx, ar) { %}
@@ -110,7 +104,7 @@ engine: Underscore
       <hr>
       <section id="education">
         <header>
-        <h3>Education</h3>
+        <h3>{% print(h.sectionTitle("Education")) %}</h3>
         </header>
         <span class="fa fa-lg fa-mortar-board"></span>
         {% r.education.history.forEach( function( edu, idx, ar) { %}
@@ -132,7 +126,7 @@ engine: Underscore
       <hr>
       <section id="awards">
         <header>
-        <h3>Awards</h3>
+        <h3>{% print( h.sectionTitle("recognition", "Awards")) %}</h3>
         </header>
         <span class="fa fa-lg fa-trophy"></span>
         {% r.recognition.forEach( function( award, idx, ar) { %}
@@ -147,7 +141,7 @@ engine: Underscore
       <hr>
       <section id="publications">
         <header>
-        <h3>Publications</h3>
+        <h3>{% print( h.sectionTitle("writing", "Publications")) %}</h3>
         </header>
         <span class="fa fa-lg fa-pencil"></span>
         {% r.writing.forEach( function( pub, idx, ar) { %}
@@ -166,7 +160,7 @@ engine: Underscore
       <hr>
       <section id="volunteer">
         <header>
-        <h3>Volunteer Work</h3>
+        <h3>{% print(h.sectionTitle("service", "Volunteer Work")) %}</h3>
         </header>
         <span class="fa fa-lg fa-child"></span>
         {% r.service.history.forEach( function( vol, idx, ar) { %}

themes/minimist/src/md.txt

@@ -7,13 +7,13 @@
 {% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %}
 
 {% if ( r.skills && r.skills.sets ) { %}
-## Skills
+## {% print(h.sectionTitle('Skills')) %}
 {% r.skills.sets.forEach( function( set, idx, ar) { %}
 - **{{ set.name }}**: {{ set.skills.join(', ') }}
 {% }); } %}
 
 {% if ( r.employment.history && r.employment.history.length ) { %}
-## Employment
+## {% print(h.sectionTitle('Employment')) %}
 {% r.employment.history.forEach( function( proj, idx, ar) { %}
 ### *{{ proj.position }}*, {{ proj.employer }}
 <small>{{ proj.safe.start.format('MMM YYYY') }} — {{ proj.safe.end.format('MMM YYYY') }}</small>
@@ -23,7 +23,7 @@
 {% }); }  }); } %}
 
 {% if ( r.education.history && r.education.history.length ) { %}
-## Education
+## {% print(h.sectionTitle('Education')) %}
 {% r.education.history.forEach( function( edu, idx, ar) { %}
 ### {{ edu.institution }} ({{ edu.safe.start.format('MMM YYYY') }} — {{ edu.safe.end.format('MMM YYYY') }})
 {{ edu.area }}
@@ -32,7 +32,7 @@
 {% }); } }); } %}
 
 {% if ( r.writing && r.writing.length ) { %}
-## Publications
+## {% print(h.sectionTitle('publications', 'Writing')) %}
 {% r.writing.forEach( function( pub, idx, ar) { %}
 ### {{ pub.title }} ({{ pub.safe.date.format('MMM YYYY') }})
 {{ pub.publisher }}
@@ -40,14 +40,14 @@
 {% }); } %}
 
 {% if ( r.service.history && r.service.history.length ) { %}
-## Volunteer
+## {% print(h.sectionTitle('service','Volunteer')) %}
 {% r.service.history.forEach( function( vol, idx, ar) { %}
 ### {{ vol.organization }} ({{ vol.safe.start.format('MMM YYYY') }} — {{ vol.safe.end.format('MMM YYYY') }})
 {{ vol.summary }}
 {% }); } %}
 
 {% if ( r.recognition && r.recognition.length ) { %}
-## Recognition
+## {% print(h.sectionTitle('Recognition')) %}
 {% r.recognition.forEach( function( awd, idx, ar) { %}
 ### *{{ awd.title }}*, {{ awd.from }} ({{ awd.safe.date.format('MMM YYYY') }})
 {{ awd.summary }}

themes/minimist/src/pdf.html

@@ -32,7 +32,7 @@ engine: Underscore
 {% if ( r.info.brief && r.info.brief.length ) { %}
       <hr>
       <section id="summary">
-        <h3>About</h3>
+        <h3>{% print(h.sectionTitle('info', 'About')) %}</h3>
         <span class="fa fa-lg fa-user"></span>
         {{ r.info.brief }}
       </section>
@@ -43,7 +43,7 @@ engine: Underscore
       <hr>
       <section id="skills">
         <header>
-        <h3>Skills</h3>
+        <h3>{% print(h.sectionTitle('Skills')) %}</h3>
         </header>
         <span class="fa fa-lg fa-code"></span>
 
@@ -77,7 +77,7 @@ engine: Underscore
       <hr>
       <section id="employment">
         <header>
-        <h3>Employment</h3>
+        <h3>{% print(h.sectionTitle("Employment")) %}</h3>
         </header>
         <span class="fa fa-lg fa-building"></span>
         {% r.employment.history.forEach( function( proj, idx, ar) { %}
@@ -106,7 +106,7 @@ engine: Underscore
       <hr>
       <section id="education">
         <header>
-        <h3>Education</h3>
+        <h3>{% print(h.sectionTitle("Education")) %}</h3>
         </header>
         <span class="fa fa-lg fa-mortar-board"></span>
         {% r.education.history.forEach( function( edu, idx, ar) { %}
@@ -128,7 +128,7 @@ engine: Underscore
       <hr>
       <section id="awards">
         <header>
-        <h3>Awards</h3>
+        <h3>{% print( h.sectionTitle("recognition", "Awards")) %}</h3>
         </header>
         <span class="fa fa-lg fa-trophy"></span>
         {% r.recognition.forEach( function( award, idx, ar) { %}
@@ -143,7 +143,7 @@ engine: Underscore
       <hr>
       <section id="publications">
         <header>
-        <h3>Publications</h3>
+        <h3>{% print( h.sectionTitle("writing", "Publications")) %}</h3>
         </header>
         <span class="fa fa-lg fa-pencil"></span>
         {% r.writing.forEach( function( pub, idx, ar) { %}
@@ -158,11 +158,11 @@ engine: Underscore
       </section>
 {% } %}
 
-{% if ( r.service.history && r.service.history.length ) { %}
+{% if ( r.service && r.service.history && r.service.history.length ) { %}
       <hr>
       <section id="volunteer">
         <header>
-        <h3>Volunteer Work</h3>
+        <h3>{% print(h.sectionTitle("service", "Volunteer Work")) %}</h3>
         </header>
         <span class="fa fa-lg fa-child"></span>
         {% r.service.history.forEach( function( vol, idx, ar) { %}

themes/minimist/src/txt.txt

@@ -1,9 +1,3 @@
-{#
-
-  minimist/txt.txt
-  A plain text resume template for FluentCV's "minimist" theme.
-
-#}
 {{ r.name }}
 {% if (r.contact.email) { %}Email: {{ r.contact.email }}{% } %}
 {% if (r.contact.phone) { %}Tel: {{ r.contact.phone }}{% } %}
@@ -23,23 +17,31 @@
 
 {% } %}
 
-{% if ( r.employment && r.employment.history ) { %}EMPLOYMENT
+{% if ( r.employment && r.employment.history ) { %}{% print(h.sectionTitle('EMPLOYMENT')) %}
 {% r.employment.history.forEach( function( proj, idx, ar) { %}
-{{ proj.employer }} ({{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }})
+{{ proj.employer }} {{ h.dateRange(proj) }}
 {{ proj.summary }}
 {% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high ) { %}
   - {{ high }}
 {% }); }  }); } %}
 
-{% if ( r.education && r.education.history ) { %}EDUCATION
+{% if ( r.education && r.education.history ) { %}{% print(h.sectionTitle('EDUCATION')) %}
 {% r.education.history.forEach( function( edu, idx, ar) { %}
-{{ edu.institution }} ({{ edu.safe.start.format('YYYY-MM') }} — {{ edu.safe.end.format('YYYY-MM') }})
+{{ edu.institution }} {% print(h.dateRange(edu)) %}
 {{ edu.summary }}
 {% if( edu.courses ) { %}{% edu.courses.forEach( function( course ) { %}
   - {{ course }}
 {% }); } }); } %}
 
-{% if ( r.service && r.service.history ) { %}VOLUNTEER
+{% if ( r.projects && r.projects.length ) { %}{% print(h.sectionTitle('PROJECTS')) %}
+{% r.projects.forEach( function( proj, idx, ar) { %}
+{{ proj.title }} {{ h.dateRange( proj ) }}
+{{ proj.summary }}
+{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high ) { %}
+  - {{ high }}
+{% }); } }); } %}
+
+{% if ( r.service && r.service.history ) { %}{% print(h.sectionTitle('service', '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 }}
@@ -47,7 +49,7 @@
   - {{ high }}
 {% }); } }); } %}
 
-{% if ( r.writing && r.writing.length ) { %}WRITING
+{% if ( r.writing && r.writing.length ) { %}{% print(h.sectionTitle('EMPLOYMENT')) %}
 {% r.writing.forEach( function( wri, idx, ar) { %}
 {{ wri.title }} ({{ wri.safe.date.format('YYYY-MM') }})
 {{ wri.summary }}

themes/minimist/theme.json

@@ -0,0 +1,6 @@
+{
+  "title": "minimist",
+  "description": "A unstyled résumé theme for FluentCV.",
+  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
+  "engine": "underscore"
+}

themes/modern/README.md

@@ -1,6 +1,6 @@
 Theme: Modern
 ===============
-A contemporary technical résumé theme for FluentCV with colored progress bars
+A contemporary technical résumé theme. Features colored progress bars
 representing skill levels and Font Awesome icons for section headers.
 
 ![](modern.png)
@@ -33,4 +33,4 @@ or a number between 1 and 10.
 
 MIT. See [LICENSE.md][lic] for details.
 
-[lic]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md

themes/modern/src/modern-doc.xml

@@ -485,13 +485,13 @@
           </w:r>
         </w:hlink>
       </w:p>
-      {{> info }}
+      {{#section "info"}}{{> info }}{{/section}}
-      {{> skills }}
+      {{#section "skills"}}{{> skills }}{{/section}}
-      {{> employment }}
+      {{#section "employment"}}{{> employment }}{{/section}}
-      {{> education }}
+      {{#section "education"}}{{> education }}{{/section}}
-      {{> service }}
+      {{#section "service"}}{{> service }}{{/section}}
-      {{> writing }}
+      {{#section "writing"}}{{> writing }}{{/section}}
-      {{> recognition }}
+      {{#section "recognition"}}{{> recognition }}{{/section}}
       <w:sectPr wsp:rsidR="00B43FDC" wsp:rsidRPr="000A3AF0" wsp:rsidSect="001B7422">
         <w:pgSz w:w="12240" w:h="15840"/>
         <w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/>

themes/modern/src/modern-html.html

@@ -5,7 +5,7 @@
     <title>{{ r.name }}</title>
     <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
-    <link href="modern-html.css" rel="stylesheet" type="text/css">
+    {{{styleSheet "modern-html.css"}}}
   </head>
   <body>
     <main id="main">
@@ -13,9 +13,9 @@
       <header>
         <h1>{{{ r.name }}}</h1>
         <div id="contact">
-          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
+          {{#has r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/has}}
-          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
+          {{#has r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/has}}
-          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{ RAW.contact.website }}</a></div>{{/if}}
+          {{#has r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{ RAW.contact.website }}</a></div>{{/has}}
         </div>
       </header>
 
@@ -23,18 +23,18 @@
 {{#if r.info.brief}}
 <hr>
 <section id="summary">
-  <h3>About</h3>
+  <h3>{{{sectionTitle "info" "About"}}}</h3>
   <span class="fa fa-lg fa-user"></span>
   {{{ r.info.brief }}}
 </section>
 {{/if}}
 
 
-{{#if r.skills }}
+{{#section 'skills' }}
       <hr>
       <section id="skills">
         <header>
-        <h3>Skills</h3>
+        <h3>{{{sectionTitle "Skills"}}}</h3>
         </header>
         <span class="fa fa-lg fa-code"></span>
 
@@ -60,20 +60,20 @@
 
 
       </section>
-{{/if}}
+{{/section}}
 
 
 
-{{#if r.employment}}
+{{#section 'employment'}}
 <hr>
 <section id="employment">
   <header>
-  <h3>Employment</h3>
+  <h3>{{{sectionTitle "Employment"}}}</h3>
   </header>
   <span class="fa fa-lg fa-building"></span>
   {{#each r.employment.history}}
     {{#if url}}
-    <h4><span class="res-label">{{ position }}</span>, <a href="{{ url }}">{{ employer }}</a></h4>
+    <h4><span class="res-label">{{ position }}</span>, <a href="{{{ url }}}">{{ employer }}</a></h4>
     {{else}}
     <h4><span class="res-label">{{ position }}</span>, <span class="defunct">{{ employer }}</span></h4>
     {{/if}}
@@ -82,20 +82,74 @@
     {{#if proj.highlights}}
       <ul>
       {{#each highlights}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
       {{/each}}
       </ul>
     {{/if}}
   {{/each}}
 
 </section>
-{{/if}}
+{{/section}}
 
-{{# if r.education}}
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  <header>
+  <h3>{{{sectionTitle "Projects"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.projects}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/section}}
+
+{{#section 'samples'}}
+<hr>
+<section id="samples">
+  <header>
+  <h3>{{{sectionTitle "Samples"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.samples}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/section}}
+
+{{#section 'education'}}
 <hr>
 <section id="education">
   <header>
-  <h3>Education</h3>
+  <h3>{{{sectionTitle "Education"}}}</h3>
   </header>
   <span class="fa fa-lg fa-mortar-board"></span>
   {{#each r.education.history}}
@@ -104,20 +158,20 @@
     {{#if courses}}
       <ul>
       {{#each courses}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
       {{/each}}
       </ul>
     {{/if}}
   {{/each}}
 
 </section>
-{{/if}}
+{{/section}}
 
-{{#if r.service}}
+{{#section 'service'}}
 <hr>
 <section id="volunteer">
   <header>
-  <h3>Service</h3>
+  <h3>{{{sectionTitle "Service"}}}</h3>
   </header>
   <span class="fa fa-lg fa-child"></span>
   {{#each r.service.history}}
@@ -131,20 +185,20 @@
     {{#if highlights}}
       <ul>
       {{#each highlights}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
       {{/each}}
       </ul>
     {{/if}}
   {{/each}}
 
 </section>
-{{/if}}
+{{/section}}
 
-{{#if r.writing}}
+{{#section 'writing'}}
 <hr>
 <section id="publications">
   <header>
-  <h3>Publications</h3>
+  <h3>{{{sectionTitle "writing" "Publications"}}}</h3>
   </header>
   <span class="fa fa-lg fa-pencil"></span>
   {{#each r.writing}}
@@ -156,13 +210,13 @@
   <span class="tenure">Published on: {{formatDate safe.date 'YYYY-MM'}}</span>
   {{/each}}
 </section>
-{{/if}}
+{{/section}}
 
-{{# if r.recognition}}
+{{#section 'recognition'}}
 <hr>
 <section id="awards">
   <header>
-  <h3>Awards</h3>
+  <h3>{{{sectionTitle "recognition" "Awards"}}}</h3>
   </header>
   <span class="fa fa-lg fa-trophy"></span>
   {{#each r.recognition}}
@@ -171,7 +225,7 @@
     {{{ summary }}}
   {{/each}}
 </section>
-{{/if}}
+{{/section}}
 
       </div>
     </main>

themes/modern/src/modern-md.txt

@@ -1,84 +0,0 @@
-{{ r.name }}
-============
-{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
-{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
-{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
-
-{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
-
-{{#if r.skills}}
-## SKILLS
-
-{{#each r.skills.sets}}
-  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
-{{/each}}
-{{/if}}
-
-{{#if r.employment}}
-## EMPLOYMENT
-
-{{#each r.employment.history }}
-  {{#compare @index 4 operator="<"}}
-### {{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-  {{/compare}}
-  {{#compare @index 4 operator=">="}}
-    {{#compare @index 4 operator="=="}}
-### Previously...
-Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.
-    {{/compare}}
-  - {{{ position }}}, {{{ employer }}}
-  {{/compare}}
-{{/each}}
-{{/if}}
-
-{{#if r.education}}
-## EDUCATION
-
-{{#each r.education.history}}
-### {{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{#if summary }}
-{{{ summary }}}
-{{/if}}
-{{#if courses}}
-{{#each courses}}
-  - {{{ this }}}{{/each}}{{/if}}
-{{/each}}
-{{/if}}
-{{#if r.writing}}
-## WRITING
-
-{{#each r.writing}}
-### {{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
-
-{{#if r.service }}
-## SERVICE
-
-{{#each r.service.history}}
-### {{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-{{/each}}
-{{/if}}
-{{#if r.recognition}}
-## RECOGNITION
-
-{{#each r.recognition}}
-### {{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}

themes/modern/src/modern-pdf.html

@@ -18,29 +18,28 @@
       <header>
         <h1>{{{ r.name }}}</h1>
         <div id="contact">
-          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
+          {{#has r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/has}}
-          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
+          {{#has r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/has}}
-          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{ RAW.contact.website }}</a></div>{{/if}}
+          {{#has r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{ RAW.contact.website }}</a></div>{{/has}}
         </div>
       </header>
-      </header>
 
 
 {{#if r.info.brief}}
 <hr>
 <section id="summary">
-  <h3>About</h3>
+  <h3>{{{sectionTitle "info" "About"}}}</h3>
   <span class="fa fa-lg fa-user"></span>
   {{{ r.info.brief }}}
 </section>
 {{/if}}
 
 
-{{#if r.skills }}
+{{#section 'skills' }}
       <hr>
       <section id="skills">
         <header>
-        <h3>Skills</h3>
+        <h3>{{{sectionTitle "Skills"}}}</h3>
         </header>
         <span class="fa fa-lg fa-code"></span>
 
@@ -66,20 +65,20 @@
 
 
       </section>
-{{/if}}
+{{/section}}
 
 
 
-{{#if r.employment}}
+{{#section 'employment'}}
 <hr>
 <section id="employment">
   <header>
-  <h3>Employment</h3>
+  <h3>{{{sectionTitle "Employment"}}}</h3>
   </header>
   <span class="fa fa-lg fa-building"></span>
   {{#each r.employment.history}}
     {{#if url}}
-    <h4><span class="res-label">{{ position }}</span>, <a href="{{ url }}">{{ employer }}</a></h4>
+    <h4><span class="res-label">{{ position }}</span>, <a href="{{{ url }}}">{{ employer }}</a></h4>
     {{else}}
     <h4><span class="res-label">{{ position }}</span>, <span class="defunct">{{ employer }}</span></h4>
     {{/if}}
@@ -88,20 +87,74 @@
     {{#if proj.highlights}}
       <ul>
       {{#each highlights}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
       {{/each}}
       </ul>
     {{/if}}
   {{/each}}
 
 </section>
-{{/if}}
+{{/section}}
 
-{{# if r.education}}
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  <header>
+  <h3>{{{sectionTitle "Projects"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.projects}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/section}}
+
+{{#section 'samples'}}
+<hr>
+<section id="samples">
+  <header>
+  <h3>{{{sectionTitle "Samples"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.samples}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/section}}
+
+{{#section 'education'}}
 <hr>
 <section id="education">
   <header>
-  <h3>Education</h3>
+  <h3>{{{sectionTitle "Education"}}}</h3>
   </header>
   <span class="fa fa-lg fa-mortar-board"></span>
   {{#each r.education.history}}
@@ -110,20 +163,20 @@
     {{#if courses}}
       <ul>
       {{#each courses}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
       {{/each}}
       </ul>
     {{/if}}
   {{/each}}
 
 </section>
-{{/if}}
+{{/section}}
 
-{{#if r.service}}
+{{#section 'service'}}
 <hr>
 <section id="volunteer">
   <header>
-  <h3>Service</h3>
+  <h3>{{{sectionTitle "Service"}}}</h3>
   </header>
   <span class="fa fa-lg fa-child"></span>
   {{#each r.service.history}}
@@ -137,20 +190,20 @@
     {{#if highlights}}
       <ul>
       {{#each highlights}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
       {{/each}}
       </ul>
     {{/if}}
   {{/each}}
 
 </section>
-{{/if}}
+{{/section}}
 
-{{#if r.writing}}
+{{#section 'writing'}}
 <hr>
 <section id="publications">
   <header>
-  <h3>Publications</h3>
+  <h3>{{{sectionTitle "writing" "Publications"}}}</h3>
   </header>
   <span class="fa fa-lg fa-pencil"></span>
   {{#each r.writing}}
@@ -162,13 +215,13 @@
   <span class="tenure">Published on: {{formatDate safe.date 'YYYY-MM'}}</span>
   {{/each}}
 </section>
-{{/if}}
+{{/section}}
 
-{{# if r.recognition}}
+{{#section 'recognition'}}
 <hr>
 <section id="awards">
   <header>
-  <h3>Awards</h3>
+  <h3>{{{sectionTitle "recognition" "Awards"}}}</h3>
   </header>
   <span class="fa fa-lg fa-trophy"></span>
   {{#each r.recognition}}
@@ -177,7 +230,7 @@
     {{{ summary }}}
   {{/each}}
 </section>
-{{/if}}
+{{/section}}
 
       </div>
     </main>

themes/modern/src/modern-png.html

@@ -1 +0,0 @@
-modern-pdf.html

themes/modern/src/modern-txt.txt

@@ -1,84 +0,0 @@
-{{ r.name }}
-{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
-{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
-{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
-================================================================================
-
-{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
-
-{{#if r.skills}}
-SKILLS -------------------------------------------------------------------------
-
-{{#each r.skills.sets}}
-  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
-{{/each}}
-{{/if}}
-
-{{#if r.employment}}
-EMPLOYMENT ---------------------------------------------------------------------
-
-{{#each r.employment.history }}
-  {{#compare @index 4 operator="<"}}
-{{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-  {{/compare}}
-  {{#compare @index 4 operator=">="}}
-    {{#compare @index 4 operator="=="}}
-Previously...
-Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.
-    {{/compare}}
-  - {{{ position }}}, {{{ employer }}}
-  {{/compare}}
-{{/each}}
-{{/if}}
-
-{{#if r.education}}
-EDUCATION ----------------------------------------------------------------------
-
-{{#each r.education.history}}
-{{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{#if summary }}
-{{{ summary }}}
-{{/if}}
-{{#if courses}}
-{{#each courses}}
-  - {{{ this }}}{{/each}}{{/if}}
-{{/each}}
-{{/if}}
-{{#if r.writing}}
-WRITING ------------------------------------------------------------------------
-
-{{#each r.writing}}
-{{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
-
-{{#if r.service }}
-SERVICE ------------------------------------------------------------------------
-
-{{#each r.service.history}}
-{{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-{{/each}}
-{{/if}}
-{{#if r.recognition}}
-RECOGNITION --------------------------------------------------------------------
-
-{{#each r.recognition}}
-{{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}

themes/modern/src/partials/education.xml

@@ -16,7 +16,7 @@
         </w:pict>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>EDUCATION</w:t>
+        <w:t>{{{sectionTitle "EDUCATION"}}}</w:t>
       </w:r>
     </w:p>
   </wx:pBdrGroup>

themes/modern/src/partials/employment.xml

@@ -16,7 +16,7 @@
         </w:pict>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>EMPLOYMENT</w:t>
+        <w:t>{{{sectionTitle "EMPLOYMENT"}}}</w:t>
       </w:r>
     </w:p>
   </wx:pBdrGroup>

themes/modern/src/partials/info.xml

@@ -36,7 +36,7 @@
         </w:pict>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>ABOUT</w:t>
+        <w:t>{{{sectionTitle "info" "ABOUT"}}}</w:t>
       </w:r>
     </w:p>
   </wx:pBdrGroup>

themes/modern/src/partials/recognition.xml

@@ -17,7 +17,7 @@
         </w:pict>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>RECOGNITION</w:t>
+        <w:t>{{{sectionTitle "RECOGNITION"}}}</w:t>
       </w:r>
     </w:p>
   </wx:pBdrGroup>

themes/modern/src/partials/service.xml

@@ -17,7 +17,7 @@
         </w:pict>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>SERVICE</w:t>
+        <w:t>{{{sectionTitle "SERVICE"}}}</w:t>
       </w:r>
     </w:p>
   </wx:pBdrGroup>

themes/modern/src/partials/skills.xml

@@ -37,7 +37,7 @@
         </w:pict>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>SKILLS</w:t>
+        <w:t>{{{sectionTitle "SKILLS"}}}</w:t>
       </w:r>
     </w:p>
   </wx:pBdrGroup>

themes/modern/src/partials/writing.xml

@@ -17,7 +17,7 @@
         </w:pict>
       </w:r>
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
-        <w:t>WRITING</w:t>
+        <w:t>{{{sectionTitle "WRITING"}}}</w:t>
       </w:r>
     </w:p>
   </wx:pBdrGroup>

themes/modern/theme.json

@@ -1,10 +1,14 @@
 {
   "title": "modern",
   "description": "A contemporary resume template suitable for modern technical candidates and employees.",
-  "author": "hacksalot <hacksalot@fluentdesk.com>",
+  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
   "engine": "handlebars",
   "palette": {
     "skillLevels": [ "#FFFFFF", "#5CB85C", "#F1C40F", "#428BCA", "#C00000" ]
   },
-  "message": "To get colored skill progress bars, make sure your resume includes a `level` element for each skill!"
+  "message": "To get colored skill progress bars, make sure your resume includes a `level` element for each skill!",
+  "inherits": {
+    "txt": "basis",
+    "md": "basis"
+  }
 }

themes/positive/README.md

@@ -1,6 +1,6 @@
 Theme: Positive
 ===============
-A dynamic technical résumé theme for FluentCV.
+A dynamic technical résumé theme.
 
 ![](positive.png)
 
@@ -8,4 +8,4 @@ A dynamic technical résumé theme for FluentCV.
 
 MIT. See [LICENSE.md][lic] for details.
 
-[lic]: https://github.com/fluentdesk/fluent-themes/blob/master/LICENSE.md
+[lic]: https://github.com/fluentdesk/fresh-themes/blob/master/LICENSE.md

themes/positive/src/partials/education.xml

@@ -4,7 +4,7 @@
       <w:pStyle w:val="Heading1"/>
     </w:pPr>
     <w:r wsp:rsidRPr="00C146CA">
-      <w:t>EDUCATION</w:t>
+      <w:t>{{{sectionTitle "EDUCATION"}}}</w:t>
     </w:r>
   </w:p>
 

themes/positive/src/partials/employment.xml

@@ -4,7 +4,7 @@
       <w:pStyle w:val="Heading1"/>
     </w:pPr>
     <w:r wsp:rsidRPr="00C146CA">
-      <w:t>EMPLOYMENT</w:t>
+      <w:t>{{{sectionTitle "EMPLOYMENT"}}}</w:t>
     </w:r>
   </w:p>
 

themes/positive/src/partials/recognition.xml

@@ -1,11 +1,10 @@
-{{#if r.recognition}}
 <wx:sub-section>
   <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
     <w:pPr>
       <w:pStyle w:val="Heading1"/>
     </w:pPr>
     <w:r wsp:rsidRPr="00C146CA">
-      <w:t>RECOGNITION</w:t>
+      <w:t>{{{sectionTitle "RECOGNITION"}}}</w:t>
     </w:r>
   </w:p>
 
@@ -70,4 +69,3 @@
   {{/each}}
 
 </wx:sub-section>
-{{/if}}

themes/positive/src/partials/service.xml

@@ -1,11 +1,10 @@
-{{#if r.service }}
 <wx:sub-section>
   <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
     <w:pPr>
       <w:pStyle w:val="Heading1"/>
     </w:pPr>
     <w:r wsp:rsidRPr="00C146CA">
-      <w:t>SERVICE</w:t>
+      <w:t>{{{sectionTitle "SERVICE"}}}</w:t>
     </w:r>
   </w:p>
 
@@ -83,4 +82,3 @@
   {{/each}}
 
 </wx:sub-section>
-{{/if}}

themes/positive/src/partials/skills.xml

@@ -1,11 +1,10 @@
-{{#if r.skills }}
 <wx:sub-section>
   <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
     <w:pPr>
       <w:pStyle w:val="Heading1"/>
     </w:pPr>
     <w:r wsp:rsidRPr="00C146CA">
-      <w:t>SKILLS</w:t>
+      <w:t>{{{sectionTitle "SKILLS"}}}</w:t>
     </w:r>
   </w:p>
   <w:tbl>
@@ -59,5 +58,4 @@
     {{/each}}
 
   </w:tbl>
-  {{/if}}
 </wx:sub-section>

themes/positive/src/partials/writing.xml

@@ -1,11 +1,10 @@
-{{#if r.writing}}
 <wx:sub-section>
   <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
     <w:pPr>
       <w:pStyle w:val="Heading1"/>
     </w:pPr>
     <w:r wsp:rsidRPr="00C146CA">
-      <w:t>WRITING</w:t>
+      <w:t>{{{sectionTitle "WRITING"}}}</w:t>
     </w:r>
   </w:p>
 
@@ -75,4 +74,3 @@
   {{/each}}
 
 </wx:sub-section>
-{{/if}}

themes/positive/src/positive-doc.xml

@@ -517,6 +517,7 @@
           </w:r>
         </w:hlink>
       </w:p>
+      {{#has "info.brief"}}
       <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00A210E1">
         <w:pPr>
           <w:pStyle w:val="Summary"/>
@@ -526,12 +527,13 @@
           <w:t>{{ r.info.brief }}</w:t>
         </w:r> -->
       </w:p>
-      {{> skills }}
+      {{/has}}
-      {{> employment }}
+      {{#section "skills"}}{{> skills }}{{/section}}
-      {{> education }}
+      {{#section "employment"}}{{> employment }}{{/section}}
-      {{> service }}
+      {{#section "education"}}{{> education }}{{/section}}
-      {{> writing }}
+      {{#section "service"}}{{> service }}{{/section}}
-      {{> recognition }}
+      {{#section "writing"}}{{> writing }}{{/section}}
+      {{#section "recognition"}}{{> recognition }}{{/section}}
       <w:sectPr wsp:rsidR="00B43FDC" wsp:rsidRPr="000A3AF0" wsp:rsidSect="001B7422">
         <w:pgSz w:w="12240" w:h="15840"/>
         <w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/>

themes/positive/src/positive-html.html

@@ -5,7 +5,7 @@
     <title>{{ r.name }}</title>
     <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
-    <link href="positive-html.css" rel="stylesheet" type="text/css">
+    {{{styleSheet "positive-html.css"}}}
   </head>
   <body>
     <main>
@@ -20,14 +20,14 @@
       </header>
 
 
-{{#if r.info.brief}}
+{{#has "info.brief"}}
       <section id="summary">
         {{{ r.info.brief }}}
       </section>
-{{/if}}
+{{/has}}
 
 
-{{#if r.skills}}
+{{#section "skills"}}
       <section id="skills">
         <header>
         <h2><span class="fa fa-code"></span> Skills</h2>
@@ -35,7 +35,7 @@
         <table>
           <thead>
             <tr>
-              <th>Skill</th>
+              <th>{{{sectionTitle "Skills"}}}</th>
               <th>Keywords</th>
             </tr>
           </thead>
@@ -49,69 +49,107 @@
           </tbody>
         </table>
       </section>
-{{/if}}
+{{/section}}
 
 
 
-{{#if r.employment}}
+{{#section "employment"}}
       <section id="employment">
         <header>
-        <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2>
+        <h2><span class="fa fa-building" style="vertical-align: top;"></span> {{{sectionTitle "Employment"}}}</h2>
         </header>
 
         {{#each r.employment.history }}
-          {{#compare @index 4 operator="<"}}
+          <h3><em>{{ position }}</em>,
-            <h3><em>{{ position }}</em>,
+            {{#if url }}
-              {{#if url }}
+            <a href="{{ url }}">{{{ employer }}}</a>
-              <a href="{{ url }}">{{{ employer }}}</a>
+            {{else}}
-              {{else}}
+            {{{ employer }}}
-              {{{ employer }}}
-              {{/if}}
-              <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
-            <p style="clear: both;">{{{ summary }}}</p>
-            {{#if highlights}}
-              <ul>
-              {{#each highlights}}
-                <li>{{{ this }}}</li>
-              {{/each}}
-              </ul>
             {{/if}}
-          {{/compare}}
+            <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
-          {{#compare @index 4 operator=">="}}
+          <p style="clear: both;">{{{ summary }}}</p>
-
+          {{#if highlights}}
-            {{#compare @index 4 operator="=="}}
-            <h3>Previously...</h3>
-            <p style="clear: both;">Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.</p>
             <ul>
-            {{/compare}}
+            {{#each highlights}}
-
+              <li>{{{ this }}}</li>
-            <li>{{{ position }}}, {{{ employer }}}</li>
+            {{/each}}
-
-            {{#if @last}}
             </ul>
-            {{/if}}
+          {{/if}}
-          {{/compare}}
         {{/each}}
 
       </section>
-{{/if}}
+{{/section}}
 
-{{# if r.education}}
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  <header>
+  <h3>{{{sectionTitle "Projects"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.projects}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/section}}
+
+{{#section 'samples'}}
+<hr>
+<section id="samples">
+  <header>
+  <h3>{{{sectionTitle "Samples"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.samples}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/section}}
+
+{{#section "education"}}
       <section id="education">
         <header>
-        <h2><span class="fa fa-mortar-board"></span> Education</h2>
+        <h2><span class="fa fa-mortar-board"></span> {{{sectionTitle "Education"}}}</h2>
         </header>
         {{#each r.education.history}}
           <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
         {{/each}}
 
       </section>
-{{/if}}
+{{/section}}
 
-{{#if r.service}}
+{{#section "service"}}
       <section id="volunteer">
         <header>
-        <h2><span class="fa fa-child" style="vertical-align: top;"></span> Service</h2>
+        <h2><span class="fa fa-child" style="vertical-align: top;"></span> {{{sectionTitle "Service"}}}</h2>
         </header>
         {{#each r.service.history}}
           <h3><em>{{{ position }}}</em>,
@@ -132,12 +170,12 @@
         {{/each}}
 
       </section>
-{{/if}}
+{{/section}}
 
-{{#if r.writing}}
+{{#section "writing"}}
       <section id="publications">
         <header>
-        <h2><span class="fa fa-book"></span> Writing</h2>
+        <h2><span class="fa fa-book"></span> {{{sectionTitle "Writing"}}}</h2>
         </header>
         {{#each r.writing }}
           <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
@@ -145,19 +183,19 @@
         {{# if summary}}{{{ summary }}}{{/if}}
         {{/each}}
       </section>
-{{/if}}
+{{/section}}
 
-{{# if r.recognition}}
+{{#section "recognition"}}
       <section id="awards">
         <header>
-        <h2><span class="fa fa-trophy"></span> Awards</h2>
+        <h2><span class="fa fa-trophy"></span> {{{"sectionTitle" "recognition" "Awards"}}}</h2>
         </header>
         {{#each r.recognition}}
           <h4><span class="res-label">{{{ title }}}</span>, {{{ from }}} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h4>
           {{{ summary }}}
         {{/each}}
       </section>
-{{/if}}
+{{/section}}
 
     </main>
   </body>

themes/positive/src/positive-pdf.html

@@ -11,7 +11,7 @@
   <body>
     <main>
       <header>
-        <h1>{{initialWords r.name }} <span style="color: #C00000;">{{lastWord r.name }}</span></h1>
+        <h1>{{{initialWords r.name }}} <span style="color: #C00000;">{{{lastWord r.name }}}</span></h1>
         <span class="label">{{{ r.info.label }}}</span>
         <p id="contact">
           {{#if r.contact.email}}<span class="email"><a href="mailto:{{ RAW.contact.email }}">{{{ r.contact.email }}}</a></span>{{/if}}
@@ -21,14 +21,14 @@
       </header>
 
 
-{{#if r.info.brief}}
+{{#has "info.brief"}}
       <section id="summary">
         {{{ r.info.brief }}}
       </section>
-{{/if}}
+{{/has}}
 
 
-{{#if r.skills}}
+{{#section "skills"}}
       <section id="skills">
         <header>
         <h2><span class="fa fa-code"></span> Skills</h2>
@@ -36,7 +36,7 @@
         <table>
           <thead>
             <tr>
-              <th>Skill</th>
+              <th>{{{sectionTitle "Skills"}}}</th>
               <th>Keywords</th>
             </tr>
           </thead>
@@ -50,115 +50,153 @@
           </tbody>
         </table>
       </section>
-{{/if}}
+{{/section}}
 
 
 
-{{#if r.employment}}
+{{#section "employment"}}
       <section id="employment">
         <header>
-        <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2>
+        <h2><span class="fa fa-building" style="vertical-align: top;"></span> {{{sectionTitle "Employment"}}}</h2>
         </header>
 
         {{#each r.employment.history }}
-          {{#compare @index 4 operator="<"}}
-            <h3><em>{{ position }}</em>,
-              {{#if url }}
-              <a href="{{ url }}">{{ employer }}</a>
-              {{else}}
-              {{ employer }}
-              {{/if}}
-              <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
-            <p style="clear: both;">{{{ summary }}}</p>
-            {{#if highlights}}
-              <ul>
-              {{#each highlights}}
-                <li>{{{ this }}}</li>
-              {{/each}}
-              </ul>
-            {{/if}}
-          {{/compare}}
-          {{#compare @index 4 operator=">="}}
-
-            {{#compare @index 4 operator="=="}}
-            <h3>Previously...</h3>
-            <p style="clear: both;">Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.</p>
-            <ul>
-            {{/compare}}
-
-            <li>{{{ position }}}, {{{ employer }}}</li>
-
-            {{#if @last}}
-            </ul>
-            {{/if}}
-          {{/compare}}
-        {{/each}}
-
-      </section>
-{{/if}}
-
-{{# if r.education}}
-      <section id="education">
-        <header>
-        <h2><span class="fa fa-mortar-board"></span> Education</h2>
-        </header>
-        {{#each r.education.history}}
-          <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-        {{/each}}
-
-      </section>
-{{/if}}
-
-{{#if r.service}}
-      <section id="volunteer">
-        <header>
-        <h2><span class="fa fa-child" style="vertical-align: top;"></span> Service</h2>
-        </header>
-        {{#each r.service.history}}
           <h3><em>{{ position }}</em>,
-            {{#if url}}
+            {{#if url }}
-            <a href="{{ url }}">{{ organization }}</a>
+            <a href="{{ url }}">{{{ employer }}}</a>
             {{else}}
-            {{ organization }}
+            {{{ employer }}}
             {{/if}}
-            <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+            <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
           <p style="clear: both;">{{{ summary }}}</p>
           {{#if highlights}}
             <ul>
             {{#each highlights}}
-              <li>{{ this }}</li>
+              <li>{{{ this }}}</li>
             {{/each}}
             </ul>
           {{/if}}
         {{/each}}
 
       </section>
-{{/if}}
+{{/section}}
 
-{{#if r.writing}}
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  <header>
+  <h3>{{{sectionTitle "Projects"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.projects}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/section}}
+
+{{#section 'samples'}}
+<hr>
+<section id="samples">
+  <header>
+  <h3>{{{sectionTitle "Samples"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.samples}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/section}}
+
+{{#section "education"}}
+      <section id="education">
+        <header>
+        <h2><span class="fa fa-mortar-board"></span> {{{sectionTitle "Education"}}}</h2>
+        </header>
+        {{#each r.education.history}}
+          <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+        {{/each}}
+
+      </section>
+{{/section}}
+
+{{#section "service"}}
+      <section id="volunteer">
+        <header>
+        <h2><span class="fa fa-child" style="vertical-align: top;"></span> {{{sectionTitle "Service"}}}</h2>
+        </header>
+        {{#each r.service.history}}
+          <h3><em>{{{ position }}}</em>,
+            {{#if url}}
+            <a href="{{ url }}">{{{ organization }}}</a>
+            {{else}}
+            {{{ organization }}}
+            {{/if}}
+            <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+          <p style="clear: both;">{{{ summary }}}</p>
+          {{#if highlights}}
+            <ul>
+            {{#each highlights}}
+              <li>{{{ this }}}</li>
+            {{/each}}
+            </ul>
+          {{/if}}
+        {{/each}}
+
+      </section>
+{{/section}}
+
+{{#section "writing"}}
       <section id="publications">
         <header>
-        <h2><span class="fa fa-book"></span> Writing</h2>
+        <h2><span class="fa fa-book"></span> {{{sectionTitle "Writing"}}}</h2>
         </header>
         {{#each r.writing }}
-          <h3><em>{{#if url}}<a href="{{ url }}">{{ title }}</a>{{else}}{{ title }}{{/if}}</em>,
+          <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
             {{{ publisher.name }}} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
         {{# if summary}}{{{ summary }}}{{/if}}
         {{/each}}
       </section>
-{{/if}}
+{{/section}}
 
-{{# if r.recognition}}
+{{#section "recognition"}}
       <section id="awards">
         <header>
-        <h2><span class="fa fa-trophy"></span> Awards</h2>
+        <h2><span class="fa fa-trophy"></span> {{{"sectionTitle" "recognition" "Awards"}}}</h2>
         </header>
         {{#each r.recognition}}
-          <h4><span class="res-label">{{ title }}</span>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h4>
+          <h4><span class="res-label">{{{ title }}}</span>, {{{ from }}} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h4>
           {{{ summary }}}
         {{/each}}
       </section>
-{{/if}}
+{{/section}}
 
     </main>
   </body>

themes/positive/theme.json

@@ -1,10 +1,10 @@
 {
   "title": "positive",
   "description": "A conventional résumé theme for FluentCV.",
-  "author": "hacksalot <hacksalot@fluentdesk.com>",
+  "author": "hacksalot <hacksalot@indevious.com> (https://github.com/hacksalot)",
   "engine": "handlebars",
   "inherits": {
-    "text": "compact",
+    "txt": "basis",
-    "md": "compact"
+    "md": "basis"
   }
 }