1
0
mirror of https://github.com/JuanCanham/fresh-themes.git synced 2025-05-04 12:57:07 +01:00

All: Better section handling & add projects.

This commit is contained in:
hacksalot
2016-01-05 04:50:43 -05:00
parent 6f2a71070e
commit 45d4cd2675
18 changed files with 299 additions and 171 deletions

View File

@ -513,9 +513,9 @@
</w:r>
</w:p> -->
{{{wpml RAW.info.brief }}}
{{#hasSection "skills"}}{{> skills }}{{/hasSection}}
{{#hasSection "employment"}}{{> employment }}{{/hasSection}}
{{#hasSection "education"}}{{> education }}{{/hasSection}}
{{#section "skills"}}{{> skills }}{{/section}}
{{#section "employment"}}{{> employment }}{{/section}}
{{#section "education"}}{{> education }}{{/section}}
<w:sectPr wsp:rsidR="00B43FDC" wsp:rsidRPr="000A3AF0" wsp:rsidSect="001B7422">
<w:pgSz w:w="12240" w:h="15840"/>
<w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/>

View File

@ -25,7 +25,7 @@
{{/has}}
{{#hasSection "skills"}}
{{#section "skills"}}
<section id="skills">
<header>
<h2><span class="fa fa-code"></span> {{{sectionTitle "Skills"}}}</h2><hr>
@ -47,18 +47,17 @@
</tbody>
</table>
</section>
{{/hasSection}}
{{/section}}
{{#hasSection "employment"}}
{{#section "employment"}}
<section id="employment">
<header>
<h2><span class="fa fa-building" style="vertical-align: top;"></span> {{{sectionTitle "Employment"}}}</h2><hr>
</header>
{{#each r.employment.history}}
{{#compare @index 4 operator="<"}}
<h3><em>{{ position }}</em>,
{{#if url }}
<a href="{{ url }}">{{ employer }}</a>
@ -74,27 +73,39 @@
{{/each}}
</ul>
{{/if}}
{{/compare}}
{{#compare @index 4 operator=">="}}
{{#compare @index 4 operator="=="}}
<h3>Previously...</h3>
<p style="clear: both;">Prior to {{ employer }}, I worked on a range of projects for companies large and small.</p>
<ul>
{{/compare}}
<li>{{{ position }}}, {{{ employer }}}</li>
{{#if @last}}
</ul>
{{/if}}
{{/compare}}
{{/each}}
</section>
{{/hasSection}}
{{/section}}
{{#hasSection "education"}}
{{#section 'projects'}}
<hr>
<section id="projects">
<header>
<h3>{{{sectionTitle "Projects"}}}</h3>
</header>
<span class="fa fa-lg fa-building"></span>
{{#each r.projects}}
{{#if url}}
<h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
{{else}}
<h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
{{/if}}
<span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
{{{ summary }}}
{{#if proj.highlights}}
<ul>
{{#each highlights}}
<li>{{{ this }}}</li>
{{/each}}
</ul>
{{/if}}
{{/each}}
</section>
{{/section}}
{{#section "education"}}
<section id="education">
<header>
<h2><span class="fa fa-mortar-board"></span> {{{sectionTitle "Education"}}}</h2><hr>
@ -104,9 +115,9 @@
{{/each}}
</section>
{{/hasSection}}
{{/section}}
{{#hasSection "service"}}
{{#section "service"}}
<section id="volunteer">
<header>
<h2><span class="fa fa-child" style="vertical-align: top;"></span> {{{sectionTitle "Service"}}}</h2><hr>
@ -130,9 +141,9 @@
{{/each}}
</section>
{{/hasSection}}
{{/section}}
{{#hasSection "writing"}}
{{#section "writing"}}
<section id="publications">
<header>
<h2><span class="fa fa-book"></span> {{{sectionTitle "Writing"}}}</h2><hr>
@ -143,9 +154,9 @@
{{# if summary}}{{{ summary }}}{{/if}}
{{/each}}
</section>
{{/hasSection}}
{{/section}}
{{#hasSection "recognition"}}
{{#section "recognition"}}
<section id="awards">
<header>
<h2><span class="fa fa-trophy"></span> {{{sectionTitle "recognition" "Awards"}}}</h2><hr>
@ -155,7 +166,7 @@
{{ summary }}
{{/each}}
</section>
{{/hasSection}}
{{/section}}
</main>
</body>

View File

@ -26,7 +26,7 @@
{{/has}}
{{#hasSection "skills"}}
{{#section "skills"}}
<section id="skills">
<header>
<h2><span class="fa fa-code"></span> {{{sectionTitle "Skills"}}}</h2><hr>
@ -48,11 +48,11 @@
</tbody>
</table>
</section>
{{/hasSection}}
{{/section}}
{{#hasSection "employment"}}
{{#section "employment"}}
<section id="employment">
<header>
<h2><span class="fa fa-building" style="vertical-align: top;"></span> {{{sectionTitle "Employment"}}}</h2><hr>
@ -93,9 +93,36 @@
{{/each}}
</section>
{{/hasSection}}
{{/section}}
{{#hasSection "education"}}
{{#section 'projects'}}
<hr>
<section id="projects">
<header>
<h3>{{{sectionTitle "Projects"}}}</h3>
</header>
<span class="fa fa-lg fa-building"></span>
{{#each r.projects}}
{{#if url}}
<h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
{{else}}
<h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
{{/if}}
<span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
{{{ summary }}}
{{#if proj.highlights}}
<ul>
{{#each highlights}}
<li>{{{ this }}}</li>
{{/each}}
</ul>
{{/if}}
{{/each}}
</section>
{{/section}}
{{#section "education"}}
<section id="education">
<header>
<h2><span class="fa fa-mortar-board"></span> {{{sectionTitle "Education"}}}</h2><hr>
@ -105,9 +132,9 @@
{{/each}}
</section>
{{/hasSection}}
{{/section}}
{{#hasSection "service"}}
{{#section "service"}}
<section id="volunteer">
<header>
<h2><span class="fa fa-child" style="vertical-align: top;"></span> {{{sectionTitle "Service"}}}</h2><hr>
@ -131,9 +158,9 @@
{{/each}}
</section>
{{/hasSection}}
{{/section}}
{{#hasSection "writing"}}
{{#section "writing"}}
<section id="publications">
<header>
<h2><span class="fa fa-book"></span> {{{sectionTitle "Writing"}}}</h2><hr>
@ -144,9 +171,9 @@
{{# if summary}}{{{ summary }}}{{/if}}
{{/each}}
</section>
{{/hasSection}}
{{/section}}
{{#hasSection "recognition"}}
{{#section "recognition"}}
<section id="awards">
<header>
<h2><span class="fa fa-trophy"></span> {{{sectionTitle "recognition" "Awards"}}}</h2><hr>
@ -156,7 +183,7 @@
{{ summary }}
{{/each}}
</section>
{{/hasSection}}
{{/section}}
</main>
</body>

View File

@ -1,24 +1,24 @@
{{ r.name }}
{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
{{#has 'contact.email' }}Email: {{{ r.contact.email }}}{{/has}}
{{#has 'contact.phone' }}Tel: {{{ r.contact.phone }}}{{/has}}
{{#has 'contact.website' }}Web: {{{ r.contact.website }}}{{/has}}
================================================================================
{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
{{#has 'info.brief' }}{{{ r.info.brief }}}{{/has}}
{{#hasSection "skills"}}
{{#section "skills"}}
{{{sectionTitle "SKILLS"}}} -------------------------------------------------------------------------
{{#each r.skills.sets}}
- {{{ name }}}: {{#each skills}}{{{ this }}} {{/each}}
{{/each}}
{{/hasSection}}
{{/section}}
{{#hasSection "employment"}}
{{#section "employment"}}
{{{sectionTitle "EMPLOYMENT"}}} ---------------------------------------------------------------------
{{#each r.employment.history }}
{{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
{{{ position }}}, {{{ employer }}} ({{dateRange .}})
{{{ summary }}}
{{#if highlights}}
{{#each highlights}}
@ -27,13 +27,13 @@
{{/if}}
{{/each}}
{{/hasSection}}
{{/section}}
{{#hasSection 'projects'}}
{{#section 'projects'}}
{{{sectionTitle "PROJECTS"}}} -----------------------------------------------------------------------
{{#each r.projects }}
{{{ title }}}, {{{ role }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
{{{ title }}}, {{{ role }}} ({{dateRange .}})
{{{ description }}}
{{{ summary }}}
{{#if highlights}}
@ -42,13 +42,13 @@
{{/each}}
{{/if}}
{{/each}}
{{/hasSection}}
{{/section}}
{{#hasSection "education"}}
{{#section "education"}}
{{{sectionTitle "EDUCATION"}}} ----------------------------------------------------------------------
{{#each r.education.history}}
{{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
{{{ institution }}} ({{dateRange .}})
{{#if summary }}
{{{ summary }}}
{{/if}}
@ -59,22 +59,22 @@
{{/if}}
{{/each}}
{{/hasSection}}
{{/section}}
{{#hasSection "writing"}}
{{#section "writing"}}
{{{sectionTitle "WRITING"}}} ------------------------------------------------------------------------
{{#each r.writing}}
{{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
{{{ title }}}{{#has 'safe.date'}} ({{formatDate safe.date 'YYYY-MM' }}){{/has}}
{{{ summary }}}
{{/each}}
{{/hasSection}}
{{/section}}
{{#hasSection "service" }}
{{#section "service" }}
{{{sectionTitle "SERVICE"}}} ------------------------------------------------------------------------
{{#each r.service.history}}
{{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
{{{ organization }}} ({{dateRange .}})
{{{ summary }}}
{{#if highlights}}
{{#each highlights}}
@ -82,13 +82,13 @@
{{/each}}
{{/if}}
{{/each}}
{{/hasSection}}
{{/section}}
{{#hasSection "recognition"}}
{{#section "recognition"}}
{{{sectionTitle "RECOGNITION"}}} --------------------------------------------------------------------
{{#each r.recognition}}
{{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
{{{ summary }}}
{{/each}}
{{/hasSection}}
{{/section}}