Reverted back to old contact.py

svn path=/stable/; revision=706

2 files changed, 27 insertions, 34 deletions

diff --git a/www-apps/pyblosxom-plugins/Manifest b/www-apps/pyblosxom-plugins/Manifest
index 297f778..be3b774 100644
--- a/www-apps/pyblosxom-plugins/Manifest
+++ b/www-apps/pyblosxom-plugins/Manifest
@@ -1,6 +1,6 @@
 MD5 68900c82dbdf221d22e8a999b02443d9 files/blocks.py 5866
 MD5 3d89ed013ed90e7afff11e8e3a57ebf4 files/comments.py 25302
-MD5 cad9589b6b07ac28854f1172a67c51c0 files/contact.py 11817
+MD5 eb4a14c8aae732ef13ba754014bbc30a files/contact.py 11493
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-pyblosxom-plugins-1.3.2 0
 MD5 ef8b9559c56fe3bff0bf15672c2239e4 files/getstamps.py 1332
 MD5 3ae49161534556018d226f514ef68195 files/hardcodedates.py 2036
diff --git a/www-apps/pyblosxom-plugins/files/contact.py b/www-apps/pyblosxom-plugins/files/contact.py
index d2f902d..b94bc53 100644
--- a/www-apps/pyblosxom-plugins/files/contact.py
+++ b/www-apps/pyblosxom-plugins/files/contact.py
@@ -46,42 +46,35 @@ MESSAGE_KEY = "contact_error_message"
 _form_fields = ['name', 'email', 'subject', 'message']
 
 _default_template = """
+<style type="text/css">
+<!--
+#contactForm label {
+    float: left;
+    width: 25%;
+    padding-top: 3px;
+    margin-bottom: 5px;
+    }
+#contactForm input, textarea {
+    width: 70%;
+    margin-right: 10px;
+    margin-bottom: 5px;
+    }
+-->
+</style>
 <div>
-<h2>Contact me</h2>
+<h3>Contact me</h3>
 <div style="display:block;">$contact_error_message</div>
 <form name="contactForm" id="contactForm" method="post" action="$base_url$contact_urltrigger">
-<div class="contactLine">
-  <div class="contactLabel">
-    <label class="contactLine" for="name" title="Your name">Name</label>
-  </div>
-  <input type="text" name="name" id="name" value="$contact_name" /><br />
-</div>
-<div class="contactLine">
-  <div class="contactLabel">
-    <label class="contactLine" for="email" title="Your email address">Email</label>
-  </div>
-  <input type="text" name="email" id="email" value="$contact_email" /><br />
-</div>
-<div class="contactLine">
-  <div class="contactLabel">
-    <label class="contactLine" for="subject" title="Subject of your message">Subject</label>
-  </div>
-  <input class="contactLine" type="text" name="subject" id="subject" value="$contact_subject" /><br />
-</div>
-<div class="contactText">
-  <div class="contactLabel">
-    <label class="contactText" for="message" title="Your message">Message</label>
-  </div>
-  <textarea name="message" id="message" style="height:150px;">$contact_message</textarea><br />
-</div>
-<div class="contactSubmit">
-  <div class="contactButton">
-    <input class="contactSubmit" type="submit" value="Send" style="width:auto; margin-right:0;" />
-  </div>
-  <div class="contactButton">
-    <input class="contactSubmit" type="reset" value="Reset" style="width:auto; margin-right:0;" />
-  </div>
-</div>
+<label for="name" title="Your name">Name</label>
+<input type="text" name="name" id="name" value="$contact_name" /><br />
+<label for="email" title="Your email address">Email</label>
+<input type="text" name="email" id="email" value="$contact_email" /><br />
+<label for="subject" title="Subject of your message">Subject</label>
+<input type="text" name="subject" id="subject" value="$contact_subject" /><br />
+<label for="message" title="Your message">Message</label>
+<textarea name="message" id="message" style="height:150px;">$contact_message</textarea><br />
+<input type="submit" value="Send" style="width:auto; margin-right:0;" />
+<input type="reset" value="Reset" style="width:auto; margin-right:0;" />
 </form>
 </div>
 """