From 318d00ef95dbfca98821195e40ee270d80059a59 Mon Sep 17 00:00:00 2001
From: hacksalot <hacksalot@fluentdesk.com>
Date: Fri, 18 Dec 2015 12:55:30 -0500
Subject: [PATCH] Positive: Tweak.

---
 themes/positive/src/partials/employment.xml  |  4 +-
 themes/positive/src/partials/recognition.xml |  2 +-
 themes/positive/src/partials/service.xml     |  4 +-
 themes/positive/src/partials/writing.xml     | 12 ++---
 themes/positive/src/positive-html.html       | 49 ++++++++++----------
 5 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/themes/positive/src/partials/employment.xml b/themes/positive/src/partials/employment.xml
index bea16be..9204942 100644
--- a/themes/positive/src/partials/employment.xml
+++ b/themes/positive/src/partials/employment.xml
@@ -21,7 +21,7 @@
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
         <w:t>{{ position }}, </w:t>
       </w:r>
-      {{#if url}}<w:hlink w:dest="{{ url }}">{{/if}}
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
         <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
           {{#if url}}
           <w:rPr>
@@ -44,7 +44,7 @@
           <w:sz-cs w:val="20"/>
         </w:rPr>
       </w:pPr>
-      {{{wpml summary true }}}
+      {{{wpml summary true}}}
       <!-- <w:r wsp:rsidRPr="000A3AF0">
         <w:rPr>
           <w:sz-cs w:val="20"/>
diff --git a/themes/positive/src/partials/recognition.xml b/themes/positive/src/partials/recognition.xml
index 6ea19a7..d0e16a3 100644
--- a/themes/positive/src/partials/recognition.xml
+++ b/themes/positive/src/partials/recognition.xml
@@ -19,7 +19,7 @@
           <w:tab w:val="right" w:pos="9360"/>
         </w:tabs>
       </w:pPr>
-      {{#if url}}<w:hlink w:dest="{{ url }}">{{/if}}
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
         <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
           {{#if url}}
           <w:rPr>
diff --git a/themes/positive/src/partials/service.xml b/themes/positive/src/partials/service.xml
index 77ec3d9..8ef5ab7 100644
--- a/themes/positive/src/partials/service.xml
+++ b/themes/positive/src/partials/service.xml
@@ -22,7 +22,7 @@
       <w:r wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA">
         <w:t>{{ position }}, </w:t>
       </w:r>
-      {{#if url}}<w:hlink w:dest="{{ url }}">{{/if}}
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
         <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
           {{#if url}}
           <w:rPr>
@@ -45,7 +45,7 @@
           <w:sz-cs w:val="20"/>
         </w:rPr>
       </w:pPr>
-      {{{wpml summary true }}}
+      {{{wpml summary true}}}
       <!-- <w:r wsp:rsidRPr="000A3AF0">
         <w:rPr>
           <w:sz-cs w:val="20"/>
diff --git a/themes/positive/src/partials/writing.xml b/themes/positive/src/partials/writing.xml
index 8fb4b08..2f52b94 100644
--- a/themes/positive/src/partials/writing.xml
+++ b/themes/positive/src/partials/writing.xml
@@ -18,7 +18,7 @@
           <w:tab w:val="right" w:pos="9360"/>
         </w:tabs>
       </w:pPr>
-      {{#if url}}<w:hlink w:dest="{{ url }}">{{/if}}
+      {{#if url}}<w:hlink w:dest="{{{ url }}}">{{/if}}
         <w:r wsp:rsidR="009452CA" wsp:rsidRPr="00606071">
           {{#if url}}
           <w:rPr>
@@ -35,20 +35,16 @@
         <w:t>{{formatDate safe.date 'YYYY'}}</w:t>
       </w:r>
     </w:p>
+    {{#if summary}}
     <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="000A3AF0" wsp:rsidRDefault="00C146CA" wsp:rsidP="00C146CA">
       <w:pPr>
         <w:rPr>
           <w:sz-cs w:val="20"/>
         </w:rPr>
       </w:pPr>
-      {{#if summary}}{{{wpml summary true }}}{{/if}}
-      <!-- <w:r wsp:rsidRPr="000A3AF0">
-        <w:rPr>
-          <w:sz-cs w:val="20"/>
-        </w:rPr>
-        <w:t>{{ summary }}</w:t>
-      </w:r> -->
+      {{{wpml summary true}}}
     </w:p>
+    {{/if}}
 
     {{#each highlights }}
     <w:p wsp:rsidR="00C146CA" wsp:rsidRDefault="009452CA" wsp:rsidP="00C146CA">
diff --git a/themes/positive/src/positive-html.html b/themes/positive/src/positive-html.html
index 33939af..277756a 100644
--- a/themes/positive/src/positive-html.html
+++ b/themes/positive/src/positive-html.html
@@ -10,18 +10,19 @@
   <body>
     <main>
       <header>
-        <h1>{{ r.name }}</h1>
-        <div id="contact">
-          {{#if r.contact.email}}<div class="email"><a href="mailto:{{ RAW.contact.email }}">{{ r.contact.email }}</a></div>{{/if}}
-          {{#if r.contact.phone}}<div class="phone">{{ r.contact.phone }}</div>{{/if}}
-          {{#if r.contact.website}}<div class="website"><a href="{{ RAW.contact.website }}">{{ r.contact.website }}</a></div>{{/if}}
-        </div>
+        <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}}
+          {{#if r.contact.phone}}<span class="phone">{{{ r.contact.phone }}}</span>{{/if}}
+          {{#if r.contact.website}}<span class="website"><a href="{{ RAW.contact.website }}">{{{ r.contact.website }}}</a></span>{{/if}}
+        </p>
       </header>
 
 
 {{#if r.info.brief}}
       <section id="summary">
-        {{ r.info.brief }}
+        {{{ r.info.brief }}}
       </section>
 {{/if}}
 
@@ -29,7 +30,7 @@
 {{#if r.skills}}
       <section id="skills">
         <header>
-        <h2><span class="fa fa-code"></span> Skills</h2><hr>
+        <h2><span class="fa fa-code"></span> Skills</h2>
         </header>
         <table>
           <thead>
@@ -41,8 +42,8 @@
           <tbody>
             {{#each r.skills.sets}}
             <tr>
-              <td style="width: 25%;">{{ name }}</td>
-              <td class="keywords">{{#each skills}}{{ this }} {{/each}}</td>
+              <td style="width: 33%;">{{{ name }}}</td>
+              <td class="keywords">{{#each skills}}{{{ this }}} {{/each}}</td>
             </tr>
             {{/each}}
           </tbody>
@@ -55,7 +56,7 @@
 {{#if r.employment}}
       <section id="employment">
         <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> Employment</h2>
         </header>
 
         {{#each r.employment.history }}
@@ -67,11 +68,11 @@
               {{ employer }}
               {{/if}}
               <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}}
               <ul>
               {{#each highlights}}
-                <li>{{ this }}</li>
+                <li>{{{ this }}}</li>
               {{/each}}
               </ul>
             {{/if}}
@@ -80,11 +81,11 @@
 
             {{#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>
+            <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>
+            <li>{{{ position }}}, {{{ employer }}}</li>
 
             {{#if @last}}
             </ul>
@@ -98,10 +99,10 @@
 {{# if r.education}}
       <section id="education">
         <header>
-        <h2><span class="fa fa-mortar-board"></span> Education</h2><hr>
+        <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>
+          <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
         {{/each}}
 
       </section>
@@ -110,7 +111,7 @@
 {{#if r.service}}
       <section id="volunteer">
         <header>
-        <h2><span class="fa fa-child" style="vertical-align: top;"></span> Service</h2><hr>
+        <h2><span class="fa fa-child" style="vertical-align: top;"></span> Service</h2>
         </header>
         {{#each r.service.history}}
           <h3><em>{{ position }}</em>,
@@ -120,7 +121,7 @@
             {{ organization }}
             {{/if}}
             <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-          <p style="clear: both;">{{ summary }}</p>
+          <p style="clear: both;">{{{ summary }}}</p>
           {{#if highlights}}
             <ul>
             {{#each highlights}}
@@ -136,12 +137,12 @@
 {{#if r.writing}}
       <section id="publications">
         <header>
-        <h2><span class="fa fa-book"></span> Writing</h2><hr>
+        <h2><span class="fa fa-book"></span> Writing</h2>
         </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}}
+            {{{ publisher.name }}} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
+        {{# if summary}}{{{ summary }}}{{/if}}
         {{/each}}
       </section>
 {{/if}}
@@ -149,11 +150,11 @@
 {{# if r.recognition}}
       <section id="awards">
         <header>
-        <h2><span class="fa fa-trophy"></span> Awards</h2><hr>
+        <h2><span class="fa fa-trophy"></span> Awards</h2>
         </header>
         {{#each r.recognition}}
           <h4><span class="res-label">{{ title }}</span>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h4>
-          {{ summary }}
+          {{{ summary }}}
         {{/each}}
       </section>
 {{/if}}