Menu
▾
▴
[Morphix-cvs] SF.net SVN: morphix: [2595] trunk/morphixlivekiosk/scripts
|
From: <bms...@us...> - 2007-11-11 23:26:20
|
Revision: 2595
http://morphix.svn.sourceforge.net/morphix/?rev=2595&view=rev
Author: bmsleight
Date: 2007-11-11 15:26:16 -0800 (Sun, 11 Nov 2007)
Log Message:
-----------
mbuild is moving along
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/index.pl
trunk/morphixlivekiosk/scripts/kabt.sh
trunk/morphixlivekiosk/scripts/mbuild/settings.py
trunk/morphixlivekiosk/scripts/mbuild/templates/delete-queue.html
trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html
trunk/morphixlivekiosk/scripts/mbuild/templates/index.html
trunk/morphixlivekiosk/scripts/mbuild/templates/java-terms-accept.html
trunk/morphixlivekiosk/scripts/mbuild/templates/kabt-queue.html
trunk/morphixlivekiosk/scripts/mbuild/templates/status.html
trunk/morphixlivekiosk/scripts/mbuild/templates/template.html
trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html
trunk/morphixlivekiosk/scripts/mbuild/urls.py
trunk/morphixlivekiosk/scripts/mbuild/web/views.py
Added Paths:
-----------
trunk/morphixlivekiosk/scripts/mbuild/media/logo.gif
trunk/morphixlivekiosk/scripts/mbuild/media/style.css
trunk/morphixlivekiosk/scripts/mbuild/media/tableftE.gif
trunk/morphixlivekiosk/scripts/mbuild/media/tabrightE.gif
trunk/morphixlivekiosk/scripts/mbuild/templates/email-build.txt
trunk/morphixlivekiosk/scripts/mbuild/templates/html-master.html
trunk/morphixlivekiosk/scripts/mbuild/templates/mbuild-status.html
trunk/morphixlivekiosk/scripts/mbuild/templates/mbuild.html
trunk/morphixlivekiosk/scripts/mbuild/templates/step-1.html
Modified: trunk/morphixlivekiosk/scripts/index.pl
===================================================================
--- trunk/morphixlivekiosk/scripts/index.pl 2007-11-11 00:08:41 UTC (rev 2594)
+++ trunk/morphixlivekiosk/scripts/index.pl 2007-11-11 23:26:16 UTC (rev 2595)
@@ -31,8 +31,9 @@
. "Please download and view the AutoTesting video first. \n"
. "The video will show how successful the build was and can save "
. "vital bandwidth if the build did not go well. \n\n"
- . "Video - $built/$video \n"
- . "ISO - $built/$iso \n"
+ . "Preview - $built/$video.jpg \n"
+ . "Video - $built/$video \n"
+ . "ISO - $built/$iso \n"
. "\n"
. "Enjoy Your Kiosk - kiosk.liveCD.org";
open(DAT, $templatequeue) || die("Could not open file!");
@@ -46,7 +47,7 @@
# There might be a nice perl way - but some times bash is nice
print p("Removed $urls from queue");
- system "echo \"$message\" | mail -s 'Custom Built Kiosk LiveCD' $emails -b bm...@ba... -- -r bu...@li... -";
+ system "echo \"$message\" | mail -s 'Custom Built Kiosk LiveCD' $emails -b bm...@ba... -- -r bu...@li... -";
system "cat $templatequeue | tail -n+2 >$templatequeue ";
}
elsif (param("queue")) {
Modified: trunk/morphixlivekiosk/scripts/kabt.sh
===================================================================
--- trunk/morphixlivekiosk/scripts/kabt.sh 2007-11-11 00:08:41 UTC (rev 2594)
+++ trunk/morphixlivekiosk/scripts/kabt.sh 2007-11-11 23:26:16 UTC (rev 2595)
@@ -182,7 +182,8 @@
if [ "$NOTESTING" = "true" ]; then
echo "Not testing the built iso"
else
- video-qemu-booting-iso.sh -q qemu_0.8.4-etch1 -t 800 -g 1024x768 -s "spc,spc,kp_enter" $OUTPUT.iso $OUTPUT.ogg
+ # Short term hack - su morph -c
+ su morph -c "video-qemu-booting-iso.sh -q qemu_0.8.4-etch1 -t 1200 -g 1024x768 -s \"spc,spc,kp_enter\" $OUTPUT.iso $OUTPUT.ogg"
fi
}
@@ -234,7 +235,7 @@
CALLWLOGG=$(cut -d\ -f2 $TMP_DIR/build-list.txt)
CALLWLISOBN=$(basename $CALLWLISO)
CALLWLOGGBN=$(basename $CALLWLOGG)
- CALLWL="${QUEUEURL}&built=${EXTERNALURL}&v=${CALLWLOGGBN}&i=${CALLWLISOBN}"
+ CALLWL="${QUEUEURL}?built=${EXTERNALURL}&v=${CALLWLOGGBN}&i=${CALLWLISOBN}"
wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/call.txt $CALLWL
fi
}
Added: trunk/morphixlivekiosk/scripts/mbuild/media/logo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/morphixlivekiosk/scripts/mbuild/media/logo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/morphixlivekiosk/scripts/mbuild/media/style.css
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/media/style.css (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/media/style.css 2007-11-11 23:26:16 UTC (rev 2595)
@@ -0,0 +1,176 @@
+#footer {
+ color:#D51308;
+ font-size: 8px;
+ text-align: right;
+ background:#000;
+ }
+
+body {
+ margin:0px;
+ padding:0px;
+ font-family:verdana, arial, helvetica, sans-serif;
+ color:#333;
+ background-color:white;
+ }
+h1 {
+ margin:0px 0px 15px 0px;
+ padding:0px;
+ font-size:28px;
+ line-height:28px;
+ font-weight:900;
+ color:#D51308;
+ }
+
+h2 {
+ margin:0px 0px 0px 0px;
+ padding:0px;
+ font-size:14px;
+ line-height:28px;
+ font-weight:900;
+ color:#D51308;
+ }
+
+h3 {
+ margin:0px 0px 15px 0px;
+ padding:0px;
+ font-size:10px;
+ line-height:28px;
+ font-weight:900;
+ color:#D51308;
+ }
+
+
+p {
+ font:11px/20px verdana, arial, helvetica, sans-serif;
+ margin:0px 0px 16px 0px;
+ padding:0px;
+ }
+ #Content>p {margin:0px;}
+/* #Content>p+p {text-indent:30px;} */
+
+a {
+ color:#D51308;
+ font-size:11px;
+ text-decoration:none;
+ font-weight:600;
+ font-family:verdana, arial, helvetica, sans-serif;
+ }
+
+:link { color:#D51308) } /* for unvisited links */
+:visited { color:#480000 } /* for visited links */
+a:active { color:#480000 } /* when link is clicked */
+a:hover { color:#780000 } /* when mouse is over link */
+
+/*- Menu Tabs--------------------------- */
+
+ #tabs {
+ float:left;
+ width:100%;
+ font-size:93%;
+ line-height:normal;
+ }
+ #tabs ul {
+ margin:0;
+ padding:10px 10px 0 50px;
+ list-style:none;
+ }
+ #tabs li {
+ display:inline;
+ margin:0;
+ padding:0;
+ }
+ #tabs a {
+ float:left;
+ background:url("tableft.gif") no-repeat left top;
+ margin:0;
+ padding:0 0 0 4px;
+ text-decoration:none;
+ }
+ #tabs a span {
+ float:left;
+ display:block;
+ background:url("tabright.gif") no-repeat right top;
+ padding:5px 15px 4px 6px;
+ color:#666;
+ }
+ /* Commented Backslash Hack hides rule from IE5-Mac \*/
+ #tabs a span {float:none;}
+ /* End IE5-Mac hack */
+ #tabs a:hover span {
+ color:#FF9834;
+ }
+ #tabs a:hover {
+ background-position:0% -42px;
+ }
+ #tabs a:hover span {
+ background-position:100% -42px;
+ }
+
+
+/*- Menu Tabs E--------------------------- */
+
+ #tabsE {
+ float:left;
+ width:100%;
+ background:#000;
+ font-size:93%;
+ line-height:normal;
+
+ }
+ #tabsE ul {
+ margin:0;
+ padding:10px 10px 0 50px;
+ list-style:none;
+ }
+ #tabsE li {
+ display:inline;
+ margin:0;
+ padding:0;
+ }
+ #tabsE a {
+ float:left;
+ background:url("tableftE.gif") no-repeat left top;
+ margin:0;
+ padding:0 0 0 4px;
+ text-decoration:none;
+ }
+ #tabsE a span {
+ float:left;
+ display:block;
+ background:url("tabrightE.gif") no-repeat right top;
+ padding:5px 15px 4px 6px;
+ color:#FFF;
+ }
+ /* Commented Backslash Hack hides rule from IE5-Mac \*/
+ #tabsE a span {float:none;}
+ /* End IE5-Mac hack */
+ #tabsE a:hover span {
+ color:#FFF;
+ }
+ #tabsE a:hover {
+ background-position:0% -42px;
+ }
+ #tabsE a:hover span {
+ background-position:100% -42px;
+ }
+
+/* Images */
+/*img {
+/* display: block;*/
+/* margin-left: auto; */
+/* margin-right: auto */
+ }
+
+
+
+label,input {
+ font:11px/20px verdana, arial, helvetica, sans-serif;
+}
+
+label {
+ font:11px/20px verdana, arial, helvetica, sans-serif;
+}
+
+ul {
+ font:11px/20px verdana, arial, helvetica, sans-serif;
+}
\ No newline at end of file
Added: trunk/morphixlivekiosk/scripts/mbuild/media/tableftE.gif
===================================================================
(Binary files differ)
Property changes on: trunk/morphixlivekiosk/scripts/mbuild/media/tableftE.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/morphixlivekiosk/scripts/mbuild/media/tabrightE.gif
===================================================================
(Binary files differ)
Property changes on: trunk/morphixlivekiosk/scripts/mbuild/media/tabrightE.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/morphixlivekiosk/scripts/mbuild/settings.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/settings.py 2007-11-11 00:08:41 UTC (rev 2594)
+++ trunk/morphixlivekiosk/scripts/mbuild/settings.py 2007-11-11 23:26:16 UTC (rev 2595)
@@ -87,5 +87,4 @@
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/delete-queue.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/delete-queue.html 2007-11-11 00:08:41 UTC (rev 2594)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/delete-queue.html 2007-11-11 23:26:16 UTC (rev 2595)
@@ -1,8 +1,11 @@
-<h1>Custom Built Kiosk LiveCD</h1>
+{% extends "html-master.html" %}
+{% block content %}
{% if queue_list %}
<p><a href=/mbuild/status/{{ queue_list.template }}/>{{ queue_list.template }}</a> <a href=http://{{ queue_list.homepage }}>{{ queue_list.brand }}</a> - Has been built ? {{ queue_list.built }} </p>
<p>{{ queue_list.builtdomain }}, {{ queue_list.builtiso }}, {{ queue_list.builtjpg }}, {{ queue_list.builtogg}}
{% else %}
<p>No template in current queue.</p>
-{% endif %}
\ No newline at end of file
+{% endif %}
+
+{% endblock %}
Added: trunk/morphixlivekiosk/scripts/mbuild/templates/email-build.txt
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/email-build.txt (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/email-build.txt 2007-11-11 23:26:16 UTC (rev 2595)
@@ -0,0 +1,15 @@
+Custom Built Kiosk LiveCD - Build is complete!
+
+The {{queue_list.brand}}-LiveCD has been tested, There are screenshots of the {{queue_list.brand}}-LiveCD booting.[1]. There is also video [2] of the {{queue_list.brand}}-LiveCD booting. Having a look at the screenshots and video could save time and avoid you downloading an iso that will not boot.
+
+Of course {{queue_list.brand}}-Kiosk is available for download [3].
+
+Hope you enjoy your {{queue_list.brand}}-Kiosk! We welcome your feedback either by email or by visiting mbuild.livecd.org.
+
+Regards,
+mbuild.livecd.org
+
+
+[1] - http://{{queue_list.builtdomain}}/{{queue_list.builtjpg}}
+[2] - http://{{queue_list.builtdomain}}/{{queue_list.builtogg}}
+[3] - http://{{queue_list.builtdomain}}/{{queue_list.builtiso}}
\ No newline at end of file
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html 2007-11-11 00:08:41 UTC (rev 2594)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html 2007-11-11 23:26:16 UTC (rev 2595)
@@ -1,7 +1,10 @@
-<h1>Custom Built Kiosk LiveCD</h1>
+{% extends "html-master.html" %}
+
+{% block content %}
<p>Template is added to the queue to be built<p>
<p>We can email you when the Kiosk has been built.<p>
<form enctype="multipart/form-data" method="post" action=".">
{{ form.as_p }}
<p><input type="submit" value="Notify →"></p>
</form>
+{% endblock %}
Added: trunk/morphixlivekiosk/scripts/mbuild/templates/html-master.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/html-master.html (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/html-master.html 2007-11-11 23:26:16 UTC (rev 2595)
@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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>
+</head>
+<h1><img src="/img/logo.gif" id="logo" alt="mbuild.livecd.net logo" > Build Kiosks - on the web for the web.</h1>
+<div id="tabsE">
+ <ul>
+ <li><a href="/download/mlk/" title="Download MorphixLiveKiosk"><span>Download MorphixLiveKiosk</span></a></li>
+ <li><a href="/start/" title="Start a New Build"><span>Start a New Build</span></a></li>
+ <li><a href="/view-queue/" title="View Build Queue"><span>View Build Queue</span></a></li>
+ <li><a href="/" title="Leave Comments"><span>Leave Comments</span></a></li>
+ <li><a href="/" title="mbuilder.blog"><span>mbuilder.blog</span></a></li>
+ </ul>
+</div>
+<br /><br />
+
+
+ <div id="Content">
+ {% block content %}{% endblock %}
+ </div>
+</body>
+<p> </p>
+<p> </p>
+<p> </p>
+<div id="footer">
+ <p>mbuild - <a href=/credits/>Credits</a></p>
+</div>
+</html>
\ No newline at end of file
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/index.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/index.html 2007-11-11 00:08:41 UTC (rev 2594)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/index.html 2007-11-11 23:26:16 UTC (rev 2595)
@@ -1,6 +1,17 @@
-<h1>Custom Built Kiosk LiveCD</h1>
+{% extends "html-master.html" %}
-<form enctype="multipart/form-data" method="post" action=".">
- {{ form.as_p }}
- <p><input type="submit" value="Continue →"></p>
-</form>
+{% block content %}
+<p>This 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>. The <i><a href="http://livecd.net" class="external text" title="http://livecd.net">LiveCD.net</a> stuff was create by Dusan Smolnikar (art), Gasper Koren (coding), Jure Cuhalev (coding), Ales Kristof (coding)</i>. Alot of the code has been reused. Thanks to all at liveCD.net</p>
+
+<p>It is a LiveCD that contains a locked down version of firefox-browser. It was built using <a href=/>mbuild</a>
+
+<p>MorphixLiveKiosk uses the <a href="http://projects.o-hand.com/matchbox/">Matchbox window manager</a>.For licensing reasons it does not contain Java or Flash. However, <a href=/>mbuild</a> has an option when building MorphixLiveKiosk to build a kiosk containing java and flash.</p>
+
+<p>It is designed to be easy to build, see the <a hre="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>Mention Debian and Morphix</p>
+
+<p>What is mbuild......<p>
+
+<p>Current queue status<p>
+{% endblock %}
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/java-terms-accept.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/java-terms-accept.html 2007-11-11 00:08:41 UTC (rev 2594)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/java-terms-accept.html 2007-11-11 23:26:16 UTC (rev 2595)
@@ -1,16 +1,17 @@
-<h1>Custom Built Kiosk LiveCD</h1>
+{% extends "html-master.html" %}
+
+{% block content %}
<h2>Java Terms and conditons</h2>
-Below is a note <a href=http://download.java.net/dlj/DLJ-FAQ.html#q17>extracted from Java.net</a>:-
+<p>Below is a note <a href=http://download.java.net/dlj/DLJ-FAQ.html#q17>extracted from Java.net</a>:-</p>
<blockquote>
-17. What do you mean by "Present for acceptance end user licenses" (from #8 above)? Do I have to create a click-through license display when a user first installs or runs the JDK? Must my users accept the license?
-
-Your users must agree to the license terms for the JDK before installing it. While you aren't required to show the DLJ on first use or installation, you must inform them that the JDK is licensed software and that they must agree to the license before using it. A click-through mechanism is the preferred way to do this, but at a minimum you must present the license by some appropriate means for acceptance. For example, your OS download procedure could show the user a page that informs him or her that software packages included in the download may contain software licenses to which the user must agree before installation, and allow the user to review them before download.
-
-You can leverage your distribution's packaging technology to ensure that the license terms have been accepted. For instance, on Debian and derivative distributions, you could configure the package so that if the debconf key for accepting the DLJ has not been pre-accepted, the installation will be canceled if the license cannot be presented. The point of presenting the license is that an individual, corporation, non-profit or entity which will be an end user of the JRE or JDK has had a chance to review and agree to the DLJ. If the user or administrator pre-accepts the key for DLJ agreement on behalf of herself or her group then it is perfectly acceptable to silently install Sun Java on one or many computers. This is an excellent example of how you can leverage packaging infrastructure to comply with the terms of the DLJ in ways that are convenient and expected for your users.
+<p>17. What do you mean by "Present for acceptance end user licenses" (from #8 above)? Do I have to create a click-through license display when a user first installs or runs the JDK? Must my users accept the license?<p>
+<p>Your users must agree to the license terms for the JDK before installing it. While you aren't required to show the DLJ on first use or installation, you must inform them that the JDK is licensed software and that they must agree to the license before using it. A click-through mechanism is the preferred way to do this, but at a minimum you must present the license by some appropriate means for acceptance. For example, your OS download procedure could show the user a page that informs him or her that software packages included in the download may contain software licenses to which the user must agree before installation, and allow the user to review them before download.</p>
+<p>You can leverage your distribution's packaging technology to ensure that the license terms have been accepted. For instance, on Debian and derivative distributions, you could configure the package so that if the debconf key for accepting the DLJ has not been pre-accepted, the installation will be canceled if the license cannot be presented. The point of presenting the license is that an individual, corporation, non-profit or entity which will be an end user of the JRE or JDK has had a chance to review and agree to the DLJ. If the user or administrator pre-accepts the key for DLJ agreement on behalf of herself or her group then it is perfectly acceptable to silently install Sun Java on one or many computers. This is an excellent example of how you can leverage packaging infrastructure to comply with the terms of the DLJ in ways that are convenient and expected for your users.</p>
</blockquote>
<p>Please read the following terms downloaded from <a href=http://download.java.net/dlj/DLJ-v1.1.txt>http://download.java.net/dlj/DLJ-v1.1.txt</a>:-<p>
<blockquote>
+<PRE>
Operating System Distributor License for Java version 1.1
SUN MICROSYSTEMS, INC. ("SUN") IS WILLING TO LICENSE THE JAVA PLATFORM
@@ -209,11 +210,11 @@
Santa Clara, California 95054, U.S.A.
DLJ v1.1 27APR2006ANS
-
+</PRE>
</blockquote>
-<p>We can email you when the Kiosk has been built.<p>
<form enctype="multipart/form-data" method="post" action=".">
-{{ form.as_p }}
+<p>{{ form.as_p }}</p>
<p><input type="submit" value="Notify →"></p>
</form>
+{% endblock %}
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/kabt-queue.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/kabt-queue.html 2007-11-11 00:08:41 UTC (rev 2594)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/kabt-queue.html 2007-11-11 23:26:16 UTC (rev 2595)
@@ -1,2 +1,2 @@
-{% if queue_list %}{% for queue in queue_list %}http://mbuild.livecd.org/mbuild/morphix.xml/{{ queue.template }}/
+{% if queue_list %}{% for queue in queue_list %}http://mbuild.livecd.org/xml/morphix/{{ queue.template }}/
{% endfor %}{% endif %}
\ No newline at end of file
Added: trunk/morphixlivekiosk/scripts/mbuild/templates/mbuild-status.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/mbuild-status.html (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/mbuild-status.html 2007-11-11 23:26:16 UTC (rev 2595)
@@ -0,0 +1,7 @@
+<h1>Custom Built Kiosk LiveCD</h1>
+
+{% if newtemplate %}
+ <p>Will email you when Kiosk has been built.<p>
+{% else %}
+ <p>We can email you when the Kiosk has been built.<p>
+{% endif %}
Added: trunk/morphixlivekiosk/scripts/mbuild/templates/mbuild.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/mbuild.html (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/mbuild.html 2007-11-11 23:26:16 UTC (rev 2595)
@@ -0,0 +1,11 @@
+{% extends "html-master.html" %}
+
+{% block content %}
+<p>Template {{ template_name }} has been added to the <a href=/view-queue>queue of kiosks</a> to be built<p>
+<p>We can email you when the Kiosk has been built.<p>
+<form enctype="multipart/form-data" method="post" action=".">
+{{ form.as_p }}
+ <p><input type="submit" value="Notify →"></p>
+{% endif %}
+</form>
+{% endblock %}
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/status.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/status.html 2007-11-11 00:08:41 UTC (rev 2594)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/status.html 2007-11-11 23:26:16 UTC (rev 2595)
@@ -1,17 +1,21 @@
-<h1>Custom Built Kiosk LiveCD</h1>
-<h2>Status</h2>
+{% extends "html-master.html" %}
+
+{% block content %}
+
{% if newtemplate.built %}
- <h3>Built!</h3>
+ <h3>Status of {{newtemplate.brand}} - 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>
+ <p>You can cheak the status of your build request at anytime by visiting this page<p>
{% else %}
- <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>
+ <h3>Status of {{newtemplate.brand}} - Queued For Building</h3>
+ <p>You build request has joined the <a href=/view-queue/>queue</a>. Will send an email when the elves have built the kiosk.<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>
-<p>You can cheak the status of your build request at anytime by visiting this page<p>
+<small>
+ <p><a href=/templates/{{newtemplate.template}}>Raw Template.xml</a> - <a href=/xml/morphix/{{newtemplate.template}}/>Morphix Style template.xml</a><p>
+</small>
+
+{% endblock %}
Added: trunk/morphixlivekiosk/scripts/mbuild/templates/step-1.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/step-1.html (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/step-1.html 2007-11-11 23:26:16 UTC (rev 2595)
@@ -0,0 +1,8 @@
+{% extends "html-master.html" %}
+
+{% block content %}
+<form enctype="multipart/form-data" method="post" action=".">
+ {{ form.as_p }}
+ <p><input type="submit" value="Continue →"></p>
+</form>
+{% endblock %}
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/template.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/template.html 2007-11-11 00:08:41 UTC (rev 2594)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/template.html 2007-11-11 23:26:16 UTC (rev 2595)
@@ -1,4 +1,6 @@
-<h1>Custom Built Kiosk LiveCD</h1>
+{% extends "html-master.html" %}
+
+{% block content %}
<p>Template {{ template_name }} is added to the queue to be built<p>
<p>We can email you when the Kiosk has been built.<p>
@@ -6,3 +8,4 @@
{{ form.as_p }}
<p><input type="submit" value="Notify →"></p>
</form>
+{% endblock %}
\ No newline at end of file
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html 2007-11-11 00:08:41 UTC (rev 2594)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html 2007-11-11 23:26:16 UTC (rev 2595)
@@ -1,11 +1,18 @@
-<h1>Custom Built Kiosk LiveCD</h1>
+{% extends "html-master.html" %}
+{% block content %}
+
{% if queue_list %}
<ul>
{% for queue in queue_list %}
- <li><a href=/mbuild/status/{{ queue.template }}/>{{ queue.template }}</a> <a href=http://{{ queue.homepage }}>{{ queue.brand }}</a> - Has been built ? {{ queue.built }} </li>
+ {% if queue.built %}
+ <li><a href=/mbuild/status/{{ queue.template }}/>{{ queue.template }}</a> <a href=http://{{ queue.homepage }}>{{ queue.brand }}</a> - Has been built ? Yep </li>
+ {% else %}
+ <li><a href=/mbuild/status/{{ queue.template }}/>{{ queue.template }}</a> <a href=http://{{ queue.homepage }}>{{ queue.brand }}</a> - Has been built ? Not Yet </li>
+ {% endif %}
{% endfor %}
</ul>
{% else %}
<p>No template in current queue.</p>
-{% endif %}
\ No newline at end of file
+{% endif %}
+{% endblock %}
Modified: trunk/morphixlivekiosk/scripts/mbuild/urls.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-11 00:08:41 UTC (rev 2594)
+++ trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-11 23:26:16 UTC (rev 2595)
@@ -2,6 +2,7 @@
urlpatterns = patterns('',
(r'^$', 'mbuild.web.views.index'),
+ (r'^start/', 'mbuild.web.views.step1'),
(r'^mbuild/terms/(?P<template>[^/]+)/', 'mbuild.web.views.acceptterms'),
(r'^mbuild/status/(?P<template>[^/]+)/', 'mbuild.web.views.mbuildstatus'),
(r'^xml/morphix/(?P<template>[^/]+)/', 'mbuild.web.views.converttokabtxml'),
Modified: trunk/morphixlivekiosk/scripts/mbuild/web/views.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-11 00:08:41 UTC (rev 2594)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-11 23:26:16 UTC (rev 2595)
@@ -10,8 +10,11 @@
import datetime, time
import elementtree.ElementTree as ET
+def index(request):
+ return render_to_response('index.html')
-def index(request):
+
+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=False, label="Graphics file (1024x768, 32pps, any format works best)")
@@ -54,11 +57,13 @@
if template.java:
return HttpResponseRedirect("/mbuild/terms/%s/" % template_name )
else:
+ template.oktobuild = "1"
+ template.save()
return HttpResponseRedirect('/mbuild/%s/' % template_name )
else:
form = BuildForm()
context = {'form': form}
- return render_to_response('index.html', context,
+ return render_to_response('step-1.html', context,
context_instance=RequestContext(request))
@@ -116,13 +121,25 @@
return HttpResponse("Template does not exist")
def kabtqueue(request):
+# queue_list = Queue.objects.filter(built=False, oktobuild=True).order_by('template')[0]
+ if request.GET:
+ queue_list = Queue.objects.filter(built=False, oktobuild=True).order_by('template')[0]
+ queue_list.built = True
+ queue_list.builtdomain = request.GET["built"]
+ queue_list.builtiso = request.GET["i"]
+ 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:
queue_list = Queue.objects.filter(built=False, oktobuild=True).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})
-
def sucessfulbuild(request):
# class BuildForm(forms.Form):
# maindomain = forms.CharField(max_length=150)
@@ -143,6 +160,10 @@
else:
return HttpResponse("Could not determine the successful builds - see kabt.sh documentation")
+def viewqueue(request):
+ queue_list = Queue.objects.filter(oktobuild=True).order_by('template')
+ return render_to_response('view-queue.html', {'queue_list': queue_list})
+
def delall(request):
# Will disable when running live
Queue.objects.all().delete()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|