Quickshot

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

  1. website
  2. Merge into website
Proposed by Brett Alton
Status: Merged
Approved by: Brett Alton
Approved revision: 6
Merge reported by: Adnane Belmadiaf
Merged at revision: not available
Proposed branch: lp:~brett-alton-deactivatedaccount/quickshot/website
Merge into: lp:~quickshotdevs/quickshot/website
Diff against target: 266 lines (+106/-39)
6 files modified
media/css/styles.css (+24/-5)
sitemap.py (+1/-1)
templates/base.html (+5/-5)
templates/contact.html (+46/-22)
templates/install.html (+25/-1)
views.py (+5/-5)
To merge this branch: bzr merge lp:~brett-alton-deactivatedaccount/quickshot/website
Reviewer Review Type Date Requested Status
Brett Alton (community) Approve
Review via email: mp+34648@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Brett Alton (brett-alton-deactivatedaccount) :
review: Approve
Revision history for this message
Adnane Belmadiaf (daker) wrote :

Merged!!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
58 font-family: Bitstream Vera Sans Mono, Dejavu sans mono, monospace;58 font-family: Bitstream Vera Sans Mono, Dejavu sans mono, monospace;
59 display: block;59 display: block;
60 padding: 0.5em 0 0.5em 2em;60 padding: 0.5em 0 0.5em 2em;
61 font-size: 85%;
61}62}
6263
63#page {64#page {
@@ -115,7 +116,8 @@
115 float:left;116 float:left;
116}117}
117118
118#page-content .content {119#page-content .content,
120#right .content {
119 line-height:20px;121 line-height:20px;
120 margin-bottom:20px;122 margin-bottom:20px;
121 font-size:14px;123 font-size:14px;
@@ -123,7 +125,6 @@
123125
124#picture {126#picture {
125 float:right;127 float:right;
126 width: 350px;
127 height:300px;128 height:300px;
128}129}
129130
@@ -223,6 +224,12 @@
223 min-width:250px; height:30px;224 min-width:250px; height:30px;
224}225}
225226
227.medium.button, .medium.button:visited {
228 font-size: 22px;
229 padding: 12px 10px 10px;
230 min-width:150px; height:25px;
231}
232
226.orange.button, .orange.button:visited { background-color: #FB8B00; }233.orange.button, .orange.button:visited { background-color: #FB8B00; }
227.orange.button:focus { background-color: #F44800; }234.orange.button:focus { background-color: #F44800; }
228235
@@ -261,13 +268,12 @@
261}268}
262269
263#contactform {270#contactform {
264 width: 300px;271 width: 400px;
265 margin-top: 25px;
266}272}
267273
268#contactform input, #contactform textarea {274#contactform input, #contactform textarea {
269 padding: 5px;275 padding: 5px;
270 width: 200px;276 width: 300px;
271 font-size: 1.4em;277 font-size: 1.4em;
272 margin: 0px 0px 5px 0px;278 margin: 0px 0px 5px 0px;
273 border: 1px solid #ccc;279 border: 1px solid #ccc;
@@ -284,6 +290,7 @@
284#contactform input.submit-button {290#contactform input.submit-button {
285 width: 100px;291 width: 100px;
286 float: right;292 float: right;
293 margin-right: 23px;
287}294}
288295
289label {296label {
@@ -295,3 +302,15 @@
295 font-size: 1.4em;302 font-size: 1.4em;
296}303}
297304
305span.left{
306 font-weight: bold;
307 float: left;
308 margin-right: 10px;
309 text-align: left;
310 width: 75px;
311}
312
313span.right{
314 float: left;
315 text-align: left;
316}
298317
=== 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 @@
66
7 def get_urls(self, page=1):7 def get_urls(self, page=1):
8 urls = []8 urls = []
9 pages = ('', 'install', 'getinvolved', 'contact', 'download',)9 pages = ('', 'install', 'contact', 'download',)
10 for page in pages:10 for page in pages:
11 sep = ''11 sep = ''
12 if page:12 if page:
1313
=== 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 @@
38 <div id="footer_links">38 <div id="footer_links">
39 <span class="copyright">&copy; 2009 - {% now "Y" %} Ubuntu Manual Team, some rights reserved</span><br />39 <span class="copyright">&copy; 2009 - {% now "Y" %} Ubuntu Manual Team, some rights reserved</span><br />
40 <ul class="links">40 <ul class="links">
41 <li><a href="#">Quickshot</a></li>41 <li><a href="{% url home %}" title="Quickshot">Quickshot</a></li>
42 <li><a href="#">USLC</a></li>42 <!--<li><a href="#">USLC</a></li>-->
43 <li><a href="#">Our philosophy</a></li>43 <!--<li><a href="#">Our philosophy</a></li>-->
44 <li><a href="#">Report a bug</a></li>44 <li><a href="https://bugs.launchpad.net/quickshot/+filebug">Report a bug</a></li>
45 <li><a href="#">Contact us</a></li>45 <li><a href="{% url contact %}" title="contact">Contact us</a></li>
46 </ul>46 </ul>
47 </div>47 </div>
48 </div>48 </div>
4949
=== 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 @@
55
6{% block content %}6{% block content %}
7<div class="entry-content"> 7<div class="entry-content">
8 8 <div id="page-content">
9 {% if status %}9 {% if status %}
10 {% if status.good %}10 {% if status.good %}
11 <p>Your email has been sent. Ben will get back to you as soon as he possibly can!</p> 11 <p>Your email has been sent. The Quickshot developers will get back to you as soon as they possibly can!</p>
12 {% else %}
13 <p>Oops, error: {{ status.msg }}</p>
14 {% endif %}
12 {% else %}15 {% else %}
13 <p>Oops, error: {{ status.msg }}</p> 16 {{ page.gethtml|safe }}
14 {% endif %}17 <div id="contactform">
15 {% else %}18 <form id="contact" action="/contact" method="POST">
16 {{ page.gethtml|safe }}19 <div class="required">
17 <div id="contactform"> 20 <label for="name">Name:</label>
18 <form id="contact" action="/contact" method="POST"> 21 <input type="text" name="name" id="name" class="inputText" size="10" maxlength="100" value="" />
19 <label for="id_sender">Email:</label> 22 </div>
20 23 <div class="required">
21 <label for="City">Subject:</label> 24 <label for="email">E-mail:</label>
22 <input type="text" name="City" id="City" /> 25 <input type="text" name="email" id="email" class="inputText" size="10" maxlength="100" value="" />
23 26 </div>
24 <label for="Message">Comments:</label><br /> 27 <div class="required">
25 <textarea name="Message" rows="20" cols="20" id="Message"></textarea> 28 <label for="message">Message:</label><br />
26 29 <textarea name="message" rows="20" cols="20" id="message"></textarea>
27 <input type="submit" name="submit" value="Submit" class="submit-button" /> 30 </div>
28 </form> 31 <div class="required">
29 </div> 32 <input type="submit" name="submit" value="Submit" class="submit-button" />
30 33 </div>
34 </form>
35 </div>
36 </div>
37
38 <div id="right" style="float: left;">
39 <div class="content">
40 <span class="left">IRC:</span><span class="right">#ubuntu-manual on <em>irc.freenode.net</em></span>
41 </div>
42 <div class="content">
43 <span class="left">Email:</span><span class="right">quickshot@list.launchpad.net</span>
44 </div>
45 <div class="content">
46 <span class="left">Launchpad:</span><span class="right"><a href="https://launchpad.net/~quickshotdevs">https://launchpad.net/~quickshotdevs</a></span>
47 </div>
48 <div class="content">
49 <span class="left">Facebook:</span><span class="right"><a href="http://facebook.com/quickshot">http://facebook.com/quickshot</a></span>
50 </div>
51 <div class="content">
52 <span class="left">Twitter:</span><span class="right"><a href="http://twitter.com/quickshotteam">http://twitter.com/quickshotteam</a></span>
53 </div>
54 </div>
31 55
32 {% endif %}56 {% endif %}
33 57
3458
=== 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 @@
4{% block section %}download{% endblock %}4{% block section %}download{% endblock %}
55
6{% block content %}6{% block content %}
77<div id="page-content">
8
9 <div class="content">
10 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.
11 </div>
12
13
14 <div class="content">
15 <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>
16 <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>
17 </div>
18
19 <div class="content">
20 Already using Ubuntu 10.10? Add our PPA by running these commands:
21 <code>
22 sudo add-apt-repository ppa:quickshotdevs/quickshot-release<br />
23 sudo apt-get update<br />
24 sudo apt-get install quickshot
25 </code>
26 </div>
27</div>
28
29<div id="picture">
30 <img src="/static/images/quickshot.png" >
31</div>
8{% endblock %}32{% endblock %}
933
=== 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 @@
1515
1616
17class ContactForm(forms.Form):17class ContactForm(forms.Form):
18 subject = forms.CharField(max_length=100)18 name = forms.CharField(max_length=100)
19 email = forms.EmailField()
19 message = forms.CharField(widget=forms.widgets.Textarea())20 message = forms.CharField(widget=forms.widgets.Textarea())
20 sender = forms.EmailField()
2121
22def contactpost(req):22def contactpost(req):
23 """23 """
@@ -29,15 +29,15 @@
29 form = ContactForm(req.POST) # A form bound to the POST data29 form = ContactForm(req.POST) # A form bound to the POST data
30 30
31 if form.is_valid(): # All validation rules pass31 if form.is_valid(): # All validation rules pass
32 subject = form.cleaned_data['subject']32 name = form.cleaned_data['name']
33 email = form.cleaned_data['email']
33 message = form.cleaned_data['message']34 message = form.cleaned_data['message']
34 sender = form.cleaned_data['sender']
35 recipients = [deploy.EMAIL_CONTACT_RECIPIENT]35 recipients = [deploy.EMAIL_CONTACT_RECIPIENT]
36 36
37 from django.core.mail import EmailMessage37 from django.core.mail import EmailMessage
38 38
39 try:39 try:
40 em = EmailMessage(subject, message, deploy.EMAIL_CONTACT_SENDER, recipients, headers = {'Reply-To': sender})40 em = EmailMessage(name, message, deploy.EMAIL_CONTACT_SENDER, recipients, headers = {'Reply-To': email})
41 em.send()41 em.send()
42 status = { 'good': True, 'msg':"" }42 status = { 'good': True, 'msg':"" }
43 except SMTPException, ex:43 except SMTPException, ex:

Subscribers

People subscribed via source and target branches