change spacing on full resume link

Make sure partials use either the {{date}} or {{dateRange}} helpers.

.gitignore

@@ -1,2 +1,3 @@
 # It is pitch black. You are likely to be eaten by a grue.
 informatic-new/
+assets/

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fresh-themes",
-  "version": "0.15.0-beta",
+  "version": "0.15.1-beta",
   "description": "Multiformat themes and templates for your résumé / CV.",
   "repository": {
     "type": "git",

partials/doc/section/education.hbs

@@ -31,7 +31,7 @@
         <w:rPr>
           <w:rStyle w:val="FromTo"/>
         </w:rPr>
-        <w:t>{{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY'}}</w:t>
+        <w:t>{{dateRange . 'YYYY'}}</w:t>
       </w:r>
     </w:p>
     {{#either area studyType }}

partials/doc/section/recognition.hbs

@@ -31,7 +31,7 @@
         <w:rPr>
           <w:rStyle w:val="FromTo"/>
         </w:rPr>
-        <w:t>{{formatDate safe.date 'YYYY-MM'}}</w:t>
+        <w:t>{{date date}}</w:t>
       </w:r>
     </w:p>
     <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">

partials/doc/section/references.hbs

@@ -34,7 +34,7 @@
         <w:rPr>
           <w:rStyle w:val="FromTo"/>
         </w:rPr>
-        <w:t>{{formatDate safe.start 'MMM YYYY'}} — {{formatDate safe.end 'MMM YYYY'}}</w:t>
+        <w:t>{{dateRange . 'MMM YYYY'}}</w:t>
       </w:r>
     </w:p>
     <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">

partials/doc/section/speaking.hbs

@@ -31,7 +31,7 @@
         <w:rPr>
           <w:rStyle w:val="FromTo"/>
         </w:rPr>
-        <w:t>{{formatDate safe.date 'YYYY-MM'}}</w:t>
+        <w:t>{{date date}}</w:t>
       </w:r>
     </w:p>
     <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">

partials/doc/section/writing.hbs

@@ -30,7 +30,7 @@
         <w:rPr>
           <w:rStyle w:val="FromTo"/>
         </w:rPr>
-        <w:t>{{formatDate safe.date 'YYYY'}}</w:t>
+        <w:t>{{date date 'YYYY'}}</w:t>
       </w:r>
     </w:p>
     {{#if summary}}

partials/html/header-icon.hbs

@@ -1,6 +1,3 @@
 <header>
-  {{#if _icon}}
+  <h2>{{#if _icon}}{{> (lookup . '_hdricon') }}{{/if}}{{{sectionTitle _title _section}}}</h2>
-  {{> (lookup . '_hdricon') }}
-  {{/if}}
-  <h2>{{{sectionTitle _title _section}}}</h2>
 </header>

partials/html/highlights.hbs

@@ -1,4 +1,5 @@
 {{#if highlights}}
+<b>Highlights:</b>
 <ul>
   {{#each highlights}}
   <li>{{{ . }}}</li>

partials/html/section/certifications.hbs

@@ -0,0 +1,35 @@
+{{#section "certifications"}}
+<hr>
+<section id="certifications">
+  <div class="certifications">
+  {{#> header-certifications }}
+    {{> header-icon _title="CERTIFICATIONS" _section="certifications" _hdricon=(lookup . '_icon') }}
+  {{/header-certifications}}
+  <center>
+    {{#each r.certifications}}
+    <span>
+      {{#each certificates}}
+        {{#if logo}}
+          <img class="media-object logo"
+            src="../images/{{logo}}"
+            alt="{{name}}{{#level}} - {{.}}{{/level}}"
+            title="{{name}}{{#level}} - {{.}}{{/level}}" />
+        {{/if}}
+      {{/each}}
+    </span>
+    {{/each}}
+    </center>
+    </div>
+    <div class="certifications">
+    <center>
+    {{#each r.certifications}}
+      {{#each certificates}}
+        {{#unless logo}}
+          | {{name}}{{#level}} - ({{.}}){{/level}} |
+        {{/unless}}
+      {{/each}}
+    {{/each}}
+  </center>
+  </div>
+</section>
+{{/section}}

partials/html/section/education.hbs

@@ -12,6 +12,7 @@
       {{{ summary }}}
       {{> highlights }}
       {{#if curriculum}}<span class="keywords">{{#each curriculum}}{{{ . }}} {{/each}}</span>{{/if}}
+      {{#if grade}} - <strong>{{grade}}</strong>{{/if}}
     </div>
     {{/body-education}}
   {{/each}}

partials/html/section/info.hbs

@@ -7,5 +7,6 @@
   {{#> body-info }}
     {{{ r.info.brief }}}
   {{/body-info}}
+  <img class="qr" src="../images/qr.png" />
 </section>
 {{/has}}

partials/html/section/interests.hbs

@@ -4,15 +4,12 @@
   {{#> header-interests }}
     {{> header-icon _title="INTERESTS" _section="interests" _hdricon=(lookup . '_icon') }}
   {{/header-interests}}
+  <center>
   {{#each r.interests}}
     {{#> body-interests }}
-    <div>
+    | <em>{{{ name }}}</em> |
-    <h3><em>{{{ name }}}</em></h3>
-    <span class="tenure">{{formatDate safe.date 'YYYY' }}</span>
-    {{{ summary }}}
-    {{> highlights }}
-    </div>
     {{/body-interests}}
   {{/each}}
+  </center>
 </section>
 {{/section}}

partials/html/section/reading.hbs

@@ -8,7 +8,7 @@
     {{#> body-reading }}
     <div>
     <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>{{#if author}}, {{{ author }}}{{/if}}</h3>
-      <span class="tenure">{{formatDate safe.date 'YYYY'}}</span>
+      <span class="tenure">{{date date 'YYYY'}}</span>
       {{{ summary }}}
     </div>
     {{/body-reading}}

partials/html/section/recognition.hbs

@@ -8,7 +8,7 @@
     {{#> body-recognition }}
     <div>
     <h3><em>{{ title }}</em>, {{{link from url }}}</h3>
-    <span class="tenure">{{formatDate safe.date 'YYYY' }}</span>
+    <span class="tenure">{{date date 'YYYY' }}</span>
     {{{ summary }}}
     {{> highlights }}
     </div>

partials/html/section/samples.hbs

@@ -14,7 +14,7 @@
     {{ title }}
     {{/if}}
     </h3>
-    <span class="tenure">{{formatDate safe.date 'YYYY-MM'}}</span>
+    <span class="tenure">{{date date 'YYYY-MM'}}</span>
     {{{ summary }}}
     {{> highlights }}
     </div>

partials/html/section/skills.hbs

@@ -15,7 +15,12 @@
       {{#each r.skills.sets}}
       <tr>
         <td style="width: 25%;">{{ name }}</td>
-        <td class="keywords">{{#each skills}}{{ . }} {{/each}}</td>
+        <td class="keywords">{{#each skills }}
+          {{#name}}
+            <span title="{{level}}{{#summary}} - {{summary}}{{/summary}}">{{ name }}</span>
+          {{/name}}{{^name}}
+            {{ . }}{{/name}}{{#unless @last}}, {{/unless}}{{/each}}
+        </td>
       </tr>
       {{/each}}
     </tbody>

partials/html/section/speaking.hbs

@@ -8,7 +8,7 @@
     {{#> body-speaking }}
     <div>
     <h3><em>{{{ title }}}</em>, {{{ event }}}</h3>
-    <span class="tenure">{{formatDate safe.date 'YYYY' }}</span>
+    <span class="tenure">{{date date 'YYYY' }}</span>
     {{{ summary }}}
     {{> highlights }}
     </div>

partials/html/section/writing.hbs

@@ -9,7 +9,7 @@
     <div>
     <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
       {{ publisher.name }}</h3>
-      <span class="tenure">{{formatDate safe.date 'YYYY'}}</span>
+      <span class="tenure">{{date date 'YYYY'}}</span>
       {{{ summary }}}
       {{> highlights }}
     </div>

partials/html/work-projects.hbs

@@ -0,0 +1,8 @@
+{{#if projects}}
+<p class="projects">
+<b>Projects:</b>
+  {{#each projects}}
+  {{{ name }}}{{#if customer}}(<i>{{customer}}</i>){{/if}}{{#unless @last}}, {{/unless}}
+  {{/each}}
+</p>
+{{/if}}

partials/md/section/employment.hbs

@@ -3,9 +3,9 @@
 
 {{#each r.employment.history }}
 {{#if url}}
-### *{{{ position }}}*, [{{{ employer }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+### *{{{ position }}}*, [{{{ employer }}}]({{{ url }}}) ({{dateRange .}})
 {{else}}
-### *{{{ position }}}*, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+### *{{{ position }}}*, {{{ employer }}} ({{dateRange .}})
 {{/if}}
 
 {{{ summary }}}

partials/md/section/projects.hbs

@@ -3,9 +3,9 @@
 
 {{#each r.projects }}
 {{#if url }}
-### *{{{camelCase role }}}*, [{{{ title }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+### *{{{camelCase role }}}*, [{{{ title }}}]({{{ url }}}) ({{dateRange .}})
 {{else}}
-### *{{{camelCase role }}}*, {{{ title }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+### *{{{camelCase role }}}*, {{{ title }}} ({{dateRange .}})
 {{/if}}
 
 {{{ description }}}

partials/md/section/recognition.hbs

@@ -3,7 +3,7 @@
 
 {{#each r.recognition}}
 ### {{{ title }}}{{#if from}}, {{{ from }}}{{/if}}
-{{~#has 'safe.date'}} ({{formatDate safe.date 'MMM YYYY' }}){{/has}}
+{{~#if date}} ({{date date 'MMM YYYY' }}){{/if}}
 {{~#if summary}}
 
 {{{ summary }}}{{/if}}

partials/md/section/samples.hbs

@@ -3,9 +3,9 @@
 
 {{#each r.samples }}
 {{#if url}}
-### [{{{ title }}}]({{{ url }}}) ({{formatDate safe.date 'YYYY-MM' }})
+### [{{{ title }}}]({{{ url }}}) ({{date date}})
 {{else}}
-### {{{ title }}} ({{formatDate safe.date}})
+### {{{ title }}} ({{date date}})
 {{/if}}
 
 {{{ summary }}}

partials/md/section/speaking.hbs

@@ -2,7 +2,7 @@
 ## {{{sectionTitle "SPEAKING"}}}
 
 {{#each r.speaking}}
-### *{{{ title }}}*, {{{ event }}} ({{formatDate safe.date 'YYYY'}})
+### *{{{ title }}}*, {{{ event }}} ({{date date 'YYYY'}})
 
 {{{ summary }}}
 {{#if highlights}}

partials/md/section/writing.hbs

@@ -3,9 +3,9 @@
 
 {{#each r.writing}}
 {{#if url}}
-### [{{{ title }}}]({{{ url }}}) ({{formatDate safe.date 'YYYY-MM' }})
+### [{{{ title }}}]({{{ url }}}) ({{date date}})
 {{else}}
-### {{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
+### {{{ title }}} ({{date date}})
 {{/if}}
 
 {{{ summary }}}

partials/txt/section/reading.hbs

@@ -7,7 +7,7 @@
 {{/if}}
 {{#if summary }}{{{ summary }}}
 {{/if}}
-{{#if date}}{{{ date }}}
+{{#if date}}{{{date date }}}
 {{/if}}
 
 {{/each}}

partials/txt/section/recognition.hbs

@@ -3,7 +3,7 @@
 
 {{#each r.recognition}}
 {{{ title }}}{{#if from}}, {{{ from }}}{{/if}}
-{{~#has 'safe.date'}} ({{formatDate safe.date 'MMM YYYY' }}){{/has}}
+{{~#if date}} ({{date date 'MMM YYYY' }}){{/if}}
 {{~#if summary}}
 
 {{{ summary }}}{{/if}}

partials/txt/section/samples.hbs

@@ -2,7 +2,7 @@
 {{{sectionTitle "SAMPLES"}}} ------------------------------------------------------------------------
 
 {{#each r.samples }}
-{{{ title }}} ({{formatDate safe.date 'YYYY-MM'}})
+{{{ title }}} ({{date date}})
 
 {{{ summary }}}
 {{#if highlights}}

partials/txt/section/skills.hbs

@@ -2,6 +2,6 @@
 {{{sectionTitle "SKILLS"}}} -------------------------------------------------------------------------
 
 {{#each r.skills.sets}}
-- {{{ name }}}: {{#each skills}}{{{ this }}} {{/each}}
+- {{{ name }}}: {{#each skills}}{{{ . }}} {{/each}}
 {{/each}}
 {{/section}}

partials/txt/section/speaking.hbs

@@ -2,7 +2,7 @@
 ## {{{sectionTitle "SPEAKING"}}} ------------------------------------------------------------------------
 
 {{#each r.speaking}}
-*{{{ title }}}*, {{{ event }}} ({{formatDate safe.date 'YYYY'}})
+*{{{ title }}}*, {{{ event }}} ({{date date 'YYYY'}})
 
 {{{ summary }}}
 {{#if highlights}}

partials/txt/section/writing.hbs

@@ -2,7 +2,7 @@
 {{{sectionTitle "WRITING"}}} ------------------------------------------------------------------------
 
 {{#each r.writing}}
-{{{ title }}}{{#has 'safe.date'}} ({{formatDate safe.date 'YYYY-MM' }}){{/has}}
+{{{ title }}}{{#if date}} ({{date date}}){{/if}}
 {{#if summary}}{{{ summary }}}
 {{/if}}
 

themes/compact/src/compact-html.css

@@ -98,3 +98,13 @@ span.keywords {
   color: gray;
   text-align: right;
 }
+
+img {
+  height: 55px;
+  display: inline-block;
+}
+
+.certifications {
+  align-content: center;
+  text-align: center;
+}

themes/compact/src/compact-html.html

@@ -13,7 +13,7 @@
         <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}}
+          {{#has 'contact.website'}}full resume: <div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/has}}
         </div>
       </header>
 
@@ -23,6 +23,7 @@
 
 -->}}
 
+{{#*inline "icon-certifications"}}<span class="fa fs-lg fa-certificate"></span>{{/inline}}
 {{#*inline "icon-skills"}}<span class="fa fa-lg fa-code"></span>{{/inline}}
 {{#*inline "icon-employment"}}<span class="fa fa-building"></span>{{/inline}}
 {{#*inline "icon-projects"}}<span class="fa fa-star"></span>{{/inline}}
@@ -50,10 +51,14 @@
     </h3>
     <span class="tenure">{{dateRange .}}</span>
   <p>{{{ summary }}}</p>
-  {{> highlights }}
   {{#if keywords}}
-  <span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>
+  <span class="keywords">{{#each keywords}}{{{ . }}}{{#unless @last}}, {{/unless}}{{/each}}</span>
   {{/if}}
+  {{#if technologies}}
+  <span class="keywords">{{#each technologies}}{{{ . }}}{{#unless @last}}, {{/unless}}{{/each}}</span>
+  {{/if}}
+  {{> highlights }}
+  {{> work-projects }}
 </div>
 {{/inline}}
 
@@ -70,7 +75,7 @@
   <p>{{{ summary }}}</p>
   {{> highlights }}
   {{#if keywords}}
-  <span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>
+  <span class="keywords">{{#each keywords}}{{{ . }}}{{#unless @last}}, {{/unless}}{{/each}}</span>
   {{/if}}
 </div>
 {{/inline}}
@@ -83,6 +88,7 @@
 
 {{#*inline "header-info"}}{{/inline}}
 {{> section/info }}
+{{> section/certifications _icon="icon-certifications"}}
 {{> section/skills _icon="icon-skills"}}
 {{> section/employment _icon="icon-employment"}}
 {{> section/projects _icon="icon-projects"}}

themes/compact/src/compact-pdf.css

@@ -33,7 +33,7 @@ hr {
 
 main {
   padding: 15px;
-  max-width: 700px;
+  max-width: 82%;
   margin: 0 auto;
 }
 
@@ -53,6 +53,14 @@ p, li {
   text-align: justify;
 }
 
+.description {
+  margin-bottom: .5em;
+}
+
+.projects {
+  text-align: left;
+}
+
 .tenure {
   float: right;
 }
@@ -91,3 +99,19 @@ h2 > span.fa {
   text-align: left;
   margin-right: 3px;
 }
+
+img {
+  height: 60px;
+  display: inline-block;
+}
+
+.logos {
+  align-content: center;
+  text-align: center;
+}
+
+.qr {
+  height: 55px;
+  float: right;
+  margin: 0px 0px 5px 0px;
+}

themes/compact/src/compact-pdf.html

@@ -13,7 +13,7 @@
         <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}}
+          {{#has 'contact.website'}}<div class="website"> - full resume: <a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/has}}
         </div>
       </header>
 
@@ -23,6 +23,7 @@
 
 -->}}
 
+{{#*inline "icon-certifications"}}<span class="fa fs-lg fa-certificate"></span>{{/inline}}
 {{#*inline "icon-skills"}}<span class="fa fa-lg fa-code"></span>{{/inline}}
 {{#*inline "icon-employment"}}<span class="fa fa-building"></span>{{/inline}}
 {{#*inline "icon-projects"}}<span class="fa fa-star"></span>{{/inline}}
@@ -47,11 +48,19 @@
     {{/if}}
     </h3>
     <span class="tenure">{{dateRange .}}</span>
-  <p>{{{ summary }}}</p>
-  {{> highlights }}
   {{#if keywords}}
-  <span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>
+  <span class="keywords">{{#each keywords}}{{{ . }}}{{#unless @last}}, {{/unless}}{{/each}}</span>
   {{/if}}
+  {{#if technologies}}
+  <span class="keywords">{{#each technologies}}{{{ . }}}{{#unless @last}}, {{/unless}}{{/each}}</span>
+  {{/if}}
+  {{#if description}}
+    <p class="description">{{{ description }}}</p>
+  {{else}}
+    <p>{{{summary}}}</p>
+  {{/if}}
+  <p>{{> work-projects }}</p>
+  {{> highlights }}
 </div>
 {{/inline}}
 
@@ -81,10 +90,12 @@
 
 {{#has "info.brief"}}
 <section id="summary">
+  <img class="qr" src="../images/qr.png" />
   {{{ r.info.brief }}}
 </section>
 {{/has}}
 
+{{> section/certifications _icon="icon-certifications"}}
 {{> section/skills _icon="icon-skills"}}
 {{> section/employment _icon="icon-employment"}}
 {{> section/projects _icon="icon-projects"}}

themes/compact/src/partials/skills.xml

@@ -38,7 +38,7 @@
         </w:tcPr>
         <w:p wsp:rsidR="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00427ECC">
           <w:r>
-            <w:t>{{#each skills }}{{ this }}{{#unless @last}}, {{/unless}}{{/each}}</w:t>
+            <w:t>{{#each skills }}{{#name}}{{ name }}{{/name}}{{^name}}{{ . }}{{/name}}{{#unless @last}}, {{/unless}}{{/each}}</w:t>
           </w:r>
         </w:p>
       </w:tc>

themes/modern/src/partials/skills.xml

@@ -59,30 +59,6 @@
       <w:trPr>
         <w:trHeight w:val="882"/>
       </w:trPr>
-      <w:tc>
-        <w:tcPr>
-          <w:tcW w:w="828" w:type="dxa"/>
-          <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
-        </w:tcPr>
-        <w:p wsp:rsidR="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00427ECC">
-          <w:r>
-            <w:rPr>
-              <w:noProof/>
-            </w:rPr>
-            <w:pict>
-              <v:rect id="_x0000_s1028" style="position:absolute;left:0;text-align:left;margin-left:20.6pt;margin-top:1.4pt;width:7.15pt;height:38.25pt;z-index:1" fillcolor="{{{skillColor level}}}"  strokeweight="0"/>
-            </w:pict>
-          </w:r>
-          <w:r>
-            <w:rPr>
-              <w:noProof/>
-            </w:rPr>
-            <w:pict>
-              <v:rect id="_x0000_s1026" style="position:absolute;left:0;text-align:left;margin-left:20.6pt;margin-top:1.4pt;width:7.15pt;height:{{{skillHeight level}}}pt;z-index:2" fillcolor="#FFFFFF" strokeweight="0"/>
-            </w:pict>
-          </w:r>
-        </w:p>
-      </w:tc>
       <w:tc>
         <w:tcPr>
           <w:tcW w:w="8748" w:type="dxa"/>