sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'hotfix/v4.19'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-10-10 08:10:11 +02:00
parent 6774c5c74d 1237e6999e
commit b6082f2716
6 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/templates/login_form.html
View File

@@ -4,6 +4,9 @@
</head> </head>
<body> <body>
<h1>Login</h1> <h1>Login</h1>
<p><a class="twitter-follow-button"
href="https://twitter.com/rowsandall">
Follow @rowsandall</a></p>
{% if form.errors %} {% if form.errors %}
<p style="color: red;"> <p style="color: red;">
@@ -23,4 +26,4 @@
<a href="/rowers/register">register</a> <a href="/rowers/register">register</a>
</p> </p>
</body> </body>
</html> </html>

11
rowers/templates/registration/login.html
View File

@@ -20,11 +20,20 @@
<tr> <tr>
<td></td> <td></td>
<td><a href="/password_reset/">Forgot password?</a></td> <td><a href="/password_reset/">Forgot password?</a></td>
</tr> </tr>
</table> </table>
<input type="submit" value="login" /> <input type="submit" value="login" />
<input type="hidden" name="next" value="{{ next }}" /> <input type="hidden" name="next" value="{{ next }}" />
</form> </form>
<p class="midden"><a class="twitter-follow-button"
href="https://twitter.com/rowsandall">
Follow @rowsandall</a>
</p>
{% endblock %} {% endblock %}

2
rowers/templates/show_graph.html
View File

@@ -16,7 +16,7 @@
<div class="grid_12"> <div class="grid_12">
<div class="grid_1 alpha"> <div class="grid_1 alpha">
<div class="fb-share-button" data-href="https://rowsandall.com/rower/graph/{{ graph.id }}" data-layout="button" data-size="small" data-mobile-iframe="false"> <div class="fb-share-button" data-href="https://rowsandall.com/rower/graph/{{ graph.id }}" data-layout="button" data-size="small" data-mobile-iframe="false">
<a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/graph/{{ graph.id }}&amp;src=sdkpreparse">Share</a></div> <a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/graph/{{ graph.id }}">Share</a></div>
</div> </div>
<div class="grid_1"> <div class="grid_1">
<a class="twitter-share-button" <a class="twitter-share-button"

2
rowers/templates/workout_form.html
View File

@@ -221,7 +221,7 @@
<div class="grid_1 omega"> <div class="grid_1 omega">
<div class="grid_1 alpha"> <div class="grid_1 alpha">
<div class="fb-share-button" data-href="https://rowsandall.com/rowers/workout/{{ workout.id }}" data-layout="button" data-size="small" data-mobile-iframe="false"> <div class="fb-share-button" data-href="https://rowsandall.com/rowers/workout/{{ workout.id }}" data-layout="button" data-size="small" data-mobile-iframe="false">
<a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/workout/{{ workout.id }}&amp;src=sdkpreparse">Share</a></div> <a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/workout/{{ workout.id }}">Share</a></div>
</div> </div>
<div class="grid_1 alpha"> <div class="grid_1 alpha">
<p>&nbsp;</p> <p>&nbsp;</p>

2
rowers/templates/workout_view.html
View File

@@ -30,7 +30,7 @@
<h1>{{ workout.name }}</h1> <h1>{{ workout.name }}</h1>
<div class="grid_1 alpha"> <div class="grid_1 alpha">
<div class="fb-share-button" data-href="https://rowsandall.com/rowers/workout/{{ workout.id }}" data-layout="button" data-size="small" data-mobile-iframe="false"> <div class="fb-share-button" data-href="https://rowsandall.com/rowers/workout/{{ workout.id }}" data-layout="button" data-size="small" data-mobile-iframe="false">
<a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/workout/{{ workout.id }}&amp;src=sdkpreparse">Share</a></div> <a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/workout/{{ workout.id }}">Share</a></div>
</div> </div>
<div class="grid_1"> <div class="grid_1">
<a class="twitter-share-button" <a class="twitter-share-button"

5
templates/basebase.html
View File

@@ -106,10 +106,7 @@
</p> </p>
</div> </div>
<div class="grid_4 alpha"> <div class="grid_4 alpha">
<p>Free Data and Analysis. For Rowers. By Rowers. <p>Free Data and Analysis. For Rowers. By Rowers.</p>
<a class="twitter-follow-button"
href="https://twitter.com/rowsandall">
Follow @rowsandall</a></p>
</div> </div>
</div> </div>