diff --git a/partials/doc/section/interests.xml b/partials/doc/section/interests.xml new file mode 100644 index 0000000..b6455ff --- /dev/null +++ b/partials/doc/section/interests.xml @@ -0,0 +1,32 @@ + + + {{#> header-interests }} + {{> header-interests _title="INTERESTS" _section="interests" }} + {{/header-interests}} + + + + {{#each r.interests}} + + + + + + + + + {{{ name }}} + + {{#if keywords}} + + + + + {{#each keywords}}{{{ . }}}{{/each}} + + {{/if}} + + {{/each}} + + + diff --git a/partials/html/section/interests.html b/partials/html/section/interests.html new file mode 100644 index 0000000..fc89378 --- /dev/null +++ b/partials/html/section/interests.html @@ -0,0 +1,18 @@ +{{#section "interests"}} +
+
+ {{#> header-interests }} + {{> header-icon _title="INTERESTS" _section="interests" _hdricon=(lookup . '_icon') }} + {{/header-interests}} + {{#each r.interests}} + {{#> body-interests }} +
+

{{{ name }}}

+ {{formatDate safe.date 'YYYY' }} + {{{ summary }}} + {{> highlights }} +
+ {{/body-interests}} + {{/each}} +
+{{/section}} diff --git a/partials/md/section/interests.hbs b/partials/md/section/interests.hbs new file mode 100644 index 0000000..9466b5d --- /dev/null +++ b/partials/md/section/interests.hbs @@ -0,0 +1,12 @@ +{{#section "interests"}} +## {{{sectionTitle "INTERESTS"}}} + +{{#each r.interests}} +- {{{toUpper name }}}{{#if keywords}}: {{#each keywords}}{{{ . }}} {{/each}}{{/if}} +{{#if summary}} +{{{ summary }}} +{{/if}} + +{{/each}} + +{{/section}} diff --git a/partials/md/section/recognition.hbs b/partials/md/section/recognition.hbs index 5a6a77a..08970d2 100644 --- a/partials/md/section/recognition.hbs +++ b/partials/md/section/recognition.hbs @@ -1,10 +1,12 @@ -{{#section 'recognition'}} +{{#section "recognition"}} ## {{{sectionTitle "RECOGNITION"}}} {{#each r.recognition}} -### *{{{ title }}}*, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }}) +### {{{ title }}}{{#if from}}, {{{ from }}}{{/if}} +{{~#has 'safe.date'}} ({{formatDate safe.date 'MMM YYYY' }}){{/has}} +{{~#if summary}} -{{{ summary }}} +{{{ summary }}}{{/if}} {{/each}} {{/section}} diff --git a/partials/txt/section/interests.hbs b/partials/txt/section/interests.hbs new file mode 100644 index 0000000..06017c1 --- /dev/null +++ b/partials/txt/section/interests.hbs @@ -0,0 +1,12 @@ +{{#section "interests"}} +{{{sectionTitle "INTERESTS"}}} ---------------------------------------------------------------------- + +{{#each r.interests}} +{{{toUpper name }}}{{#if keywords}}: {{#each keywords}}{{{ . }}} {{/each}}{{/if}} +{{~#if summary}} + +{{{ summary }}}{{/if}} + +{{/each}} + +{{/section}} diff --git a/partials/txt/section/recognition.hbs b/partials/txt/section/recognition.hbs index 9af97db..b67efd3 100644 --- a/partials/txt/section/recognition.hbs +++ b/partials/txt/section/recognition.hbs @@ -2,8 +2,11 @@ {{{sectionTitle "RECOGNITION"}}} -------------------------------------------------------------------- {{#each r.recognition}} -{{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }}) -{{{ summary }}} +{{{ title }}}{{#if from}}, {{{ from }}}{{/if}} +{{~#has 'safe.date'}} ({{formatDate safe.date 'MMM YYYY' }}){{/has}} +{{~#if summary}} + +{{{ summary }}}{{/if}} {{/each}} {{/section}} diff --git a/partials/txt/section/writing.hbs b/partials/txt/section/writing.hbs index da15843..b6420d6 100644 --- a/partials/txt/section/writing.hbs +++ b/partials/txt/section/writing.hbs @@ -3,7 +3,8 @@ {{#each r.writing}} {{{ title }}}{{#has 'safe.date'}} ({{formatDate safe.date 'YYYY-MM' }}){{/has}} -{{{ summary }}} +{{#if summary}}{{{ summary }}} +{{/if}} {{/each}} {{/section}} diff --git a/themes/basis/src/html.html b/themes/basis/src/html.html index aa3e843..fd43ead 100644 --- a/themes/basis/src/html.html +++ b/themes/basis/src/html.html @@ -55,6 +55,10 @@ {{> section/speaking }} +{{> section/references }} + +{{> section/interests }} + diff --git a/themes/basis/src/md.txt b/themes/basis/src/md.txt index 660cad5..748fc7a 100644 --- a/themes/basis/src/md.txt +++ b/themes/basis/src/md.txt @@ -29,3 +29,5 @@ {{> section/speaking }} {{> section/references }} + +{{> section/interests }} diff --git a/themes/basis/src/pdf.html b/themes/basis/src/pdf.html index aa3e843..fd43ead 100644 --- a/themes/basis/src/pdf.html +++ b/themes/basis/src/pdf.html @@ -55,6 +55,10 @@ {{> section/speaking }} +{{> section/references }} + +{{> section/interests }} + diff --git a/themes/basis/src/txt.txt b/themes/basis/src/txt.txt index 23d0a16..732464c 100644 --- a/themes/basis/src/txt.txt +++ b/themes/basis/src/txt.txt @@ -27,3 +27,5 @@ {{> section/recognition }} {{> section/references }} + +{{> section/interests }} diff --git a/themes/modern/src/modern-doc.xml b/themes/modern/src/modern-doc.xml index 054970a..7d88c51 100644 --- a/themes/modern/src/modern-doc.xml +++ b/themes/modern/src/modern-doc.xml @@ -204,6 +204,7 @@ {{#*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}} + {{#*inline "header-interests"}}{{> header-icon _title="INTERESTS" _section="interests" _icon="pict/arrow" }}{{/inline}} {{!