Merge branch 'master' into gh-pages

davorg · Aug 17, 2014 · 6364785 · 6364785
2 parents a29789d + 99cc08a
commit 6364785
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/c/battersea.html b/c/battersea.html
@@ -62,8 +62,8 @@ <h1>Battersea</h1>
           </div>
           <div class="col-md-4">
             <ul>
-              <li>Jane Ellison (Conservative)</li>
-              <li>Will Martindale (Labour)</li>
+              <li>Jane Ellison (Conservative)<br><a href="https://twitter.com/janeellisonmp>@janeellisonmp</a></li>
+              <li>Will Martindale (Labour)<br><a href="https://twitter.com/WillJMartindale>@WillJMartindale</a></li>
             </ul>
           </div>
         </div>

diff --git a/c/clacton.html b/c/clacton.html
@@ -62,7 +62,7 @@ <h1>Clacton</h1>
           </div>
           <div class="col-md-4">
             <ul>
-              <li>Douglas Carswell (Conservative)</li>
+              <li>Douglas Carswell (Conservative)<br><a href="https://twitter.com/DouglasCarswell>@DouglasCarswell</a></li>
             </ul>
           </div>
         </div>

diff --git a/c/mid-bedfordshire.html b/c/mid-bedfordshire.html
@@ -62,8 +62,8 @@ <h1>Mid Bedfordshire</h1>
           </div>
           <div class="col-md-4">
             <ul>
-              <li>Nadine Dorries (Conservative)</li>
-              <li>Charlynne Pullen (Labour)</li>
+              <li>Nadine Dorries (Conservative)<br><a href="https://twitter.com/NadineDorriesMP>@NadineDorriesMP</a></li>
+              <li>Charlynne Pullen (Labour)<br><a href="https://twitter.com/CharlynnePullen>@CharlynnePullen</a></li>
             </ul>
           </div>
         </div>

diff --git a/c/tooting.html b/c/tooting.html
@@ -62,8 +62,8 @@ <h1>Tooting</h1>
           </div>
           <div class="col-md-4">
             <ul>
-              <li>Dan Watkins (Conservative)</li>
-              <li>Sadiq Khan (Labour)</li>
+              <li>Dan Watkins (Conservative)<br><a href="https://twitter.com/DanWatkins>@DanWatkins</a></li>
+              <li>Sadiq Khan (Labour)<br><a href="https://twitter.com/SadiqKhan>@SadiqKhan</a></li>
             </ul>
           </div>
         </div>

diff --git a/ttlib/page.tt b/ttlib/page.tt
@@ -63,7 +63,7 @@ body {
           <div class="col-md-4">
             <ul>
 [% FOREACH cand IN c.candidates -%]
-              <li>[% cand.name %] ([% cand.party.name %])</li>
+              <li>[% cand.name %] ([% cand.party.name %])[% IF cand.twitter %]<br><a href="https://twitter.com/[% cand.twitter %]>@[% cand.twitter %]</a>[% END %]</li>
 [% END -%]
             </ul>
           </div>