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

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

Revision: 2599
          http://morphix.svn.sourceforge.net/morphix/?rev=2599&view=rev
Author:   bmsleight
Date:     2007-11-20 11:21:57 -0800 (Tue, 20 Nov 2007)

Log Message:
-----------
Supplying an image is optional - As per Jure's request :)

Modified Paths:
--------------
    trunk/morphixlivekiosk/scripts/mbuild/media/style.css
    trunk/morphixlivekiosk/scripts/mbuild/settings.py
    trunk/morphixlivekiosk/scripts/mbuild/templates/html-master.html
    trunk/morphixlivekiosk/scripts/mbuild/templates/index.html
    trunk/morphixlivekiosk/scripts/mbuild/urls.py
    trunk/morphixlivekiosk/scripts/mbuild/web/views.py

Added Paths:
-----------
    trunk/morphixlivekiosk/scripts/mbuild/media/favicon.ico
    trunk/morphixlivekiosk/scripts/mbuild/templates/downloads.html

Added: trunk/morphixlivekiosk/scripts/mbuild/media/favicon.ico
===================================================================
(Binary files differ)


Property changes on: trunk/morphixlivekiosk/scripts/mbuild/media/favicon.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/morphixlivekiosk/scripts/mbuild/media/style.css
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/media/style.css	2007-11-19 23:07:00 UTC (rev 2598)
+++ trunk/morphixlivekiosk/scripts/mbuild/media/style.css	2007-11-20 19:21:57 UTC (rev 2599)
@@ -3,6 +3,10 @@
 	font-size: 8px;
 	text-align: right;
       background:#000;
+ border-left:2px solid #CC0000;
+ border-right:2px solid #CC0000;
+ border-top:2px solid #CC0000;
+ border-bottom:2px solid #CC0000;
 	}
 
 body {
@@ -63,6 +67,12 @@
 
 #bblack {
  background:#000000;
+ margin:1px 1px 1px 1px;
+ border-left:2px solid #CC0000;
+ border-right:2px solid #CC0000;
+ border-top:2px solid #CC0000;
+ border-bottom:2px solid #CC0000;
+
 }
 
 .hbuttons a{
@@ -70,7 +80,7 @@
 text-decoration: none;
 font-size: 75%;
 color: #CC0000;
-background: #000000;
+background: #FFFFFF;
 float: centre;
 display: inline;
 margin-right: 2px;
@@ -78,7 +88,6 @@
 text-align:center;
 border-left:1px solid #CC0000;
 border-right:1px solid #CC0000;
-
 }
 
 .hbuttons a:hover {background-color: #FFFFFF;

Modified: trunk/morphixlivekiosk/scripts/mbuild/settings.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/settings.py	2007-11-19 23:07:00 UTC (rev 2598)
+++ trunk/morphixlivekiosk/scripts/mbuild/settings.py	2007-11-20 19:21:57 UTC (rev 2599)
@@ -2,7 +2,7 @@
 import os
 here = lambda x: os.path.join(os.path.dirname(__file__),x)
 
-DEBUG = True
+DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (

Added: trunk/morphixlivekiosk/scripts/mbuild/templates/downloads.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/downloads.html	                        (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/downloads.html	2007-11-20 19:21:57 UTC (rev 2599)
@@ -0,0 +1,19 @@
+{% extends "html-master.html" %}
+
+{% block content %}
+
+<h2>MorphixLiveKiosk</h2>
+<p>The orginal MorphixLiveKiosk, version 0.04. This is the basis for all of the customised kiosks, it is worth looking at this example before paying the Elves to build a customised kiosk LiveCD. It will give you a good idea of this final product.</p>
+<ul>
+  <li><a href="http://downloads.sourceforge.net/morphix/2007-11-19--23-00_MorphixLiveKiosk.ogg?use_mirror=osdn">Download MorphixLiveKiosk 0.04 - AutoTesting video</a></li>
+  <li><a href="http://downloads.sourceforge.net/morphix/2007-11-19--23-00_MorphixLiveKiosk.iso?use_mirror=osdn">Download MorphixLiveKiosk 0.04 iso</a></li>
+  <li><a href="http://downloads.sourceforge.net/morphix/2007-11-19--23-00_MorphixLiveKiosk.iso.md5sum?use_mirror=osdn">Download MorphixLiveKiosk 0.04 md5sum</a></li>
+</ul>
+
+<h2>Tools Used</h2>
+<p>You can download all the tools to build ans customise your own kiosk LiveCD, mbuild is a service to fast track your build. All the tools, parts of MorphixLiveKiosk and the customisation tools are open-source.</p>
+<p>The tools are from <a href="http://www.morphix.org">Morphix.org</a>. How to build MorphixLiveKiosk is detail in the manual <a href="http://www.morphix.org/doc/how_tos/docbook_html/ar01s05.html">"HowTo: Building a new LiveCD in two commands"</a>. To automate the build rocess for customised kiosk LiveCD, a script <a href="http://morphix.svn.sourceforge.net/viewvc/morphix/trunk/morphixlivekiosk/scripts/kabt.sh?view=markup">kabt</a> was used. The <a href="http://morphix.svn.sourceforge.net/viewvc/morphix/trunk/morphixlivekiosk/scripts/mbuild/">mbuild source code</a> and an <a href="http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/morphixlivekiosk/templates/MLK-example.xml?revision=2575&content-type=text%2Fplain">example template</a> to pass to kabt (-t) is available via the morphix repository.</p>
+<p>Morphix tools are used to make the LiveCD the underlying packages are from the <a href="http://packages.debian.org/stable/">Debian Etch repository</a>.</p>
+
+
+{% endblock %}
\ No newline at end of file

Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/html-master.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/html-master.html	2007-11-19 23:07:00 UTC (rev 2598)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/html-master.html	2007-11-20 19:21:57 UTC (rev 2599)
@@ -3,20 +3,21 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <link rel="stylesheet" href="/css/style.css" />
-    <title>Custom Kiosk LiveCD</title>
+    <LINK REL="SHORCUT ICON" HREF="/img/favicon.ico">
+    <title>mbuild - Custom Kiosk LiveCD</title>
 </head>
+<body>
 <h1><img src="/img/logo.gif" id="logo" alt="mbuild.livecd.net logo" > Build Kiosks - on the web for the web.</h1>
 <div id="bblack">
  <div class="hbuttons">
   <a href="/" title="about">mbuild</a></li>
-  <a href="/kiosks//2007-11-11--22-07_MorphixLiveKiosk.iso" title="Download MorphixLiveKiosk">Download MorphixLiveKiosk</a>
+  <a href="/downloads/" title="Download MorphixLiveKiosk">Download MorphixLiveKiosk</a>
   <a href="/view-queue/" title="View Build Queue">View Build Queue</a>
   <a href="/start/" title="Start a New Build">Start a New Build</a>
   <a href="/comments/" title="Leave Comments">Comments</a>
  <a href="/blog/" title="mbuilder.blog">mbuild.blog</a>
  </div>
 </div>
-</body>
     <div id="body">
         {% block content %}{% endblock %}
     </div>

Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/index.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/index.html	2007-11-19 23:07:00 UTC (rev 2598)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/index.html	2007-11-20 19:21:57 UTC (rev 2599)
@@ -2,12 +2,12 @@
 
 {% block content %}
 <h2>MorphixLiveKiosk</h2>
-<p>MorphixLiveKiosk is a new Morphix CD, based on the previous LiveCDs released by <a href="http://livecd.net" class="external text" title="http://livecd.net">LiveCD.net</a>.  It is a LiveCD that contains a locked down version of firefox-browser. Boot the computer using the LiveCD you can use the browser - nothing else (well apart from a screensaver), close the brower and all the viewing history is deleted from memory. It was built using <a href=/>mbuild</a>. For licensing reasons it does not contain Java or Flash. However, <a href=/>mbuild</a> has these as optional items.  MorphixLiveKiosk is designed to be easy to build, see the <a href="http://www.morphix.org">Morphix</a> Manual, <a href="http://www.morphix.org/doc/how_tos/docbook_html/ar01s05.html" class="external text" title="http://www.morphix.org/doc/how tos/docbook html/ar01s05.html">HowTo - Build a LiveCD in two commands</a></p>
+<p>MorphixLiveKiosk is a Morphix CD, based on the previous LiveCDs released by <a href="http://livecd.net" class="external text" title="http://livecd.net">LiveCD.net</a>.  It is a LiveCD that contains a locked down version of firefox-browser. Boot the computer using the LiveCD and you can use the browser - nothing else (well apart from a screensaver), close the brower and all the viewing history is deleted from memory. It was built using <a href=/>mbuild</a>. For licensing reasons it does not contain Java or Flash. However, <a href=/>mbuild</a> has these as optional items.  MorphixLiveKiosk is designed to be easy to build, see the <a href="http://www.morphix.org">Morphix</a> Manual, <a href="http://www.morphix.org/doc/how_tos/docbook_html/ar01s05.html" class="external text" title="http://www.morphix.org/doc/how tos/docbook html/ar01s05.html">HowTo - Build a LiveCD in two commands</a>. This is now version 0.04 of MorphixLiveKiosk.</p>
 
 <h2>mbuild</h2>
 <p>MorphixLiveKiosk is easy to build, but we want to make life even easier.  Thats where mbuild joins the party - we will build a new Kiosk LiveCD, based upon your Branding, Graphics, Homepage and plugins. Want to hide the navigation bar - no problem.</p>
 <h2>mbuild - How ?</h2>
-<p>Fill-out the <a href=/start/>mbuild form online</a> with the seven main options, add  your email address and our little trained Elves will built a customised Kiosk LiveCD. The Elves will even test the LiveCD, complete will an image showing frames of how the booting went and a full video of the boot-up - all for GBP25. The GBP25 is to help maintain and feed the Elves. The Elves will take <a href="http://www.paypal.co.uk/uk">Paypal</a> or <a href="http://checkout.google.com">Google-Checkout</a>.  Please note the Elves can only do about three builds a day before they get tired, normally a request gets built within 24 hours, but depending how many templates are waitng to be build there may be a delay. </p>
+<p>Fill-out the <a href=/start/>mbuild form online</a> with the seven main options, add  your email address and our little trained Elves will built a customised Kiosk LiveCD. The Elves will even test the LiveCD, complete will an image showing frames of how the booting went and a full video of the boot-up - all for GBP25. The GBP25 is to help maintain and feed the Elves. The Elves will take <a href="http://www.paypal.co.uk/uk">Paypal</a> or <a href="http://checkout.google.com">Google-Checkout</a>.  Please note the Elves can only do about three builds a day before they get tired, normally a request gets built within 24 hours, but depending how many templates are <a href=/view-queue/>waiting to be built</a> there may be a delay. </p>
 <p>&nbsp</p>
 <p>Enjoy,</p>
 <p><i>mbuild team</i></p>

Modified: trunk/morphixlivekiosk/scripts/mbuild/urls.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/urls.py	2007-11-19 23:07:00 UTC (rev 2598)
+++ trunk/morphixlivekiosk/scripts/mbuild/urls.py	2007-11-20 19:21:57 UTC (rev 2599)
@@ -12,6 +12,7 @@
       (r'^kabt-queue/', 'mbuild.web.views.kabtqueue'),
       (r'^delete-queue/', 'mbuild.web.views.delall'),
       (r'^credits/', 'mbuild.web.views.credits'),
+      (r'^downloads/', 'mbuild.web.views.downloads'),
       (r'^comments/leave/', 'mbuild.web.views.leavecomments'),
       (r'^comments/', 'mbuild.web.views.viewcomments'),
       (r'^blog/', 'mbuild.web.views.viewblog'),

Modified: trunk/morphixlivekiosk/scripts/mbuild/web/views.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/views.py	2007-11-19 23:07:00 UTC (rev 2598)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py	2007-11-20 19:21:57 UTC (rev 2599)
@@ -19,8 +19,8 @@
 def step1(request):
   class BuildForm(forms.Form):
     brand_name = forms.CharField(max_length=150, required=True, label="What Brand name would you like to use? (No spaces or dashes e.g. MorphixLiveKiosk)", initial="MorphixLiveKiosk")
-    graphics = forms.ImageField(required=True, label="Graphics file (Size 1024x768, (png/jpg/gif), works best)")
     homepage = forms.CharField(max_length=150, required=True, label="Desired homepage http://", initial="www.morphix.org")
+    graphics = forms.ImageField(required=False, label="Graphics file (Size 1024x768, (png/jpg/gif), works best) - leave blank to use MorphixLIveKiosk graphics.")
     nav_bar = forms.BooleanField(widget=forms.RadioSelect(choices=[("1", 'Yes'), ("0", 'No')]),
             initial="1", label="Should the Navigation Bar be visable?")
     dhcp = forms.BooleanField(widget=forms.RadioSelect(choices=[("1", 'Yes')]),
@@ -43,6 +43,8 @@
         f.write(cd['graphics'].content)
         f.close()
         cd['graphics'] = "%s" % uniq + "-" + cd['graphics'].filename
+      else:
+      	cd['graphics'] = "MorphixLiveKiosk.png"
       
       root = ET.Element("LIVECD")
       for v in cd:
@@ -178,6 +180,11 @@
 #Yes I know Jure - I shoudl use flatpages - I will try to move to flatpages....
     return render_to_response('credits.html')
 
+def downloads(request):
+#Yes I know Jure - I shoudl use flatpages - I will try to move to flatpages....
+    return render_to_response('downloads.html')
+
+
 def paymentcomplete(request):
 #Yes I know Jure - I shoudl use flatpages - I will try to move to flatpages....
     return render_to_response('payment-complete.html')


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