kaputtnik has proposed merging
lp:~widelands-dev/widelands-website/copyrightyear_and_links into
lp:widelands-website.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/copyrightyear_and_links/+merge/281450
This branch contains:
1. Changing copyrightyear in the footer of the web site
2. Added links to Syntax page for each reply box
The second one is a bit bad because we have same code in three templates, but i
think it is ok.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/copyrightyear_and_links into
lp:widelands-website.
=== added file 'media/img/menu_help.png'
Binary files media/img/menu_help.png 1970-01-01 00:00:00 +0000 and media/img/menu_help.png 2015-12-31 10:57:51 +0000 differ
=== modified file 'templates/footer.html'
--- templates/footer.html 2015-02-24 20:24:59 +0000
+++ templates/footer.html 2015-12-31 10:57:51 +0000
@@ -7,5 +7,5 @@
{% endcomment %}
<div id="footer">
- Copyright © 2009 - 2015 By the Widelands Development Team
+ Copyright © 2009 - 2016 By the Widelands Development Team
</div>
=== modified file 'templates/pybb/add_post.html'
--- templates/pybb/add_post.html 2015-02-18 22:30:08 +0000
+++ templates/pybb/add_post.html 2015-12-31 10:57:51 +0000
@@ -71,6 +71,13 @@
<br />
</div>
+ <div class="posRight">
+ <a href="/wiki/WikiSyntax" title="Opens new Tab/Window" target="_blank">
+ <img src="{{ MEDIA_URL }}img/menu_help.png" alt="Help on Syntax" class="middle">
+ Help on Syntax
+ </a>
+ </div>
+
{{ form.as_p }}
{% csrf_token %}
<button type="submit">
=== modified file 'templates/pybb/base.html'
--- templates/pybb/base.html 2015-02-18 22:30:08 +0000
+++ templates/pybb/base.html 2015-12-31 10:57:51 +0000
@@ -11,5 +11,6 @@
<link rel="alternate" type="application/atom+xml" title="Latest Posts on all forums" href="{% url pybb_feed "posts" %}" />
<link rel="alternate" type="application/atom+xml" title="Latest Topics on all forums" href="{% url pybb_feed "topics" %}" />
-{{ block.super}}{% endblock %}
+{{ block.super}}
+{% endblock %}
=== modified file 'templates/pybb/edit_post.html'
--- templates/pybb/edit_post.html 2015-02-18 22:30:08 +0000
+++ templates/pybb/edit_post.html 2015-12-31 10:57:51 +0000
@@ -46,7 +46,14 @@
</div>
<br />
</div>
-
+
+ <div class="posRight">
+ <a href="/wiki/WikiSyntax" title="Opens new Tab/Window" target="_blank">
+ <img src="{{ MEDIA_URL }}img/menu_help.png" alt="Help on Syntax" class="middle">
+ Help on Syntax
+ </a>
+ </div>
+
{{ form.as_p }}
{% csrf_token %}
<button type="submit">
=== modified file 'templates/pybb/inlines/add_post_form.html'
--- templates/pybb/inlines/add_post_form.html 2015-02-18 22:30:08 +0000
+++ templates/pybb/inlines/add_post_form.html 2015-12-31 10:57:51 +0000
@@ -48,6 +48,13 @@
<br />
</div>
+ <div class="posRight">
+ <a href="/wiki/WikiSyntax" title="Opens new Tab/Window" target="_blank">
+ <img src="{{ MEDIA_URL }}img/menu_help.png" alt="Help on Syntax" class="middle">
+ Help on Syntax
+ </a>
+ </div>
+
{{ form.as_p }}
{% csrf_token %}
<button type="submit">
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
