From b4a93020ecc71a87d7ae64bb11400ec289165d6c Mon Sep 17 00:00:00 2001 From: hacksalot Date: Wed, 6 Jan 2016 03:51:13 -0500 Subject: [PATCH] Introduce global theme partials. --- package.json | 4 +- .../partials => partials/doc}/education.xml | 0 .../partials => partials/doc}/employment.xml | 0 partials/doc/info.xml | 16 +++ partials/doc/projects.xml | 84 ++++++++++++++ .../partials => partials/doc}/recognition.xml | 6 +- .../src/partials => partials/doc}/service.xml | 5 +- partials/doc/skills.xml | 104 ++++++++++++++++++ .../src/partials => partials/doc}/writing.xml | 5 +- partials/html/education.html | 10 ++ partials/html/employment.html | 24 ++++ partials/html/projects.html | 25 +++++ partials/html/recognition.html | 11 ++ partials/html/service.html | 24 ++++ partials/html/skills.html | 23 ++++ partials/html/writing.html | 12 ++ themes/basis/src/html.html | 38 ++++--- themes/compact/src/compact-doc.xml | 1 + themes/compact/src/compact-html.html | 37 ++++--- themes/compact/src/compact-pdf.html | 37 ++++--- themes/compact/src/partials/projects.xml | 84 ++++++++++++++ themes/modern/src/modern-doc.xml | 13 ++- themes/modern/src/partials/projects.xml | 84 ++++++++++++++ themes/positive/src/positive-doc.xml | 11 +- 24 files changed, 599 insertions(+), 59 deletions(-) rename {themes/positive/src/partials => partials/doc}/education.xml (100%) rename {themes/positive/src/partials => partials/doc}/employment.xml (100%) create mode 100644 partials/doc/info.xml create mode 100644 partials/doc/projects.xml rename {themes/positive/src/partials => partials/doc}/recognition.xml (95%) rename {themes/positive/src/partials => partials/doc}/service.xml (96%) create mode 100644 partials/doc/skills.xml rename {themes/positive/src/partials => partials/doc}/writing.xml (95%) create mode 100644 partials/html/education.html create mode 100644 partials/html/employment.html create mode 100644 partials/html/projects.html create mode 100644 partials/html/recognition.html create mode 100644 partials/html/service.html create mode 100644 partials/html/skills.html create mode 100644 partials/html/writing.html create mode 100644 themes/compact/src/partials/projects.xml create mode 100644 themes/modern/src/partials/projects.xml diff --git a/package.json b/package.json index 6eace3d..cda946e 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "fresh-themes", - "version": "0.11.0-beta", + "version": "0.12.0-beta", "description": "Multiformat résumé themes and templates for HackMyResume and FluentCV.", "repository": { "type": "git", "url": "https://github.com/fluentdesk/fresh-themes.git" }, - "main": "themes/README.md", + "main": "README.md", "keywords": [ "résumé", "resume", diff --git a/themes/positive/src/partials/education.xml b/partials/doc/education.xml similarity index 100% rename from themes/positive/src/partials/education.xml rename to partials/doc/education.xml diff --git a/themes/positive/src/partials/employment.xml b/partials/doc/employment.xml similarity index 100% rename from themes/positive/src/partials/employment.xml rename to partials/doc/employment.xml diff --git a/partials/doc/info.xml b/partials/doc/info.xml new file mode 100644 index 0000000..1182bcc --- /dev/null +++ b/partials/doc/info.xml @@ -0,0 +1,16 @@ + + + + + + + {{{sectionTitle "info" "ABOUT}}} + + + + + + + {{{wpml r.info.brief true }}} + + diff --git a/partials/doc/projects.xml b/partials/doc/projects.xml new file mode 100644 index 0000000..e474b66 --- /dev/null +++ b/partials/doc/projects.xml @@ -0,0 +1,84 @@ + + + + + + + {{{sectionTitle "PROJECTS"}}} + + + + {{#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/positive/src/partials/recognition.xml b/partials/doc/recognition.xml similarity index 95% rename from themes/positive/src/partials/recognition.xml rename to partials/doc/recognition.xml index 70e019d..329b715 100644 --- a/themes/positive/src/partials/recognition.xml +++ b/partials/doc/recognition.xml @@ -1,13 +1,15 @@ - + + - + {{{sectionTitle "RECOGNITION"}}} + {{#each r.recognition}} diff --git a/themes/positive/src/partials/service.xml b/partials/doc/service.xml similarity index 96% rename from themes/positive/src/partials/service.xml rename to partials/doc/service.xml index 89da20a..f8ec21c 100644 --- a/themes/positive/src/partials/service.xml +++ b/partials/doc/service.xml @@ -1,13 +1,14 @@ - + - + {{{sectionTitle "SERVICE"}}} + {{#each r.service.history}} diff --git a/partials/doc/skills.xml b/partials/doc/skills.xml new file mode 100644 index 0000000..3031286 --- /dev/null +++ b/partials/doc/skills.xml @@ -0,0 +1,104 @@ + + + + + + + + {{{sectionTitle "SKILLS"}}} + + + + + + + + + + + + + + + + {{#each r.skills.sets}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{{ name }}} + + + + + + + + + {{#each skills }}{{ this }}{{#unless @last}} {{/unless}}{{/each}} + + + + + + {{/each}} + + + diff --git a/themes/positive/src/partials/writing.xml b/partials/doc/writing.xml similarity index 95% rename from themes/positive/src/partials/writing.xml rename to partials/doc/writing.xml index 98ba434..c32215e 100644 --- a/themes/positive/src/partials/writing.xml +++ b/partials/doc/writing.xml @@ -1,13 +1,14 @@ - + - + {{{sectionTitle "WRITING"}}} + {{#each r.writing}} diff --git a/partials/html/education.html b/partials/html/education.html new file mode 100644 index 0000000..89fc82a --- /dev/null +++ b/partials/html/education.html @@ -0,0 +1,10 @@ +{{#section "education"}} +
+
+

{{{sectionTitle "Education"}}}

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

{{{ institution }}} {{dateRange .}}

+ {{/each}} +
+{{/section}} diff --git a/partials/html/employment.html b/partials/html/employment.html new file mode 100644 index 0000000..f9eadb8 --- /dev/null +++ b/partials/html/employment.html @@ -0,0 +1,24 @@ +{{#section "employment"}} +
+
+

{{{sectionTitle "Employment"}}}

+
+ {{#each r.employment.history}} +

{{ position }}, + {{#if url }} + {{ employer }} + {{else}} + {{ employer }} + {{/if}} + {{dateRange .}}

+

{{{ summary }}}

+ {{#if highlights}} +
    + {{#each highlights}} +
  • {{{ this }}}
    • + {{/each}} +
+ {{/if}} + {{/each}} +
+{{/section}} diff --git a/partials/html/projects.html b/partials/html/projects.html new file mode 100644 index 0000000..42e1f9e --- /dev/null +++ b/partials/html/projects.html @@ -0,0 +1,25 @@ +{{#section 'projects'}} +
+
+
+

{{{sectionTitle "Projects"}}}

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

{{#if role}}{{camelCase role }},{{/if}} + {{#if url}} + {{ title }} + {{else}} + {{ title }} + {{/if}} + {{dateRange .}}

+ {{{ summary }}} + {{#if proj.highlights}} +
    + {{#each highlights}} +
  • {{{ this }}}
    • + {{/each}} +
+ {{/if}} + {{/each}} +
+{{/section}} diff --git a/partials/html/recognition.html b/partials/html/recognition.html new file mode 100644 index 0000000..d09e7d3 --- /dev/null +++ b/partials/html/recognition.html @@ -0,0 +1,11 @@ +{{#section "recognition"}} +
+
+

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

+
+ {{#each r.recognition}} +

{{ title }}, {{ from }} {{formatDate safe.date 'YYYY' }}

+ {{ summary }} + {{/each}} +
+{{/section}} diff --git a/partials/html/service.html b/partials/html/service.html new file mode 100644 index 0000000..09c7806 --- /dev/null +++ b/partials/html/service.html @@ -0,0 +1,24 @@ +{{#section "service"}} +
+
+

{{{sectionTitle "Service"}}}

+
+ {{#each r.service.history}} +

{{ position }}, + {{#if url}} + {{ organization }} + {{else}} + {{ organization }} + {{/if}} + {{dateRange .}}

+

{{{ summary }}}

+ {{#if highlights}} +
    + {{#each highlights}} +
  • {{{ this }}}
    • + {{/each}} +
+ {{/if}} + {{/each}} +
+{{/section}} diff --git a/partials/html/skills.html b/partials/html/skills.html new file mode 100644 index 0000000..262bd4a --- /dev/null +++ b/partials/html/skills.html @@ -0,0 +1,23 @@ +{{#section "skills"}} +
+
+

{{{sectionTitle "Skills"}}}

+
+ + + + + + + + + {{#each r.skills.sets}} + + + + + {{/each}} + +
SkillKeywords
{{ name }}{{#each skills}}{{ this }} {{/each}}
+
+{{/section}} diff --git a/partials/html/writing.html b/partials/html/writing.html new file mode 100644 index 0000000..ba0fbae --- /dev/null +++ b/partials/html/writing.html @@ -0,0 +1,12 @@ +{{#section "writing"}} +
+
+

{{{sectionTitle "Writing"}}}

+
+ {{#each r.writing }} +

{{#if url}}{{{ title }}}{{else}}{{{ title }}}{{/if}}, + {{ publisher.name }} {{formatDate safe.date 'YYYY'}}

+ {{# if summary}}{{{ summary }}}{{/if}} + {{/each}} +
+{{/section}} diff --git a/themes/basis/src/html.html b/themes/basis/src/html.html index 80cb185..1071453 100644 --- a/themes/basis/src/html.html +++ b/themes/basis/src/html.html @@ -3,7 +3,6 @@ {{ RAW.name }} - {{{styleSheet "html.css"}}} @@ -17,6 +16,8 @@ + + {{#has "info.brief"}}
{{{ r.info.brief }}} @@ -24,6 +25,7 @@ {{/has}} + {{#section "skills"}}
@@ -55,7 +57,6 @@

{{{sectionTitle "Employment"}}}

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

{{ position }}, {{#if url }} @@ -63,7 +64,7 @@ {{else}} {{ employer }} {{/if}} - {{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }}

+ {{dateRange .}}

{{{ summary }}}

{{#if highlights}}
    @@ -73,10 +74,11 @@
{{/if}} {{/each}} -
{{/section}} + + {{#section 'projects'}}
@@ -84,12 +86,13 @@

{{{sectionTitle "Projects"}}}

{{#each r.projects}} +

{{#if role}}{{camelCase role }},{{/if}} {{#if url}} -

{{ role }}, {{ title }}

+ {{ title }} {{else}} -

{{ role }}, {{ title }}

+ {{ title }} {{/if}} - {{formatDate safe.start 'YYYY-MM' }}—{{formatDate safe.end 'YYYY-MM' }} + {{dateRange .}} {{{ summary }}} {{#if proj.highlights}}
    @@ -99,22 +102,24 @@
{{/if}} {{/each}} -
{{/section}} + + {{#section "education"}}

{{{sectionTitle "Education"}}}

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

{{{ institution }}} {{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY' }}

+

{{{ institution }}} {{dateRange .}}

{{/each}} -
{{/section}} + + {{#section "service"}}
@@ -127,7 +132,7 @@ {{else}} {{ organization }} {{/if}} - {{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY' }} + {{dateRange .}}

{{{ summary }}}

{{#if highlights}}
    @@ -137,10 +142,11 @@
{{/if}} {{/each}} -
{{/section}} + + {{#section "writing"}}
@@ -148,24 +154,28 @@
{{#each r.writing }}

{{#if url}}{{{ title }}}{{else}}{{{ title }}}{{/if}}, - {{ publisher }} {{formatDate safe.date 'YYYY'}}

+ {{ publisher.name }} {{formatDate safe.date 'YYYY'}} {{# if summary}}{{{ summary }}}{{/if}} {{/each}}
{{/section}} + + {{#section "recognition"}}

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

{{#each r.recognition}} -

{{ title }}, {{ from }} {{formatDate safe.date 'YYYY' }}

+

{{ title }}, {{ from }} {{formatDate safe.date 'YYYY' }}

{{ summary }} {{/each}}
{{/section}} + + diff --git a/themes/compact/src/compact-doc.xml b/themes/compact/src/compact-doc.xml index 7a87ff3..b34c071 100644 --- a/themes/compact/src/compact-doc.xml +++ b/themes/compact/src/compact-doc.xml @@ -515,6 +515,7 @@ {{{wpml RAW.info.brief }}} {{#section "skills"}}{{> skills }}{{/section}} {{#section "employment"}}{{> employment }}{{/section}} + {{#section "projects"}}{{> projects }}{{/section}} {{#section "education"}}{{> education }}{{/section}} diff --git a/themes/compact/src/compact-html.html b/themes/compact/src/compact-html.html index 44429be..3d93a00 100644 --- a/themes/compact/src/compact-html.html +++ b/themes/compact/src/compact-html.html @@ -17,6 +17,8 @@ + + {{#has "info.brief"}}
{{{ r.info.brief }}} @@ -24,6 +26,7 @@ {{/has}} + {{#section "skills"}}
@@ -55,7 +58,6 @@

{{{sectionTitle "Employment"}}}

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

{{ position }}, {{#if url }} @@ -63,7 +65,7 @@ {{else}} {{ employer }} {{/if}} - {{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }}

+ {{dateRange .}}

{{{ summary }}}

{{#if highlights}}
    @@ -73,10 +75,11 @@
{{/if}} {{/each}} -
{{/section}} + + {{#section 'projects'}}
@@ -84,12 +87,13 @@

{{{sectionTitle "Projects"}}}

{{#each r.projects}} +

{{#if role}}{{camelCase role }},{{/if}} {{#if url}} -

{{ role }}, {{ title }}

+ {{ title }} {{else}} -

{{ role }}, {{ title }}

+ {{ title }} {{/if}} - {{formatDate safe.start 'YYYY-MM' }}—{{formatDate safe.end 'YYYY-MM' }} + {{dateRange .}} {{{ summary }}} {{#if proj.highlights}}
    @@ -99,22 +103,24 @@
{{/if}} {{/each}} -
{{/section}} + + {{#section "education"}}

{{{sectionTitle "Education"}}}

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

{{{ institution }}} {{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY' }}

+

{{{ institution }}} {{dateRange .}}

{{/each}} -
{{/section}} + + {{#section "service"}}
@@ -127,7 +133,7 @@ {{else}} {{ organization }} {{/if}} - {{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY' }} + {{dateRange .}}

{{{ summary }}}

{{#if highlights}}
    @@ -137,10 +143,11 @@
{{/if}} {{/each}} -
{{/section}} + + {{#section "writing"}}
@@ -148,24 +155,28 @@
{{#each r.writing }}

{{#if url}}{{{ title }}}{{else}}{{{ title }}}{{/if}}, - {{ publisher }} {{formatDate safe.date 'YYYY'}}

+ {{ publisher.name }} {{formatDate safe.date 'YYYY'}} {{# if summary}}{{{ summary }}}{{/if}} {{/each}}
{{/section}} + + {{#section "recognition"}}

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

{{#each r.recognition}} -

{{ title }}, {{ from }} {{formatDate safe.date 'YYYY' }}

+

{{ title }}, {{ from }} {{formatDate safe.date 'YYYY' }}

{{ summary }} {{/each}}
{{/section}} + + diff --git a/themes/compact/src/compact-pdf.html b/themes/compact/src/compact-pdf.html index 2f98545..d717f4b 100644 --- a/themes/compact/src/compact-pdf.html +++ b/themes/compact/src/compact-pdf.html @@ -18,6 +18,8 @@ + + {{#has "info.brief"}}
{{{ r.info.brief }}} @@ -25,6 +27,7 @@ {{/has}} + {{#section "skills"}}
@@ -56,7 +59,6 @@

{{{sectionTitle "Employment"}}}

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

{{ position }}, {{#if url }} @@ -64,7 +66,7 @@ {{else}} {{ employer }} {{/if}} - {{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }}

+ {{dateRange .}}

{{{ summary }}}

{{#if highlights}}
    @@ -74,10 +76,11 @@
{{/if}} {{/each}} -
{{/section}} + + {{#section 'projects'}}
@@ -85,12 +88,13 @@

{{{sectionTitle "Projects"}}}

{{#each r.projects}} +

{{#if role}}{{camelCase role }},{{/if}} {{#if url}} -

{{ role }}, {{ title }}

+ {{ title }} {{else}} -

{{ role }}, {{ title }}

+ {{ title }} {{/if}} - {{formatDate safe.start 'YYYY-MM' }}—{{formatDate safe.end 'YYYY-MM' }} + {{dateRange .}} {{{ summary }}} {{#if proj.highlights}}
    @@ -100,22 +104,24 @@
{{/if}} {{/each}} -
{{/section}} + + {{#section "education"}}

{{{sectionTitle "Education"}}}

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

{{{ institution }}} {{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY' }}

+

{{{ institution }}} {{dateRange .}}

{{/each}} -
{{/section}} + + {{#section "service"}}
@@ -128,7 +134,7 @@ {{else}} {{ organization }} {{/if}} - {{formatDate safe.start 'YYYY' }} — {{formatDate safe.end 'YYYY' }} + {{dateRange .}}

{{{ summary }}}

{{#if highlights}}
    @@ -138,10 +144,11 @@
{{/if}} {{/each}} -
{{/section}} + + {{#section "writing"}}
@@ -149,24 +156,28 @@
{{#each r.writing }}

{{#if url}}{{{ title }}}{{else}}{{{ title }}}{{/if}}, - {{ publisher }} {{formatDate safe.date 'YYYY'}}

+ {{ publisher.name }} {{formatDate safe.date 'YYYY'}} {{# if summary}}{{{ summary }}}{{/if}} {{/each}}
{{/section}} + + {{#section "recognition"}}

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

{{#each r.recognition}} -

{{ title }}, {{ from }} {{formatDate safe.date 'YYYY' }}

+

{{ title }}, {{ from }} {{formatDate safe.date 'YYYY' }}

{{ summary }} {{/each}}
{{/section}} + + diff --git a/themes/compact/src/partials/projects.xml b/themes/compact/src/partials/projects.xml new file mode 100644 index 0000000..155851a --- /dev/null +++ b/themes/compact/src/partials/projects.xml @@ -0,0 +1,84 @@ + + + + + + + {{{sectionTitle "PROJECTS"}}} + + + + {{#each r.projects}} + + + + + + + + + + + {{ role }}, + + {{#if url}}{{/if}} + + {{#if url}} + + + + {{/if}} + {{ title }} + + {{#if url}}{{/if}} + + + + + {{formatDate safe.start 'YYYY-MM'}} — {{formatDate safe.end 'YYYY-MM'}} + + + + + + + + + {{{wpml summary true }}} + + + + {{#each highlights }} + + + + + + + + + + + + + + {{{wpml this true}}} + + + {{/each}} + + + + {{/each}} + + diff --git a/themes/modern/src/modern-doc.xml b/themes/modern/src/modern-doc.xml index dd3ea6f..f90ecd4 100644 --- a/themes/modern/src/modern-doc.xml +++ b/themes/modern/src/modern-doc.xml @@ -486,12 +486,13 @@ {{#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}} + {{#section "skills"}}{{> doc-skills.xml }}{{/section}} + {{#section "employment"}}{{> doc-employment.xml }}{{/section}} + {{#section "projects"}}{{> doc-projects.xml }}{{/section}} + {{#section "education"}}{{> doc-education.xml }}{{/section}} + {{#section "service"}}{{> doc-service.xml }}{{/section}} + {{#section "writing"}}{{> doc-writing.xml }}{{/section}} + {{#section "recognition"}}{{> doc-recognition.xml }}{{/section}} diff --git a/themes/modern/src/partials/projects.xml b/themes/modern/src/partials/projects.xml new file mode 100644 index 0000000..e474b66 --- /dev/null +++ b/themes/modern/src/partials/projects.xml @@ -0,0 +1,84 @@ + + + + + + + {{{sectionTitle "PROJECTS"}}} + + + + {{#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/positive/src/positive-doc.xml b/themes/positive/src/positive-doc.xml index 5209290..07451f7 100644 --- a/themes/positive/src/positive-doc.xml +++ b/themes/positive/src/positive-doc.xml @@ -529,11 +529,12 @@ {{/has}} {{#section "skills"}}{{> skills }}{{/section}} - {{#section "employment"}}{{> employment }}{{/section}} - {{#section "education"}}{{> education }}{{/section}} - {{#section "service"}}{{> service }}{{/section}} - {{#section "writing"}}{{> writing }}{{/section}} - {{#section "recognition"}}{{> recognition }}{{/section}} + {{#section "employment"}}{{> doc-employment.xml }}{{/section}} + {{#section "education"}}{{> doc-education.xml }}{{/section}} + {{#section "projects"}}{{> doc-projects.xml }}{{/section}} + {{#section "service"}}{{> doc-service.xml }}{{/section}} + {{#section "writing"}}{{> doc-writing.xml }}{{/section}} + {{#section "recognition"}}{{> doc-recognition.xml }}{{/section}}