widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #00309
[Merge] lp:~hjd/widelands-website/break into lp:widelands-website
Hans Joachim Desserud has proposed merging lp:~hjd/widelands-website/break into lp:widelands-website.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~hjd/widelands-website/break/+merge/69881
Changed <br> to <br /> in two places (items under important dates, and in the registration form), which results in two errors less when validating the pages.
There are two more instances of <br> remaining, but I am not sure where they are used, so I left them alone.
--
https://code.launchpad.net/~hjd/widelands-website/break/+merge/69881
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands-website/break into lp:widelands-website.
=== modified file 'templates/right_boxes.html'
--- templates/right_boxes.html 2010-10-31 12:17:41 +0000
+++ templates/right_boxes.html 2011-07-30 09:13:21 +0000
@@ -109,7 +109,7 @@
<div class="box_content" align="center">
{% for e in events %}
<div class="event">
- <a href="{{e.link}}" class="link">{{e.name}}</a><br>
+ <a href="{{e.link}}" class="link">{{e.name}}</a><br />
<div class="date">
{{e.start_date|date:"d M"}}
{% ifnotequal e.start_date e.end_date %}
=== modified file 'wlrecaptcha/forms.py'
--- wlrecaptcha/forms.py 2009-03-03 13:46:05 +0000
+++ wlrecaptcha/forms.py 2011-07-30 09:13:21 +0000
@@ -43,7 +43,7 @@
<noscript>
<iframe src="http://api.recaptcha.net/noscript?k=%(public_key)s"
- height="300" width="500" frameborder="0"></iframe><br>
+ height="300" width="500" frameborder="0"></iframe><br />
<textarea name="recaptcha_challenge_field" rows="3" cols="40">
</textarea>
<input type="hidden" name="recaptcha_response_field"
Follow ups