From 0a091b30f607fc125cf21312dc2b46435194d97f Mon Sep 17 00:00:00 2001 From: hacksalot Date: Mon, 11 Jan 2016 11:29:15 -0500 Subject: [PATCH] Modern: DOC: Use global partials. --- partials/doc/header-simple.xml | 9 + partials/doc/section/education.xml | 12 +- partials/doc/section/employment.xml | 12 +- partials/doc/section/projects.xml | 12 +- partials/doc/section/recognition.xml | 12 +- partials/doc/section/service.xml | 11 +- partials/doc/section/skills.xml | 20 +- .../doc/section}/speaking.xml | 4 +- partials/doc/section/writing.xml | 11 +- themes/modern/src/modern-doc.xml | 45 ++++- themes/modern/src/modern-pdf.html | 183 +++--------------- themes/modern/src/partials/education.xml | 75 ------- themes/modern/src/partials/employment.xml | 72 ------- themes/modern/src/partials/projects.xml | 66 ------- themes/modern/src/partials/recognition.xml | 65 ------- themes/modern/src/partials/service.xml | 66 ------- themes/modern/src/partials/writing.xml | 64 ------ 17 files changed, 98 insertions(+), 641 deletions(-) create mode 100644 partials/doc/header-simple.xml rename {themes/modern/src/partials => partials/doc/section}/speaking.xml (93%) delete mode 100644 themes/modern/src/partials/education.xml delete mode 100644 themes/modern/src/partials/employment.xml delete mode 100644 themes/modern/src/partials/projects.xml delete mode 100644 themes/modern/src/partials/recognition.xml delete mode 100644 themes/modern/src/partials/service.xml delete mode 100644 themes/modern/src/partials/writing.xml diff --git a/partials/doc/header-simple.xml b/partials/doc/header-simple.xml new file mode 100644 index 0000000..3aa9230 --- /dev/null +++ b/partials/doc/header-simple.xml @@ -0,0 +1,9 @@ +{{! A simple resume heading. }} + + + + + + {{{sectionTitle _title}} + + diff --git a/partials/doc/section/education.xml b/partials/doc/section/education.xml index 7a8847f..d7aa635 100644 --- a/partials/doc/section/education.xml +++ b/partials/doc/section/education.xml @@ -1,12 +1,8 @@ - - - - - - {{{sectionTitle "EDUCATION"}}} - - + + {{#> header-education }} + {{> header-simple _title="EDUCATION" _section="education" }} + {{/header-education}} {{#each r.education.history}} diff --git a/partials/doc/section/employment.xml b/partials/doc/section/employment.xml index a07c4ae..14b9e5d 100644 --- a/partials/doc/section/employment.xml +++ b/partials/doc/section/employment.xml @@ -1,12 +1,8 @@ - - - - - - {{{sectionTitle "EMPLOYMENT"}}} - - + + {{#> header-employment }} + {{> header-simple _title="EMPLOYMENT" _section="employment" }} + {{/header-employment}} {{#each r.employment.history}} diff --git a/partials/doc/section/projects.xml b/partials/doc/section/projects.xml index e474b66..eff5f66 100644 --- a/partials/doc/section/projects.xml +++ b/partials/doc/section/projects.xml @@ -1,12 +1,8 @@ - - - - - - {{{sectionTitle "PROJECTS"}}} - - + + {{#> header-projects }} + {{> header-simple _title="PROJECTS" _section="projects" }} + {{/header-projects}} {{#each r.projects}} diff --git a/partials/doc/section/recognition.xml b/partials/doc/section/recognition.xml index 329b715..ad1fd80 100644 --- a/partials/doc/section/recognition.xml +++ b/partials/doc/section/recognition.xml @@ -1,14 +1,8 @@ - - - - - - {{{sectionTitle "RECOGNITION"}}} - - - + {{#> header-recognition }} + {{> header-simple _title="RECOGNITION" _section="recognition" }} + {{/header-recognition}} {{#each r.recognition}} diff --git a/partials/doc/section/service.xml b/partials/doc/section/service.xml index f8ec21c..52a6e1b 100644 --- a/partials/doc/section/service.xml +++ b/partials/doc/section/service.xml @@ -1,13 +1,8 @@ - - - - - - {{{sectionTitle "SERVICE"}}} - - + {{#> header-service }} + {{> header-simple _title="SERVICE" _section="service" }} + {{/header-service}} {{#each r.service.history}} diff --git a/partials/doc/section/skills.xml b/partials/doc/section/skills.xml index 3031286..14ae57d 100644 --- a/partials/doc/section/skills.xml +++ b/partials/doc/section/skills.xml @@ -1,23 +1,9 @@ - - - - - - {{{sectionTitle "SKILLS"}}} - - + {{#> header-skills }} + {{> header-simple _title="SKILLS" _section="skills" }} + {{/header-skills}} - - diff --git a/themes/modern/src/partials/speaking.xml b/partials/doc/section/speaking.xml similarity index 93% rename from themes/modern/src/partials/speaking.xml rename to partials/doc/section/speaking.xml index 8eb51a8..8181477 100644 --- a/themes/modern/src/partials/speaking.xml +++ b/partials/doc/section/speaking.xml @@ -1,6 +1,8 @@ - {{> header-icon _title="SPEAKING" _section="speaking" _icon="pict/arrow" }} + {{#> header-speaking }} + {{> header-simple _title="SPEAKING" _section="speaking" }} + {{/header-speaking}} {{#each r.speaking}} diff --git a/partials/doc/section/writing.xml b/partials/doc/section/writing.xml index c32215e..6cc84b0 100644 --- a/partials/doc/section/writing.xml +++ b/partials/doc/section/writing.xml @@ -1,13 +1,8 @@ - - - - - - {{{sectionTitle "WRITING"}}} - - + {{#> header-writing }} + {{> header-simple _title="WRITING" _section="writing" }} + {{/header-writing}} {{#each r.writing}} diff --git a/themes/modern/src/modern-doc.xml b/themes/modern/src/modern-doc.xml index d7978a6..efabc9f 100644 --- a/themes/modern/src/modern-doc.xml +++ b/themes/modern/src/modern-doc.xml @@ -485,15 +485,46 @@ + {{#section "info"}}{{> info }}{{/section}} + {{#section "skills"}}{{> skills }}{{/section}} - {{#section "employment"}}{{> employment }}{{/section}} - {{#section "projects"}}{{> projects }}{{/section}} - {{#section "education"}}{{> education }}{{/section}} - {{#section "service"}}{{> service }}{{/section}} - {{#section "writing"}}{{> writing }}{{/section}} - {{#section "recognition"}}{{> recognition }}{{/section}} - {{#section "speaking"}}{{> speaking }}{{/section}} + + {{#*inline "header-employment"}} + {{> header-icon _title="EMPLOYMENT" _section="employment" _icon="pict/emp" }} + {{/inline}} + {{#section "employment"}}{{> section/employment }}{{/section}} + + {{#*inline "header-projects"}} + {{> header-icon _title="PROJECTS" _section="projects" _icon="pict/star" }} + {{/inline}} + {{#section "projects"}}{{> section/projects }}{{/section}} + + {{#*inline "header-education"}} + {{> header-icon _title="EDUCATION" _section="education" _icon="pict/edu" }} + {{/inline}} + {{#section "education"}}{{> section/education }}{{/section}} + + {{#*inline "header-service"}} + {{> header-icon _title="SERVICE" _section="service" _icon="pict/srv" }} + {{/inline}} + {{#section "service"}}{{> section/service }}{{/section}} + + {{#*inline "header-writing"}} + {{> header-icon _title="WRITING" _section="writing" _icon="pict/wri" }} + {{/inline}} + {{#section "writing"}}{{> section/writing }}{{/section}} + + {{#*inline "header-recognition"}} + {{> header-icon _title="RECOGNITION" _section="recognition" _icon="pict/rec" }} + {{/inline}} + {{#section "recognition"}}{{> section/recognition }}{{/section}} + + {{#*inline "header-speaking"}} + {{> header-icon _title="SPEAKING" _section="speaking" _icon="pict/arrow" }} + {{/inline}} + {{#section "speaking"}}{{> section/speaking }}{{/section}} + diff --git a/themes/modern/src/modern-pdf.html b/themes/modern/src/modern-pdf.html index 531d4a6..c677579 100644 --- a/themes/modern/src/modern-pdf.html +++ b/themes/modern/src/modern-pdf.html @@ -28,21 +28,21 @@ {{#if r.info.brief}}
-

{{{sectionTitle "info" "About"}}}

+

{{{sectionTitle "info" "About"}}}

{{{ r.info.brief }}}
{{/if}} +{{!}} {{#section 'skills' }}
-

{{{sectionTitle "Skills"}}}

+

{{{sectionTitle "Skills"}}}

-
    {{#each r.skills.sets}}
  • @@ -62,175 +62,40 @@
    • {{/each}}
- -
{{/section}} +{{!}} -{{#section 'employment'}} -
-
-
-

{{{sectionTitle "Employment"}}}

-
- - {{#each r.employment.history}} - {{#if url}} -

{{ position }}, {{ employer }}

- {{else}} -

{{ position }}, {{ employer }}

- {{/if}} - {{formatDate safe.start 'YYYY-MM' }}—{{formatDate safe.end 'YYYY-MM' }} - {{{ summary }}} - {{#if proj.highlights}} -
    - {{#each highlights}} -
  • {{{ this }}}
    • - {{/each}} -
- {{/if}} - {{/each}} +{{#*inline "icon-employment"}}{{/inline}} +{{> section/employment }} -
-{{/section}} +{{#*inline "icon-projects"}}{{/inline}} +{{> section/projects }} -{{#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}} +{{#*inline "icon-education"}}{{/inline}} +{{> section/education }} -
-{{/section}} +{{#*inline "icon-service"}}{{/inline}} +{{> section/service }} -{{#section 'samples'}} -
-
-
-

{{{sectionTitle "Samples"}}}

-
- - {{#each r.samples}} - {{#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}} +{{#*inline "icon-samples"}}{{/inline}} +{{> section/samples }} -
-{{/section}} +{{#*inline "icon-writing"}}{{/inline}} +{{> section/writing }} -{{#section 'education'}} -
-
-
-

{{{sectionTitle "Education"}}}

-
- - {{#each r.education.history}} -

{{ institution }}

- {{formatDate safe.start 'YYYY-MM' }}—{{formatDate safe.end 'YYYY-MM' }} - {{#if courses}} -
    - {{#each courses}} -
  • {{{ this }}}
    • - {{/each}} -
- {{/if}} - {{/each}} +{{#*inline "icon-recognition"}}{{/inline}} +{{> section/recognition }} -
-{{/section}} +{{#*inline "icon-speaking"}}{{/inline}} +{{> section/speaking }} -{{#section 'service'}} -
-
-
-

{{{sectionTitle "Service"}}}

-
- - {{#each r.service.history}} - {{#if url}} -

{{ position }}, {{ organization }}

- {{else}} -

{{ position }}, {{ organization }}

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

{{{sectionTitle "writing" "Publications"}}}

-
- - {{#each r.writing}} - {{#if url}} -

{{{ title }}}, {{{ publisher.name }}}

- {{else}} -

{{{ title }}}, {{{ publisher.name }}}

- {{/if}} - Published on: {{formatDate safe.date 'YYYY-MM'}} - {{/each}} -
-{{/section}} - -{{#section 'recognition'}} -
-
-
-

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

-
- - {{#each r.recognition}} -

{{{ title }}}, {{{ from }}}

- {{{ date }}} - {{{ summary }}} - {{/each}} -
-{{/section}} diff --git a/themes/modern/src/partials/education.xml b/themes/modern/src/partials/education.xml deleted file mode 100644 index 351d8eb..0000000 --- a/themes/modern/src/partials/education.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - {{> header-icon _title="EDUCATION" _section="education" _icon="pict/edu" }} - - {{#each r.education.history}} - - - - - - - - - - {{#if url}}{{/if}} - - {{#if url }} - - - - {{/if}} - {{ institution }} - - {{#if url}}{{/if}} - - - - - {{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY'}} - - - {{#either area studyType }} - - - - - - - - - - - {{ area }}, {{ studyType }} - - - {{/either}} - - {{#each highlights }} - - - - - - - - - - - - - - - - - - {{ this }} - - - {{/each}} - - - - {{/each}} - - diff --git a/themes/modern/src/partials/employment.xml b/themes/modern/src/partials/employment.xml deleted file mode 100644 index 7b51540..0000000 --- a/themes/modern/src/partials/employment.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - {{> header-icon _title="EMPLOYMENT" _section="employment" _icon="pict/emp" }} - - {{#each r.employment.history}} - - - - - - - - - - - {{ position }}, - - {{#if url}}{{/if}} - - {{#if url}} - - - - {{/if}} - {{ employer }} - - {{#if url}}{{/if}} - - - - - {{formatDate safe.start 'MMM YYYY'}} — {{formatDate safe.end 'MMM YYYY'}} - - - - - - - - - {{{wpml summary true}}} - - - {{#each highlights }} - - - - - - - - - - - - - - {{{wpml this true}}} - - - {{/each}} - - - - {{/each}} - - diff --git a/themes/modern/src/partials/projects.xml b/themes/modern/src/partials/projects.xml deleted file mode 100644 index 4a80f81..0000000 --- a/themes/modern/src/partials/projects.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - {{> header-icon _title="PROJECTS" _section="projects" _icon="pict/star" }} - - {{#each r.projects}} - - - - - - - - - - - {{ role }}, - - {{#if url}}{{/if}} - - {{#if url}} - - - - {{/if}} - {{ title }} - - {{#if url}}{{/if}} - - - - - {{dateRange .}} - - - - - - - - - {{{wpml summary true}}} - - - {{#each highlights }} - - - - - - - - - - - - - - {{{wpml this true}}} - - {{/each}} - - - - {{/each}} - - diff --git a/themes/modern/src/partials/recognition.xml b/themes/modern/src/partials/recognition.xml deleted file mode 100644 index 78b0b50..0000000 --- a/themes/modern/src/partials/recognition.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - {{> header-icon _title="RECOGNITION" _section="recognition" _icon="pict/rec" }} - - {{#each r.recognition}} - - - - - - - - - - {{#if url}}{{/if}} - - {{#if url}} - - - - {{/if}} - {{ title }} - - {{#if url}}{{/if}} - - - - - {{formatDate safe.date 'YYYY-MM'}} - - - - - - - - - {{{wpml summary true }}} - - - {{#if highlights}} - {{#each highlights }} - - - - - - - - - - - - - - {{{wpml this true}}} - - {{/each}} - {{/if}} - - - - {{/each}} - - diff --git a/themes/modern/src/partials/service.xml b/themes/modern/src/partials/service.xml deleted file mode 100644 index 1f07343..0000000 --- a/themes/modern/src/partials/service.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - {{> header-icon _title="SERVICE" _section="service" _icon="pict/srv" }} - - {{#each r.service.history}} - - - - - - - - - - - {{ position }}, - - {{#if url}}{{/if}} - - {{#if url}} - - - - {{/if}} - {{ organization }} - - {{#if url}}{{/if}} - - - - - {{formatDate safe.start 'MMM YYYY'}} — {{formatDate safe.end 'MMM YYYY'}} - - - - - - - - - {{{wpml summary true}}} - - - {{#each highlights }} - - - - - - - - - - - - - - {{{wpml this true}}} - - {{/each}} - - - - {{/each}} - - diff --git a/themes/modern/src/partials/writing.xml b/themes/modern/src/partials/writing.xml deleted file mode 100644 index f9a6690..0000000 --- a/themes/modern/src/partials/writing.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - {{> header-icon _title="WRITING" _section="writing" _icon="pict/wri" }} - - {{#each r.writing}} - - - - - - - - - {{#if url}}{{/if}} - - {{#if url}} - - - - {{/if}} - {{{ title }}} - - {{#if url}}{{/if}} - - - - - {{formatDate safe.date 'YYYY'}} - - - {{#if summary}} - - - - - - - {{{wpml summary true}}} - - {{/if}} - - {{#each highlights }} - - - - - - - - - - - - - - {{{wpml this true}}} - - {{/each}} - - - - {{/each}} - -