From 977da727887ed25b593ba4d997524bc5453893e0 Mon Sep 17 00:00:00 2001
From: Rioting Pacifist <linux@riotingpacifist.net>
Date: Tue, 17 Mar 2020 00:52:49 +0000
Subject: [PATCH] add certifications & qr code

---
 partials/html/header-icon.hbs            |  5 +---
 partials/html/highlights.hbs             |  1 +
 partials/html/section/certifications.hbs | 35 ++++++++++++++++++++++++
 partials/html/section/education.hbs      |  1 +
 partials/html/section/info.hbs           |  1 +
 partials/html/section/interests.hbs      |  9 ++----
 partials/html/section/skills.hbs         |  7 ++++-
 partials/html/work-projects.hbs          |  8 ++++++
 themes/compact/src/compact-html.css      | 10 +++++++
 themes/compact/src/compact-html.html     | 14 +++++++---
 themes/compact/src/compact-pdf.css       | 26 +++++++++++++++++-
 themes/compact/src/compact-pdf.html      | 19 ++++++++++---
 themes/compact/src/partials/skills.xml   |  2 +-
 themes/modern/src/partials/skills.xml    | 24 ----------------
 14 files changed, 117 insertions(+), 45 deletions(-)
 create mode 100644 partials/html/section/certifications.hbs
 create mode 100644 partials/html/work-projects.hbs

diff --git a/partials/html/header-icon.hbs b/partials/html/header-icon.hbs
index 63b0140..399b3de 100644
--- a/partials/html/header-icon.hbs
+++ b/partials/html/header-icon.hbs
@@ -1,6 +1,3 @@
 <header>
-  {{#if _icon}}
-  {{> (lookup . '_hdricon') }}
-  {{/if}}
-  <h2>{{{sectionTitle _title _section}}}</h2>
+  <h2>{{#if _icon}}{{> (lookup . '_hdricon') }}{{/if}}{{{sectionTitle _title _section}}}</h2>
 </header>
diff --git a/partials/html/highlights.hbs b/partials/html/highlights.hbs
index e06e47a..baa0109 100644
--- a/partials/html/highlights.hbs
+++ b/partials/html/highlights.hbs
@@ -1,4 +1,5 @@
 {{#if highlights}}
+<b>Highlights:</b>
 <ul>
   {{#each highlights}}
   <li>{{{ . }}}</li>
diff --git a/partials/html/section/certifications.hbs b/partials/html/section/certifications.hbs
new file mode 100644
index 0000000..0a80c01
--- /dev/null
+++ b/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}}
diff --git a/partials/html/section/education.hbs b/partials/html/section/education.hbs
index 2e5fae9..84c6c51 100644
--- a/partials/html/section/education.hbs
+++ b/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}}
diff --git a/partials/html/section/info.hbs b/partials/html/section/info.hbs
index e7a97de..8119046 100644
--- a/partials/html/section/info.hbs
+++ b/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}}
diff --git a/partials/html/section/interests.hbs b/partials/html/section/interests.hbs
index b100ed5..95888ca 100644
--- a/partials/html/section/interests.hbs
+++ b/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>
-    <h3><em>{{{ name }}}</em></h3>
-    <span class="tenure">{{date date 'YYYY' }}</span>
-    {{{ summary }}}
-    {{> highlights }}
-    </div>
+    | <em>{{{ name }}}</em> |
     {{/body-interests}}
   {{/each}}
+  </center>
 </section>
 {{/section}}
diff --git a/partials/html/section/skills.hbs b/partials/html/section/skills.hbs
index 58ecf65..a5c8bd8 100644
--- a/partials/html/section/skills.hbs
+++ b/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>
diff --git a/partials/html/work-projects.hbs b/partials/html/work-projects.hbs
new file mode 100644
index 0000000..b4f7f70
--- /dev/null
+++ b/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}}
diff --git a/themes/compact/src/compact-html.css b/themes/compact/src/compact-html.css
index 52e47d7..08ee504 100644
--- a/themes/compact/src/compact-html.css
+++ b/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;
+}
diff --git a/themes/compact/src/compact-html.html b/themes/compact/src/compact-html.html
index 2535a72..69ac4db 100644
--- a/themes/compact/src/compact-html.html
+++ b/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"}}
diff --git a/themes/compact/src/compact-pdf.css b/themes/compact/src/compact-pdf.css
index 51ce196..a8cba3d 100644
--- a/themes/compact/src/compact-pdf.css
+++ b/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;
+}
diff --git a/themes/compact/src/compact-pdf.html b/themes/compact/src/compact-pdf.html
index c6cea73..68c1c80 100644
--- a/themes/compact/src/compact-pdf.html
+++ b/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'}}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}}
@@ -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"}}
diff --git a/themes/compact/src/partials/skills.xml b/themes/compact/src/partials/skills.xml
index f0efcde..02e5cb5 100644
--- a/themes/compact/src/partials/skills.xml
+++ b/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>
diff --git a/themes/modern/src/partials/skills.xml b/themes/modern/src/partials/skills.xml
index 2a0aefc..66d6852 100644
--- a/themes/modern/src/partials/skills.xml
+++ b/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"/>