Merge lp:~brett-alton-deactivatedaccount/quickshot/website into lp:~quickshotdevs/quickshot/website

[Brett Alton]

Accidentally put under my own branch. Please merge and I will develop under the proper branch from now on.

[Brett Alton (brett-alton-deactivatedaccount)]

review: Approve

[Adnane Belmadiaf (daker)]

Merged!!

=== modified file 'media/css/styles.css'
--- media/css/styles.css	2010-08-27 23:28:06 +0000
+++ media/css/styles.css	2010-09-05 23:48:43 +0000
@@ -58,6 +58,7 @@
     font-family: Bitstream Vera Sans Mono, Dejavu sans mono, monospace;
     display: block;
     padding: 0.5em 0 0.5em 2em;
+    font-size: 85%;
 }
 
 #page {
@@ -115,7 +116,8 @@
     float:left;
 }
 
-#page-content .content {
+#page-content .content,
+#right .content {
    line-height:20px;
    margin-bottom:20px;
    font-size:14px;
@@ -123,7 +125,6 @@
 
 #picture {
     float:right;
-    width: 350px;
     height:300px;
 }
 
@@ -223,6 +224,12 @@
     min-width:250px; height:30px;
 }
 
+.medium.button, .medium.button:visited {
+    font-size: 22px;
+    padding: 12px 10px 10px;
+    min-width:150px; height:25px;
+}
+
 .orange.button, .orange.button:visited	{ background-color: #FB8B00; }
 .orange.button:focus			{ background-color: #F44800; }
 
@@ -261,13 +268,12 @@
 }
 
 #contactform {
-	width: 300px;
-	margin-top: 25px;
+	width: 400px;
 }
 
 #contactform input, #contactform textarea {
 	padding: 5px;
-	width: 200px;
+	width: 300px;
 	font-size: 1.4em;
 	margin: 0px 0px 5px 0px;
 	border: 1px solid #ccc;
@@ -284,6 +290,7 @@
 #contactform input.submit-button {
 	width: 100px;
 	float: right;
+	margin-right: 23px;
 }
 
 label {
@@ -295,3 +302,15 @@
 	font-size: 1.4em;
 }
 
+span.left{
+	font-weight: bold;
+	float: left;
+	margin-right: 10px;
+	text-align: left;
+	width: 75px;
+}
+
+span.right{
+	float: left;
+	text-align: left;
+}

=== modified file 'sitemap.py'
--- sitemap.py	2010-07-09 21:53:51 +0000
+++ sitemap.py	2010-09-05 23:48:43 +0000
@@ -6,7 +6,7 @@
 
     def get_urls(self, page=1):
         urls = []
-        pages = ('', 'install', 'getinvolved', 'contact', 'download',)
+        pages = ('', 'install', 'contact', 'download',)
         for page in pages:
             sep = ''
             if page:

=== modified file 'templates/base.html'
--- templates/base.html	2010-07-14 12:08:59 +0000
+++ templates/base.html	2010-09-05 23:48:43 +0000
@@ -38,11 +38,11 @@
                <div id="footer_links">
                    <span class="copyright">&copy; 2009 - {% now "Y" %} Ubuntu Manual Team, some rights reserved</span><br />
                    <ul class="links">
-                        <li><a href="#">Quickshot</a></li>
-                        <li><a href="#">USLC</a></li>
-                        <li><a href="#">Our philosophy</a></li>
-                        <li><a href="#">Report a bug</a></li>
-                        <li><a href="#">Contact us</a></li>
+                        <li><a href="{% url home %}" title="Quickshot">Quickshot</a></li>
+                        <!--<li><a href="#">USLC</a></li>-->
+                        <!--<li><a href="#">Our philosophy</a></li>-->
+                        <li><a href="https://bugs.launchpad.net/quickshot/+filebug">Report a bug</a></li>
+                        <li><a href="{% url contact %}" title="contact">Contact us</a></li>
                    </ul>
                </div>
             </div>

=== modified file 'templates/contact.html'
--- templates/contact.html	2010-08-27 23:28:06 +0000
+++ templates/contact.html	2010-09-05 23:48:43 +0000
@@ -5,29 +5,53 @@
 
 {% block content %}
 <div class="entry-content"> 
- 
-			{% if status %}
-				{% if status.good %}
-					<p>Your email has been sent. Ben will get back to you as soon as he possibly can!</p> 
+ 			<div id="page-content">
+				{% if status %}
+					{% if status.good %}
+						<p>Your email has been sent. The Quickshot developers will get back to you as soon as they possibly can!</p> 
+					{% else %}
+						<p>Oops, error: {{ status.msg }}</p> 
+					{% endif %}
 				{% else %}
-					<p>Oops, error: {{ status.msg }}</p> 
-				{% endif %}
-			{% else %}
-				{{ page.gethtml|safe }}
-			<div id="contactform"> 
-				<form id="contact" action="/contact" method="POST"> 
-					<label for="id_sender">Email:</label> 
-				
-					<label for="City">Subject:</label> 
-					<input type="text" name="City" id="City" />  
-				
-					<label for="Message">Comments:</label><br /> 
-					<textarea name="Message" rows="20" cols="20" id="Message"></textarea> 
-	 
-					<input type="submit" name="submit" value="Submit" class="submit-button" /> 
-				</form> 
-			</div> 
- 
+					{{ page.gethtml|safe }}
+				<div id="contactform"> 
+					<form id="contact" action="/contact" method="POST"> 
+						<div class="required">
+							<label for="name">Name:</label>
+							<input type="text" name="name" id="name" class="inputText" size="10" maxlength="100" value="" />
+						</div>
+						<div class="required">
+							<label for="email">E-mail:</label>
+							<input type="text" name="email" id="email" class="inputText" size="10" maxlength="100" value="" />
+						</div>
+						<div class="required">
+							<label for="message">Message:</label><br /> 
+							<textarea name="message" rows="20" cols="20" id="message"></textarea> 
+						</div>
+						<div class="required">
+							<input type="submit" name="submit" value="Submit" class="submit-button" />
+						</div>
+					</form> 
+				</div>
+			</div>
+			
+ 			<div id="right" style="float: left;">
+      			<div class="content">
+      				<span class="left">IRC:</span><span class="right">#ubuntu-manual on <em>irc.freenode.net</em></span>
+      			</div>
+      			<div class="content">
+	      			<span class="left">Email:</span><span class="right">[e-mail]</span>
+	      		</div>
+      			<div class="content">
+      				<span class="left">Launchpad:</span><span class="right"><a href="https://launchpad.net/~quickshotdevs">https://launchpad.net/~quickshotdevs</a></span>
+      			</div>
+      			<div class="content">
+      				<span class="left">Facebook:</span><span class="right"><a href="http://facebook.com/quickshot">http://facebook.com/quickshot</a></span>
+      			</div>
+      			<div class="content">
+      				<span class="left">Twitter:</span><span class="right"><a href="http://twitter.com/quickshotteam">http://twitter.com/quickshotteam</a></span>
+      			</div>
+			</div>
 				
 			{% endif %}
  

=== modified file 'templates/install.html'
--- templates/install.html	2010-07-09 21:53:51 +0000
+++ templates/install.html	2010-09-05 23:48:43 +0000
@@ -4,5 +4,29 @@
 {% block section %}download{% endblock %}
 
 {% block content %}
-
+<div id="page-content">
+
+	<div class="content">
+		If you are not already using Ubuntu 10.10 (Maverick Meerkat), the easiest, and recommended way to use Quickshot is to download the Quickshot Live CD and boot into that to take screenshots.
+	</div>
+
+
+	<div class="content">
+		<a href="http://files.ubuntu-manual.org/quickshot/ubuntu-manual-quickshot-i386-0.0.8.iso" class="medium button orange" style="float: left; margin-right: 8px">Download</a>
+		<span style="font-size: 85%"><strong>Please note:</strong> This Live CD is a striped down version of Ubuntu 10.10 and therefore is not suitable for use as a real operating system.</span>
+	</div>
+
+	<div class="content">
+		Already using Ubuntu 10.10? Add our PPA by running these commands:
+		<code>
+			sudo add-apt-repository ppa:quickshotdevs/quickshot-release<br />
+			sudo apt-get update<br />
+			sudo apt-get install quickshot
+		</code>
+	</div>
+</div>
+             
+<div id="picture">
+       <img src="/static/images/quickshot.png" >
+</div>
 {% endblock %}

=== modified file 'views.py'
--- views.py	2010-07-09 21:53:51 +0000
+++ views.py	2010-09-05 23:48:43 +0000
@@ -15,9 +15,9 @@
 
 
 class ContactForm(forms.Form):
-    subject = forms.CharField(max_length=100)
+    name = forms.CharField(max_length=100)
+    email = forms.EmailField()
     message = forms.CharField(widget=forms.widgets.Textarea())
-    sender = forms.EmailField()
 
 def contactpost(req):
     """
@@ -29,15 +29,15 @@
     form = ContactForm(req.POST) # A form bound to the POST data
     
     if form.is_valid(): # All validation rules pass
-        subject = form.cleaned_data['subject']
+        name = form.cleaned_data['name']
+        email = form.cleaned_data['email']
         message = form.cleaned_data['message']
-        sender = form.cleaned_data['sender']
         recipients = [deploy.EMAIL_CONTACT_RECIPIENT]
     
         from django.core.mail import EmailMessage
         
         try:
-            em = EmailMessage(subject, message, deploy.EMAIL_CONTACT_SENDER, recipients, headers = {'Reply-To': sender})
+            em = EmailMessage(name, message, deploy.EMAIL_CONTACT_SENDER, recipients, headers = {'Reply-To': email})
             em.send()
             status = { 'good': True, 'msg':"" }
         except SMTPException, ex: