Merge commit '3702f7a' (update)

4 files changed, 4 insertions, 31 deletions

diff --git a/retro/templates/retro/index-20040327.html b/retro/templates/retro/index-20040327.html
index 384ce03c..08588fe5 100644
--- a/retro/templates/retro/index-20040327.html
+++ b/retro/templates/retro/index-20040327.html
@@ -218,18 +218,9 @@
 				<tr>
 					<td style="background-color: rgb(238, 238, 238);" align="center"><br>
 <!-- paypal code -->
-<form action="http://web.archive.org/web/20040327023505/https://www.paypal.com/cgi-bin/webscr" method="post">
-<input name="cmd" value="_xclick" type="hidden">
-<input name="business" value="jvinet@zeroflux.org" type="hidden">
-<input name="item_name" value="Arch Linux" type="hidden">
-<input name="image_url" value="http://www.archlinux.org/logos/arch-paypal.jpg" type="hidden">
-<input name="no_shipping" value="1" type="hidden">
-<input name="cn" value="Suggestions/Comments" type="hidden">
-<input name="no_note" value="1" type="hidden">
-<input src="{{ RETRO_STATIC_URL }}x-click-butcc-donate.gif" name="submit" alt="Make payments with PayPal - it's fast, free and secure!" style="background: none repeat scroll 0% 0% transparent; border: medium none;" border="0" type="image">
+<img src="{{ RETRO_STATIC_URL }}x-click-butcc-donate.gif" alt="Make payments with PayPal - it's fast, free and secure!" style="background: none repeat scroll 0% 0% transparent; border: medium none;" border="0">
 <br>
 <span class="f4">All money goes directly to server costs</span>
-</form>
 					</td>
 				</tr>
 				<tr>
diff --git a/retro/templates/retro/index-20050328.html b/retro/templates/retro/index-20050328.html
index 7cdca300..e2d3058f 100644
--- a/retro/templates/retro/index-20050328.html
+++ b/retro/templates/retro/index-20050328.html
@@ -295,18 +295,9 @@
 				<tr>
 					<td style="background-color: rgb(238, 238, 238);" align="center"><br>
 <!-- paypal code -->
-<form action="http://web.archive.org/web/20050328032247/https://www.paypal.com/cgi-bin/webscr" method="post">
-<input name="cmd" value="_xclick" type="hidden">
-<input name="business" value="jvinet@zeroflux.org" type="hidden">
-<input name="item_name" value="Arch Linux" type="hidden">
-<input name="image_url" value="http://www.archlinux.org/logos/arch-paypal.jpg" type="hidden">
-<input name="no_shipping" value="1" type="hidden">
-<input name="cn" value="Suggestions/Comments" type="hidden">
-<input name="no_note" value="1" type="hidden">
-<input src="{{ RETRO_STATIC_URL }}x-click-butcc-donate.gif" name="submit" alt="Make payments with PayPal - it's fast, free and secure!" style="background: none repeat scroll 0% 0% transparent; border: medium none;" border="0" type="image">
+<img src="{{ RETRO_STATIC_URL }}x-click-butcc-donate.gif" alt="Make payments with PayPal - it's fast, free and secure!" style="background: none repeat scroll 0% 0% transparent; border: medium none;" border="0">
 <br>
 <span class="f4">All money goes directly to server costs</span>
-</form>
 					</td>
 				</tr>
 				<tr>
diff --git a/retro/templates/retro/index-20060328.html b/retro/templates/retro/index-20060328.html
index aaf006e5..840974c0 100644
--- a/retro/templates/retro/index-20060328.html
+++ b/retro/templates/retro/index-20060328.html
@@ -323,16 +323,7 @@
 				<tr>
 					<td style="background-color: rgb(238, 238, 238);" align="center"><br>
 <!-- paypal code -->
-<form action="http://web.archive.org/web/20060328003102/https://www.paypal.com/cgi-bin/webscr" method="post">
-<input name="cmd" value="_xclick" type="hidden">
-<input name="business" value="jvinet@zeroflux.org" type="hidden">
-<input name="item_name" value="Arch Linux" type="hidden">
-<input name="image_url" value="/logos/arch-paypal.jpg" type="hidden">
-<input name="no_shipping" value="1" type="hidden">
-<input name="cn" value="Suggestions/Comments" type="hidden">
-<input name="no_note" value="1" type="hidden">
-<input src="{{ RETRO_STATIC_URL }}x-click-butcc-donate.gif" name="submit" alt="Make payments with PayPal - it's fast, free and secure!" style="background: none repeat scroll 0% 0% transparent; border: medium none;" border="0" type="image">
-</form>
+<img src="{{ RETRO_STATIC_URL }}x-click-butcc-donate.gif" alt="Make payments with PayPal - it's fast, free and secure!" style="background: none repeat scroll 0% 0% transparent; border: medium none;" border="0">
 					</td>
 				</tr>
 				<tr>
diff --git a/templates/packages/details.html b/templates/packages/details.html
index 715ba2c0..1dd39937 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -154,7 +154,7 @@
         </tr>
         {% if user.is_authenticated %}{% with pkg.flag_request as flag_request %}{% if flag_request %}<tr>
             <th>Last Flag Request:</th>
-            <td>From {{ flag_request.who }} on {{ flag_request.created|date }}:<br/>
+            <td class="wrap">From {{ flag_request.who }} on {{ flag_request.created|date }}:<br/>
                 <div class="userdata">{{ flag_request.message|linebreaksbr|default:"{no message}" }}</div></td>
         </tr>{% endif %}{% endwith %}{% endif %}
     </table>