[Morphix-cvs] SF.net SVN: morphix: [2594] trunk/morphixlivekiosk/scripts/mbuild

[<bms...@us...>]

Revision: 2594
          http://morphix.svn.sourceforge.net/morphix/?rev=2594&view=rev
Author:   bmsleight
Date:     2007-11-10 16:08:41 -0800 (Sat, 10 Nov 2007)

Log Message:
-----------
Enough for one day

Modified Paths:
--------------
    trunk/morphixlivekiosk/scripts/mbuild/settings.py
    trunk/morphixlivekiosk/scripts/mbuild/templates/status.html
    trunk/morphixlivekiosk/scripts/mbuild/web/views.py

Modified: trunk/morphixlivekiosk/scripts/mbuild/settings.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/settings.py	2007-11-10 22:43:18 UTC (rev 2593)
+++ trunk/morphixlivekiosk/scripts/mbuild/settings.py	2007-11-11 00:08:41 UTC (rev 2594)
@@ -83,3 +83,9 @@
     'mbuild.web',
     'django.contrib.admin',
 )
+
+EMAIL_USE_TLS = True
+EMAIL_HOST = 'smtp.gmail.com'
+EMAIL_HOST_USER = 'liv...@go...'
+EMAIL_HOST_PASSWORD = ''
+EMAIL_PORT = 587

Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/status.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/status.html	2007-11-10 22:43:18 UTC (rev 2593)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/status.html	2007-11-11 00:08:41 UTC (rev 2594)
@@ -1,14 +1,16 @@
 <h1>Custom Built Kiosk LiveCD</h1>
 <h2>Status</h2>
 {% if newtemplate.built %}
+	<h3>Built!</h3>
 	<p>Email has been sent, build is complete. It is listed in the <a href=/view-queue/>hall of fame</a> of built and yet to be build kiosks<p>
 	<p>The LiveCD has been tested - there is a <a href=http://{{newtemplate.builtdomain}}/{{newtemplate.builtogg}}>video of the {{newtemplate.brand}} LiveCD booting</a>. Having a look at the video could save time downloading an iso that will not boot</a>. Below are frames captured from the video.</p>
 	<img src=http://{{newtemplate.builtdomain}}/{{newtemplate.builtjpg}}>
 	<p>The <a href=http://{{newtemplate.builtdomain}}/{{newtemplate.builtiso}}>{{newtemplate.brand}} Kiosk</a> is available for download.</p>
 {% else %}
-	<p>You build request is XXX in the list<p>
+	<h3>Queued For Building</h3>
+	<p>You build request has joined the <a href=/view-queue/>queue.</a><p>
 	<p>Will send an email when the elves have built the kiosk.<p>
-	<p>In the meatime - have a look at the <a href=/view-queue/>queue of built and yet to be build kiosks</a><p>
+	<p>You can cheak the status of your build request at anytime by visiting this page<p>
 {% endif %}
 <p><a href=/templates/{{newtemplate.template}}>Raw Template.xml</a><p>
 <p><a href=/xml/morphix/{{newtemplate.template}}/>Morphix Style template.xml</a><p>

Modified: trunk/morphixlivekiosk/scripts/mbuild/web/views.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/views.py	2007-11-10 22:43:18 UTC (rev 2593)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py	2007-11-11 00:08:41 UTC (rev 2594)
@@ -4,6 +4,8 @@
 from django.http import HttpResponse
 from django.http import HttpResponseRedirect
 from mbuild.web.models import Queue
+from django.core.mail import EmailMessage
+from django.template import loader, Context
 
 import datetime, time
 import elementtree.ElementTree as ET
@@ -132,6 +134,11 @@
     queue_list.builtogg = request.GET["v"]
     queue_list.builtjpg = request.GET["v"] + ".jpg"
     queue_list.save()
+    body = loader.get_template('email-build.txt')
+    c = Context({'queue_list': queue_list})
+    email = EmailMessage(queue_list.brand, body.render(c), 'liv...@go...',
+            [queue_list.notifybyemail])
+    email.send()
     return render_to_response('delete-queue.html', {'queue_list': queue_list})
   else:
     return HttpResponse("Could not determine the successful builds - see kabt.sh documentation")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.