From e85525d448e968109a67f5988f3b57e92bc54ce9 Mon Sep 17 00:00:00 2001
From: Sumeet Adur <sumeet.adur@ft.com>
Date: Wed, 2 Dec 2015 16:54:14 +0000
Subject: [PATCH] use source url on label for usage example. changed
 'Translation' to 'Translation to plain English'. changed heading link to work
 with base tag

---
 client/definition-page.hbs | 14 +++++++-------
 client/main-page.hbs       |  2 +-
 gulpfile.babel.js          |  3 +--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/client/definition-page.hbs b/client/definition-page.hbs
index 31d76ae..d3dabdb 100755
--- a/client/definition-page.hbs
+++ b/client/definition-page.hbs
@@ -1,6 +1,6 @@
 {{> top }}
 	<main>
-		<h1><a href="">Guffipedia</a></h1>
+		<h1><a href=".">Guffipedia</a></h1>
      	<div class="headshot"><img src="images/lucy.png"></div>
      	<div class="subheader">Lucy Kellaway's dictionary of business jargon and corporate nonsense</div>
      	<div class="line"></div>
@@ -14,22 +14,22 @@
 			</div>
 			<div class="details">
 				{{#if definition}}
-					<p class="detail definition"><strong>Translation
-					</strong> {{definition}}</p>
+					<p class="detail definition"><strong>Translation</strong> {{definition}}</p>
 				{{/if}}
 				{{#if showPerpetratorData}}
 					<p class="detail perpetrator"><strong>Perpetrator</strong>
 				{{/if}}
-				{{#if sourceurl}}<a href="{{sourceurl}}" target="_blank">{{/if}}
 					{{#if perpetrator}}{{perpetrator}}{{/if}}{{#if perpetrator}}{{#if usagesource}}, {{/if}}{{/if}}{{#if usagesource}}{{usagesource}}{{/if}}
-					{{#unless perpetrator}}{{#unless usagesource}}{{#if sourceurl}}{{sourceurl}}{{/if}}{{/unless}}{{/unless}}
-				{{#if sourceurl}}</a>{{/if}}
 				{{#if showPerpetratorData}}
 					</p>
 				{{/if}}
 				{{#if usageexample}}
 					<p class="detail usageexample">
-						<strong>Usage example </strong>
+						<strong>
+							{{#if sourceurl}}<a href="{{sourceurl}}" target="_blank">{{/if}}
+								Usage example
+							{{#if sourceurl}}</a>{{/if}}
+						</strong>
 						{{usageexample}}
 					</p>
 				{{/if}}
diff --git a/client/main-page.hbs b/client/main-page.hbs
index ea0b456..c3f8e1d 100644
--- a/client/main-page.hbs
+++ b/client/main-page.hbs
@@ -15,7 +15,7 @@
 				<a class="word" href="{{@key}}/">{{word}}</a>
 				<div class="details">
 					{{#if definition}}
-						<p class="detail definition"><strong>Translation
+						<p class="detail definition"><strong>Translation into plain English
 						</strong> {{definition}}</p>
 					{{/if}}
 					{{#if usageexample}}
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 2d77b7f..85bdfe7 100755
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -297,8 +297,7 @@ gulp.task('download-data', () => fetch(SPREADSHEET_URL)
       };
 
       words[currentSlug].showPerpetratorData = words[currentSlug].perpetrator
-                                              || words[currentSlug].usagesource
-                                              || words[currentSlug].sourceurl ? true : null;
+                                              || words[currentSlug].usagesource ? true : null;
     }
 
     fs.writeFileSync('client/words.json', JSON.stringify(words, null, 2));