Menu
▾
▴
[Morphix-cvs] SF.net SVN: morphix: [2596] trunk/morphixlivekiosk/scripts/mbuild
|
From: <bms...@us...> - 2007-11-13 18:55:46
|
Revision: 2596
http://morphix.svn.sourceforge.net/morphix/?rev=2596&view=rev
Author: bmsleight
Date: 2007-11-13 10:55:31 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
Almost there ...
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/mbuild/media/style.css
trunk/morphixlivekiosk/scripts/mbuild/templates/html-master.html
trunk/morphixlivekiosk/scripts/mbuild/templates/index.html
trunk/morphixlivekiosk/scripts/mbuild/templates/kabt-queue.html
trunk/morphixlivekiosk/scripts/mbuild/templates/status.html
trunk/morphixlivekiosk/scripts/mbuild/templates/step-1.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/credits.html
Modified: trunk/morphixlivekiosk/scripts/mbuild/media/style.css
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/media/style.css 2007-11-11 23:26:16 UTC (rev 2595)
+++ trunk/morphixlivekiosk/scripts/mbuild/media/style.css 2007-11-13 18:55:31 UTC (rev 2596)
@@ -6,7 +6,7 @@
}
body {
- margin:0px;
+ margin:5px;
padding:0px;
font-family:verdana, arial, helvetica, sans-serif;
color:#333;
@@ -42,7 +42,7 @@
p {
font:11px/20px verdana, arial, helvetica, sans-serif;
- margin:0px 0px 16px 0px;
+ margin:0px 0px 0px 0px;
padding:0px;
}
#Content>p {margin:0px;}
@@ -171,6 +171,10 @@
font:11px/20px verdana, arial, helvetica, sans-serif;
}
+input {
+ 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/templates/credits.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/credits.html (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/credits.html 2007-11-13 18:55:31 UTC (rev 2596)
@@ -0,0 +1,31 @@
+{% extends "html-master.html" %}
+
+{% block content %}
+
+<h2>LiveCD.net</h2>
+<p>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>
+
+<h2>mbuild</h2>
+<p>Jure's idea - extended by bmsleight.</p>
+
+<h2><a href=www.morphix.org>Morphix</a></h2>
+<p>Our benevolent dictator Alextreme wrote :-</p>
+<blockquote>
+<p>Given the popularity of Knoppix and the vast amount of people working on derivative versions of Knoppix, it doesn't come as a surprise that people have been working to make Knoppix easier to modify and more flexible to use. In early 2003, Morphix was born out of a number of Knoppix remasters' wishes to have a version of Knoppix that was good at what they used Knoppix for: a base upon which to build their own versions using Debian GNU/Linux</p>
+</blockquote>
+<p>Thanks to paul_c - British humor, proof reading, gandalfar - for most of the code in MorphixLiveKiosk, Fellow morphers at #morphix</p>
+
+<h2>MorphixLiveKisok</h2>
+<p>Good job by bmsleight</p>
+
+<h2>Other Web-Kiosks</h2>
+<p>Kia thank-you for sharing <a href=http://webconverger.com/>Webconverger</a> Plugin. Open source - sharing not competing.</p>
+
+<h2><a href=http://www.debian.org>Debian</a></h2>
+<p>It is cool, it is how to build a distributiion<p>
+
+<h2>Django</h2>
+<p><a href=http://www.djangoproject.com>It is really cool</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-11 23:26:16 UTC (rev 2595)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/html-master.html 2007-11-13 18:55:31 UTC (rev 2596)
@@ -8,17 +8,18 @@
<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="/" title="about"><span>mbuild</span></a></li>
+ <li><a href="/kiosks//2007-11-11--22-07_MorphixLiveKiosk.iso" title="Download MorphixLiveKiosk"><span>Download MorphixLiveKiosk</span></a></li>
+ <li><a href="/view-queue/" title="View Build Queue"><span>View Build Queue</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>
+ <li><a href="/" title="mbuilder.blog"><span>mbuild.blog</span></a></li>
</ul>
</div>
<br /><br />
- <div id="Content">
+ <div id="body">
{% block content %}{% endblock %}
</div>
</body>
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/index.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/index.html 2007-11-11 23:26:16 UTC (rev 2595)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/index.html 2007-11-13 18:55:31 UTC (rev 2596)
@@ -1,17 +1,15 @@
{% extends "html-master.html" %}
{% 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>
+<h2>MorphixLiveKisok</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>It is a LiveCD that contains a locked down version of firefox-browser. It was built using <a href=/>mbuild</a>
+<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 overnight 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</p>
+<p> </p>
+<p>Enjoy,</p>
+<p><i>mbuild team</i></p>
-<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/kabt-queue.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/kabt-queue.html 2007-11-11 23:26:16 UTC (rev 2595)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/kabt-queue.html 2007-11-13 18:55:31 UTC (rev 2596)
@@ -1,2 +1,2 @@
-{% if queue_list %}{% for queue in queue_list %}http://mbuild.livecd.org/xml/morphix/{{ 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
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/status.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/status.html 2007-11-11 23:26:16 UTC (rev 2595)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/status.html 2007-11-13 18:55:31 UTC (rev 2596)
@@ -15,7 +15,7 @@
<p>You can cheak the status of your build request at anytime by visiting this page<p>
{% endif %}
<small>
- <p><a href=/templates/{{newtemplate.template}}>Raw Template.xml</a> - <a href=/xml/morphix/{{newtemplate.template}}/>Morphix Style template.xml</a><p>
+ <p><a href=/templates/{{newtemplate.template}}>Raw Template.xml</a> - <a href=/xml/morphix/{{newtemplate.template}}>Morphix Style template.xml</a><p>
</small>
{% endblock %}
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/step-1.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/step-1.html 2007-11-11 23:26:16 UTC (rev 2595)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/step-1.html 2007-11-13 18:55:31 UTC (rev 2596)
@@ -1,6 +1,12 @@
{% extends "html-master.html" %}
{% block content %}
+<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. </p>
+<h2>mbuild - How ?</h2>
+<p>Fill-out a form below with the seven main options, add your email address and overnight 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</p>
+
+<h2>Start Your Build ....</h2>
<form enctype="multipart/form-data" method="post" action=".">
{{ form.as_p }}
<p><input type="submit" value="Continue →"></p>
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html 2007-11-11 23:26:16 UTC (rev 2595)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html 2007-11-13 18:55:31 UTC (rev 2596)
@@ -1,12 +1,12 @@
{% extends "html-master.html" %}
{% block content %}
-
+<p>Below is a listing of the queue.
{% if queue_list %}
<ul>
{% for queue in queue_list %}
{% 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>
+ <li><a href=/mbuild/status/{{ queue.template }}/>Status Page for {{ queue.template }}</a> Branded:<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 %}
Modified: trunk/morphixlivekiosk/scripts/mbuild/urls.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-11 23:26:16 UTC (rev 2595)
+++ trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-13 18:55:31 UTC (rev 2596)
@@ -5,12 +5,12 @@
(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'),
+ (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'^kabt-built/', 'mbuild.web.views.sucessfulbuild'),
(r'^delete-queue/', 'mbuild.web.views.delall'),
+ (r'^credits/', 'mbuild.web.views.credits'),
# Uncomment this for admin:
(r'^admin/', include('django.contrib.admin.urls')),
Modified: trunk/morphixlivekiosk/scripts/mbuild/web/models.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/models.py 2007-11-11 23:26:16 UTC (rev 2595)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/models.py 2007-11-13 18:55:31 UTC (rev 2596)
@@ -18,4 +18,7 @@
builtiso = models.CharField(maxlength="150")
builtogg = models.CharField(maxlength="150")
builtjpg = models.CharField(maxlength="150")
- oktobuild = models.BooleanField(default=False)
\ No newline at end of file
+ oktobuild = models.BooleanField(default=False)
+
+ class Admin:
+ pass
\ No newline at end of file
Modified: trunk/morphixlivekiosk/scripts/mbuild/web/views.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-11 23:26:16 UTC (rev 2595)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-13 18:55:31 UTC (rev 2596)
@@ -17,11 +17,11 @@
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)")
+ 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")
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'), ("0", 'No')]),
+ dhcp = forms.BooleanField(widget=forms.RadioSelect(choices=[("1", 'Yes')]),
initial="1", label="Use DHCP?")
flash = forms.BooleanField(widget=forms.RadioSelect(choices=[("1", 'Yes'), ("0", 'No')]),
label="Include Flash?", initial="0")
@@ -164,6 +164,11 @@
queue_list = Queue.objects.filter(oktobuild=True).order_by('template')
return render_to_response('view-queue.html', {'queue_list': queue_list})
+def credits(request):
+#Yes I know Jure - I shoudl use flatpages - I will try to move to flatpages....
+ return render_to_response('credits.html')
+
+
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.
|
