No more duplicated themes

This commit is contained in:
2018-05-09 23:30:40 +02:00
parent 5d82dbf58b
commit 6bfd12756d
15 changed files with 286 additions and 2223 deletions

View File

@@ -1,5 +1,5 @@
<!doctype html>
<html lang="en">
<html lang="{{.Language}}">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" />
@@ -27,22 +27,22 @@
</div>
{{- end}}
{{if .Basic.ResumeLocation.City}}
{{if .Basic.Location.City}}
<span class="location">
{{if .Basic.ResumeLocation.Address}}
<span class="address">{{.Basic.ResumeLocation.Address}},</span>
{{if .Basic.Location.Address}}
<span class="address">{{.Basic.Location.Address}},</span>
{{- end}}
{{if .Basic.ResumeLocation.PostalCode}}
<span class="postalCode">{{.Basic.ResumeLocation.PostalCode}},</span>
{{if .Basic.Location.PostalCode}}
<span class="postalCode">{{.Basic.Location.PostalCode}},</span>
{{- end}}
{{if .Basic.ResumeLocation.City}}
<span class="city">{{.Basic.ResumeLocation.City}},</span>
{{if .Basic.Location.City}}
<span class="city">{{.Basic.Location.City}},</span>
{{- end}}
{{if .Basic.ResumeLocation.Region}}
<span class="region">{{.Basic.ResumeLocation.Region}}</span>
{{if .Basic.Location.Region}}
<span class="region">{{.Basic.Location.Region}}</span>
{{- end}}
{{if .Basic.ResumeLocation.CountryCode}}
<span class="countryCode">{{.Basic.ResumeLocation.CountryCode}}</span>
{{if .Basic.Location.CountryCode}}
<span class="countryCode">{{.Basic.Location.CountryCode}}</span>
{{- end}}
</span>
{{- end}}
@@ -99,7 +99,7 @@
{{if .Skills}}
<section class="section margin1">
<header>
<h2 class='section-title'>Skills</h2>
<h2 class='section-title'>{{.Lang.Skills}}</h2>
</header>
<section id="skills">
{{range .Skills}}
@@ -119,7 +119,7 @@
{{if .Work}}
<section class="section">
<header>
<h2 class='section-title'>Work Experience <span class="item-count">({{len .Work}})</span></h2>
<h2 class='section-title'>{{.Lang.WorkExperience}} <span class="item-count">({{len .Work}})</span></h2>
</header>
<section id="work">
{{range $index, $w := .Work}}
@@ -135,15 +135,15 @@
{{if $w.Position}}<div class="position">{{$w.Position}}</div>{{end}}
<div class="company">{{$w.Name}}</div>
<div class="date">
<span class="startDate">{{formatDateWork $w.StartDate}}</span>
<span class="endDate">- {{formatDateWork $w.EndDate}}</span>
<span class="startDate">{{formatDateMY $w.StartDate}}</span>
<span class="endDate">- {{formatDateMY $w.EndDate}}</span>
</div>
</header>
{{- end}}
{{if $w.WorkLocation -}}
{{if $w.Location -}}
<span class="location">
<span class="fas fa-map-marker-alt"></span>
{{if $w.WorkLocation}}<span class="city">{{$w.WorkLocation}},</span>{{end}}
{{if $w.Location}}<span class="city">{{$w.Location}},</span>{{end}}
</span>
{{- end}}
{{if $w.URL}}<span class="website"> <a target="_blank" href="{{$w.URL}}">{{$w.URL}}</a></span>{{end}}
@@ -175,7 +175,7 @@
{{if .Projects -}}
<section class="section">
<header>
<h2 class='section-title'>Projects <span class="item-count">({{len .Projects}})</span></h2>
<h2 class='section-title'>{{.Lang.Projects}} <span class="item-count">({{len .Projects}})</span></h2>
</header>
<section id="projects">
{{range $index, $p := .Projects}}
@@ -191,8 +191,8 @@
{{if $p.Name}}<div class="position">{{$p.Name}}</div>{{end}}
{{if $p.StartDate -}}
<div class="date">
<span class="startDate">{{formatDateWork $p.StartDate}}</span>
<span class="endDate">- {{formatDateWork $p.EndDate}}</span>
<span class="startDate">{{formatDateMY $p.StartDate}}</span>
<span class="endDate">- {{formatDateMY $p.EndDate}}</span>
</div>
{{- end}}
</header>
@@ -209,7 +209,17 @@
{{- end}}
<div class="item">
{{if $p.Description}}<div class="summary"><p>{{$p.Description}}</p></div>{{end}}
{{if $p.Highlights}}<ul class="highlights">{{range $p.Highlights}}<li>{{.}}</li>{{end}}</ul>{{end}}
{{if $p.Highlights}}<ul class="highlights">
{{range $p.Highlights -}}
<li>{{.Title}}
{{if .Items -}}
<ul>
{{range .Items}}<li>{{.}}</li>{{end}}
</ul>
{{- end}}
</li>
{{- end}}
</ul>{{end}}
</div>
</section>
{{- end}}
@@ -219,7 +229,7 @@
{{if .Volunteer -}}
<section class="section">
<header>
<h2 class='section-title'>Volunteer</h2>
<h2 class='section-title'>{{.Lang.Volunteer}}</h2>
</header>
<section id="volunteer">
{{range $index, $v := .Volunteer}}
@@ -237,8 +247,8 @@
<div class="organization">{{$v.Organization}}</div>
</div>
<div class="date">
<span class="startDate">{{formatDateWork $v.StartDate}}</span>
<span class="endDate"> - {{formatDateWork $v.EndDate}}</span>
<span class="startDate">{{formatDateMY $v.StartDate}}</span>
<span class="endDate"> - {{formatDateMY $v.EndDate}}</span>
</div>
</header>
{{- end}}
@@ -255,7 +265,15 @@
{{if $v.Summary}}<div class="summary"><p>{{$v.Summary}}</p></div>{{end}}
{{if $v.Highlights}}
<ul class="highlights">
{{range $v.Highlights}}<li>{{.}}</li>{{end}}
{{range $v.Highlights -}}
<li>{{.Title}}
{{if .Items -}}
<ul>
{{range .Items}}<li>{{.}}</li>{{end}}
</ul>
{{- end}}
</li>
{{- end}}
</ul>
{{- end}}
</div>
@@ -267,7 +285,7 @@
{{if .Education -}}
<section class="section">
<header>
<h2 class='section-title'>Education <span class="item-count">({{len .Education}})</span></h2>
<h2 class='section-title'>{{.Lang.Education}} <span class="item-count">({{len .Education}})</span></h2>
</header>
<section id="education">
@@ -286,8 +304,8 @@
{{if $e.Institution}} <div class="institution">{{$e.Institution}}</div>{{end}}
</div>
<div class="date">
{{if $e.StartDate}}<span class="startDate">{{formatDateEdu $e.StartDate}}</span>{{end}}
<span class="endDate"> - {{formatDateEdu $e.EndDate}} </span>
{{if $e.StartDate}}<span class="startDate">{{formatDateY $e.StartDate}}</span>{{end}}
<span class="endDate"> - {{formatDateY $e.EndDate}} </span>
</div>
</header>
{{if $e.Courses -}}
@@ -310,7 +328,7 @@
{{if .Awards -}}
<section class="section">
<header>
<h2 class='section-title'>Awards</h2>
<h2 class='section-title'>{{.Lang.Awards}}</h2>
</header>
<section id="awards">
{{range $index, $a := .Awards}}
@@ -326,7 +344,7 @@
{{if $a.Title}}<div class="title">{{$a.Title}}</div>{{end}}
{{if $a.Awarder}}<div class="awarder">{{$a.Awarder}}</div>{{end}}
</div>
{{if $a.Date}}<div class="date">{{formatDatePub $a.Date}}</div>{{end}}
{{if $a.Date}}<div class="date">{{formatDateDMY $a.Date}}</div>{{end}}
</header>
<div class="item">
{{if $a.Summary}}<div class="summary"><p>{{$a.Summary}}</p></div>{{end}}
@@ -339,7 +357,7 @@
{{if .Publications -}}
<section class="section">
<header>
<h2 class='section-title'>Publications</h2>
<h2 class='section-title'>{{.Lang.Publications}}</h2>
</header>
<section id="publications">
{{range $index, $p := .Publications}}
@@ -366,7 +384,7 @@
{{- end}}
{{if $p.Publisher}}<span class="publisher"> in {{$p.Publisher}}</span>{{end}}
</div>
{{if $p.ReleaseDate}}<span class="date"> {{formatDatePub $p.ReleaseDate}} </span>{{end}}
{{if $p.ReleaseDate}}<span class="date"> {{formatDateDMY $p.ReleaseDate}} </span>{{end}}
</header>
<div class="item">
@@ -380,7 +398,7 @@
{{if .Languages -}}
<section class="section margin1">
<header>
<h2 class='section-title'>Languages</h2>
<h2 class='section-title'>{{.Lang.Languages}}</h2>
</header>
<section id="languages">
{{range .Languages}}
@@ -402,7 +420,7 @@
{{if .Interests -}}
<section class="section margin1">
<header>
<h2 class='section-title' class='section-title'>Interests</h2>
<h2 class='section-title' class='section-title'>{{.Lang.Interests}}</h2>
</header>
<section id="interests">
{{range .Interests}}
@@ -423,7 +441,7 @@
{{if .References -}}
<section class="section">
<header>
<h2 class='section-title'>References</h2>
<h2 class='section-title'>{{.Lang.References}}</h2>
</header>
<section id="references">
{{range .References}}