SF.net SVN: morphix: [2590] trunk/morphixlivekiosk/scripts/mbuild

Revision: 2590
          http://morphix.svn.sourceforge.net/morphix/?rev=2590&view=rev
Author:   bmsleight
Date:     2007-11-09 15:34:22 -0800 (Fri, 09 Nov 2007)

Log Message:
-----------
More django

Modified Paths:
--------------
    trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html
    trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html
    trunk/morphixlivekiosk/scripts/mbuild/urls.py
    trunk/morphixlivekiosk/scripts/mbuild/web/models.py
    trunk/morphixlivekiosk/scripts/mbuild/web/views.py

Added Paths:
-----------
    trunk/morphixlivekiosk/scripts/mbuild/templates/kabt-queue.html
    trunk/morphixlivekiosk/scripts/mbuild/templates/master.xml

Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html	2007-11-08 22:43:23 UTC (rev 2589)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html	2007-11-09 23:34:22 UTC (rev 2590)
@@ -1,5 +1,12 @@
 <h1>Custom Built Kiosk LiveCD</h1>
+<h2>Status</h2>
+{% if newtemplate.built %}
+	<p>Email has been sent, build is complete <p>
+{% else %}
+	<p>You build request is XXX in the list<p>
+{% endif %}
+<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>Will send an email when the elves have built the kiosk.<p>
 
-<p>Will email  {{ emailnotify }} 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>
\ No newline at end of file
+<p><a href=/template/{{newtemplate.template}}>Raw Template.xml</a><p>
+<p>You can cheak the status of your build request at anytime by visiting this page<p>

Added: trunk/morphixlivekiosk/scripts/mbuild/templates/kabt-queue.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/kabt-queue.html	                        (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/kabt-queue.html	2007-11-09 23:34:22 UTC (rev 2590)
@@ -0,0 +1,2 @@
+{% if queue_list %}{% for queue in queue_list %}http://mbuild.livecd.org/mbuild/morphix.xml/{{ queue.template }}/
+{% endfor %}{% endif %}
\ No newline at end of file

Added: trunk/morphixlivekiosk/scripts/mbuild/templates/master.xml
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/master.xml	                        (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/master.xml	2007-11-09 23:34:22 UTC (rev 2590)
@@ -0,0 +1,22 @@
+<comps>
+ <group>
+  <kiosk>
+   <version>0.0.1</version>
+   <brand>{{newtemplate.brand}}</brand>
+   <graphic>http://mbuild.livecd.org/images/{{newtemplate.graphic}}</graphic>
+   <homepage>{{newtemplate.homepage}}</homepage>
+{% if newtemplate.navbar %}   <navbar>true</navbar> 
+{% else %}   <navbar>true</navbar> 
+{% endif %}
+   <extralist>
+{% if newtemplate.flash %}    <MiniModule>MorphixMini-NonFree-FlashPlugin.xml</MiniModule> {% endif %}
+{% if newtemplate.java %}    <MiniModule>MorphixMini-NonFree-Java.xml</MiniModule> {% endif %}
+   </extralist>
+   <network>
+{% if newtemplate.built %}    <dhcp>dhcp</dhcp>
+{% else %}    <dhcp></dhcp>
+{% endif %}
+   </network>
+  </kiosk>
+ </group>
+</comps>

Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html	2007-11-08 22:43:23 UTC (rev 2589)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html	2007-11-09 23:34:22 UTC (rev 2590)
@@ -3,7 +3,7 @@
 {% if queue_list %}
     <ul>
     {% for queue in queue_list %}
-        <li>{{ queue.template }} <a href=http://{{ queue.homepage }}>{{ queue.brand }}</a> - Has been built ? {{ queue.built }} </li>
+        <li><a href=/mbuild/status/{{ queue.template }}/>{{ queue.template }}</a> <a href=http://{{ queue.homepage }}>{{ queue.brand }}</a> - Has been built ? {{ queue.built }} </li>
     {% endfor %}
     </ul>
 {% else %}

Modified: trunk/morphixlivekiosk/scripts/mbuild/urls.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/urls.py	2007-11-08 22:43:23 UTC (rev 2589)
+++ trunk/morphixlivekiosk/scripts/mbuild/urls.py	2007-11-09 23:34:22 UTC (rev 2590)
@@ -2,8 +2,11 @@
 
 urlpatterns = patterns('',
       (r'^$', 'mbuild.web.views.index'),
-      (r'^template/(?P<template>[^/]+)/', 'mbuild.web.views.template'),
+      (r'^mbuild/status/(?P<template>[^/]+)/', 'mbuild.web.views.mbuildstatus'),
+      (r'^xml/morphix/(?P<template>[^/]+)/', 'mbuild.web.views.converttokabtxml'),
+      (r'^mbuild/(?P<template>[^/]+)/', 'mbuild.web.views.mbuild'),
       (r'^view-queue/', 'mbuild.web.views.viewqueue'),
+      (r'^kabt-queue/', 'mbuild.web.views.kabtqueue'),
       (r'^delete-queue/', 'mbuild.web.views.delall'),
 
     # Uncomment this for admin:

Modified: trunk/morphixlivekiosk/scripts/mbuild/web/models.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/models.py	2007-11-08 22:43:23 UTC (rev 2589)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/models.py	2007-11-09 23:34:22 UTC (rev 2590)
@@ -8,4 +8,12 @@
 	built = models.BooleanField(default=False, 
 					help_text="Has Kiosk been built")
 	notifybyemail = models.EmailField(null=True)
-	homepage = models.CharField(maxlength="150")
\ No newline at end of file
+	homepage = models.CharField(maxlength="150")
+	navbar = models.BooleanField(default=False)
+	flash = models.BooleanField(default=False) 
+	java = models.BooleanField(default=False)
+	graphic = models.CharField(maxlength="150")
+	builtdomain = models.CharField(maxlength="150")
+	builtiso = models.CharField(maxlength="150")
+	builtogg = models.CharField(maxlength="150")
+	builtjpg = models.CharField(maxlength="150")
\ No newline at end of file

Modified: trunk/morphixlivekiosk/scripts/mbuild/web/views.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/views.py	2007-11-08 22:43:23 UTC (rev 2589)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py	2007-11-09 23:34:22 UTC (rev 2590)
@@ -47,9 +47,9 @@
       
       #Save details to dBase
       template_name = "%s.xml" % uniq
-      template = Queue(template=template_name, brand=cd['brand_name'], homepage=cd['homepage'])
+      template = Queue(template=template_name, brand=cd['brand_name'], homepage=cd['homepage'], navbar=cd['nav_bar'], flash=cd['flash'], java=cd['java'], graphic=cd['graphics'])
       template.save()
-      return HttpResponseRedirect("/template/%s/" % template_name ) 
+      return HttpResponseRedirect("/mbuild/%s/" % template_name ) 
   else:
     form = BuildForm()
     
@@ -57,7 +57,7 @@
   return render_to_response('index.html', context,
                             context_instance=RequestContext(request))
 
-def template(request, template):
+def mbuild(request, template):
   class BuildForm(forms.Form):
       emailnotify = forms.EmailField("Email to recieve notifications?")
   if request.POST:
@@ -68,13 +68,31 @@
 	newtemplate.save()
     except Queue.DoesNotExist:
 	    return HttpResponse("Template does not exist")
-    return render_to_response("emailnotify.html",{"emailnotify":emailnotify})
+    return HttpResponseRedirect("/mbuild/status/%s/" % template )
   else:
     form = BuildForm()    
     context = {'form': form}
   return render_to_response('index.html', context,
                             context_instance=RequestContext(request))
 
+def mbuildstatus(request, template):
+ try:
+   newtemplate = Queue.objects.get(pk=template)
+   return render_to_response("emailnotify.html",{"newtemplate":newtemplate})
+ except Queue.DoesNotExist:
+   return HttpResponse("Template does not exist")
+
+def converttokabtxml(request, template):
+ try:
+   newtemplate = Queue.objects.get(pk=template)
+   return render_to_response("master.xml",{"newtemplate":newtemplate})
+ except Queue.DoesNotExist:
+   return HttpResponse("Template does not exist")
+
+def kabtqueue(request):
+    queue_list = Queue.objects.filter(built=False).order_by('template')
+    return render_to_response('kabt-queue.html', {'queue_list': queue_list})
+
 def viewqueue(request):
     queue_list = Queue.objects.all().order_by('template')
     return render_to_response('view-queue.html', {'queue_list': queue_list})


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

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/