Add short address

cli/resume.go

@@ -46,8 +46,10 @@ func main() {
 	var err error
 	var outf string
 	var lang string
+	var fulladdr bool
 	var f *os.File
 
+	flag.BoolVar(&fulladdr, "a", false, "Use full address")
 	flag.StringVar(&resume, "resume", "resume.json", "JSON of resume")
 	flag.StringVar(&resume, "r", "resume.json", "JSON of resume")
 	flag.StringVar(&theme, "theme", "", "Theme of resume")
@@ -71,7 +73,7 @@ func main() {
 	if lang != "" {
 		r.Language = lang
 	}
-
+	r.UseFullAddress = fulladdr
 	if t, exists := themes.Themes[theme]; exists {
 		if err = t.Render(r, f); err != nil {
 			log.Fatal(err)

model/json.go

@@ -53,19 +53,20 @@ func (ct *ResumeDate) UnmarshalJSON(b []byte) (err error) {
 
 // Resume represent Curriculum Vitae
 type Resume struct {
-	Title        string        `json:"title"`
-	Language     string        `json:"lang"`
-	Basic        Basic         `json:"basics"`
-	Work         []Work        `json:"work"`
-	Volunteer    []Volunteer   `json:"volunteer"`
-	Education    []Education   `json:"education"`
-	Awards       []Award       `json:"awards"`
-	Publications []Publication `json:"publications"`
-	Skills       []Skill       `json:"skills"`
-	Languages    []Language    `json:"languages"`
-	Interests    []Interest    `json:"interests"`
-	References   []Reference   `json:"references"`
-	Projects     []Project     `json:"projects"`
+	Title          string `json:"title"`
+	UseFullAddress bool
+	Language       string        `json:"lang"`
+	Basic          Basic         `json:"basics"`
+	Work           []Work        `json:"work"`
+	Volunteer      []Volunteer   `json:"volunteer"`
+	Education      []Education   `json:"education"`
+	Awards         []Award       `json:"awards"`
+	Publications   []Publication `json:"publications"`
+	Skills         []Skill       `json:"skills"`
+	Languages      []Language    `json:"languages"`
+	Interests      []Interest    `json:"interests"`
+	References     []Reference   `json:"references"`
+	Projects       []Project     `json:"projects"`
 }
 
 // Basic is the basic information for a resume
@@ -83,11 +84,12 @@ type Basic struct {
 
 // Location is the location details of a resume owner.
 type UserLocation struct {
-	Address     string `json:"address"`
-	PostalCode  string `json:"postalCode"`
-	City        string `json:"city"`
-	CountryCode string `json:"countryCode"`
-	Region      string `json:"region"`
+	Address      string `json:"address"`
+	ShortAddress string `json:"shortAddress"`
+	PostalCode   string `json:"postalCode"`
+	City         string `json:"city"`
+	CountryCode  string `json:"countryCode"`
+	Region       string `json:"region"`
 }
 
 // SocialProfile is the profile of the resume owner.

themes/kendall/resume.template

@@ -150,6 +150,7 @@
             {{if .Basic.Location.City -}}
             <div class="contact-item">
               <div class="icon pull-left text-center"><span class="fa fa-map-marker fa-fw"></span></div>
+	      {{- if .UseFullAddress -}}
               {{if .Basic.Location.Address}}<div class="title pull-right">{{.Basic.Location.Address}}</div>{{- end}}
               <div class="title {{if not .Basic.Location.Address}}only {{- end}} pull-right">
 		      {{- if eq .Language "fr" -}}
@@ -158,9 +159,18 @@
 			      {{.Basic.Location.City}}{{if .Basic.Location.Region}}, {{.Basic.Location.Region}}{{- end}}{{if .Basic.Location.PostalCode}} {{.Basic.Location.PostalCode}}{{- end}}{{if .Basic.Location.CountryCode}} {{.Basic.Location.CountryCode}}{{- end}}
 		      {{- end -}}
 	      </div>
+	      {{- else -}}
+              <div class="title only pull-right">
+		      {{- if eq .Language "fr" -}}
+			      {{.Basic.Location.ShortAddress}}{{if .Basic.Location.Region}}, {{.Basic.Location.Region}}{{- end}}{{if .Basic.Location.CountryCode}} {{.Basic.Location.CountryCode}}{{- end}}
+		      {{- else -}}
+			      {{.Basic.Location.ShortAddress}}{{if .Basic.Location.Region}}, {{.Basic.Location.Region}}{{- end}}{{if .Basic.Location.CountryCode}} {{.Basic.Location.CountryCode}}{{- end}}
+		      {{- end -}}
+	      </div>
+	      {{- end -}}
             </div>
 	    {{- end}}
-            {{if .Basic.Phone -}}
+            {{if and .Basic.Phone .UseFullAddress -}}
             <div class="contact-item">
               <div class="icon pull-left text-center"><span class="fa fa-phone fa-fw"></span></div>
               <div class="title only pull-right">{{.Basic.Phone}}</div>

themes/kendall2/resume.template

@@ -40,7 +40,7 @@
           <!-- WORK EXPERIENCE -->
           <div class="box">
 	    <h2><i class= "fa fa-suitcase ico"></i> {{.Lang.WorkExperience}}</h2>
-            {{range .Work -}}
+	    {{range .Work -}}{{if not .Hide}}
               <div class="job clearfix">
                 <div class="row">
                   <div class="details">
@@ -76,7 +76,7 @@
                   </div>
                 </div>
               </div>
-            {{- end}}
+            {{- end}}{{- end}}
           </div>
           {{- end}}
           {{if .Awards -}}
@@ -149,11 +149,17 @@
             {{if .Basic.Location.City -}}
             <div class="contact-item">
               <div class="icon pull-left text-center"><span class="fa fa-map-marker fa-fw"></span></div>
+	      {{- if .UseFullAddress -}}
               {{if .Basic.Location.Address}}<div class="title pull-right">{{.Basic.Location.Address}}</div>{{- end}}
               <div class="title {{if not .Basic.Location.Address}}only {{- end}} pull-right">{{if .Basic.Location.PostalCode}} {{.Basic.Location.PostalCode}}{{- end}} {{.Basic.Location.City}}{{if .Basic.Location.Region}}, {{.Basic.Location.Region}}{{- end}}{{if .Basic.Location.CountryCode}} {{.Basic.Location.CountryCode}}{{- end}}</div>
             </div>
+	      {{- else -}}
+              <div class="title only pull-right">
+		{{.Basic.Location.ShortAddress}}{{if .Basic.Location.Region}}, {{.Basic.Location.Region}}{{- end}}{{if .Basic.Location.CountryCode}} {{.Basic.Location.CountryCode}}{{- end}}</div>
+            </div>
+	      {{- end -}}
 	    {{- end}}
-            {{if .Basic.Phone -}}
+            {{if and .Basic.Phone .UseFullAddress -}}
             <div class="contact-item">
               <div class="icon pull-left text-center"><span class="fa fa-phone fa-fw"></span></div>
               <div class="title only pull-right">{{.Basic.Phone}}</div>

themes/stackoverflow/resume.template

@@ -29,6 +29,7 @@
 
 				{{if .Basic.Location.City}}
 				<span class="location">
+					{{- if .UseFullAddress -}}
 					{{if .Basic.Location.Address}}
 					<span class="address">{{.Basic.Location.Address}},</span>
 					{{- end}}
@@ -38,6 +39,11 @@
 					{{if .Basic.Location.City}}
 					<span class="city">{{.Basic.Location.City}},</span>
 					{{- end}}
+					{{- else -}}
+					{{if .Basic.Location.ShortAddress}}
+					<span class="city">{{.Basic.Location.ShortAddress}},</span>
+					{{- end}}
+					{{- end -}}
 					{{if .Basic.Location.Region}}
 					<span class="region">{{.Basic.Location.Region}}</span>
 					{{- end}}
@@ -59,7 +65,7 @@
 						<a href="mailto:{{.Basic.Email}}">{{.Basic.Email}}</a>
 					</div>
 					{{- end}}
-					{{if .Basic.Phone}}
+					{{if and .Basic.Phone .UseFullAddress}}
 					<div class="phone">
 						<span class="fas fa-mobile-alt"></span>
 						<a href="tel:{{.Basic.Phone}}">{{.Basic.Phone}}</a>