From c2498a14213192ef0caa751b7087f60ec51ece94 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Sat, 21 Nov 2015 09:12:18 -0500 Subject: [PATCH] Enhance "compact" theme. --- themes/compact/templates/html.css | 5 +++++ themes/compact/templates/html.html | 35 +++++++++++------------------- themes/compact/templates/pdf.css | 5 +++++ themes/compact/templates/pdf.html | 35 +++++++++++------------------- 4 files changed, 36 insertions(+), 44 deletions(-) diff --git a/themes/compact/templates/html.css b/themes/compact/templates/html.css index 33b6129..cf4fa4c 100644 --- a/themes/compact/templates/html.css +++ b/themes/compact/templates/html.css @@ -75,3 +75,8 @@ main > header > h1 { display: inline-block; margin-left: 5px; } + +h2 > span.fa { + text-align: left; + margin-right: 3px; +} diff --git a/themes/compact/templates/html.html b/themes/compact/templates/html.html index c9b3ca0..c2b2e35 100644 --- a/themes/compact/templates/html.html +++ b/themes/compact/templates/html.html @@ -4,6 +4,7 @@ {{ r.name }} + @@ -11,7 +12,7 @@

{{ r.name }}

- {% if (r.contact.email) { %}{% } %} + {% if (r.contact.email) { %}{% } %} {% if (r.contact.phone) { %}
{{ r.contact.phone }}
{% } %} {% if (r.contact.website) { %}
{{ r.contact.website }}
{% } %}
@@ -28,7 +29,7 @@ {% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %}
-

Skills

+

Skills

@@ -41,7 +42,7 @@ {% r.skills.sets.forEach( function( skillset ) { %} - + {% }); %} @@ -54,14 +55,14 @@ {% if ( r.employment && r.employment.history ) { %}
-

Employment

+

Employment

{% r.employment.history.forEach( function( proj, idx, ar) { %} {% if( idx < 4 ) { %} -

{{ proj.position }}, {{ proj.employer }} {{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }}

+

{{ proj.position }}, {{ filt.link( proj.employer, proj.url ) }} {{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }}

{{ proj.summary|md }}

{% if( proj.highlights ) { %}
    @@ -99,11 +100,10 @@ {% if ( r.education && r.education.history ) { %}
    -

    Education

    +

    Education

    {% r.education.history.forEach( function( edu, idx, ar) { %}

    {{ edu.institution }} {{ edu.safe.start.format('YYYY') }} — {{ edu.safe.end.format('YYYY') }}

    - {% if(edu.summary) { %}

    {{ edu.summary|md }}

    {% } %} {% }); %}
    @@ -112,10 +112,10 @@ {% if ( r.service && r.service.history && r.service.history.length ) { %}
    -

    Volunteer

    +

    Service

    {% r.service.history.forEach( function( vol, idx, ar ) { %} -

    {{ vol.organization }} {{ vol.safe.start.format('YYYY') }} — {{ vol.safe.end.format('YYYY') }}

    +

    {{ vol.position }}, {{ filt.link(vol.organization, vol.url) }} {{ vol.safe.start.format('YYYY') }} — {{ vol.safe.end.format('YYYY') }}

    {{ vol.summary|md }}

    {% if( vol.highlights ) { %}
      @@ -132,18 +132,10 @@ {% if( r.writing && r.writing.length ) { %}
      -

      Publications

      +

      Writing

      - - {% r.writing.forEach( function( pub, idx, ar) { %} -

      - {% if( pub.url ) { %} - {{ pub.title }}, {{ pub.publisher }} - {% } else { %} - {{ pub.title }}, {{ pub.publisher }} - {% } %} - {{ pub.safe.date.format('YYYY') }} -

      + {% r.writing.forEach( function( pub, idx, ar ) { %} +

      {{ filt.link( pub.title, pub.url ) }}, {{ pub.publisher }} {{ pub.safe.date.format('YYYY') }}

      {% if (pub.summary) { %}{{ pub.summary|md }}{% } %} @@ -154,9 +146,8 @@ {% if( r.recognition && r.recognition.length ) { %}
      -

      Awards

      +

      Awards

      - {% r.recognition.forEach( function( award, idx, ar) { %}

      {{ award.title }}, {{ award.from }} {{ award.safe.date.format('YYYY') }}

      {{ award.summary|md }} diff --git a/themes/compact/templates/pdf.css b/themes/compact/templates/pdf.css index 33b6129..cf4fa4c 100644 --- a/themes/compact/templates/pdf.css +++ b/themes/compact/templates/pdf.css @@ -75,3 +75,8 @@ main > header > h1 { display: inline-block; margin-left: 5px; } + +h2 > span.fa { + text-align: left; + margin-right: 3px; +} diff --git a/themes/compact/templates/pdf.html b/themes/compact/templates/pdf.html index bffec4d..e29bc72 100644 --- a/themes/compact/templates/pdf.html +++ b/themes/compact/templates/pdf.html @@ -13,7 +13,7 @@

      {{ r.name }}

      - {% if (r.contact.email) { %}{% } %} + {% if (r.contact.email) { %}{% } %} {% if (r.contact.phone) { %}
      {{ r.contact.phone }}
      {% } %} {% if (r.contact.website) { %}
      {{ r.contact.website }}
      {% } %}
      @@ -30,7 +30,7 @@ {% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %}
      -

      Skills

      +

      Skills

{{ skillset.name }}{{ skillset.skills.join(',') }}{{ skillset.skills.join(', ') }}
@@ -43,7 +43,7 @@ {% r.skills.sets.forEach( function( skillset ) { %} - + {% }); %} @@ -56,14 +56,14 @@ {% if ( r.employment && r.employment.history ) { %}
-

Employment

+

Employment

{% r.employment.history.forEach( function( proj, idx, ar) { %} {% if( idx < 4 ) { %} -

{{ proj.position }}, {{ proj.employer }} {{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }}

+

{{ proj.position }}, {{ filt.link( proj.employer, proj.url ) }} {{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }}

{{ proj.summary|md }}

{% if( proj.highlights ) { %}
    @@ -101,11 +101,10 @@ {% if ( r.education && r.education.history ) { %}
    -

    Education

    +

    Education

    {% r.education.history.forEach( function( edu, idx, ar) { %}

    {{ edu.institution }} {{ edu.safe.start.format('YYYY') }} — {{ edu.safe.end.format('YYYY') }}

    - {% if(edu.summary) { %}

    {{ edu.summary|md }}

    {% } %} {% }); %}
    @@ -114,10 +113,10 @@ {% if ( r.service && r.service.history && r.service.history.length ) { %}
    -

    Volunteer

    +

    Service

    {% r.service.history.forEach( function( vol, idx, ar ) { %} -

    {{ vol.organization }} {{ vol.safe.start.format('YYYY') }} — {{ vol.safe.end.format('YYYY') }}

    +

    {{ filt.link(vol.organization, vol.url) }} {{ vol.safe.start.format('YYYY') }} — {{ vol.safe.end.format('YYYY') }}

    {{ vol.summary|md }}

    {% if( vol.highlights ) { %}
      @@ -134,18 +133,10 @@ {% if( r.writing && r.writing.length ) { %}
      -

      Publications

      +

      Writing

      - - {% r.writing.forEach( function( pub, idx, ar) { %} -

      - {% if( pub.url ) { %} - {{ pub.title }}, {{ pub.publisher }} - {% } else { %} - {{ pub.title }}, {{ pub.publisher }} - {% } %} - {{ pub.safe.date.format('YYYY') }} -

      + {% r.writing.forEach( function( pub, idx, ar ) { %} +

      {{ filt.link( pub.title, pub.url ) }}, {{ pub.publisher }} {{ pub.safe.date.format('YYYY') }}

      {% if (pub.summary) { %}{{ pub.summary|md }}{% } %} @@ -156,9 +147,8 @@ {% if( r.recognition && r.recognition.length ) { %}
      -

      Awards

      +

      Awards

      - {% r.recognition.forEach( function( award, idx, ar) { %}

      {{ award.title }}, {{ award.from }} {{ award.safe.date.format('YYYY') }}

      {{ award.summary|md }} @@ -168,3 +158,4 @@ +
{{ skillset.name }}{{ skillset.skills.join(',') }}{{ skillset.skills.join(', ') }}