Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Candidates #198

Merged
merged 3 commits into from
Aug 15, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions _layouts/homepage.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ <h1>The OpenPolitics Project</h1>
<p>{{site.tagline}}</p>
<p>
<a href='manifesto' class='btn btn-primary btn-lg'>Help write the Manifesto</a>
<a href='candidates.html' class='btn btn-primary btn-lg'>Vote OpenPolitics in 2015</a>
</p>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion _layouts/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
{% endfor %}
</ul>
</li>
<li><a href="http://votebot.openpolitics.org.uk">Open Votes</a></li>
<li><a href="http://votebot.openpolitics.org.uk">Votes</a></li>
<li><a href="{{site.baseurl}}candidates.html">Candidates</a></li>
<li><a href="{{site.baseurl}}contributing.html">How to Contribute</a></li>
</ul>
<a href="https://github.com/openpolitics/manifesto/edit/gh-pages/{{page.path}}" class='btn btn-primary navbar-btn pull-right'>
Expand Down
26 changes: 26 additions & 0 deletions candidates.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
title: Candidates
layout: page
published: true
---

This is a list of candidates who have announced that they will be standing in the 2015 elections, on the OpenPolitics Manifesto platform.

<h2>UK Parliament</h2>

<table class='table table-striped'>
<tr>
<th>Name</th>
<th>Constituency</th>
<th>Contact</th>
</tr>
<tr>
<td>James Smith</td>
<td>Horsham</td>
<td><a href='http://openhorsham.org.uk'>Open Horsham</a>, <a href='http://twitter.com/Floppy'>@Floppy</a></td>
</tr>
</table>

<h2>Standing</h2>

If you want to stand on the OpenPolitics Manifesto in <em>your</em> area, <a href='https://github.com/openpolitics/manifesto/edit/gh-pages/candidates.html'>add yourself to the list here</a>!
2 changes: 1 addition & 1 deletion contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ All changes (aside from very minor ones) should remain open for discussion for a

Any contributor can block a merge by including a 'thumbs-down' symbol, as long as they include constructive reasoning and alternative proposals. A change cannot be merged as long as there are blocks in place.

Votes are counted by an automated script, which sets the GitHub build status on the pull request depending whether enough votes have been received. See the [Open Votes](http://votebot.openpolitics.org.uk) page for details and vote counts. Changes are merged by a [repository administrator](https://github.com/orgs/openpolitics/members) once consensus is reached.
Votes are counted by an automated script, which sets the GitHub build status on the pull request depending whether enough votes have been received. See the [Votes](http://votebot.openpolitics.org.uk) page for details and vote counts. Changes are merged by a [repository administrator](https://github.com/orgs/openpolitics/members) once consensus is reached.

Once an author has had a change merged in, they will become an existing contributor and thus can vote on new changes.

Expand Down