From 45d4cd2675f8541f313c122807d10af97c45eb4b Mon Sep 17 00:00:00 2001 From: hacksalot Date: Tue, 5 Jan 2016 04:50:43 -0500 Subject: [PATCH] All: Better section handling & add projects. --- themes/awesome/README.md | 13 ++--- themes/awesome/theme.json | 2 +- themes/compact/src/compact-doc.xml | 6 +-- themes/compact/src/compact-html.html | 67 ++++++++++++++---------- themes/compact/src/compact-pdf.html | 51 +++++++++++++----- themes/compact/src/compact-txt.txt | 46 ++++++++-------- themes/hello-world/theme.json | 4 +- themes/minimist/README.md | 3 +- themes/minimist/src/txt.txt | 10 ++-- themes/minimist/theme.json | 6 +-- themes/modern/src/modern-doc.xml | 14 ++--- themes/modern/src/modern-html.html | 8 +-- themes/modern/src/modern-md.txt | 72 +++++++++++++++++++------- themes/modern/src/modern-pdf.html | 8 +-- themes/modern/src/modern-txt.txt | 46 ++++++++-------- themes/positive/src/positive-doc.xml | 12 ++--- themes/positive/src/positive-html.html | 51 +++++++++++++----- themes/positive/src/positive-pdf.html | 51 +++++++++++++----- 18 files changed, 299 insertions(+), 171 deletions(-) diff --git a/themes/awesome/README.md b/themes/awesome/README.md index dd19671..0429ed0 100644 --- a/themes/awesome/README.md +++ b/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 -a LaTeX résumé in the Awesome-CV style using your FRESH or JSON Resume resume. +1. Run `hackmyresume build my-resume.json to out/my-resume.all -t awesome` to +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,10 +22,10 @@ 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` -theme. To create these symlinks manually, either use the Linux / OS X symlink -command for all three or, if on Windows, run use `mklink /H` for the first two -and `mklink /J` for the last. +HackMyResume creates these by default when it generates a resume under the +`awesome` theme. To create these symlinks manually, either use the Linux / OS X +symlink command for all three or, if on Windows, run use `mklink /H` for the +first two and `mklink /J` for the last. ## License diff --git a/themes/awesome/theme.json b/themes/awesome/theme.json index e2f1a59..ba3d89b 100644 --- a/themes/awesome/theme.json +++ b/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", diff --git a/themes/compact/src/compact-doc.xml b/themes/compact/src/compact-doc.xml index 26cf786..7a87ff3 100644 --- a/themes/compact/src/compact-doc.xml +++ b/themes/compact/src/compact-doc.xml @@ -513,9 +513,9 @@ --> {{{wpml RAW.info.brief }}} - {{#hasSection "skills"}}{{> skills }}{{/hasSection}} - {{#hasSection "employment"}}{{> employment }}{{/hasSection}} - {{#hasSection "education"}}{{> education }}{{/hasSection}} + {{#section "skills"}}{{> skills }}{{/section}} + {{#section "employment"}}{{> employment }}{{/section}} + {{#section "education"}}{{> education }}{{/section}} diff --git a/themes/compact/src/compact-html.html b/themes/compact/src/compact-html.html index dd52d1a..9ba90c3 100644 --- a/themes/compact/src/compact-html.html +++ b/themes/compact/src/compact-html.html @@ -25,7 +25,7 @@ {{/has}} -{{#hasSection "skills"}} +{{#section "skills"}}

{{{sectionTitle "Skills"}}}

@@ -47,18 +47,17 @@
-{{/hasSection}} +{{/section}} -{{#hasSection "employment"}} +{{#section "employment"}}

{{{sectionTitle "Employment"}}}

{{#each r.employment.history}} - {{#compare @index 4 operator="<"}}

{{ position }}, {{#if url }} {{ employer }} @@ -74,27 +73,39 @@ {{/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 }}}
    • - - {{#if @last}} -
- {{/if}} - {{/compare}} {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection "education"}} +{{#section 'projects'}} +
+
+
+

{{{sectionTitle "Projects"}}}

+
+ + {{#each r.projects}} + {{#if url}} +

{{ role }}, {{ title }}

+ {{else}} +

{{ role }}, {{ title }}

+ {{/if}} + {{formatDate safe.start 'YYYY-MM' }}—{{formatDate safe.end 'YYYY-MM' }} + {{{ summary }}} + {{#if proj.highlights}} +
    + {{#each highlights}} +
  • {{{ this }}}
    • + {{/each}} +
+ {{/if}} + {{/each}} + +
+{{/section}} + +{{#section "education"}}

{{{sectionTitle "Education"}}}

@@ -104,9 +115,9 @@ {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection "service"}} +{{#section "service"}}

{{{sectionTitle "Service"}}}

@@ -130,9 +141,9 @@ {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection "writing"}} +{{#section "writing"}}

{{{sectionTitle "Writing"}}}

@@ -143,9 +154,9 @@ {{# if summary}}{{{ summary }}}{{/if}} {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection "recognition"}} +{{#section "recognition"}}

{{{sectionTitle "recognition" "Awards"}}}

@@ -155,7 +166,7 @@ {{ summary }} {{/each}}
-{{/hasSection}} +{{/section}} diff --git a/themes/compact/src/compact-pdf.html b/themes/compact/src/compact-pdf.html index dbcdfe6..46df5a9 100644 --- a/themes/compact/src/compact-pdf.html +++ b/themes/compact/src/compact-pdf.html @@ -26,7 +26,7 @@ {{/has}} -{{#hasSection "skills"}} +{{#section "skills"}}

{{{sectionTitle "Skills"}}}

@@ -48,11 +48,11 @@
-{{/hasSection}} +{{/section}} -{{#hasSection "employment"}} +{{#section "employment"}}

{{{sectionTitle "Employment"}}}

@@ -93,9 +93,36 @@ {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection "education"}} +{{#section 'projects'}} +
+
+
+

{{{sectionTitle "Projects"}}}

+
+ + {{#each r.projects}} + {{#if url}} +

{{ role }}, {{ title }}

+ {{else}} +

{{ role }}, {{ title }}

+ {{/if}} + {{formatDate safe.start 'YYYY-MM' }}—{{formatDate safe.end 'YYYY-MM' }} + {{{ summary }}} + {{#if proj.highlights}} +
    + {{#each highlights}} +
  • {{{ this }}}
    • + {{/each}} +
+ {{/if}} + {{/each}} + +
+{{/section}} + +{{#section "education"}}

{{{sectionTitle "Education"}}}

@@ -105,9 +132,9 @@ {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection "service"}} +{{#section "service"}}

{{{sectionTitle "Service"}}}

@@ -131,9 +158,9 @@ {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection "writing"}} +{{#section "writing"}}

{{{sectionTitle "Writing"}}}

@@ -144,9 +171,9 @@ {{# if summary}}{{{ summary }}}{{/if}} {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection "recognition"}} +{{#section "recognition"}}

{{{sectionTitle "recognition" "Awards"}}}

@@ -156,7 +183,7 @@ {{ summary }} {{/each}}
-{{/hasSection}} +{{/section}} diff --git a/themes/compact/src/compact-txt.txt b/themes/compact/src/compact-txt.txt index 0ab9e0d..134a620 100644 --- a/themes/compact/src/compact-txt.txt +++ b/themes/compact/src/compact-txt.txt @@ -1,24 +1,24 @@ {{ 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}} +{{#has 'contact.email' }}Email: {{{ r.contact.email }}}{{/has}} +{{#has 'contact.phone' }}Tel: {{{ r.contact.phone }}}{{/has}} +{{#has 'contact.website' }}Web: {{{ r.contact.website }}}{{/has}} ================================================================================ -{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}} +{{#has 'info.brief' }}{{{ r.info.brief }}}{{/has}} -{{#hasSection "skills"}} +{{#section "skills"}} {{{sectionTitle "SKILLS"}}} ------------------------------------------------------------------------- {{#each r.skills.sets}} - {{{ name }}}: {{#each skills}}{{{ this }}} {{/each}} {{/each}} -{{/hasSection}} +{{/section}} -{{#hasSection "employment"}} +{{#section "employment"}} {{{sectionTitle "EMPLOYMENT"}}} --------------------------------------------------------------------- {{#each r.employment.history }} -{{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }}) +{{{ position }}}, {{{ employer }}} ({{dateRange .}}) {{{ summary }}} {{#if highlights}} {{#each highlights}} @@ -27,13 +27,13 @@ {{/if}} {{/each}} -{{/hasSection}} +{{/section}} -{{#hasSection 'projects'}} +{{#section 'projects'}} {{{sectionTitle "PROJECTS"}}} ----------------------------------------------------------------------- {{#each r.projects }} -{{{ title }}}, {{{ role }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }}) +{{{ title }}}, {{{ role }}} ({{dateRange .}}) {{{ description }}} {{{ summary }}} {{#if highlights}} @@ -42,13 +42,13 @@ {{/each}} {{/if}} {{/each}} -{{/hasSection}} +{{/section}} -{{#hasSection "education"}} +{{#section "education"}} {{{sectionTitle "EDUCATION"}}} ---------------------------------------------------------------------- {{#each r.education.history}} -{{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }}) +{{{ institution }}} ({{dateRange .}}) {{#if summary }} {{{ summary }}} {{/if}} @@ -59,22 +59,22 @@ {{/if}} {{/each}} -{{/hasSection}} +{{/section}} -{{#hasSection "writing"}} +{{#section "writing"}} {{{sectionTitle "WRITING"}}} ------------------------------------------------------------------------ {{#each r.writing}} -{{{ title }}} ({{formatDate safe.date 'YYYY-MM' }}) +{{{ title }}}{{#has 'safe.date'}} ({{formatDate safe.date 'YYYY-MM' }}){{/has}} {{{ summary }}} {{/each}} -{{/hasSection}} +{{/section}} -{{#hasSection "service" }} +{{#section "service" }} {{{sectionTitle "SERVICE"}}} ------------------------------------------------------------------------ {{#each r.service.history}} -{{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }}) +{{{ organization }}} ({{dateRange .}}) {{{ summary }}} {{#if highlights}} {{#each highlights}} @@ -82,13 +82,13 @@ {{/each}} {{/if}} {{/each}} -{{/hasSection}} +{{/section}} -{{#hasSection "recognition"}} +{{#section "recognition"}} {{{sectionTitle "RECOGNITION"}}} -------------------------------------------------------------------- {{#each r.recognition}} {{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }}) {{{ summary }}} {{/each}} -{{/hasSection}} +{{/section}} diff --git a/themes/hello-world/theme.json b/themes/hello-world/theme.json index 308558c..4e06f63 100644 --- a/themes/hello-world/theme.json +++ b/themes/hello-world/theme.json @@ -1,6 +1,6 @@ { - "title": "minimist", + "title": "hello-world", "description": "An unstyled starter résumé theme for FluentCV.", - "author": "hacksalot ", + "author": "hacksalot ", "engine": "handlebars" } diff --git a/themes/minimist/README.md b/themes/minimist/README.md index daf0234..a274161 100644 --- a/themes/minimist/README.md +++ b/themes/minimist/README.md @@ -1,6 +1,7 @@ Theme: Minimist =============== -An unstyled résumé theme. +An unstyled résumé theme. Unlike most other FRESH themes, Minimist uses the +Underscore.js templating engine (instead of Handlebars). ## License diff --git a/themes/minimist/src/txt.txt b/themes/minimist/src/txt.txt index ef9079f..53eab53 100644 --- a/themes/minimist/src/txt.txt +++ b/themes/minimist/src/txt.txt @@ -19,7 +19,7 @@ {% 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 }} @@ -27,7 +27,7 @@ {% 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 }} @@ -35,10 +35,10 @@ {% if ( r.projects && r.projects.length ) { %}{% print(h.sectionTitle('PROJECTS')) %} {% r.projects.forEach( function( proj, idx, ar) { %} -{{ proj.title }} ({{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }}) +{{ proj.title }} {{ h.dateRange( proj ) }} {{ proj.summary }} -{% if( edu.courses ) { %}{% proj.highlights.forEach( function( course ) { %} - - {{ course }} +{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high ) { %} + - {{ high }} {% }); } }); } %} {% if ( r.service && r.service.history ) { %}{% print(h.sectionTitle('service', 'VOLUNTEER')) %} diff --git a/themes/minimist/theme.json b/themes/minimist/theme.json index d02993f..113f607 100644 --- a/themes/minimist/theme.json +++ b/themes/minimist/theme.json @@ -1,6 +1,6 @@ { - "title": "awesome", - "description": "A visually compact résumé theme for FluentCV.", - "author": "hacksalot ", + "title": "minimist", + "description": "A unstyled résumé theme for FluentCV.", + "author": "hacksalot ", "engine": "underscore" } diff --git a/themes/modern/src/modern-doc.xml b/themes/modern/src/modern-doc.xml index cc2c995..dd3ea6f 100644 --- a/themes/modern/src/modern-doc.xml +++ b/themes/modern/src/modern-doc.xml @@ -485,13 +485,13 @@ - {{#hasSection "info"}}{{> info }}{{/hasSection}} - {{#hasSection "skills"}}{{> skills }}{{/hasSection}} - {{#hasSection "employment"}}{{> employment }}{{/hasSection}} - {{#hasSection "education"}}{{> education }}{{/hasSection}} - {{#hasSection "service"}}{{> service }}{{/hasSection}} - {{#hasSection "writing"}}{{> writing }}{{/hasSection}} - {{#hasSection "recognition"}}{{> recognition }}{{/hasSection}} + {{#section "info"}}{{> info }}{{/section}} + {{#section "skills"}}{{> skills }}{{/section}} + {{#section "employment"}}{{> employment }}{{/section}} + {{#section "education"}}{{> education }}{{/section}} + {{#section "service"}}{{> service }}{{/section}} + {{#section "writing"}}{{> writing }}{{/section}} + {{#section "recognition"}}{{> recognition }}{{/section}} diff --git a/themes/modern/src/modern-html.html b/themes/modern/src/modern-html.html index c76792f..bbd0460 100644 --- a/themes/modern/src/modern-html.html +++ b/themes/modern/src/modern-html.html @@ -91,7 +91,7 @@ {{/if}} -{{#hasSection 'projects'}} +{{#section 'projects'}}
@@ -116,9 +116,9 @@ {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection 'education'}} +{{#section 'education'}}
@@ -138,7 +138,7 @@ {{/each}}
-{{/hasSection}} +{{/section}} {{#if r.service}}
diff --git a/themes/modern/src/modern-md.txt b/themes/modern/src/modern-md.txt index 8778f58..4d7aafa 100644 --- a/themes/modern/src/modern-md.txt +++ b/themes/modern/src/modern-md.txt @@ -1,38 +1,68 @@ {{ 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}} +{{#has 'contact.email' }}Email: {{{ r.contact.email }}}{{/has}} +{{#has 'contact.phone' }}Tel: {{{ r.contact.phone }}}{{/has}} +{{#has 'contact.website' }}Web: {{{ r.contact.website }}}{{/has}} -{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}} +{{#has "info.brief" }}{{{ r.info.brief }}}{{/has}} -{{#if r.skills}} +{{#section "skills"}} ## {{{sectionTitle "SKILLS"}}} {{#each r.skills.sets}} - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}} {{/each}} -{{/if}} +{{/section}} -{{#if r.employment}} +{{#section "employment"}} ## {{{sectionTitle "EMPLOYMENT"}}} {{#each r.employment.history }} -### {{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }}) + +{{#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}} -{{#if r.education}} +{{#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}} @@ -40,35 +70,39 @@ {{#each courses}} - {{{ this }}}{{/each}}{{/if}} {{/each}} -{{/if}} -{{#if r.writing}} +{{/section}} +{{#section 'writing'}} ## WRITING {{#each r.writing}} ### {{{ title }}} ({{formatDate safe.date 'YYYY-MM' }}) {{{ summary }}} {{/each}} -{{/if}} +{{/section}} -{{#if r.service }} +{{#section 'service'}} ## {{{sectionTitle "SERVICE"}}} -{{#each r.service.history}} +{{#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}} -{{/if}} -{{#if r.recognition}} +{{/section}} + +{{#section 'recognition'}} ## {{{sectionTitle "RECOGNITION"}}} {{#each r.recognition}} -### {{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }}) +### *{{{ title }}}*, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }}) {{{ summary }}} {{/each}} -{{/if}} +{{/section}} diff --git a/themes/modern/src/modern-pdf.html b/themes/modern/src/modern-pdf.html index 77fec66..5feac72 100644 --- a/themes/modern/src/modern-pdf.html +++ b/themes/modern/src/modern-pdf.html @@ -96,7 +96,7 @@ {{/if}} -{{#hasSection 'projects'}} +{{#section 'projects'}}
@@ -121,9 +121,9 @@ {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection 'education'}} +{{#section 'education'}}
@@ -143,7 +143,7 @@ {{/each}}
-{{/hasSection}} +{{/section}} {{#if r.service}}
diff --git a/themes/modern/src/modern-txt.txt b/themes/modern/src/modern-txt.txt index 0ab9e0d..134a620 100644 --- a/themes/modern/src/modern-txt.txt +++ b/themes/modern/src/modern-txt.txt @@ -1,24 +1,24 @@ {{ 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}} +{{#has 'contact.email' }}Email: {{{ r.contact.email }}}{{/has}} +{{#has 'contact.phone' }}Tel: {{{ r.contact.phone }}}{{/has}} +{{#has 'contact.website' }}Web: {{{ r.contact.website }}}{{/has}} ================================================================================ -{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}} +{{#has 'info.brief' }}{{{ r.info.brief }}}{{/has}} -{{#hasSection "skills"}} +{{#section "skills"}} {{{sectionTitle "SKILLS"}}} ------------------------------------------------------------------------- {{#each r.skills.sets}} - {{{ name }}}: {{#each skills}}{{{ this }}} {{/each}} {{/each}} -{{/hasSection}} +{{/section}} -{{#hasSection "employment"}} +{{#section "employment"}} {{{sectionTitle "EMPLOYMENT"}}} --------------------------------------------------------------------- {{#each r.employment.history }} -{{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }}) +{{{ position }}}, {{{ employer }}} ({{dateRange .}}) {{{ summary }}} {{#if highlights}} {{#each highlights}} @@ -27,13 +27,13 @@ {{/if}} {{/each}} -{{/hasSection}} +{{/section}} -{{#hasSection 'projects'}} +{{#section 'projects'}} {{{sectionTitle "PROJECTS"}}} ----------------------------------------------------------------------- {{#each r.projects }} -{{{ title }}}, {{{ role }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }}) +{{{ title }}}, {{{ role }}} ({{dateRange .}}) {{{ description }}} {{{ summary }}} {{#if highlights}} @@ -42,13 +42,13 @@ {{/each}} {{/if}} {{/each}} -{{/hasSection}} +{{/section}} -{{#hasSection "education"}} +{{#section "education"}} {{{sectionTitle "EDUCATION"}}} ---------------------------------------------------------------------- {{#each r.education.history}} -{{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }}) +{{{ institution }}} ({{dateRange .}}) {{#if summary }} {{{ summary }}} {{/if}} @@ -59,22 +59,22 @@ {{/if}} {{/each}} -{{/hasSection}} +{{/section}} -{{#hasSection "writing"}} +{{#section "writing"}} {{{sectionTitle "WRITING"}}} ------------------------------------------------------------------------ {{#each r.writing}} -{{{ title }}} ({{formatDate safe.date 'YYYY-MM' }}) +{{{ title }}}{{#has 'safe.date'}} ({{formatDate safe.date 'YYYY-MM' }}){{/has}} {{{ summary }}} {{/each}} -{{/hasSection}} +{{/section}} -{{#hasSection "service" }} +{{#section "service" }} {{{sectionTitle "SERVICE"}}} ------------------------------------------------------------------------ {{#each r.service.history}} -{{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }}) +{{{ organization }}} ({{dateRange .}}) {{{ summary }}} {{#if highlights}} {{#each highlights}} @@ -82,13 +82,13 @@ {{/each}} {{/if}} {{/each}} -{{/hasSection}} +{{/section}} -{{#hasSection "recognition"}} +{{#section "recognition"}} {{{sectionTitle "RECOGNITION"}}} -------------------------------------------------------------------- {{#each r.recognition}} {{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }}) {{{ summary }}} {{/each}} -{{/hasSection}} +{{/section}} diff --git a/themes/positive/src/positive-doc.xml b/themes/positive/src/positive-doc.xml index b04d894..5209290 100644 --- a/themes/positive/src/positive-doc.xml +++ b/themes/positive/src/positive-doc.xml @@ -528,12 +528,12 @@ --> {{/has}} - {{#hasSection "skills"}}{{> skills }}{{/hasSection}} - {{#hasSection "employment"}}{{> employment }}{{/hasSection}} - {{#hasSection "education"}}{{> education }}{{/hasSection}} - {{#hasSection "service"}}{{> service }}{{/hasSection}} - {{#hasSection "writing"}}{{> writing }}{{/hasSection}} - {{#hasSection "recognition"}}{{> recognition }}{{/hasSection}} + {{#section "skills"}}{{> skills }}{{/section}} + {{#section "employment"}}{{> employment }}{{/section}} + {{#section "education"}}{{> education }}{{/section}} + {{#section "service"}}{{> service }}{{/section}} + {{#section "writing"}}{{> writing }}{{/section}} + {{#section "recognition"}}{{> recognition }}{{/section}} diff --git a/themes/positive/src/positive-html.html b/themes/positive/src/positive-html.html index 182c4ba..5880be2 100644 --- a/themes/positive/src/positive-html.html +++ b/themes/positive/src/positive-html.html @@ -27,7 +27,7 @@ {{/has}} -{{#hasSection "skills"}} +{{#section "skills"}}

Skills

@@ -49,11 +49,11 @@
-{{/hasSection}} +{{/section}} -{{#hasSection "employment"}} +{{#section "employment"}}

{{{sectionTitle "Employment"}}}

@@ -94,9 +94,36 @@ {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection "education"}} +{{#section 'projects'}} +
+
+
+

{{{sectionTitle "Projects"}}}

+
+ + {{#each r.projects}} + {{#if url}} +

{{ role }}, {{ title }}

+ {{else}} +

{{ role }}, {{ title }}

+ {{/if}} + {{formatDate safe.start 'YYYY-MM' }}—{{formatDate safe.end 'YYYY-MM' }} + {{{ summary }}} + {{#if proj.highlights}} +
    + {{#each highlights}} +
  • {{{ this }}}
    • + {{/each}} +
+ {{/if}} + {{/each}} + +
+{{/section}} + +{{#section "education"}}

{{{sectionTitle "Education"}}}

@@ -106,9 +133,9 @@ {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection "service"}} +{{#section "service"}}

{{{sectionTitle "Service"}}}

@@ -132,9 +159,9 @@ {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection "writing"}} +{{#section "writing"}}

{{{sectionTitle "Writing"}}}

@@ -145,9 +172,9 @@ {{# if summary}}{{{ summary }}}{{/if}} {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection "recognition"}} +{{#section "recognition"}}

{{{"sectionTitle" "recognition" "Awards"}}}

@@ -157,7 +184,7 @@ {{{ summary }}} {{/each}}
-{{/hasSection}} +{{/section}} diff --git a/themes/positive/src/positive-pdf.html b/themes/positive/src/positive-pdf.html index 76ff3ce..39770e2 100644 --- a/themes/positive/src/positive-pdf.html +++ b/themes/positive/src/positive-pdf.html @@ -28,7 +28,7 @@ {{/has}} -{{#hasSection "skills"}} +{{#section "skills"}}

Skills

@@ -50,11 +50,11 @@
-{{/hasSection}} +{{/section}} -{{#hasSection "employment"}} +{{#section "employment"}}

{{{sectionTitle "Employment"}}}

@@ -95,9 +95,36 @@ {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection "education"}} +{{#section 'projects'}} +
+
+
+

{{{sectionTitle "Projects"}}}

+
+ + {{#each r.projects}} + {{#if url}} +

{{ role }}, {{ title }}

+ {{else}} +

{{ role }}, {{ title }}

+ {{/if}} + {{formatDate safe.start 'YYYY-MM' }}—{{formatDate safe.end 'YYYY-MM' }} + {{{ summary }}} + {{#if proj.highlights}} +
    + {{#each highlights}} +
  • {{{ this }}}
    • + {{/each}} +
+ {{/if}} + {{/each}} + +
+{{/section}} + +{{#section "education"}}

{{{sectionTitle "Education"}}}

@@ -107,9 +134,9 @@ {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection "service"}} +{{#section "service"}}

{{{sectionTitle "Service"}}}

@@ -133,9 +160,9 @@ {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection "writing"}} +{{#section "writing"}}

{{{sectionTitle "Writing"}}}

@@ -146,9 +173,9 @@ {{# if summary}}{{{ summary }}}{{/if}} {{/each}}
-{{/hasSection}} +{{/section}} -{{#hasSection "recognition"}} +{{#section "recognition"}}

{{{"sectionTitle" "recognition" "Awards"}}}

@@ -158,7 +185,7 @@ {{{ summary }}} {{/each}}
-{{/hasSection}} +{{/section}}