From 7f92f1f4d453419c4fec92e68dd04cb2062fe3f5 Mon Sep 17 00:00:00 2001
From: sanderroosendaal <roosendaalsander@gmail.com>
Date: Mon, 31 Oct 2016 19:16:59 +0100
Subject: [PATCH] Added Twitter and Bitbucket to contact/email page

---
 .gitignore                     |  1 +
 rowers/templates/about_us.html |  2 ++
 rowers/templates/email.html    | 22 ++++++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/.gitignore b/.gitignore
index 988572a3..81586df1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /build/
 /docs/
 
+
 # Python egg metadata, regenerated from source files by setuptools.
 *.egg-info
 
diff --git a/rowers/templates/about_us.html b/rowers/templates/about_us.html
index 70c9665d..f7626823 100644
--- a/rowers/templates/about_us.html
+++ b/rowers/templates/about_us.html
@@ -105,6 +105,8 @@ You will be taken to the secure PayPal payment site.
 
 <p>
 <ul>
+<li>2016-11-01 Sliders to select subsets of data on some plots</li>
+<li>2016-11-01 Emailing workouts to workouts@rowsandall.com </li>
 <li>2016-09-30 Stroke Analysis Plot - with date range filtering</li>
 <li>2016-09-29 Improved Flex plot, Power Histogram and Ranking Pieces - with date range filtering</li>
 <li>2016-09-20 Added the Power histogram</li>
diff --git a/rowers/templates/email.html b/rowers/templates/email.html
index 9403c3da..89ea62b9 100644
--- a/rowers/templates/email.html
+++ b/rowers/templates/email.html
@@ -2,6 +2,7 @@
     {% block title %}Contact Us{% endblock title %}
     {% block content %}
 	<div id="emailform" class="grid_6 alpha">
+	<h1>Contact us through email</h1>
 
     {% if form.errors %}
         <p style="color: red;">
@@ -56,5 +57,26 @@
 	</table>
       </form>	
 	</div>
+
+<div class="grid_6 omega">
+<h1>Bug reporting, feature requests</h1>
+
+<p>
+Bug reports and feature requests can be done through our BitBucket page. Please check on the following link if your bug or issue is a known one. Feel free to file any feature request. 
+<ul>
+<li><a href="https://bitbucket.org/sanderroosendaal/rowsandall/issues">BitBucket Issue list (click here to go report an issue or request a feature)</a></li>
+</ul>
+</p>
+
+<h1>Twitter</h1>
+
+<p>You can also check me on Twitter:
+<ul>
+<li><a href="https://twitter.com/rowsandall">https://twitter.com/rowsandall</a>
+</ul>
+When the site is down, this is the appropriate channel to look for apologies, updates, and offer help.
+</p>
+
+</div>
     {% endblock content %}
   
\ No newline at end of file