diff --git a/partials/html/section/writing.hbs b/partials/html/section/writing.hbs index ab09e51..8c63f90 100644 --- a/partials/html/section/writing.hbs +++ b/partials/html/section/writing.hbs @@ -8,7 +8,8 @@ {{#> body-writing }}

{{#if url}}{{{ title }}}{{else}}{{{ title }}}{{/if}}, - {{ publisher.name }}

+ + {{stringOrObject publisher "name" }} {{date date 'YYYY'}} {{{ summary }}} {{> highlights }} diff --git a/partials/md/section/speaking.hbs b/partials/md/section/speaking.hbs index e72fd81..445f932 100644 --- a/partials/md/section/speaking.hbs +++ b/partials/md/section/speaking.hbs @@ -6,10 +6,9 @@ {{{ summary }}} {{#if highlights}} + {{#each highlights}} - {{{ this }}} -{{/each}} -{{/if}} - +{{/each}}{{/if}} {{/each}} {{/section}} diff --git a/partials/md/section/writing.hbs b/partials/md/section/writing.hbs index 4d862a8..b7d92ac 100644 --- a/partials/md/section/writing.hbs +++ b/partials/md/section/writing.hbs @@ -1,13 +1,8 @@ {{#section 'writing'}} -## WRITING +## {{{sectionTitle "WRITING"}}} {{#each r.writing}} -{{#if url}} -### [{{{ title }}}]({{{ url }}}) ({{date date}}) -{{else}} -### {{{ title }}} ({{date date}}) -{{/if}} - +### ***{{linkMD title url}}*** ({{#if publisher}}{{stringOrObject publisher "name"}}, {{/if}}{{date date}}) {{{ summary }}} {{/each}} diff --git a/partials/txt/section/extracurricular.hbs b/partials/txt/section/extracurricular.hbs index 59c6fe0..4c7a26d 100644 --- a/partials/txt/section/extracurricular.hbs +++ b/partials/txt/section/extracurricular.hbs @@ -3,7 +3,8 @@ {{#each r.extracurricular }} {{{ title }}}, {{{ activity }}} ({{dateRange .}}) -{{{ summary }}} +{{#if summary}}{{{ summary }}} +{{/if}} {{#if highlights}} {{#each highlights}} - {{{ this }}} diff --git a/partials/txt/section/governance.hbs b/partials/txt/section/governance.hbs index dbd740c..a7711b5 100644 --- a/partials/txt/section/governance.hbs +++ b/partials/txt/section/governance.hbs @@ -3,15 +3,13 @@ {{#each r.governance }} {{#if role}}{{{ role }}}, {{/if}}{{{ organization }}}{{#has 'start'}} ({{dateRange .}}){{/has}} -{{~#if summary}} - -{{{ summary }}}{{/if}} - -{{~#if highlights}} - +{{#if summary}}{{{ summary }}} +{{/if}} +{{#if highlights}} {{#each highlights}} - {{{ this }}} -{{/each}}{{/if}} +{{/each}} +{{/if}} {{/each}} {{/section}} diff --git a/partials/txt/section/info.hbs b/partials/txt/section/info.hbs index 900069b..58b428f 100644 --- a/partials/txt/section/info.hbs +++ b/partials/txt/section/info.hbs @@ -1 +1,4 @@ -{{#has 'info.brief' }}{{{ r.info.brief }}}{{/has}} +{{#has 'info.brief' }} +{{{ r.info.brief }}} + +{{/has}} diff --git a/partials/txt/section/samples.hbs b/partials/txt/section/samples.hbs index 0df6d87..f29196b 100644 --- a/partials/txt/section/samples.hbs +++ b/partials/txt/section/samples.hbs @@ -3,7 +3,6 @@ {{#each r.samples }} {{{ title }}} ({{date date}}) - {{{ summary }}} {{#if highlights}} {{#each highlights}} diff --git a/partials/txt/section/skills.hbs b/partials/txt/section/skills.hbs index 980a547..d904a92 100644 --- a/partials/txt/section/skills.hbs +++ b/partials/txt/section/skills.hbs @@ -4,4 +4,5 @@ {{#each r.skills.sets}} - {{{ name }}}: {{#each skills}}{{{ . }}} {{/each}} {{/each}} + {{/section}} diff --git a/partials/txt/section/writing.hbs b/partials/txt/section/writing.hbs index 8d76eb3..9b1f58c 100644 --- a/partials/txt/section/writing.hbs +++ b/partials/txt/section/writing.hbs @@ -2,7 +2,7 @@ {{{sectionTitle "WRITING"}}} ------------------------------------------------------------------------ {{#each r.writing}} -{{{ title }}}{{#if date}} ({{date date}}){{/if}} +{{{ title }}} ({{#if publisher}}{{stringOrObject publisher "name" }}{{/if}}{{#if date}}, {{date date}}{{/if}}) {{#if summary}}{{{ summary }}} {{/if}} diff --git a/themes/basis/src/txt.txt b/themes/basis/src/txt.txt index 89d8acb..5a6639c 100644 --- a/themes/basis/src/txt.txt +++ b/themes/basis/src/txt.txt @@ -4,6 +4,7 @@ {{#has 'contact.website' }}Web: {{{ r.contact.website }}}{{/has}} ================================================================================ + {{> section/info }} {{> section/skills }}