Modern: Refactor to use global partials.

This commit is contained in:
hacksalot 2016-01-10 23:30:35 -05:00
parent 06e458eab7
commit b7b2afe568
11 changed files with 84 additions and 169 deletions

View File

@ -1,10 +1,13 @@
{{#section "education"}}
<hr>
<section id="education">
<header>
<h2>{{{sectionTitle "Education"}}}</h2><hr>
<h2>{{{sectionTitle "Education"}}}</h2>
</header>
{{#> icon-education }}{{/icon-education}}
{{#each r.education.history}}
<h3>{{{ institution }}} <span class="tenure">{{dateRange .}}<span></h3>
<h3>{{{ institution }}}</h3>
<span class="tenure">{{dateRange .}}<span>
{{/each}}
</section>
{{/section}}

View File

@ -1,8 +1,10 @@
{{#section "employment"}}
<hr>
<section id="employment">
<header>
<h2>{{{sectionTitle "Employment"}}}</h2><hr>
<h2>{{{sectionTitle "Employment"}}}</h2>
</header>
{{#> icon-employment }}{{/icon-employment}}
{{#each r.employment.history}}
<h3><em>{{ position }}</em>,
{{#if url }}
@ -10,7 +12,8 @@
{{else}}
{{ employer }}
{{/if}}
<span class="tenure">{{dateRange .}}<span></h3>
</h3>
<span class="tenure">{{dateRange .}}</span>
<p style="clear: both;">{{{ summary }}}</p>
{{#if highlights}}
<ul>

View File

@ -4,6 +4,7 @@
<header>
<h2>{{{sectionTitle "Projects"}}}</h2>
</header>
{{#> icon-projects }}{{/icon-projects}}
{{#each r.projects}}
<h3>{{#if role}}<em>{{camelCase role }}</em>,{{/if}}
{{#if url}}

View File

@ -1,8 +1,10 @@
{{#section "recognition"}}
<hr>
<section id="awards">
<header>
<h2>{{{sectionTitle "recognition" "Awards"}}}</h2><hr>
<h2>{{{sectionTitle "recognition" "Awards"}}}</h2>
</header>
{{#> icon-recognition }}{{/icon-recognition}}
{{#each r.recognition}}
<h3><em>{{ title }}</em>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h3>
{{ summary }}

View File

@ -0,0 +1,26 @@
{{#section 'samples'}}
<hr>
<section id="samples">
<header>
<h2>{{{sectionTitle "Samples"}}}</h2>
</header>
{{#> icon-samples }}{{/icon-samples}}
{{#each r.samples}}
<h3>
{{#if url}}
<a href="{{{ url }}}">{{ title }}</a>
{{else}}
{{ title }}
{{/if}}
<span class="tenure">{{formatDate date 'YYYY-MM'}}</span></h3>
{{{ summary }}}
{{#if highlights}}
<ul>
{{#each highlights}}
<li>{{{ this }}}</li>
{{/each}}
</ul>
{{/if}}
{{/each}}
</section>
{{/section}}

View File

@ -1,8 +1,10 @@
{{#section "service"}}
<hr>
<section id="volunteer">
<header>
<h2>{{{sectionTitle "Service"}}}</h2><hr>
<h2>{{{sectionTitle "Service"}}}</h2>
</header>
{{#> icon-service }}{{/icon-service}}
{{#each r.service.history}}
<h3><em>{{ position }}</em>,
{{#if url}}
@ -10,7 +12,8 @@
{{else}}
{{ organization }}
{{/if}}
<span class="tenure">{{dateRange .}}<span></h3>
</h3>
<span class="tenure">{{dateRange .}}<span>
<p style="clear: both;">{{{ summary }}}</p>
{{#if highlights}}
<ul>

View File

@ -1,8 +1,10 @@
{{#section "skills"}}
<hr>
<section id="skills">
<header>
<h2>{{{sectionTitle "Skills"}}}</h2><hr>
<h2>{{{sectionTitle "Skills"}}}</h2>
</header>
{{#> icon-skills }}{{/icon-skills}}
<table>
<thead>
<tr>

View File

@ -0,0 +1,13 @@
{{#section "speaking"}}
<hr>
<section id="speaking">
<header>
<h2>{{{sectionTitle "speaking" "Speaking Engagements"}}}</h2>
</header>
{{#> icon-speaking }}{{/icon-speaking}}
{{#each r.speaking}}
<h3><em>{{ title }}</em>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h3>
{{ summary }}
{{/each}}
</section>
{{/section}}

View File

@ -1,8 +1,10 @@
{{#section "writing"}}
<hr>
<section id="publications">
<header>
<h2>{{{sectionTitle "Writing"}}}</h2><hr>
<h2>{{{sectionTitle "Writing"}}}</h2>
</header>
{{#> icon-writing }}{{/icon-writing}}
{{#each r.writing }}
<h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
{{ publisher.name }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>

View File

@ -74,14 +74,14 @@ h1 {
font-size: 46px;
}
h3 {
h2 {
font-size: 24px;
color: #BFC1C3;
text-transform: uppercase;
font-weight: normal;
}
h4 {
h3 {
margin-bottom: 0;
font-size: 18px;
}

View File

@ -23,7 +23,7 @@
{{#if r.info.brief}}
<hr>
<section id="summary">
<h3>{{{sectionTitle "info" "About"}}}</h3>
<h2>{{{sectionTitle "info" "About"}}}</h2>
<span class="fa fa-lg fa-user"></span>
{{{ r.info.brief }}}
</section>
@ -34,7 +34,7 @@
<hr>
<section id="skills">
<header>
<h3>{{{sectionTitle "Skills"}}}</h3>
<h2>{{{sectionTitle "Skills"}}}</h2>
</header>
<span class="fa fa-lg fa-code"></span>
@ -62,170 +62,30 @@
</section>
{{/section}}
{{#*inline "icon-employment"}}<span class="fa fa-lg fa-building"></span>{{/inline}}
{{> sections/employment }}
{{#*inline "icon-projects"}}<span class="fa fa-lg fa-star"></span>{{/inline}}
{{> sections/projects }}
{{#section 'employment'}}
<hr>
<section id="employment">
<header>
<h3>{{{sectionTitle "Employment"}}}</h3>
</header>
<span class="fa fa-lg fa-building"></span>
{{#each r.employment.history}}
{{#if url}}
<h4><span class="res-label">{{ position }}</span>, <a href="{{{ url }}}">{{ employer }}</a></h4>
{{else}}
<h4><span class="res-label">{{ position }}</span>, <span class="defunct">{{ employer }}</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}}
{{#*inline "icon-education"}}<span class="fa fa-lg fa-mortar-board"></span>{{/inline}}
{{> sections/education }}
</section>
{{/section}}
{{#*inline "icon-service"}}<span class="fa fa-lg fa-child"></span>{{/inline}}
{{> sections/service }}
{{#section 'projects'}}
<hr>
<section id="projects">
<header>
<h3>{{{sectionTitle "Projects"}}}</h3>
</header>
<span class="fa fa-lg fa-star"></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}}
{{#*inline "icon-samples"}}<span class="fa fa-lg fa-share"></span>{{/inline}}
{{> sections/samples }}
</section>
{{/section}}
{{#*inline "icon-writing"}}<span class="fa fa-lg fa-pencil"></span>{{/inline}}
{{> sections/writing }}
{{#section 'samples'}}
<hr>
<section id="samples">
<header>
<h3>{{{sectionTitle "Samples"}}}</h3>
</header>
<span class="fa fa-lg fa-building"></span>
{{#each r.samples}}
{{#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}}
{{#*inline "icon-recognition"}}<span class="fa fa-lg fa-trophy"></span>{{/inline}}
{{> sections/recognition }}
</section>
{{/section}}
{{#*inline "icon-speaking"}}<span class="fa fa-lg fa-users"></span>{{/inline}}
{{> sections/speaking }}
{{#section 'education'}}
<hr>
<section id="education">
<header>
<h3>{{{sectionTitle "Education"}}}</h3>
</header>
<span class="fa fa-lg fa-mortar-board"></span>
{{#each r.education.history}}
<h4>{{ institution }}</h4>
<span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
{{#if courses}}
<ul>
{{#each courses}}
<li>{{{ this }}}</li>
{{/each}}
</ul>
{{/if}}
{{/each}}
</section>
{{/section}}
{{#section 'service'}}
<hr>
<section id="volunteer">
<header>
<h3>{{{sectionTitle "Service"}}}</h3>
</header>
<span class="fa fa-lg fa-child"></span>
{{#each r.service.history}}
{{#if url}}
<h4><span class="res-label">{{ position }}</span>, <a href="{{{ website }}}">{{ organization }}</a></h4>
{{else}}
<h4><span class="res-label">{{ position }}</span>, <span class="defunct">{{ organization }}</span></h4>
{{/if}}
<span class="tenure">{{formatDate safe.start 'YYYY-MM'}}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
{{{ summary }}}
{{#if highlights}}
<ul>
{{#each highlights}}
<li>{{{ this }}}</li>
{{/each}}
</ul>
{{/if}}
{{/each}}
</section>
{{/section}}
{{#section 'writing'}}
<hr>
<section id="publications">
<header>
<h3>{{{sectionTitle "writing" "Publications"}}}</h3>
</header>
<span class="fa fa-lg fa-pencil"></span>
{{#each r.writing}}
{{#if url}}
<h4><a href=""><span class="res-label">{{{ title }}}</span></a>, <span>{{{ publisher.name }}}</span></h4>
{{else}}
<h4><span class="res-label">{{{ title }}}</span>, <span class="defunct">{{{ publisher.name }}}</span></h4>
{{/if}}
<span class="tenure">Published on: {{formatDate safe.date 'YYYY-MM'}}</span>
{{/each}}
</section>
{{/section}}
{{#section 'recognition'}}
<hr>
<section id="awards">
<header>
<h3>{{{sectionTitle "recognition" "Awards"}}}</h3>
</header>
<span class="fa fa-lg fa-trophy"></span>
{{#each r.recognition}}
<h4><span class="res-label">{{{ title }}}</span>, {{{ from }}}</h4>
<span class="tenure">{{{ date }}}</span>
{{{ summary }}}
{{/each}}
</section>
{{/section}}
</div>
</main>