diff --git a/partials/doc/section/reading.xml b/partials/doc/section/reading.xml new file mode 100644 index 0000000..d4bde94 --- /dev/null +++ b/partials/doc/section/reading.xml @@ -0,0 +1,68 @@ + + + {{#> header-reading }} + {{> header-simple _title="READING" _section="reading" }} + {{/header-reading}} + + {{#each r.reading}} + + + + + + + + + {{#if url}}{{/if}} + + {{#if url}} + + + + {{/if}} + {{{ title }}} + + {{#if url}}{{/if}} + + + + {{#if author}} + + , {{{ author }}} + + {{/if}} + + {{#if summary}} + + + + + + + {{{wpml summary true}}} + + {{/if}} + + {{#each highlights }} + + + + + + + + + + + + + + {{{wpml this true}}} + + {{/each}} + + + + {{/each}} + + diff --git a/partials/html/section/reading.html b/partials/html/section/reading.html new file mode 100644 index 0000000..143e8c3 --- /dev/null +++ b/partials/html/section/reading.html @@ -0,0 +1,17 @@ +{{#section "reading"}} +
+
+ {{#> header-reading }} + {{> header-icon _title="READING" _section="reading" _hdricon=(lookup . '_icon') }} + {{/header-reading}} + {{#each r.reading }} + {{#> body-reading }} +
+

{{#if url}}{{{ title }}}{{else}}{{{ title }}}{{/if}}{{#if author}}, {{{ author }}}{{/if}}

+ {{formatDate safe.date 'YYYY'}} + {{{ summary }}} +
+ {{/body-reading}} + {{/each}} +
+{{/section}} diff --git a/partials/md/section/reading.hbs b/partials/md/section/reading.hbs new file mode 100644 index 0000000..8957b00 --- /dev/null +++ b/partials/md/section/reading.hbs @@ -0,0 +1,12 @@ +{{#section "reading"}} +## {{{sectionTitle "READING"}}} + +{{#each r.reading}} +{{#if url}}### [*{{{ title }}}*]({{{url}}}){{#if author}}, {{{ author }}}{{/if}} +{{else}}### *{{{ title }}}*{{#if author}}, {{{ author }}}{{/if}} +{{/if}} +{{#if summary}}{{{ summary }}} +{{/if}} + +{{/each}} +{{/section}} diff --git a/partials/txt/section/reading.hbs b/partials/txt/section/reading.hbs new file mode 100644 index 0000000..5df3297 --- /dev/null +++ b/partials/txt/section/reading.hbs @@ -0,0 +1,14 @@ +{{#section "reading"}} +{{{sectionTitle "READING"}}} ------------------------------------------------------------------------ + +{{#each r.reading}} +"{{{ title }}}"{{#if author}}, {{{ author }}}{{/if}} +{{#if url}}{{{ url }}} +{{/if}} +{{#if summary }}{{{ summary }}} +{{/if}} +{{#if date}}{{{ date }}} +{{/if}} + +{{/each}} +{{/section}} diff --git a/themes/basis/src/html.html b/themes/basis/src/html.html index 90b1059..96a4845 100644 --- a/themes/basis/src/html.html +++ b/themes/basis/src/html.html @@ -47,6 +47,8 @@ {{> section/writing }} +{{> section/reading }} + {{> section/recognition }} {{> section/speaking }} diff --git a/themes/basis/src/md.txt b/themes/basis/src/md.txt index 8c15fc6..d146690 100644 --- a/themes/basis/src/md.txt +++ b/themes/basis/src/md.txt @@ -18,6 +18,8 @@ {{> section/writing }} +{{> section/reading }} + {{> section/service }} {{> section/recognition }} diff --git a/themes/basis/src/pdf.html b/themes/basis/src/pdf.html index 90b1059..96a4845 100644 --- a/themes/basis/src/pdf.html +++ b/themes/basis/src/pdf.html @@ -47,6 +47,8 @@ {{> section/writing }} +{{> section/reading }} + {{> section/recognition }} {{> section/speaking }} diff --git a/themes/basis/src/txt.txt b/themes/basis/src/txt.txt index 51ac468..63c8f64 100644 --- a/themes/basis/src/txt.txt +++ b/themes/basis/src/txt.txt @@ -18,6 +18,8 @@ {{> section/writing }} +{{> section/reading }} + {{> section/service }} {{> section/recognition }} diff --git a/themes/compact/src/compact-doc.xml b/themes/compact/src/compact-doc.xml index 32a04d7..c09dd24 100644 --- a/themes/compact/src/compact-doc.xml +++ b/themes/compact/src/compact-doc.xml @@ -362,7 +362,9 @@ {{#section "education"}}{{> section/education }}{{/section}} {{#section "service"}}{{> section/service }}{{/section}} {{#section "writing"}}{{> section/writing }}{{/section}} + {{#section "reading"}}{{> section/reading }}{{/section}} {{#section "recognition"}}{{> section/recognition }}{{/section}} + {{#section "references"}}{{> section/references }}{{/section}} diff --git a/themes/compact/src/compact-html.html b/themes/compact/src/compact-html.html index 0076f95..3f91018 100644 --- a/themes/compact/src/compact-html.html +++ b/themes/compact/src/compact-html.html @@ -30,6 +30,7 @@ {{#*inline "icon-service"}}{{/inline}} {{#*inline "icon-samples"}}{{/inline}} {{#*inline "icon-writing"}}{{/inline}} +{{#*inline "icon-reading"}}{{/inline}} {{#*inline "icon-recognition"}}{{/inline}} {{#*inline "icon-speaking"}}{{/inline}} {{#*inline "icon-testimonials"}}{{/inline}} @@ -90,6 +91,7 @@ {{> section/service _icon="icon-service"}} {{> section/samples _icon="icon-samples"}} {{> section/writing _icon="icon-writing"}} +{{> section/reading _icon="icon-reading"}} {{> section/recognition _icon="icon-recognition"}} {{> section/speaking _icon="icon-speaking"}} {{> section/testimonials _icon="icon-testimonials"}} diff --git a/themes/compact/src/compact-pdf.html b/themes/compact/src/compact-pdf.html index 3aae33f..174de23 100644 --- a/themes/compact/src/compact-pdf.html +++ b/themes/compact/src/compact-pdf.html @@ -18,7 +18,66 @@ +{{!}} + +{{#*inline "icon-skills"}}{{/inline}} +{{#*inline "icon-employment"}}{{/inline}} +{{#*inline "icon-projects"}}{{/inline}} +{{#*inline "icon-education"}}{{/inline}} +{{#*inline "icon-service"}}{{/inline}} +{{#*inline "icon-samples"}}{{/inline}} +{{#*inline "icon-writing"}}{{/inline}} +{{#*inline "icon-reading"}}{{/inline}} +{{#*inline "icon-recognition"}}{{/inline}} +{{#*inline "icon-speaking"}}{{/inline}} +{{#*inline "icon-testimonials"}}{{/inline}} +{{#*inline "icon-references"}}{{/inline}} + +{{#*inline "body-employment" }} +
+

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

+ {{dateRange .}} +

{{{ summary }}}

+ {{> highlights }} + {{#if keywords}} + {{#each keywords}}{{{ . }}} {{/each}} + {{/if}} +
+{{/inline}} + +{{#*inline "body-projects" }} +
+

{{ role }}, + {{#if url }} + {{ title }} + {{else}} + {{ title }} + {{/if}} +

+ {{dateRange .}} +

{{{ summary }}}

+ {{> highlights }} + {{#if keywords}} + {{#each keywords}}{{{ . }}} {{/each}} + {{/if}} +
+{{/inline}} + +{{!}} {{#has "info.brief"}}
@@ -26,49 +85,18 @@
{{/has}} - - -{{!}} - -{{#*inline "icon-skills"}}{{/inline}} -{{> section/skills }} - -{{#*inline "icon-employment"}}{{/inline}} -{{> section/employment }} - -{{#*inline "icon-projects"}}{{/inline}} -{{> section/projects }} - -{{#*inline "icon-education"}}{{/inline}} -{{> section/education }} - -{{#*inline "icon-service"}}{{/inline}} -{{> section/service }} - -{{#*inline "icon-samples"}}{{/inline}} -{{> section/samples }} - -{{#*inline "icon-writing"}}{{/inline}} -{{> section/writing }} - -{{#*inline "icon-recognition"}}{{/inline}} -{{> section/recognition }} - -{{#*inline "icon-speaking"}}{{/inline}} -{{> section/speaking }} - -{{#*inline "icon-testimonials"}}{{/inline}} -{{> section/testimonials }} - -{{#*inline "icon-references"}}{{/inline}} -{{> section/references }} - - +{{> section/skills _icon="icon-skills"}} +{{> section/employment _icon="icon-employment"}} +{{> section/projects _icon="icon-projects"}} +{{> section/education _icon="icon-education"}} +{{> section/service _icon="icon-service"}} +{{> section/samples _icon="icon-samples"}} +{{> section/writing _icon="icon-writing"}} +{{> section/reading _icon="icon-reading"}} +{{> section/recognition _icon="icon-recognition"}} +{{> section/speaking _icon="icon-speaking"}} +{{> section/testimonials _icon="icon-testimonials"}} +{{> section/references _icon="icon-references"}} diff --git a/themes/modern/src/modern-doc.xml b/themes/modern/src/modern-doc.xml index 8c53dd7..054970a 100644 --- a/themes/modern/src/modern-doc.xml +++ b/themes/modern/src/modern-doc.xml @@ -200,6 +200,7 @@ {{#*inline "header-education"}}{{> header-icon _title="EDUCATION" _section="education" _icon="pict/edu" }}{{/inline}} {{#*inline "header-service"}}{{> header-icon _title="SERVICE" _section="service" _icon="pict/srv" }}{{/inline}} {{#*inline "header-writing"}}{{> header-icon _title="WRITING" _section="writing" _icon="pict/wri" }}{{/inline}} + {{#*inline "header-reading"}}{{> header-icon _title="READING" _section="reading" _icon="pict/wri" }}{{/inline}} {{#*inline "header-recognition"}}{{> header-icon _title="RECOGNITION" _section="recognition" _icon="pict/rec" }}{{/inline}} {{#*inline "header-speaking"}}{{> header-icon _title="SPEAKING" _section="speaking" _icon="pict/arrow" }}{{/inline}} {{#*inline "header-references"}}{{> header-icon _title="REFERENCES" _section="references" _icon="pict/arrow" }}{{/inline}} @@ -222,6 +223,7 @@ {{#section "education"}}{{> section/education }}{{/section}} {{#section "service"}}{{> section/service }}{{/section}} {{#section "writing"}}{{> section/writing }}{{/section}} + {{#section "writing"}}{{> section/reading }}{{/section}} {{#section "recognition"}}{{> section/recognition }}{{/section}} {{#section "speaking"}}{{> section/speaking }}{{/section}} {{#section "references"}}{{> section/references }}{{/section}} diff --git a/themes/modern/src/modern-html.html b/themes/modern/src/modern-html.html index 95dd8bc..cf1be3c 100644 --- a/themes/modern/src/modern-html.html +++ b/themes/modern/src/modern-html.html @@ -286,6 +286,7 @@ also doesn't render any content. {{#*inline "icon-service"}}{{/inline}} {{#*inline "icon-samples"}}{{/inline}} {{#*inline "icon-writing"}}{{/inline}} +{{#*inline "icon-reading"}}{{/inline}} {{#*inline "icon-recognition"}}{{/inline}} {{#*inline "icon-speaking"}}{{/inline}} {{#*inline "icon-testimonials"}}{{/inline}} @@ -300,6 +301,7 @@ also doesn't render any content. {{> section/service _icon="icon-service"}} {{> section/samples _icon="icon-samples"}} {{> section/writing _icon="icon-writing"}} +{{> section/reading _icon="icon-reading"}} {{> section/recognition _icon="icon-recognition"}} {{> section/speaking _icon="icon-speaking"}} {{> section/testimonials _icon="icon-testimonials"}} diff --git a/themes/modern/src/modern-pdf.html b/themes/modern/src/modern-pdf.html index 7eed183..db0ff88 100644 --- a/themes/modern/src/modern-pdf.html +++ b/themes/modern/src/modern-pdf.html @@ -114,6 +114,7 @@ {{#*inline "icon-service"}}{{/inline}} {{#*inline "icon-samples"}}{{/inline}} {{#*inline "icon-writing"}}{{/inline}} +{{#*inline "icon-reading"}}{{/inline}} {{#*inline "icon-recognition"}}{{/inline}} {{#*inline "icon-speaking"}}{{/inline}} {{#*inline "icon-testimonials"}}{{/inline}} @@ -123,6 +124,7 @@ {{> section/service _icon="icon-service"}} {{> section/samples _icon="icon-samples"}} {{> section/writing _icon="icon-writing"}} +{{> section/reading _icon="icon-reading"}} {{> section/recognition _icon="icon-recognition"}} {{> section/speaking _icon="icon-speaking"}} {{> section/testimonials _icon="icon-testimonials"}} diff --git a/themes/positive/src/positive-doc.xml b/themes/positive/src/positive-doc.xml index 2e654d6..b7236ca 100644 --- a/themes/positive/src/positive-doc.xml +++ b/themes/positive/src/positive-doc.xml @@ -552,6 +552,11 @@ {{/inline}} {{#section "writing"}}{{> section/writing }}{{/section}} + {{#*inline "header-reading"}} + {{> header-icon _title="READING" _section="reading" _icon="pict/wri" }} + {{/inline}} + {{#section "reading"}}{{> section/reading }}{{/section}} + {{#*inline "header-recognition"}} {{> header-icon _title="RECOGNITION" _section="recognition" _icon="pict/rec" }} {{/inline}} diff --git a/themes/positive/src/positive-html.html b/themes/positive/src/positive-html.html index 55dab6b..9a5bfb0 100644 --- a/themes/positive/src/positive-html.html +++ b/themes/positive/src/positive-html.html @@ -55,6 +55,9 @@ {{#*inline "icon-writing"}}{{/inline}} {{> section/writing _icon="icon-writing"}} + {{#*inline "icon-reading"}}{{/inline}} + {{> section/reading _icon="icon-reading"}} + {{#*inline "icon-recognition"}}{{/inline}} {{> section/recognition _icon="icon-recognition"}} diff --git a/themes/positive/src/positive-pdf.html b/themes/positive/src/positive-pdf.html index 3d0a98f..111c124 100644 --- a/themes/positive/src/positive-pdf.html +++ b/themes/positive/src/positive-pdf.html @@ -56,6 +56,9 @@ {{#*inline "icon-writing"}}{{/inline}} {{> section/writing _icon="icon-writing"}} + {{#*inline "icon-reading"}}{{/inline}} + {{> section/reading _icon="icon-reading"}} + {{#*inline "icon-recognition"}}{{/inline}} {{> section/recognition _icon="icon-recognition"}}