Merge pull request #53 from ben-e-whitney/dev

Awesome: add service section and make corrections to writing section.

themes/awesome/src/latex/examples/cv.tex

@@ -90,6 +90,7 @@
 \input{cv/education.tex}
 \input{cv/skills.tex}
 \input{cv/experience.tex}
+\input{cv/service.tex}
 \input{cv/extracurricular.tex}
 \input{cv/honors.tex}
 \input{cv/presentation.tex}

themes/awesome/src/latex/examples/cv/service.tex

@@ -0,0 +1,28 @@
+[~ if (r.service && r.service.history && r.service.history.length ) { ~]
+%-------------------------------------------------------------------------------
+%	SECTION TITLE
+%-------------------------------------------------------------------------------
+\cvsection{Service}
+
+
+%-------------------------------------------------------------------------------
+%	CONTENT
+%-------------------------------------------------------------------------------
+\begin{cventries}
+[~ _.each( r.service.history, function(job) { ~]
+%---------------------------------------------------------
+  \cventry
+    {[[ job.position ]]} % Job title
+    {[[ job.organization ]]} % Organization
+    {[[ job.location ]]} % Location
+    {[[ h.dateRange( job ) ]]} % Date(s)
+    {[~ if (job.highlights && job.highlights.length ) { ~]
+      \begin{cvitems} % Description(s) of tasks/responsibilities
+[[ h.pad( job.highlights.map( function(h) { return '\\item {' + h + '}' }), -8 ) ]]
+      \end{cvitems}
+    [~ } ~]}
+
+[~ }); ~]
+%---------------------------------------------------------
+\end{cventries}
+[~ } ~]

themes/awesome/src/latex/examples/cv/writing.tex

@@ -12,15 +12,15 @@
 [~ _.each( r.writing, function(wri) { ~]
 %---------------------------------------------------------
   \cventry
-    {[~ print( wri.publisher ? wri.publisher.name : 'Unknown' ) ~]} % Role
+    {[~ if (_.isString(wri.publisher)) { ~]
+    [[ wri.publisher]]
+    [~ } else { ~]
+    print( wri.publisher ? wri.publisher.name : 'Unknown' )
+    [~ } ~]} % Publisher
     {[[ wri.title ]]} % Title
-    {[[ wri.url ]]} % Location
+    {[[ wri.url ]]} % URL
     {[[ h.date(wri.date) ]]} % Date(s)
-    {[~ if (wri.highlights && wri.highlights.length) { ~]
+    {[[ wri.summary ]]} % Summary
-      \begin{cvitems} % Description(s)
-[~ print( h.pad( wri.highlights.map( function(h) { return '\\item {' + h + '}' }), -8 ) ) ~]
-      \end{cvitems}
-    [~ } ~]}
 
 [~ }); ~]
 %---------------------------------------------------------

themes/awesome/src/latex/examples/resume.tex

@@ -90,6 +90,7 @@
 % \input{resume/summary.tex}
 \input{resume/education.tex}
 \input{resume/experience.tex}
+\input{resume/service.tex}
 \input{resume/extracurricular.tex}
 \input{resume/honors.tex}
 \input{resume/presentation.tex}

themes/awesome/src/latex/examples/resume/service.tex

@@ -0,0 +1,28 @@
+[~ if (r.service && r.service.history && r.service.history.length ) { ~]
+%-------------------------------------------------------------------------------
+%	SECTION TITLE
+%-------------------------------------------------------------------------------
+\cvsection{Service}
+
+
+%-------------------------------------------------------------------------------
+%	CONTENT
+%-------------------------------------------------------------------------------
+\begin{cventries}
+[~ _.each( r.service.history, function(job) { ~]
+%---------------------------------------------------------
+  \cventry
+    {[[ job.position ]]} % Job title
+    {[[ job.organization ]]} % Organization
+    {[[ job.location ]]} % Location
+    {[[ h.dateRange( job ) ]]} % Date(s)
+    {[~ if (job.highlights && job.highlights.length ) { ~]
+      \begin{cvitems} % Description(s) of tasks/responsibilities
+[[ h.pad( job.highlights.map( function(h) { return '\\item {' + h + '}' }), -8 ) ]]
+      \end{cvitems}
+    [~ } ~]}
+
+[~ }); ~]
+%---------------------------------------------------------
+\end{cventries}
+[~ } ~]

themes/awesome/src/latex/examples/resume/writing.tex

@@ -12,15 +12,15 @@
 [~ _.each( r.writing, function(wri) { ~]
 %---------------------------------------------------------
   \cventry
-    {[~ print( wri.publisher ? wri.publisher.name : 'Unknown' ) ~]} % Role
+    {[~ if (_.isString(wri.publisher)) { ~]
+    [[ wri.publisher]]
+    [~ } else { ~]
+    print( wri.publisher ? wri.publisher.name : 'Unknown' )
+    [~ } ~]} % Publisher
     {[[ wri.title ]]} % Title
-    {[[ wri.url ]]} % Location
+    {[[ wri.url ]]} % URL
     {[[ h.date(wri.date) ]]} % Date(s)
-    {[~ if (wri.highlights && wri.highlights.length) { ~]
+    {[[ wri.summary ]]} % Summary
-      \begin{cvitems} % Description(s)
-[~ print( h.pad( wri.highlights.map( function(h) { return '\\item {' + h + '}' }), -8 ) ) ~]
-      \end{cvitems}
-    [~ } ~]}
 
 [~ }); ~]
 %---------------------------------------------------------

themes/awesome/theme.json

@@ -28,6 +28,7 @@
         "src/latex/examples/cv/committees.tex",
         "src/latex/examples/cv/education.tex",
         "src/latex/examples/cv/experience.tex",
+        "src/latex/examples/cv/service.tex",
         "src/latex/examples/cv/extracurricular.tex",
         "src/latex/examples/cv/honors.tex",
         "src/latex/examples/cv/presentation.tex",