Skip to content
This repository has been archived by the owner on Feb 17, 2021. It is now read-only.

Commit

Permalink
use source url on label for usage example. changed 'Translation' to '…
Browse files Browse the repository at this point in the history
…Translation to plain English'. changed heading link to work with base tag
  • Loading branch information
Sumeet Adur committed Dec 2, 2015
1 parent db19e08 commit e85525d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
14 changes: 7 additions & 7 deletions client/definition-page.hbs
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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}}
Expand Down
2 changes: 1 addition & 1 deletion client/main-page.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
3 changes: 1 addition & 2 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit e85525d

Please sign in to comment.