Clean up template

index.js

@@ -20,6 +20,17 @@ function render(resume) {
 	});
 }
 
+Handlebars.registerHelper('paragraphSplit', function(plaintext) {
+    var i, output = '',
+        lines = plaintext.split(/\r\n|\r|\n/g);
+    for (i = 0; i < lines.length; i++) {
+        if(lines[i]) {
+            output += '<p>' + lines[i] + '</p>';
+        }
+    }
+    return new Handlebars.SafeString(output);
+});
+
 module.exports = {
 	render: render
 };

package-lock.json

@@ -0,0 +1,62 @@
+{
+  "name": "jsonresume-theme-short",
+  "version": "0.1.7",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "optional": true
+    },
+    "async": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+      "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
+      "optional": true
+    },
+    "handlebars": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz",
+      "integrity": "sha1-bp1/hRSjRn+l6fgswVjs/B1ax28=",
+      "requires": {
+        "optimist": "0.3.7",
+        "uglify-js": "2.3.6"
+      }
+    },
+    "optimist": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+      "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
+      "requires": {
+        "wordwrap": "0.0.3"
+      }
+    },
+    "source-map": {
+      "version": "0.1.43",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+      "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+      "optional": true,
+      "requires": {
+        "amdefine": "1.0.1"
+      }
+    },
+    "uglify-js": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz",
+      "integrity": "sha1-+gmEdwtCi3qbKoBY9GNV0U/vIRo=",
+      "optional": true,
+      "requires": {
+        "async": "0.2.10",
+        "optimist": "0.3.7",
+        "source-map": "0.1.43"
+      }
+    },
+    "wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
+    }
+  }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsonresume-theme-short",
-  "version": "0.1.1",
+  "version": "0.1.7",
   "description": "Simple to the point theme for JSON Resume",
   "author": "Graeme Maciver",
   "repository": {

resume.template

@@ -46,11 +46,10 @@
 
 
 		{{#if summary}}
-		<p>{{summary}}</p>
+		<p>{{paragraphSplit summary}}</p>
 		{{/if}}
 
 		{{#if profiles.length}}
-		<section id="profiles">
 			{{#each profiles}}
 			<div class="profile">
 				{{#if network}}
@@ -69,12 +68,36 @@
 				{{/if}}
 			</div>
 			{{/each}}
-		</section>
 		{{/if}}
 
 	</section>
 	{{/resume.basics}}
 
+	{{#if resume.publications.length}}
+	<section id="publications">
+		<h2>Academic Publications</h2>
+		{{#each resume.publications}}
+		<div class="item">
+			{{#if name}}
+			<div class="name">
+				{{name}}
+			</div>
+			{{/if}}
+			{{#if authors}}
+			<div class="authors">
+				{{authors}}
+			</div>
+			{{/if}}
+			{{#if venue}}
+			<div class="venue">
+				{{venue}}
+			</div>
+			{{/if}}
+		</div>
+		{{/each}}
+	</section>
+	{{/if}}	
+
 	{{#if resume.skills.length}}
 	<section id="skills">
 		<h2>Skills</h2>
@@ -103,8 +126,8 @@
 		{{#each resume.work}}
 		<section class="item">
 			<header>
-				{{#if company}}
+				{{#if name}}
-					<h3 class="name">{{company}}</h3>
+					<h3 class="name">{{name}}</h3>
 				{{/if}}
 			</header>
 			{{#if position}}
@@ -130,7 +153,7 @@
 
 			{{#if summary}}
 			<div class="summary">
-				<p>{{summary}}</p>
+				<p>{{paragraphSplit summary}}</p>
 			</div>
 			{{/if}}
 			{{#if highlights.length}}
@@ -145,6 +168,37 @@
 	</section>
 	{{/if}}
 
+	{{#if resume.projects.length}}
+	<section class="experience">
+		<h2>Projects</h2>
+		{{#each resume.projects}}
+			<header>
+				{{#if name}}
+					<h3 class="name">
+					{{#if url}}
+						<a href="{{url}}">{{name}}</a>
+					{{else}}
+						{{name}}
+					{{/if}}
+					</h3>
+				{{/if}}
+			</header>
+			{{#if description}}
+			<div class="summary">
+				<p>{{paragraphSplit description}}</p>
+			</div>
+			{{/if}}
+			{{#if highlights.length}}
+			<ul class="highlights">
+				{{#each highlights}}
+				<li>{{.}}</li>
+				{{/each}}
+			</ul>
+			{{/if}}
+		{{/each}}
+	</section>
+	{{/if}}
+
 	{{#if resume.volunteer.length}}
 	<section class="experience">
 		<h2>Volunteering</h2>
@@ -276,41 +330,6 @@
 	</section>
 	{{/if}}
 	
-	{{#if resume.publications.length}}
-	<section id="publications">
-		<h2>Publications</h2>
-		{{#each resume.publications}}
-		<div class="item">
-			{{#if name}}
-			<div class="name">
-				{{name}}
-			</div>
-			{{/if}}
-			{{#if publisher}}
-			<div class="publisher">
-				{{publisher}}
-			</div>
-			{{/if}}
-			{{#if releaseDate}}
-			<div class="releaseDate">
-				{{releaseDate}}
-			</div>
-			{{/if}}
-			{{#if website}}
-			<div class="website">
-				<a href="{{website}}">Link</a>
-			</div>
-			{{/if}}
-			{{#if summary}}
-			<div class="summary">
-				<p>{{summary}}</p>
-			</div>
-			{{/if}}
-		</div>
-		{{/each}}
-	</section>
-	{{/if}}
-
 	{{#if resume.languages.length}}
 	<section id="languages">
 		<h2>Languages</h2>

style.css

@@ -1,6 +1,6 @@
 body {
 	background: #fff;
-	font: 16px 'Open Sans' Helvetica, Arial, sans-serif;
+	font: 16px 'Open Sans', Helvetica, Arial, sans-serif;
 	line-height: 1.4;
 	margin: 0 0;
 	margin-bottom: 100px;
@@ -30,7 +30,7 @@ blockquote {
 }
 #resume {
 	margin: 2em 2em 2em 2.5em;
-	max-width: 960px;
+	max-width: 760px;
 }
 
 /* Resume heading */
@@ -54,13 +54,14 @@ blockquote {
 	margin: 0 1em 0 0;
 }
 
-#profiles .profile {
+.profile {
 	display: inline-block;
 	margin: 0 1em 0 0;
 }
 
-#profiles .profile strong,
+.profile strong,
-#profiles .profile span {
+.profile span {
+	display: inline-block;
 	margin: 0 1em 0 0;
 }
 /* section / line breaks */
@@ -112,10 +113,9 @@ section h2 {
 
 /* skills */
 #skills .item {
-	margin: 0.4em 0;
+	margin: 0.5em 0;
-	padding: 0;
+	padding: 0 0 0.5em;
 	font-size: 90%;
-	border-bottom: 0;
 }
 
 #skills .item .name {
@@ -123,10 +123,14 @@ section h2 {
 	display: inline-block;
 	text-transform: uppercase;
 	margin: 0 1em 0 0;
+	width: 23%;
+	vertical-align: top;
 }
 
 #skills .item .keywords {
 	display: inline-block;
+	width: 70%;
+	vertical-align: top;
 }
 
 /* education */
@@ -137,4 +141,10 @@ section h2 {
 	border-bottom: 0;
 }
 
+#publications .authors {
+	font-size: 0.8em;
+}
 
+#publications .venue {
+	font-size: 0.8em;
+}