Skip to content

Commit

Permalink
Merge branch 'master' into gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
davorg committed Jan 15, 2015
2 parents acffd41 + 3a18a4b commit 4749587
Show file tree
Hide file tree
Showing 23 changed files with 638 additions and 38 deletions.
31 changes: 19 additions & 12 deletions bin/get_cands
Expand Up @@ -57,9 +57,6 @@ foreach my $con ($cons_rs->all) {
for (values %cands) {
my $cand = $_->{person_id}{versions}[0]{data};

say $cand->{name}, ' / ', $cand->{party_memberships}{2015}{name},
' / @', $cand->{twitter_username};

my ($party_id) = $cand->{party_memberships}{2015}{id} =~ /(\d+)/;
my $party;
unless ($party = $par_rs->find({ yournextmp_id => $party_id })) {
Expand All @@ -72,17 +69,27 @@ foreach my $con ($cons_rs->all) {
if (exists $curr_cands{$cand->{id}}) {
my $curr_cand = delete $curr_cands{$cand->{id}};
if ($cand->{name} ne $curr_cand->name
or $cand->{twitter_username} ne $curr_cand->twitter) {
$curr_cand->update({
yournextmp_id => $cand->{id},
name => $cand->{name},
twitter => $cand->{twitter_username},
party_id => $party->id,
constituency_id => $con->id,
});
$changed = 1;
or $cand->{twitter_username} ne $curr_cand->twitter) {
say "* Updating $cand->{name} / ",
$cand->{party_memberships}{2015}{name},
" / \@$cand->{twitter_username}";
$curr_cand->update({
yournextmp_id => $cand->{id},
name => $cand->{name},
twitter => $cand->{twitter_username},
party_id => $party->id,
constituency_id => $con->id,
});
$changed = 1;
} else {
say "* No change $cand->{name} / ",
$cand->{party_memberships}{2015}{name},
" / \@$cand->{twitter_username}";
}
} else {
say "* Adding $cand->{name} / ",
$cand->{party_memberships}{2015}{name},
" / \@$cand->{twitter_username}";
$can_rs->create({
yournextmp_id => $cand->{id},
name => $cand->{name},
Expand Down
1 change: 0 additions & 1 deletion c/cambridge.html
Expand Up @@ -82,7 +82,6 @@ <h1>Cambridge</h1>
<li>Rupert Read (Green)<br><a href="https://twitter.com/GreenRupertRead">@GreenRupertRead</a></li>
<li>Chamali Fernando (Conservative)<br><a href="https://twitter.com/whereis007">@whereis007</a></li>
<li>Julian Huppert (Liberal Democrat)<br><a href="https://twitter.com/JulianHuppert">@JulianHuppert</a></li>
<li>Daniel Brett (Class War)</li>
<li>Patrick O'Flynn (UKIP)<br><a href="https://twitter.com/oflynnmep">@oflynnmep</a></li>
</ul>
<p><small>If you wish to make any corrections to this list, please see the
Expand Down
2 changes: 1 addition & 1 deletion c/edmonton.html
Expand Up @@ -79,7 +79,7 @@ <h1>Edmonton</h1>
<div class="col-md-4">
<ul>
<li>Douglas Coker (Green)</li>
<li>Mrs Gonul Daniels (Independent)<br><a href="https://twitter.com/GonulDaniels">@GonulDaniels</a></li>
<li>Gonul Daniels (Conservative)<br><a href="https://twitter.com/GonulDaniels">@GonulDaniels</a></li>
<li>Neville Watson (UKIP)</li>
</ul>
<p><small>If you wish to make any corrections to this list, please see the
Expand Down
117 changes: 117 additions & 0 deletions c/haltemprice-and-howden-2.html
@@ -0,0 +1,117 @@
<!DOCTYPE html>
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>TwittElection: Haltemprice and Howden</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">

<link rel="stylesheet" href="/css/bootstrap.min.css">
<style>
body {
padding-top: 50px;
padding-bottom: 20px;
}
</style>
<link rel="stylesheet" href="/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="/css/main.css">

<script src="/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js"></script>
</head>
<body>
<!--[if lt IE 7]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">TwittElection</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li class="active"><a href="/">Home</a></li>
<li><a href="/c/">Constituencies</a></li>
<!-- li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Dropdown <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li class="dropdown-header">Nav header</li>
<li><a href="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li>
</ul>
</li -->
</ul>
<!-- form class="navbar-form navbar-right" role="form">
<div class="form-group">
<input type="text" placeholder="Email" class="form-control">
</div>
<div class="form-group">
<input type="password" placeholder="Password" class="form-control">
</div>
<button type="submit" class="btn btn-success">Sign in</button>
</form -->
</div><!--/.navbar-collapse -->
</div>
</div>

<!-- Main jumbotron for a primary marketing message or call to action -->
<div class="jumbotron">
<div class="container">
<h1>Haltemprice and Howden</h1>
<div class="row">
<div class="col-md-8">
<a class="twitter-timeline" href="https://twitter.com/TwittElection/lists/haltemprice-and-howden-2" data-widget-id="464129893937082368" data-list-owner-screen-name="TwittElection" data-list-slug="haltemprice-and-howden-2">Tweets from https://twitter.com/TwittElection/lists/haltemprice-and-howden-2</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
<div class="col-md-4">
<ul>
<li>Tim Greene (Green)</li>
<li>Edward Hart (Labour)<br><a href="https://twitter.com/xanderedz77">@xanderedz77</a></li>
</ul>
<p><small>If you wish to make any corrections to this list, please see the
<a href="https://yournextmp.com/constituency/65671">Haltemprice and Howden page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
</div>
</div>
</div>
</div>


<div id="footer">
<div class="container">
<p class="muted">Made by <a href="https://twitter.com/davorg/">@davorg</a></p>
</div>
</div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="/js/vendor/jquery-1.11.0.min.js"><\/script>')</script>

<script src="/js/vendor/bootstrap.min.js"></script>

<script src="/js/plugins.js"></script>
<script src="/js/main.js"></script>

<!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-56332-52', 'twittelection.co.uk');
ga('send', 'pageview');

</script>
</body>
</html>
1 change: 1 addition & 0 deletions c/hartlepool.html
Expand Up @@ -79,6 +79,7 @@ <h1>Hartlepool</h1>
<div class="col-md-4">
<ul>
<li>Phillip Broughton (UKIP)</li>
<li>Richard Royal (Conservative)</li>
</ul>
<p><small>If you wish to make any corrections to this list, please see the
<a href="https://yournextmp.com/constituency/65990">Hartlepool page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
Expand Down
9 changes: 5 additions & 4 deletions c/index.html
Expand Up @@ -337,7 +337,7 @@ <h1>Constituencies</h1>
<tr><td><a href="/c/hackney-s-and-shoreditch.html">Hackney South and Shoreditch</a></td></tr>
<tr><td><a href="/c/halesowen-and-rowley-regi.html">Halesowen and Rowley Regis</a></td></tr>
<tr><td><a href="/c/halifax.html">Halifax</a></td></tr>
<tr><td><a href="/c/haltemprice-and-howden.html">Haltemprice and Howden</a></td></tr>
<tr><td><a href="/c/haltemprice-and-howden-2.html">Haltemprice and Howden</a></td></tr>
<tr><td><a href="/c/hammersmith.html">Hammersmith</a></td></tr>
<tr><td><a href="/c/hampstead-and-kilburn.html">Hampstead and Kilburn</a></td></tr>
<tr><td><a href="/c/harborough.html">Harborough</a></td></tr>
Expand Down Expand Up @@ -374,7 +374,7 @@ <h1>Constituencies</h1>
<tr><th><a name="I">I</a></th></tr>
<tr><td><a href="/c/ilford-n.html">Ilford North</a></td></tr>
<tr><td><a href="/c/ilford-s.html">Ilford South</a></td></tr>
<tr><td><a href="/c/inverness-nairn-badenoch-.html">Inverness, Nairn, Badenoch and Strathspey</a></td></tr>
<tr><td><a href="/c/inverness-nairn-badenoch.html">Inverness, Nairn, Badenoch and Strathspey</a></td></tr>
<tr><td><a href="/c/ipswich.html">Ipswich</a></td></tr>
<tr><td><a href="/c/isle-of-wight.html">Isle of Wight</a></td></tr>
<tr><td><a href="/c/islington-n.html">Islington North</a></td></tr>
Expand All @@ -386,12 +386,12 @@ <h1>Constituencies</h1>
<tr><td><a href="/c/keighley.html">Keighley</a></td></tr>
<tr><td><a href="/c/kenilworth-and-southam.html">Kenilworth and Southam</a></td></tr>
<tr><td><a href="/c/kensington.html">Kensington</a></td></tr>
<tr><td><a href="/c/kettering.html">Kettering</a></td></tr>
<tr><td><a href="/c/kettering-2.html">Kettering</a></td></tr>
<tr><td><a href="/c/kilmarnock-and-loudoun.html">Kilmarnock and Loudoun</a></td></tr>
<tr><td><a href="/c/kingston-and-surbiton.html">Kingston and Surbiton</a></td></tr>
<tr><td><a href="/c/kingston-upon-hull-e.html">Kingston upon Hull East</a></td></tr>
<tr><td><a href="/c/kingston-upon-hull-n.html">Kingston upon Hull North</a></td></tr>
<tr><td><a href="/c/kingston-upon-hull-w-and-.html">Kingston upon Hull West and Hessle</a></td></tr>
<tr><td><a href="/c/kingston-upon-hull-w-and.html">Kingston upon Hull West and Hessle</a></td></tr>
<tr><td><a href="/c/kingswood.html">Kingswood</a></td></tr>
<tr><td><a href="/c/kirkcaldy-and-cowdenbeath.html">Kirkcaldy and Cowdenbeath</a></td></tr>
<tr><td><a href="/c/knowsley.html">Knowsley</a></td></tr>
Expand Down Expand Up @@ -469,6 +469,7 @@ <h1>Constituencies</h1>
<tr><td><a href="/c/newport-w.html">Newport West</a></td></tr>
<tr><td><a href="/c/newry-and-armagh.html">Newry and Armagh</a></td></tr>
<tr><td><a href="/c/newton-abbot.html">Newton Abbot</a></td></tr>
<tr><td><a href="/c/normanton-pontefract-and-.html">Normanton, Pontefract and Castleford</a></td></tr>
<tr><td><a href="/c/n-antrim.html">North Antrim</a></td></tr>
<tr><td><a href="/c/n-ayrshire-and-arran.html">North Ayrshire and Arran</a></td></tr>
<tr><td><a href="/c/n-cornwall.html">North Cornwall</a></td></tr>
Expand Down
119 changes: 119 additions & 0 deletions c/inverness-nairn-badenoch.html
@@ -0,0 +1,119 @@
<!DOCTYPE html>
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>TwittElection: Inverness, Nairn, Badenoch and Strathspey</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">

<link rel="stylesheet" href="/css/bootstrap.min.css">
<style>
body {
padding-top: 50px;
padding-bottom: 20px;
}
</style>
<link rel="stylesheet" href="/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="/css/main.css">

<script src="/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js"></script>
</head>
<body>
<!--[if lt IE 7]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">TwittElection</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li class="active"><a href="/">Home</a></li>
<li><a href="/c/">Constituencies</a></li>
<!-- li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Dropdown <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li class="dropdown-header">Nav header</li>
<li><a href="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li>
</ul>
</li -->
</ul>
<!-- form class="navbar-form navbar-right" role="form">
<div class="form-group">
<input type="text" placeholder="Email" class="form-control">
</div>
<div class="form-group">
<input type="password" placeholder="Password" class="form-control">
</div>
<button type="submit" class="btn btn-success">Sign in</button>
</form -->
</div><!--/.navbar-collapse -->
</div>
</div>

<!-- Main jumbotron for a primary marketing message or call to action -->
<div class="jumbotron">
<div class="container">
<h1>Inverness, Nairn, Badenoch and Strathspey</h1>
<div class="row">
<div class="col-md-8">
<a class="twitter-timeline" href="https://twitter.com/TwittElection/lists/inverness-nairn-badenoch" data-widget-id="464129893937082368" data-list-owner-screen-name="TwittElection" data-list-slug="inverness-nairn-badenoch">Tweets from https://twitter.com/TwittElection/lists/inverness-nairn-badenoch</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
<div class="col-md-4">
<ul>
<li>Danny Alexander (Liberal Democrat)<br><a href="https://twitter.com/dannyalexander">@dannyalexander</a></li>
<li>Drew Hendry (Scottish National Party (SNP))<br><a href="https://twitter.com/drewhendrysnp">@drewhendrysnp</a></li>
<li>Edward Mountain (Conservative)<br><a href="https://twitter.com/1edmountain">@1edmountain</a></li>
<li>Mike Robb (Labour)</li>
</ul>
<p><small>If you wish to make any corrections to this list, please see the
<a href="https://yournextmp.com/constituency/14435">Inverness, Nairn, Badenoch and Strathspey page</a> on <a href="https://yournextmp.com/">YourNextMP</a>.</small></p>
</div>
</div>
</div>
</div>


<div id="footer">
<div class="container">
<p class="muted">Made by <a href="https://twitter.com/davorg/">@davorg</a></p>
</div>
</div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="/js/vendor/jquery-1.11.0.min.js"><\/script>')</script>

<script src="/js/vendor/bootstrap.min.js"></script>

<script src="/js/plugins.js"></script>
<script src="/js/main.js"></script>

<!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-56332-52', 'twittelection.co.uk');
ga('send', 'pageview');

</script>
</body>
</html>

0 comments on commit 4749587

Please sign in to comment.