You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(23) |
Nov
(20) |
Dec
(32) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(43) |
Feb
(31) |
Mar
(99) |
Apr
(57) |
May
(82) |
Jun
(73) |
Jul
(123) |
Aug
(634) |
Sep
(588) |
Oct
(264) |
Nov
(217) |
Dec
(179) |
2005 |
Jan
(262) |
Feb
(273) |
Mar
(164) |
Apr
(88) |
May
(23) |
Jun
(10) |
Jul
(8) |
Aug
(19) |
Sep
(112) |
Oct
(57) |
Nov
(71) |
Dec
(6) |
2006 |
Jan
(14) |
Feb
(48) |
Mar
(56) |
Apr
(21) |
May
(77) |
Jun
(46) |
Jul
(47) |
Aug
(27) |
Sep
(18) |
Oct
(16) |
Nov
(4) |
Dec
(18) |
2007 |
Jan
(2) |
Feb
(6) |
Mar
(2) |
Apr
(27) |
May
(13) |
Jun
(27) |
Jul
(20) |
Aug
(3) |
Sep
(3) |
Oct
(23) |
Nov
(21) |
Dec
(6) |
2008 |
Jan
(7) |
Feb
(3) |
Mar
(4) |
Apr
(8) |
May
(3) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
(11) |
Feb
(1) |
Mar
(8) |
Apr
|
May
|
Jun
(4) |
Jul
(6) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
From: <bms...@us...> - 2008-02-09 16:47:35
|
Revision: 2616 http://morphix.svn.sourceforge.net/morphix/?rev=2616&view=rev Author: bmsleight Date: 2008-02-09 08:47:30 -0800 (Sat, 09 Feb 2008) Log Message: ----------- Using here() for locations - thanks gandalfar Modified Paths: -------------- trunk/templatetool/settings.py Modified: trunk/templatetool/settings.py =================================================================== --- trunk/templatetool/settings.py 2008-02-09 16:30:37 UTC (rev 2615) +++ trunk/templatetool/settings.py 2008-02-09 16:47:30 UTC (rev 2616) @@ -1,4 +1,6 @@ # Django settings for templatetool project. +import os +here = lambda x: os.path.join(os.path.dirname(__file__),x) DEBUG = True TEMPLATE_DEBUG = DEBUG @@ -37,7 +39,7 @@ # Absolute path to the directory that holds media. # Example: "/home/media/media.lawrence.com/" -MEDIA_ROOT = '/home/alex/templatetool/media' +MEDIA_ROOT = here('media') # URL that handles the media served from MEDIA_ROOT. # Example: "http://media.lawrence.com" @@ -68,7 +70,7 @@ ROOT_URLCONF = 'templatetool.urls' TEMPLATE_DIRS = ( - '/home/alex/templatetool/tt_templates', + here('templates'), # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2008-02-09 16:30:48
|
Revision: 2615 http://morphix.svn.sourceforge.net/morphix/?rev=2615&view=rev Author: alextreme Date: 2008-02-09 08:30:37 -0800 (Sat, 09 Feb 2008) Log Message: ----------- * importing templatetool Added Paths: ----------- trunk/templatetool/ trunk/templatetool/__init__.py trunk/templatetool/manage.py trunk/templatetool/media/ trunk/templatetool/media/css/ trunk/templatetool/media/css/base.css trunk/templatetool/media/css/changelists.css trunk/templatetool/media/css/dashboard.css trunk/templatetool/media/css/forms.css trunk/templatetool/media/css/global.css trunk/templatetool/media/css/layout.css trunk/templatetool/media/css/login.css trunk/templatetool/media/css/patch-iewin.css trunk/templatetool/media/css/rtl.css trunk/templatetool/media/css/widgets.css trunk/templatetool/media/img/ trunk/templatetool/media/img/admin/ trunk/templatetool/media/img/admin/arrow-down.gif trunk/templatetool/media/img/admin/arrow-up.gif trunk/templatetool/media/img/admin/changelist-bg.gif trunk/templatetool/media/img/admin/chooser-bg.gif trunk/templatetool/media/img/admin/chooser_stacked-bg.gif trunk/templatetool/media/img/admin/default-bg-reverse.gif trunk/templatetool/media/img/admin/default-bg.gif trunk/templatetool/media/img/admin/deleted-overlay.gif trunk/templatetool/media/img/admin/icon-no.gif trunk/templatetool/media/img/admin/icon-unknown.gif trunk/templatetool/media/img/admin/icon-yes.gif trunk/templatetool/media/img/admin/icon_addlink.gif trunk/templatetool/media/img/admin/icon_alert.gif trunk/templatetool/media/img/admin/icon_calendar.gif trunk/templatetool/media/img/admin/icon_changelink.gif trunk/templatetool/media/img/admin/icon_clock.gif trunk/templatetool/media/img/admin/icon_deletelink.gif trunk/templatetool/media/img/admin/icon_error.gif trunk/templatetool/media/img/admin/icon_searchbox.png trunk/templatetool/media/img/admin/icon_success.gif trunk/templatetool/media/img/admin/inline-delete-8bit.png trunk/templatetool/media/img/admin/inline-delete.png trunk/templatetool/media/img/admin/inline-restore-8bit.png trunk/templatetool/media/img/admin/inline-restore.png trunk/templatetool/media/img/admin/inline-splitter-bg.gif trunk/templatetool/media/img/admin/nav-bg-grabber.gif trunk/templatetool/media/img/admin/nav-bg-reverse.gif trunk/templatetool/media/img/admin/nav-bg.gif trunk/templatetool/media/img/admin/selector-add.gif trunk/templatetool/media/img/admin/selector-addall.gif trunk/templatetool/media/img/admin/selector-remove.gif trunk/templatetool/media/img/admin/selector-removeall.gif trunk/templatetool/media/img/admin/selector-search.gif trunk/templatetool/media/img/admin/selector_stacked-add.gif trunk/templatetool/media/img/admin/selector_stacked-remove.gif trunk/templatetool/media/img/admin/tool-left.gif trunk/templatetool/media/img/admin/tool-left_over.gif trunk/templatetool/media/img/admin/tool-right.gif trunk/templatetool/media/img/admin/tool-right_over.gif trunk/templatetool/media/img/admin/tooltag-add.gif trunk/templatetool/media/img/admin/tooltag-add_over.gif trunk/templatetool/media/img/admin/tooltag-arrowright.gif trunk/templatetool/media/img/admin/tooltag-arrowright_over.gif trunk/templatetool/media/js/ trunk/templatetool/media/js/SelectBox.js trunk/templatetool/media/js/SelectFilter.js trunk/templatetool/media/js/SelectFilter2.js trunk/templatetool/media/js/admin/ trunk/templatetool/media/js/admin/CollapsedFieldsets.js trunk/templatetool/media/js/admin/DateTimeShortcuts.js trunk/templatetool/media/js/admin/RelatedObjectLookups.js trunk/templatetool/media/js/admin/ordering.js trunk/templatetool/media/js/calendar.js trunk/templatetool/media/js/core.js trunk/templatetool/media/js/dateparse.js trunk/templatetool/media/js/getElementsBySelector.js trunk/templatetool/media/js/timeparse.js trunk/templatetool/media/js/urlify.js trunk/templatetool/modify/ trunk/templatetool/modify/__init__.py trunk/templatetool/modify/models.py trunk/templatetool/modify/urls.py trunk/templatetool/modify/views.py trunk/templatetool/settings.py trunk/templatetool/template.py trunk/templatetool/tt_templates/ trunk/templatetool/tt_templates/modify/ trunk/templatetool/tt_templates/modify/index.html trunk/templatetool/tt_templates/modify/main.html trunk/templatetool/tt_templates/modify/template.html trunk/templatetool/urls.py Added: trunk/templatetool/__init__.py =================================================================== Added: trunk/templatetool/manage.py =================================================================== --- trunk/templatetool/manage.py (rev 0) +++ trunk/templatetool/manage.py 2008-02-09 16:30:37 UTC (rev 2615) @@ -0,0 +1,11 @@ +#!/usr/bin/env python +from django.core.management import execute_manager +try: + import settings # Assumed to be in the same directory. +except ImportError: + import sys + sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__) + sys.exit(1) + +if __name__ == "__main__": + execute_manager(settings) Added: trunk/templatetool/media/css/base.css =================================================================== --- trunk/templatetool/media/css/base.css (rev 0) +++ trunk/templatetool/media/css/base.css 2008-02-09 16:30:37 UTC (rev 2615) @@ -0,0 +1,14 @@ +/* + DJANGO Admin + by Wilson Miner wi...@la... +*/ + +/* Block IE 5 */ +@import "null?\"\{"; + +/* Import other styles */ +@import url('global.css'); +@import url('layout.css'); + +/* Import patch for IE 6 Windows */ +/*\*/ @import "patch-iewin.css"; /**/ \ No newline at end of file Added: trunk/templatetool/media/css/changelists.css =================================================================== --- trunk/templatetool/media/css/changelists.css (rev 0) +++ trunk/templatetool/media/css/changelists.css 2008-02-09 16:30:37 UTC (rev 2615) @@ -0,0 +1,50 @@ +@import url('base.css'); + +/* CHANGELISTS */ +#changelist { position:relative; width:100%; } +#changelist table { width:100%; } +.change-list .filtered table { border-right:1px solid #ddd; } +.change-list .filtered { min-height:400px; } +.change-list .filtered { background:white url(../img/admin/changelist-bg.gif) top right repeat-y !important; } +.change-list .filtered table, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull { margin-right:160px !important; width:auto !important; } +.change-list .filtered table tbody th { padding-right:1em; } +#changelist .toplinks { border-bottom:1px solid #ccc !important; } +#changelist .paginator { color:#666; border-top:1px solid #eee; border-bottom:1px solid #eee; background:white url(../img/admin/nav-bg.gif) 0 180% repeat-x; overflow:hidden; } +.change-list .filtered .paginator { border-right:1px solid #ddd; } + +/* CHANGELIST TABLES */ +#changelist table thead th { white-space:nowrap; } +#changelist table tbody td { border-left: 1px solid #ddd; } +#changelist table tfoot { color: #666; } + +/* TOOLBAR */ +#changelist #toolbar { padding:3px; border-bottom:1px solid #ddd; background:#e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; color:#666; } +#changelist #toolbar form input { font-size:11px; padding:1px 2px; } +#changelist #toolbar form #searchbar { padding:2px; } +#changelist #changelist-search img { vertical-align:middle; } + +/* FILTER COLUMN */ +#changelist-filter { position:absolute; top:0; right:0; z-index:1000; width:160px; border-left:1px solid #ddd; background:#efefef; margin:0; } +#changelist-filter h2 { font-size:11px; padding:2px 5px; border-bottom:1px solid #ddd; } +#changelist-filter h3 { font-size:12px; margin-bottom:0; } +#changelist-filter ul { padding-left:0;margin-left:10px; } +#changelist-filter li { list-style-type:none; margin-left:0; padding-left:0; } +#changelist-filter a { color:#999; } +#changelist-filter a:hover { color:#036; } +#changelist-filter li.selected { border-left:5px solid #ccc; padding-left:5px;margin-left:-10px; } +#changelist-filter li.selected a { color:#5b80b2 !important; } + +/* DATE DRILLDOWN */ +.change-list ul.toplinks { display:block; background:white url(../img/admin/nav-bg-reverse.gif) 0 -10px repeat-x; border-top:1px solid white; float:left; padding:0 !important; margin:0 !important; width:100%; } +.change-list ul.toplinks li { float: left; width: 9em; padding:3px 6px; font-weight: bold; list-style-type:none; } +.change-list ul.toplinks .date-back a { color:#999; } +.change-list ul.toplinks .date-back a:hover { color:#036; } + +/* PAGINATOR */ +.paginator { font-size:11px; padding-top:10px; padding-bottom:10px; line-height:22px; margin:0; border-top:1px solid #ddd; } +.paginator a:link, .paginator a:visited { padding:2px 6px; border:solid 1px #ccc; background:white; text-decoration:none; } +.paginator a.showall { padding:0 !important; border:none !important; } +.paginator a.showall:hover { color:#036 !important; background:transparent !important; } +.paginator .end { border-width:2px !important; margin-right:6px; } +.paginator .this-page { padding:2px 6px; font-weight:bold; font-size:13px; vertical-align:top; } +.paginator a:hover { color:white; background:#5b80b2; border-color:#036; } Added: trunk/templatetool/media/css/dashboard.css =================================================================== --- trunk/templatetool/media/css/dashboard.css (rev 0) +++ trunk/templatetool/media/css/dashboard.css 2008-02-09 16:30:37 UTC (rev 2615) @@ -0,0 +1,10 @@ +@import url('base.css'); + +/* DASHBOARD */ +.dashboard .module table th { width:100%; } +.dashboard .module table td { white-space:nowrap; } +.dashboard .module table td a { display:block; padding-right:.6em; } + +/* RECENT ACTIONS MODULE */ +.module ul.actionlist { margin-left:0; } +ul.actionlist li { list-style-type:none; } \ No newline at end of file Added: trunk/templatetool/media/css/forms.css =================================================================== --- trunk/templatetool/media/css/forms.css (rev 0) +++ trunk/templatetool/media/css/forms.css 2008-02-09 16:30:37 UTC (rev 2615) @@ -0,0 +1,60 @@ +@import url('base.css'); +@import url('widgets.css'); + +/* FORM ROWS */ +.form-row { overflow:hidden; padding:8px 12px; font-size:11px; border-bottom:1px solid #eee; } +.form-row img, .form-row input { vertical-align:middle; } +form .form-row p { padding-left:0; font-size:11px; } + +/* FORM LABELS */ +form h4 { margin:0 !important; padding:0 !important; border:none !important; } +label { font-weight:normal !important; color:#666; font-size:12px; } +label.inline { margin-left:20px; } +.required label, label.required { font-weight:bold !important; color:#333 !important; } + +/* RADIO BUTTONS */ +form ul.radiolist li { list-style-type:none; } +form ul.radiolist label { float:none; display:inline; } +form ul.inline { margin-left:0; padding:0; } +form ul.inline li { float:left; padding-right:7px; } + +/* ALIGNED FIELDSETS */ +.aligned label { display:block; padding:0 1em 3px 0; float:left; width:8em; } +.aligned label.inline { display:inline; float:none; } +.colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField { width:350px; } +form .aligned p, form .aligned ul { margin-left:7em; padding-left:30px; } +form .aligned table p { margin-left:0; padding-left:0; } +form .aligned p.help { padding-left:38px; } +.aligned .vCheckboxLabel { float:none !important; display:inline; padding-left:4px; } +.colM .aligned .vLargeTextField, colM .aligned .vXMLLargeTextField { width:610px; } +.checkbox-row p.help { margin-left:0; padding-left:0 !important; } + +/* WIDE FIELDSETS */ +.wide label { width:15em !important; } +form .wide p { margin-left:15em; } +form .wide p.help { padding-left:38px; } +.colM fieldset.wide .vLargeTextField, .colM fieldset.wide .vXMLLargeTextField { width:450px; } + +/* COLLAPSED FIELDSETS */ +fieldset.collapsed * { display:none; } +fieldset.collapsed h2, fieldset.collapsed { display:block !important; } +fieldset.collapsed h2 { background-image:url(../img/admin/nav-bg.gif); background-position:bottom left; color:#999; } +fieldset.collapsed .collapse-toggle { padding:3px 5px !important; background:transparent; display:inline !important;} + +/* MONOSPACE TEXTAREAS */ +fieldset.monospace textarea { font-family:"Bitstream Vera Sans Mono",Monaco,"Courier New",Courier,monospace; } + +/* SUBMIT ROW */ +.submit-row { padding:5px 7px; text-align:right; background:white url(../img/admin/nav-bg.gif) 0 100% repeat-x; border:1px solid #ccc; margin:5px 0; } +.submit-row input { margin:0 0 0 5px; } +.submit-row p { margin-top:0.3em; } +.submit-row .deletelink { background:url(../img/admin/icon_deletelink.gif) 0 50% no-repeat; padding-left:14px; } + +/* CUSTOM FORM FIELDS */ +.vSelectMultipleField { vertical-align:top !important; } +.vCheckboxField { border:none; } +.vDateField, .vTimeField { margin-right:2px; } +.vURLField { width:30em; } +.vLargeTextField, .vXMLLargeTextField { width:48em; } +.flatpages-flatpage #id_content { height:40.2em; } +.module table .vPositiveSmallIntegerField { width:2.2em; } Added: trunk/templatetool/media/css/global.css =================================================================== --- trunk/templatetool/media/css/global.css (rev 0) +++ trunk/templatetool/media/css/global.css 2008-02-09 16:30:37 UTC (rev 2615) @@ -0,0 +1,141 @@ +body { margin:0; padding:0; font-size:12px; font-family:"Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif; color:#333; background:#fff; } + +/* LINKS */ +a:link, a:visited { color: #5b80b2; text-decoration:none; } +a:hover { color: #036; } +a img { border:none; } + +/* GLOBAL DEFAULTS */ +p, ol, ul, dl { margin:.2em 0 .8em 0; } +p { padding:0; line-height:140%; } + +h1,h2,h3,h4,h5 { font-weight:bold; } +h1 { font-size:18px; color:#666; padding:0 6px 0 0; margin:0 0 .2em 0; } +h2 { font-size:16px; margin:1em 0 .5em 0; } +h2.subhead { font-weight:normal;margin-top:0; } +h3 { font-size:14px; margin:.8em 0 .3em 0; color:#666; font-weight:bold; } +h4 { font-size:12px; margin:1em 0 .8em 0; padding-bottom:3px; } +h5 { font-size:10px; margin:1.5em 0 .5em 0; color:#666; text-transform:uppercase; letter-spacing:1px; } + +ul li { list-style-type:square; padding:1px 0; } +ul.plainlist { margin-left:0 !important; } +ul.plainlist li { list-style-type:none; } +li ul { margin-bottom:0; } +li, dt, dd { font-size:11px; line-height:14px; } +dt { font-weight:bold; margin-top:4px; } +dd { margin-left:0; } + +form { margin:0; padding:0; } +fieldset { margin:0; padding:0; } + +blockquote { font-size:11px; color:#777; margin-left:2px; padding-left:10px; border-left:5px solid #ddd; } +code, pre { font-family:"Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace; background:inherit; color:#666; font-size:11px; } +pre.literal-block { margin:10px; background:#eee; padding:6px 8px; } +code strong { color:#930; } +hr { clear:both; color:#eee; background-color:#eee; height:1px; border:none; margin:0; padding:0; font-size:1px; line-height:1px; } + +/* TEXT STYLES & MODIFIERS */ +.small { font-size:11px; } +.tiny { font-size:10px; } +p.tiny { margin-top:-2px; } +.mini { font-size:9px; } +p.mini { margin-top:-3px; } +.help, p.help { font-size:10px !important; color:#999; } +p img, h1 img, h2 img, h3 img, h4 img, td img { vertical-align:middle; } +.quiet, a.quiet:link, a.quiet:visited { color:#999 !important;font-weight:normal !important; } +.quiet strong { font-weight:bold !important; } +.float-right { float:right; } +.float-left { float:left; } +.clear { clear:both; } +.align-left { text-align:left; } +.align-right { text-align:right; } +.example { margin:10px 0; padding:5px 10px; background:#efefef; } +.nowrap { white-space:nowrap; } + +/* TABLES */ +table { border-collapse:collapse; border-color:#ccc; } +td, th { font-size:11px; line-height:13px; border-bottom:1px solid #eee; vertical-align:top; padding:5px; font-family:"Lucida Grande", Verdana, Arial, sans-serif; } +th { text-align:left; font-size:12px; font-weight:bold; } +thead th, +tfoot td { color:#666; padding:2px 5px; font-size:11px; background:#e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; border-left:1px solid #ddd; border-bottom:1px solid #ddd; } +tfoot td { border-bottom:none; border-top:1px solid #ddd; } +thead th:first-child, +tfoot td:first-child { border-left:none !important; } +thead th.optional { font-weight:normal !important; } +fieldset table { border-right:1px solid #eee; } +tr.row-label td { font-size:9px; padding-top:2px; padding-bottom:0; border-bottom:none; color:#666; margin-top:-1px; } +tr.alt { background:#f6f6f6; } +.row1 { background:#EDF3FE; } +.row2 { background:white; } + +/* SORTABLE TABLES */ +thead th a:link, thead th a:visited { color:#666; display:block; } +table thead th.sorted { background-position:bottom left !important; } +table thead th.sorted a { padding-right:13px; } +table thead th.ascending a { background:url(../img/admin/arrow-down.gif) right .4em no-repeat; } +table thead th.descending a { background:url(../img/admin/arrow-up.gif) right .4em no-repeat; } + +/* ORDERABLE TABLES */ +table.orderable tbody tr td:hover { cursor:move; } +table.orderable tbody tr td:first-child { padding-left:14px; background-image:url(../img/admin/nav-bg-grabber.gif); background-repeat:repeat-y; } +table.orderable-initalized .order-cell, body>tr>td.order-cell { display:none; } + +/* FORM DEFAULTS */ +input, textarea, select { margin:2px 0; padding:2px 3px; vertical-align:middle; font-family:"Lucida Grande", Verdana, Arial, sans-serif; font-weight:normal; font-size:11px; } +textarea { vertical-align:top !important; } +input[type=text], input[type=password], textarea, select, .vTextField { border:1px solid #ccc; } + +/* FORM BUTTONS */ +input[type=submit], input[type=button], .submit-row input { background:white url(../img/admin/nav-bg.gif) bottom repeat-x; padding:3px; color:black; border:1px solid #bbb; border-color:#ddd #aaa #aaa #ddd; } +input[type=submit]:active, input[type=button]:active { background-image:url(../img/admin/nav-bg-reverse.gif); background-position:top; } +input[type=submit].default, .submit-row input.default { border:2px solid #5b80b2; background:#7CA0C7 url(../img/admin/default-bg.gif) bottom repeat-x; font-weight:bold; color:white; } +input[type=submit].default:active { background-image:url(../img/admin/default-bg-reverse.gif); background-position:top; } + +/* MODULES */ +.module { border:1px solid #ccc; margin-bottom:5px; background:white; } +.module p, .module ul, .module h3, .module h4, .module dl, .module pre { padding-left:10px; padding-right:10px; } +.module blockquote { margin-left:12px; } +.module ul, .module ol { margin-left:1.5em; } +.module h3 { margin-top:.6em; } +.module h2, .module caption { margin:0; padding:2px 5px 3px 5px; font-size:11px; text-align:left; font-weight:bold; background:#7CA0C7 url(../img/admin/default-bg.gif) top left repeat-x; color:white; } +.module table { border-collapse: collapse; } + +/* MESSAGES & ERRORS */ +ul.messagelist { padding:0 0 5px 0; margin:0; } +ul.messagelist li { font-size:12px; display:block; padding:4px 5px 4px 25px; margin:0 0 3px 0; border-bottom:1px solid #ddd; color:#666; background:#ffc url(../img/admin/icon_success.gif) 5px .3em no-repeat; } +.errornote { font-size:12px !important; display:block; padding:4px 5px 4px 25px; margin:0 0 3px 0; border:1px solid red; color:red;background:#ffc url(../img/admin/icon_error.gif) 5px .3em no-repeat; } +ul.errorlist { margin:0 !important; padding:0 !important; } +.errorlist li { font-size:12px !important; display:block; padding:4px 5px 4px 25px; margin:0 0 3px 0; border:1px solid red; color:white; background:red url(../img/admin/icon_alert.gif) 5px .3em no-repeat; } +td ul.errorlist { margin:0 !important; padding:0 !important; } +td ul.errorlist li { margin:0 !important; } +.error { background:#ffc; } +.error input, .error select { border:1px solid red; } +div.system-message { background: #ffc; margin: 10px; padding: 6px 8px; font-size: .8em; } +div.system-message p.system-message-title { padding:4px 5px 4px 25px; margin:0; color:red; background:#ffc url(../img/admin/icon_error.gif) 5px .3em no-repeat; } +.description { font-size:12px; padding:5px 0 0 12px; } + +/* BREADCRUMBS */ +div.breadcrumbs { background:white url(../img/admin/nav-bg-reverse.gif) 0 -10px repeat-x; padding:2px 8px 3px 8px; font-size:11px; color:#999; border-top:1px solid white; border-bottom:1px solid #ccc; text-align:left; } + +/* ACTION ICONS */ +.addlink { padding-left:12px; background:url(../img/admin/icon_addlink.gif) 0 .2em no-repeat; } +.changelink { padding-left:12px; background:url(../img/admin/icon_changelink.gif) 0 .2em no-repeat; } +.deletelink { padding-left:12px; background:url(../img/admin/icon_deletelink.gif) 0 .25em no-repeat; } +a.deletelink:link, a.deletelink:visited { color:#CC3434; } +a.deletelink:hover { color:#993333; } + +/* OBJECT TOOLS */ +.object-tools { font-size:10px; font-weight:bold; font-family:Arial,Helvetica,sans-serif; padding-left:0; float:right; position:relative; margin-top:-2.4em; margin-bottom:-2em; } +.form-row .object-tools { margin-top:5px; margin-bottom:5px; float:none; height:2em; padding-left:3.5em; } +.object-tools li { display:block; float:left; background:url(../img/admin/tool-left.gif) 0 0 no-repeat; padding:0 0 0 8px; margin-left:2px; height:16px; } +.object-tools li:hover { background:url(../img/admin/tool-left_over.gif) 0 0 no-repeat; } +.object-tools a:link, .object-tools a:visited { display:block; float:left; color:white; padding:.1em 14px .1em 8px; height:14px; background:#999 url(../img/admin/tool-right.gif) 100% 0 no-repeat; } +.object-tools a:hover, .object-tools li:hover a { background:#5b80b2 url(../img/admin/tool-right_over.gif) 100% 0 no-repeat; } +.object-tools a.viewsitelink, .object-tools a.golink { background:#999 url(../img/admin/tooltag-arrowright.gif) top right no-repeat; padding-right:28px; } +.object-tools a.viewsitelink:hover, .object-tools a.golink:hover { background:#5b80b2 url(../img/admin/tooltag-arrowright_over.gif) top right no-repeat; } +.object-tools a.addlink { background:#999 url(../img/admin/tooltag-add.gif) top right no-repeat; padding-right:28px; } +.object-tools a.addlink:hover { background:#5b80b2 url(../img/admin/tooltag-add_over.gif) top right no-repeat; } + +/* OBJECT HISTORY */ +table#change-history { width:100%; } +table#change-history tbody th { width:16em; } Added: trunk/templatetool/media/css/layout.css =================================================================== --- trunk/templatetool/media/css/layout.css (rev 0) +++ trunk/templatetool/media/css/layout.css 2008-02-09 16:30:37 UTC (rev 2615) @@ -0,0 +1,29 @@ +/* PAGE STRUCTURE */ +#container { position:relative; width:100%; min-width:760px; padding:0; } +#content { margin:10px 15px; } +#header { width:100%; } +#content-main { float:left; width:100%; } +#content-related { float:right; width:18em; position:relative; margin-right:-19em; } +#footer { clear:both; padding:10px; } + +/* COLUMN TYPES */ +.colMS { margin-right:20em !important; } +.colSM { margin-left:20em !important; } +.colSM #content-related { float:left; margin-right:0; margin-left:-19em; } +.colSM #content-main { float:right; } +.popup .colM { width:95%; } +.subcol { float:left; width:46%; margin-right:15px; } +.dashboard #content { width:500px; } + +/* HEADER */ +#header { background:#417690; color:#ffc; overflow:hidden; } +#header a:link, #header a:visited { color:white; } +#header a:hover { text-decoration:underline; } +#branding h1 { padding:0 10px; font-size:18px; margin:8px 0; font-weight:normal; color:#f4f379; } +#branding h2 { padding:0 10px; font-size:14px; margin:-8px 0 8px 0; font-weight:normal; color:#ffc; } +#user-tools { position:absolute; top:0; right:0; padding:1.2em 10px; font-size:11px; text-align:right; } + +/* SIDEBAR */ +#content-related h3 { font-size:12px; color:#666; margin-bottom:3px; } +#content-related h4 { font-size:11px; } +#content-related .module h2 { background:#eee url(../img/admin/nav-bg.gif) bottom left repeat-x; color:#666; } \ No newline at end of file Added: trunk/templatetool/media/css/login.css =================================================================== --- trunk/templatetool/media/css/login.css (rev 0) +++ trunk/templatetool/media/css/login.css 2008-02-09 16:30:37 UTC (rev 2615) @@ -0,0 +1,13 @@ +@import url('base.css'); +@import url('layout.css'); + +/* LOGIN FORM */ +body.login { background:#eee; } +.login #container { background:white; border:1px solid #ccc; width:28em; min-width:300px; margin-left:auto; margin-right:auto; margin-top:100px; } +.login #content-main { width:100%; } +.login form { margin-top:1em; } +.login .form-row { padding:4px 0; float:left; width:100%; } +.login .form-row label { float:left; width:9em; padding-right:0.5em; line-height:2em; text-align:right; font-size:1em; color:#333; } +.login .form-row #id_username, .login .form-row #id_password { width:14em; } +.login span.help { font-size:10px; display:block; } +.login .submit-row { clear:both; padding:1em 0 0 9.4em; } \ No newline at end of file Added: trunk/templatetool/media/css/patch-iewin.css =================================================================== --- trunk/templatetool/media/css/patch-iewin.css (rev 0) +++ trunk/templatetool/media/css/patch-iewin.css 2008-02-09 16:30:37 UTC (rev 2615) @@ -0,0 +1,8 @@ +* html #container { position:static; } /* keep header from flowing off the page */ +* html .colMS #content-related { margin-right:0; margin-left:10px; position:static; } /* put the right sidebars back on the page */ +* html .colSM #content-related { margin-right:10px; margin-left:-115px; position:static; } /* put the left sidebars back on the page */ +* html .form-row { height:1%; } +* html .dashboard #content { width:768px; } /* proper fixed width for dashboard in IE6 */ +* html .dashboard #content-main { width:535px; } /* proper fixed width for dashboard in IE6 */ +* html #changelist-filter ul { margin-right:-10px; } /* fix right margin for changelist filters in IE6 */ +* html .change-list .filtered { height:400px; } /* IE ignores min-height, but treats height as if it were min-height */ \ No newline at end of file Added: trunk/templatetool/media/css/rtl.css =================================================================== --- trunk/templatetool/media/css/rtl.css (rev 0) +++ trunk/templatetool/media/css/rtl.css 2008-02-09 16:30:37 UTC (rev 2615) @@ -0,0 +1,46 @@ +body { direction: rtl; } + +/* login styles */ + +.login .form-row { float:right; } +.login .form-row label { float:right; padding-left:0.5em; padding-right:0; text-align:left;} +.login .submit-row { clear:both; padding:1em 9.4em 0 0; } + + +/* global styles */ +th { text-align: right; } +.module h2, .module caption { text-align: right; } +.addlink, .changelink { padding-left:0px; padding-right:12px; background-position:100% 0.2em; } +.deletelink { padding-left:0px; padding-right:12px; background-position:100% 0.25em; } +.object-tools { float:left; } + + +/* layout styles */ +#user-tools { right:auto; left:0; text-align:left; } +div.breadcrumbs { text-align:right; } +#content-main { float:right;} +#content-related { float:left; margin-left:-19em; margin-right:auto;} +.colMS { margin-left:20em !important; margin-right:10px !important;} + +/* dashboard styles */ +.dashboard .module table td a { padding-left:.6em; padding-right:12px; } + +/* changelists styles */ +.change-list .filtered { background:white url(../img/admin/changelist-bg_rtl.gif) top left repeat-y !important; } +.change-list .filtered table { border-left:1px solid #ddd; border-right:0px none; } +#changelist-filter { right:auto; left:0; border-left:0px none; border-right:1px solid #ddd;} +.change-list .filtered table, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull { margin-right:0px !important; margin-left:160px !important; } +#changelist-filter li.selected { border-left:0px none; padding-left:0px; margin-left:0; border-right:5px solid #ccc; padding-right:5px;margin-right:-10px; } + +/* fomrs styles */ +.aligned label { padding:0 0 3px 1em; float:right; } +.submit-row { text-align: left } +.vDateField, .vTimeField { margin-left:2px; } + +/* widget styles */ +.calendarnav-previous { top:0; left:auto; right:0; } +.calendarnav-next { top:0; right:auto; left:0;} +.calendar caption, .calendarbox h2 { text-align:center; } + +.selector { float: right;} +.selector .selector-filter { text-align: right;} Added: trunk/templatetool/media/css/widgets.css =================================================================== --- trunk/templatetool/media/css/widgets.css (rev 0) +++ trunk/templatetool/media/css/widgets.css 2008-02-09 16:30:37 UTC (rev 2615) @@ -0,0 +1,101 @@ +/* SELECTOR (FILTER INTERFACE) */ +.selector { width:580px; float:left; } +.selector select { width:270px; height:17.2em; } +.selector-available, .selector-chosen { float:left; width:270px; text-align:center; margin-bottom:5px; } +.selector-available h2, .selector-chosen h2 { border:1px solid #ccc; } +.selector .selector-available h2 { background:white url(../img/admin/nav-bg.gif) bottom left repeat-x; color:#666; } +.selector .selector-filter { background:white; border:1px solid #ccc; border-width:0 1px; padding:3px; color:#999; font-size:10px; margin:0; text-align:left; } +.selector .selector-chosen .selector-filter { padding:4px 5px; } +.selector .selector-available input { width:230px; } +.selector ul.selector-chooser { float:left; width:22px; height:50px; background:url(../img/admin/chooser-bg.gif) top center no-repeat; margin:8em 3px 0 3px; padding:0; } +.selector-chooser li { margin:0; padding:3px; list-style-type:none; } +.selector select { margin-bottom:5px; margin-top:0; } +.selector-add, .selector-remove { width:16px; height:16px; display:block; text-indent:-3000px; } +.selector-add { background:url(../img/admin/selector-add.gif) top center no-repeat; margin-bottom:2px; } +.selector-remove { background:url(../img/admin/selector-remove.gif) top center no-repeat; } +a.selector-chooseall, a.selector-clearall { display:block; width:6em; text-align:left; margin-left:auto; margin-right:auto; font-weight:bold; color:#666; padding:3px 0 3px 18px; } +a.selector-chooseall:hover, a.selector-clearall:hover { color:#036; } +a.selector-chooseall { width:7em; background:url(../img/admin/selector-addall.gif) left center no-repeat; } +a.selector-clearall { background:url(../img/admin/selector-removeall.gif) left center no-repeat; } + +/* STACKED SELECTORS */ +.stacked { float:left; width:500px; } +.stacked select { width:480px; height:10.1em; } +.stacked .selector-available, .stacked .selector-chosen { width:480px; } +.stacked .selector-available { margin-bottom:0; } +.stacked .selector-available input { width:442px; } +.stacked ul.selector-chooser { height:22px; width:50px; margin:0 0 3px 40%; background:url(../img/admin/chooser_stacked-bg.gif) top center no-repeat; } +.stacked .selector-chooser li { float:left; padding:3px 3px 3px 5px; } +.stacked .selector-chooseall, .stacked .selector-clearall { display:none; } +.stacked .selector-add { background-image:url(../img/admin/selector_stacked-add.gif); } +.stacked .selector-remove { background-image:url(../img/admin/selector_stacked-remove.gif); } + +/* DATE AND TIME */ +p.datetime { line-height:20px; margin:0; padding:0; color:#666; font-size:11px; font-weight:bold; } +.datetime span { font-size:11px; color:#ccc; font-weight:normal; white-space:nowrap; } +.vDateField { margin-left:4px; } +table p.datetime { font-size:10px; margin-left:0; padding-left:0; } + +/* FILE UPLOADS */ +p.file-upload { line-height:20px; margin:0; padding:0; color:#666; font-size:11px; font-weight:bold; } +.file-upload a { font-weight:normal; } +.file-upload .deletelink { margin-left:5px; } + +/* CALENDARS & CLOCKS */ +.calendarbox, .clockbox { margin:5px auto; font-size:11px; width:16em; text-align:center; background:white; position:relative; } +.clockbox { width:9em; } +.calendar { margin:0; padding: 0; } +.calendar table { margin:0; padding:0; border-collapse:collapse; background:white; width:99%; } +.calendar caption, .calendarbox h2 { margin: 0; font-size:11px; text-align:center; border-top:none; } +.calendar th { font-size:10px; color:#666; padding:2px 3px; text-align:center; background:#e1e1e1 url(../img/admin/nav-bg.gif) 0 50% repeat-x; border-bottom:1px solid #ddd; } +.calendar td { font-size:11px; text-align: center; padding: 0; border-top:1px solid #eee; border-bottom:none; } +.calendar td.selected a { background: #C9DBED; } +.calendar td.nonday { background:#efefef; } +.calendar td.today a { background:#ffc; } +.calendar td a, .timelist a { display: block; font-weight:bold; padding:4px; text-decoration: none; color:#444; } +.calendar td a:hover, .timelist a:hover { background: #5b80b2; color:white; } +.calendar td a:active, .timelist a:active { background: #036; color:white; } +.calendarnav { font-size:10px; text-align: center; color:#ccc; margin:0; padding:1px 3px; } +.calendarnav a:link, #calendarnav a:visited, #calendarnav a:hover { color: #999; } +.calendar-shortcuts { background:white; font-size:10px; line-height:11px; border-top:1px solid #eee; padding:3px 0 4px; color:#ccc; } +.calendarbox .calendarnav-previous, .calendarbox .calendarnav-next { display:block; position:absolute; font-weight:bold; font-size:12px; background:#C9DBED url(../img/admin/default-bg.gif) bottom left repeat-x; padding:1px 4px 2px 4px; color:white; } +.calendarnav-previous:hover, .calendarnav-next:hover { background:#036; } +.calendarnav-previous { top:0; left:0; } +.calendarnav-next { top:0; right:0; } +.calendar-cancel { margin:0 !important; padding:0; font-size:10px; background:#e1e1e1 url(../img/admin/nav-bg.gif) 0 50% repeat-x; border-top:1px solid #ddd; } +.calendar-cancel a { padding:2px; color:#999; } +ul.timelist, .timelist li { list-style-type:none; margin:0; padding:0; } +.timelist a { padding:2px; } + +/* INLINE ORDERER */ +ul.orderer { position:relative; padding:0 !important; margin:0 !important; list-style-type:none; } +ul.orderer li { list-style-type:none; display:block; padding:0; margin:0; border:1px solid #bbb; border-width:0 1px 1px 0; white-space:nowrap; overflow:hidden; background:#e2e2e2 url(../img/admin/nav-bg-grabber.gif) repeat-y; } +ul.orderer li:hover { cursor:move; background-color:#ddd; } +ul.orderer li a.selector { margin-left:12px; overflow:hidden; width:83%; font-size:10px !important; padding:0.6em 0; } +ul.orderer li a:link, ul.orderer li a:visited { color:#333; } +ul.orderer li .inline-deletelink { position:absolute; right:4px; margin-top:0.6em; } +ul.orderer li.selected { background-color:#f8f8f8; border-right-color:#f8f8f8; } +ul.orderer li.deleted { background:#bbb url(../img/admin/deleted-overlay.gif); } +ul.orderer li.deleted a:link, ul.orderer li.deleted a:visited { color:#888; } +ul.orderer li.deleted .inline-deletelink { background-image:url(../img/admin/inline-restore.png); } +ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover { cursor:default; } + +/* EDIT INLINE */ +.inline-deletelink { display:block; text-indent:-9999px; background:transparent url(../img/admin/inline-delete.png) no-repeat; width:15px; height:15px; margin:0.4em 0; border: 0px none; } +.inline-deletelink:hover { background-position:-15px 0; cursor:pointer; } +.editinline button.addlink { border: 0px none; color: #5b80b2; font-size: 100%; cursor: pointer; } +.editinline button.addlink:hover { color: #036; cursor: pointer; } +.editinline table .help { text-align:right; float:right; padding-left:2em; } +.editinline tfoot .addlink { white-space:nowrap; } +.editinline table thead th:last-child { border-left:none; } +.editinline tr.deleted { background:#ddd url(../img/admin/deleted-overlay.gif); } +.editinline tr.deleted .inline-deletelink { background-image:url(../img/admin/inline-restore.png); } +.editinline tr.deleted td:hover { cursor:default; } +.editinline tr.deleted td:first-child { background-image:none !important; } + +/* EDIT INLINE - STACKED */ +.editinline-stacked { min-width:758px; } +.editinline-stacked .inline-object { margin-left:210px; background:white; } +.editinline-stacked .inline-source { float:left; width:200px; background:#f8f8f8; } +.editinline-stacked .inline-splitter { float:left; width:9px; background:#f8f8f8 url(../img/admin/inline-splitter-bg.gif) 50% 50% no-repeat; border-right:1px solid #ccc; } +.editinline-stacked .controls { clear:both; background:#e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; padding:3px 4px; font-size:11px; border-top:1px solid #ddd; } \ No newline at end of file Added: trunk/templatetool/media/img/admin/arrow-down.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/arrow-down.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/arrow-up.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/arrow-up.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/changelist-bg.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/changelist-bg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/chooser-bg.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/chooser-bg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/chooser_stacked-bg.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/chooser_stacked-bg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/default-bg-reverse.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/default-bg-reverse.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/default-bg.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/default-bg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/deleted-overlay.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/deleted-overlay.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/icon-no.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/icon-no.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/icon-unknown.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/icon-unknown.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/icon-yes.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/icon-yes.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/icon_addlink.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/icon_addlink.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/icon_alert.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/icon_alert.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/icon_calendar.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/icon_calendar.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/icon_changelink.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/icon_changelink.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/icon_clock.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/icon_clock.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/icon_deletelink.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/icon_deletelink.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/icon_error.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/icon_error.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/icon_searchbox.png =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/icon_searchbox.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/icon_success.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/icon_success.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/inline-delete-8bit.png =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/inline-delete-8bit.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/inline-delete.png =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/inline-delete.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/inline-restore-8bit.png =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/inline-restore-8bit.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/inline-restore.png =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/inline-restore.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/inline-splitter-bg.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/inline-splitter-bg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/nav-bg-grabber.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/nav-bg-grabber.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/nav-bg-reverse.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/nav-bg-reverse.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/nav-bg.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/nav-bg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/selector-add.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/selector-add.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/selector-addall.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/selector-addall.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/selector-remove.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/selector-remove.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/selector-removeall.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/selector-removeall.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/selector-search.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/selector-search.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/selector_stacked-add.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/selector_stacked-add.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/selector_stacked-remove.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/selector_stacked-remove.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/tool-left.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/tool-left.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/tool-left_over.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/tool-left_over.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/tool-right.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/tool-right.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/tool-right_over.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/tool-right_over.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/tooltag-add.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/tooltag-add.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/tooltag-add_over.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/tooltag-add_over.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/tooltag-arrowright.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/tooltag-arrowright.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/img/admin/tooltag-arrowright_over.gif =================================================================== (Binary files differ) Property changes on: trunk/templatetool/media/img/admin/tooltag-arrowright_over.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/templatetool/media/js/SelectBox.js =================================================================== --- trunk/templatetool/media/js/SelectBox.js (rev 0) +++ trunk/templatetool/media/js/SelectBox.js 2008-02-09 16:30:37 UTC (rev 2615) @@ -0,0 +1,109 @@ +var SelectBox = { + cache: new Object(), + init: function(id) { + var box = document.getElementById(id); + var node; + SelectBox.cache[id] = new Array(); + var cache = SelectBox.cache[id]; + for (var i = 0; (node = box.options[i]); i++) { + cache.push({ value: node.value, text: node.text, displayed: 1 }); + } + }, + redisplay: function(id) { + // Repopulate HTML select box from cache + var box = document.getElementById(id); + box.options.length = 0; // clear all options + for (var i = 0, j = SelectBox.cache[id].length; i < j; i++) { + var node = SelectBox.cache[id][i]; + if (node.displayed) { + box.options[box.options.length] = new Option(node.text, node.value, false, false); + } + } + }, + filter: function(id, text) { + // Redisplay the HTML select box, displaying only the choices containing ALL + // the words in text. (It's an AND search.) + var tokens = text.toLowerCase().split(/\s+/); + var node, token; + for (var i = 0; (node = SelectBox.cache[id][i]); i++) { + node.displayed = 1; + for (var j = 0; (token = tokens[j]); j++) { + if (node.text.toLowerCase().indexOf(token) == -1) { + node.displayed = 0; + } + } + } + SelectBox.redisplay(id); + }, + delete_from_cache: function(id, value) { + var node, delete_index = null; + for (var i = 0; (node = SelectBox.cache[id][i]); i++) { + if (node.value == value) { + delete_index = i; + break; + } + } + var j = SelectBox.cache[id].length - 1; + for (var i = delete_index; i < j; i++) { + SelectBox.cache[id][i] = SelectBox.cache[id][i+1]; + } + SelectBox.cache[id].length--; + }, + add_to_cache: function(id, option) { + SelectBox.cache[id].push({ value: option.value, text: option.text, displayed: 1 }); + }, + cache_contains: function(id, value) { + // Check if an item is contained in the cache + var node; + for (var i = 0; (node = SelectBox.cache[id][i]); i++) { + if (node.value == value) { + return true; + } + } + return false; + }, + move: function(from, to) { + var from_box = document.getElementById(from); + var to_box = document.getElementById(to); + var option; + for (var i = 0; (option = from_box.options[i]); i++) { + if (option.selected && SelectBox.cache_contains(from, option.value)) { + SelectBox.add_to_cache(to, { value: option.value, text: option.text, displayed: 1 }); + SelectBox.delete_from_cache(from, option.value); + } + } + SelectBox.redisplay(from); + SelectBox.redisplay(to); + }, + move_all: function(from, to) { + var from_box = document.getElementById(from); + var to_box = document.getElementById(to); + var option; + for (var i = 0; (option = from_box.options[i]); i++) { + SelectBox.add_to_cache(to, { value: option.value, text: option.text, displayed: 1 }); + SelectBox.delete_from_cache(from, option.value); + } + SelectBox.redisplay(from); + SelectBox.redisplay(to); + }, + sort: function(id) { + SelectBox.cache[id].sort( function(a, b) { + a = a.text.toLowerCase(); + b = b.text.toLowerCase(); + try { + if (a > b) return 1; + if (a < b) return -1; + } + catch (e) { + // silently fail on IE 'unknown' exception + } + return 0; + } ); + }, + select_all: function(id) { + var box = document.getElementById(id); + for (var i = 0; i < box.options.length; i++) { + box.options[i].selected = 'selected'; + } + } +} Added: trunk/templatetool/media/js/SelectFilter.js =================================================================== --- trunk/templatetool/media/js/SelectFilter.js (rev 0) +++ trunk/templatetool/media/js/SelectFilter.js 2008-02-09 16:30:37 UTC (rev 2615) @@ -0,0 +1,81 @@ +/* +SelectFilter - Turns a multiple-select box into a filter interface. + +Requires SelectBox.js and addevent.js. +*/ + +function findForm(node) { + // returns the node of the form containing the given node + if (node.tagName.toLowerCase() != 'form') { + return findForm(node.parentNode); + } + return node; +} + +var SelectFilter = { + init: function(field_id) { + var from_box = document.getElementById(field_id); + from_box.id += '_from'; // change its ID + // Create the INPUT input box + var input_box = document.createElement('input'); + input_box.id = field_id + '_input'; + input_box.setAttribute('type', 'text'); + from_box.parentNode.insertBefore(input_box, from_box); + from_box.parentNode.insertBefore(document.createElement('br'), input_box.nextSibling); + // Create the TO box + var to_box = document.createElement('select'); + to_box.id = field_id + '_to'; + to_box.setAttribute('multiple', 'multiple'); + to_box.setAttribute('size', from_box.size); + from_box.parentNode.insertBefore(to_box, from_box.nextSibling); + to_box.setAttribute('name', from_box.getAttribute('name')); + from_box.setAttribute('name', from_box.getAttribute('name') + '_old'); + // Give the filters a CSS hook + from_box.setAttribute('class', 'filtered'); + to_box.setAttribute('class', 'filtered'); + // Set up the JavaScript event handlers for the select box filter interface + addEvent(input_box, 'keyup', function(e) { SelectFilter.filter_key_up(e, field_id); }); + addEvent(input_box, 'keydown', function(e) { SelectFilter.filter_key_down(e, field_id); }); + addEvent(from_box, 'dblclick', function() { SelectBox.move(field_id + '_from', field_id + '_to'); }); + addEvent(from_box, 'focus', function() { input_box.focus(); }); + addEvent(to_box, 'dblclick', function() { SelectBox.move(field_id + '_to', field_id + '_from'); }); + addEvent(findForm(from_box), 'submit', function() { SelectBox.select_all(field_id + '_to'); }); + SelectBox.init(field_id + '_from'); + SelectBox.init(field_id + '_to'); + // Move selected from_box options to to_box + SelectBox.move(field_id + '_from', field_id + '_to'); + }, + filter_key_up: function(event, field_id) { + from = document.getElementById(field_id + '_from'); + // don't submit form if user pressed Enter + if ((event.which && event.which == 13) || (event.keyCode && event.keyCode == 13)) { + from.selectedIndex = 0; + SelectBox.move(field_id + '_from', field_id + '_to'); + from.selectedIndex = 0; + return false; + } + var temp = from.selectedIndex; + SelectBox.filter(field_id + '_from', document.getElementById(field_id + '_input').value); + from.selectedIndex = temp; + return true; + }, + filter_key_down: function(event, field_id) { + from = document.getElementById(field_id + '_from'); + // right arrow -- move across + if ((event.which && event.which == 39) || (event.keyCode && event.keyCode == 39)) { + var old_index = from.selectedIndex; + SelectBox.move(field_id + '_from', field_id + '_to'); + from.selectedIndex = (old_index == from.length) ? from.length - 1 : old_index; + return false; + } + // down arrow -- wrap around + if ((event.which && event.which == 40) || (event.keyCode && event.keyCode == 40)) { + from.selectedIndex = (from.length == from.selectedIndex + 1) ? 0 : from.selectedIndex + 1; + } + // up arrow -- w... [truncated message content] |
From: <bms...@us...> - 2008-01-28 21:17:57
|
Revision: 2614 http://morphix.svn.sourceforge.net/morphix/?rev=2614&view=rev Author: bmsleight Date: 2008-01-28 13:17:27 -0800 (Mon, 28 Jan 2008) Log Message: ----------- Updating ibiblio rsync links distro with a _r_ Modified Paths: -------------- trunk/mmaker/utils/auto-testing/run_testing.sh Modified: trunk/mmaker/utils/auto-testing/run_testing.sh =================================================================== --- trunk/mmaker/utils/auto-testing/run_testing.sh 2008-01-28 20:35:56 UTC (rev 2613) +++ trunk/mmaker/utils/auto-testing/run_testing.sh 2008-01-28 21:17:27 UTC (rev 2614) @@ -65,11 +65,11 @@ find /home/morph/autobuilds/video/ -not -type d -mtime +4 -print0 | xargs --null --no-run-if-empty sudo rm -f if [ "$SKIP_DOWNLOADS" != "SkipAll" ]; then - rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/disto/autobuilds/base/*$TODAY* /home/morph/autobuilds/base/ - rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/disto/autobuilds/mainmod/sid/*$TODAY* /home/morph/autobuilds/mainmod/sid/ - rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/disto/autobuilds/mainmod/etch/*$TODAY* /home/morph/autobuilds/mainmod/etch/ - rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/disto/autobuilds/mainmod/sarge/*$TODAY* /home/morph/autobuilds/mainmod/sarge/ - rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/disto/autobuilds/minimod/*$TODAY* /home/morph/autobuilds/minimod/ + rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/distro/autobuilds/base/*$TODAY* /home/morph/autobuilds/base/ + rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/distro/autobuilds/mainmod/sid/*$TODAY* /home/morph/autobuilds/mainmod/sid/ + rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/distro/autobuilds/mainmod/etch/*$TODAY* /home/morph/autobuilds/mainmod/etch/ + rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/distro/autobuilds/mainmod/sarge/*$TODAY* /home/morph/autobuilds/mainmod/sarge/ + rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/distro/autobuilds/minimod/*$TODAY* /home/morph/autobuilds/minimod/ if [ "$SKIP_DOWNLOADS" != "SkipAlextreme" ]; then #Get Autobuilds from alextreme.org @@ -184,7 +184,7 @@ echo "Upload" echo $TITLED date - rsync -avz --delete -e ssh $VID_DIR mo...@lo...:morphixorg/disto/autobuilds/video/ + rsync -avz --delete -e ssh $VID_DIR mo...@lo...:morphixorg/distro/autobuilds/video/ cp $VID_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN.ogg /home/morph/autobuilds/video/ date # This machine get hot - have 20 minutes to cool down @@ -214,7 +214,7 @@ echo "Upload log and xml as tar.gz" echo $TITLED gzip -c $LOG_FILE >$VID_DIR/$LOG_FILE_BN'_'$TODAY'_.gz' -rsync -avz --delete -e ssh $VID_DIR mo...@lo...:morphixorg/disto/autobuilds/video/ +rsync -avz --delete -e ssh $VID_DIR mo...@lo...:morphixorg/distro/autobuilds/video/ rm $TMP_TAR_DIR/* sudo rm $TMP_ISO_DIR -r rm /tmp/AutoTesting.lock This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2008-01-28 20:36:02
|
Revision: 2613 http://morphix.svn.sourceforge.net/morphix/?rev=2613&view=rev Author: bmsleight Date: 2008-01-28 12:35:56 -0800 (Mon, 28 Jan 2008) Log Message: ----------- Updating ibiblio rsync links Modified Paths: -------------- trunk/mmaker/utils/auto-testing/run_testing.sh Modified: trunk/mmaker/utils/auto-testing/run_testing.sh =================================================================== --- trunk/mmaker/utils/auto-testing/run_testing.sh 2008-01-27 21:34:18 UTC (rev 2612) +++ trunk/mmaker/utils/auto-testing/run_testing.sh 2008-01-28 20:35:56 UTC (rev 2613) @@ -65,11 +65,11 @@ find /home/morph/autobuilds/video/ -not -type d -mtime +4 -print0 | xargs --null --no-run-if-empty sudo rm -f if [ "$SKIP_DOWNLOADS" != "SkipAll" ]; then - rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/base/*$TODAY* /home/morph/autobuilds/base/ - rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/sid/*$TODAY* /home/morph/autobuilds/mainmod/sid/ - rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/etch/*$TODAY* /home/morph/autobuilds/mainmod/etch/ - rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/sarge/*$TODAY* /home/morph/autobuilds/mainmod/sarge/ - rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/minimod/*$TODAY* /home/morph/autobuilds/minimod/ + rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/disto/autobuilds/base/*$TODAY* /home/morph/autobuilds/base/ + rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/disto/autobuilds/mainmod/sid/*$TODAY* /home/morph/autobuilds/mainmod/sid/ + rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/disto/autobuilds/mainmod/etch/*$TODAY* /home/morph/autobuilds/mainmod/etch/ + rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/disto/autobuilds/mainmod/sarge/*$TODAY* /home/morph/autobuilds/mainmod/sarge/ + rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/disto/autobuilds/minimod/*$TODAY* /home/morph/autobuilds/minimod/ if [ "$SKIP_DOWNLOADS" != "SkipAlextreme" ]; then #Get Autobuilds from alextreme.org @@ -184,7 +184,7 @@ echo "Upload" echo $TITLED date - rsync -avz --delete -e ssh $VID_DIR mo...@lo...:morphixorg/autobuilds/video/ + rsync -avz --delete -e ssh $VID_DIR mo...@lo...:morphixorg/disto/autobuilds/video/ cp $VID_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN.ogg /home/morph/autobuilds/video/ date # This machine get hot - have 20 minutes to cool down @@ -214,7 +214,7 @@ echo "Upload log and xml as tar.gz" echo $TITLED gzip -c $LOG_FILE >$VID_DIR/$LOG_FILE_BN'_'$TODAY'_.gz' -rsync -avz --delete -e ssh $VID_DIR mo...@lo...:morphixorg/autobuilds/video/ +rsync -avz --delete -e ssh $VID_DIR mo...@lo...:morphixorg/disto/autobuilds/video/ rm $TMP_TAR_DIR/* sudo rm $TMP_ISO_DIR -r rm /tmp/AutoTesting.lock This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2008-01-27 21:34:23
|
Revision: 2612 http://morphix.svn.sourceforge.net/morphix/?rev=2612&view=rev Author: alextreme Date: 2008-01-27 13:34:18 -0800 (Sun, 27 Jan 2008) Log Message: ----------- * bumping Modified Paths: -------------- trunk/scripts-base/miniroot/debian/changelog trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog Modified: trunk/scripts-base/miniroot/debian/changelog =================================================================== --- trunk/scripts-base/miniroot/debian/changelog 2008-01-27 21:32:51 UTC (rev 2611) +++ trunk/scripts-base/miniroot/debian/changelog 2008-01-27 21:34:18 UTC (rev 2612) @@ -1,3 +1,9 @@ +miniroot-morphix (0.1-15) unstable; urgency=low + + * Number of minor USB drive fixes (By Markus Mandalka) + + -- root <ro...@io...> Sun, 27 Jan 2008 22:33:50 +0100 + miniroot-morphix (0.1-14) unstable; urgency=low * Add cdrom.ko to the list of modules to load. Modified: trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog =================================================================== --- trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog 2008-01-27 21:32:51 UTC (rev 2611) +++ trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog 2008-01-27 21:34:18 UTC (rev 2612) @@ -1,3 +1,9 @@ +morphix-miniroot-linuxrc (0.1-10) unstable; urgency=low + + * Number of fixes for USB drive booting (From Markus Mandalka) + + -- root <ro...@al...> Sun, 27 Jan 2008 22:33:03 +0100 + morphix-miniroot-linuxrc (0.1-9) unstable; urgency=low * Add cdrom.ko to the list of modules to load. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2008-01-27 21:32:59
|
Revision: 2611 http://morphix.svn.sourceforge.net/morphix/?rev=2611&view=rev Author: alextreme Date: 2008-01-27 13:32:51 -0800 (Sun, 27 Jan 2008) Log Message: ----------- * Also adding vfat codepage modules in case USB drive is VFAT formatted Modified Paths: -------------- trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc Modified: trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc =================================================================== --- trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2008-01-27 20:13:27 UTC (rev 2610) +++ trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2008-01-27 21:32:51 UTC (rev 2611) @@ -233,7 +233,12 @@ then # load usb-modules first (so that memory-stick becomes /dev/sda1) echo "6" > /proc/sys/kernel/printk + + # NLS charsets required for VFAT-formatted USB drives + $INSMOD -f /modules/nls/nls_iso8859-1$KEXT >/dev/null + $INSMOD -f /modules/nls/nls_cp437$KEXT >/dev/null + # scsi_mod and sd_mod SCSI modules need to be loaded before usb-storage $INSMOD -f /modules/scsi/scsi_mod$KEXT >/dev/null $INSMOD -f /modules/usb/usbcore$KEXT >/dev/null FOUNDUSB="" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2008-01-27 20:13:29
|
Revision: 2610 http://morphix.svn.sourceforge.net/morphix/?rev=2610&view=rev Author: alextreme Date: 2008-01-27 12:13:27 -0800 (Sun, 27 Jan 2008) Log Message: ----------- * usb -> scsi directory, fix supplied by Markus Modified Paths: -------------- trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc Modified: trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc =================================================================== --- trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2008-01-27 14:52:06 UTC (rev 2609) +++ trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2008-01-27 20:13:27 UTC (rev 2610) @@ -234,7 +234,7 @@ # load usb-modules first (so that memory-stick becomes /dev/sda1) echo "6" > /proc/sys/kernel/printk - $INSMOD -f /modules/usb/scsi_mod$KEXT >/dev/null + $INSMOD -f /modules/scsi/scsi_mod$KEXT >/dev/null $INSMOD -f /modules/usb/usbcore$KEXT >/dev/null FOUNDUSB="" if test -n "$USBBOOT2" @@ -246,7 +246,7 @@ $INSMOD -f /modules/usb/uhci-hcd$KEXT >/dev/null && FOUNDUSB="yes" $INSMOD -f /modules/usb/ohci-hcd$KEXT >/dev/null && FOUNDUSB="yes" fi - $INSMOD -f /modules/usb/sd_mod$KEXT >/dev/null + $INSMOD -f /modules/scsi/sd_mod$KEXT >/dev/null $INSMOD -f /modules/usb/usb-storage$KEXT >/dev/null # wait 5 seconds for usb device to be registered This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2008-01-27 14:52:11
|
Revision: 2609 http://morphix.svn.sourceforge.net/morphix/?rev=2609&view=rev Author: alextreme Date: 2008-01-27 06:52:06 -0800 (Sun, 27 Jan 2008) Log Message: ----------- * adding sd_mod (in case of module) to miniroot * add loading of scsi_mod and sd_mod in case of usb-booting * These issues were submitted by Markus Mandalka Modified Paths: -------------- trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc trunk/scripts-base/miniroot/mkminiroot.sh Modified: trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc =================================================================== --- trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2008-01-17 16:00:34 UTC (rev 2608) +++ trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2008-01-27 14:52:06 UTC (rev 2609) @@ -234,6 +234,7 @@ # load usb-modules first (so that memory-stick becomes /dev/sda1) echo "6" > /proc/sys/kernel/printk + $INSMOD -f /modules/usb/scsi_mod$KEXT >/dev/null $INSMOD -f /modules/usb/usbcore$KEXT >/dev/null FOUNDUSB="" if test -n "$USBBOOT2" @@ -245,6 +246,7 @@ $INSMOD -f /modules/usb/uhci-hcd$KEXT >/dev/null && FOUNDUSB="yes" $INSMOD -f /modules/usb/ohci-hcd$KEXT >/dev/null && FOUNDUSB="yes" fi + $INSMOD -f /modules/usb/sd_mod$KEXT >/dev/null $INSMOD -f /modules/usb/usb-storage$KEXT >/dev/null # wait 5 seconds for usb device to be registered Modified: trunk/scripts-base/miniroot/mkminiroot.sh =================================================================== --- trunk/scripts-base/miniroot/mkminiroot.sh 2008-01-17 16:00:34 UTC (rev 2608) +++ trunk/scripts-base/miniroot/mkminiroot.sh 2008-01-27 14:52:06 UTC (rev 2609) @@ -180,7 +180,7 @@ cp $BASEDIR/lib/modules/*/kernel/drivers/cdrom/cdrom.* $DESTDIR/modules/ cp $BASEDIR/lib/modules/*/kernel/drivers/ide/ide-cd.* $DESTDIR/modules/ cp $BASEDIR/lib/modules/*/kernel/drivers/scsi/{3w-xxxx.*,BusLogic.*,NCR53c406a.*,a100u2w.*,advansys.*,aha152x.*,aha1542.*,aic7xxx/aic7xxx.*,atp870u.*,dtc.*,eata.*,fdomain.*,gdth.*,initio.*,megaraid.*,pas16.*,psi240i.*,qlogicfas.*,qlogicfc.*,seagate.*,t128.*,tmscsim.*,u14-34f.*,ultrastor.*,wd7000.*} $DESTDIR/modules/scsi -cp $BASEDIR/lib/modules/*/kernel/drivers/scsi/{scsi_transport_spi.*,scsi_mod.*,qlogicfas408.*} $DESTDIR/modules/scsi +cp $BASEDIR/lib/modules/*/kernel/drivers/scsi/{scsi_transport_spi.*,scsi_mod.*,qlogicfas408.*,sd_mod.*} $DESTDIR/modules/scsi cp $BASEDIR/lib/modules/*/kernel/drivers/usb/{core/usbcore.*,host/ehci-hcd.*,host/ohci-hcd.*,host/uhci-hcd.*,storage/usb-storage.*} $DESTDIR/modules/usb ln -s /MorphixCD/opt $DESTDIR/opt # is this one necessary? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pa...@us...> - 2008-01-17 16:00:53
|
Revision: 2608 http://morphix.svn.sourceforge.net/morphix/?rev=2608&view=rev Author: paul_c Date: 2008-01-17 08:00:34 -0800 (Thu, 17 Jan 2008) Log Message: ----------- Clean up a couple of compile time warnings and silence a configure warning about datarootdir. Modified Paths: -------------- trunk/morphixinstaller/autogen.sh trunk/morphixinstaller/src/instlib.c Modified: trunk/morphixinstaller/autogen.sh =================================================================== --- trunk/morphixinstaller/autogen.sh 2007-12-31 17:03:36 UTC (rev 2607) +++ trunk/morphixinstaller/autogen.sh 2008-01-17 16:00:34 UTC (rev 2608) @@ -134,6 +134,10 @@ libtoolize --force --copy fi fi + # Ward of any complaints about datarootdir being ignored. + if test `grep "^pkgdatadir" po/Makefile.in.in 2> /dev/null | wc -l` -eq 0; then + echo "pkgdatadir = @datarootdir@" >> po/Makefile.in.in + fi echo "Running aclocal $aclocalinclude ..." aclocal $aclocalinclude if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then @@ -141,7 +145,7 @@ autoheader fi echo "Running automake --gnu $am_opt ..." - automake --add-missing --gnu $am_opt + automake --add-missing --copy --gnu $am_opt echo "Running autoconf ..." autoconf ) Modified: trunk/morphixinstaller/src/instlib.c =================================================================== --- trunk/morphixinstaller/src/instlib.c 2007-12-31 17:03:36 UTC (rev 2607) +++ trunk/morphixinstaller/src/instlib.c 2008-01-17 16:00:34 UTC (rev 2608) @@ -517,10 +517,10 @@ gint i = 0; gint j = 0; FILE *file; - gint modules_len; + gsize modules_len; gchar **contents_array; gchar *contents_etc; - gint length; + gsize length; gchar temp_str[20]; /* Make the mountdir */ @@ -694,11 +694,11 @@ file = fopen(cmdline,"w"); if (file == NULL) { debug("Unable to open %s, something went very wrong during the install. Aborting!\n",cmdline); - return FALSE; + return; } if (GetSelectedRoot() == NULL || GetSelectedFilesystemName() == NULL || (swapon == TRUE && GetSelectedSwap() == NULL)) { debug("GetSelectedRoot(), GetSelectedFilesystemName() or GetSelectedSwap() returned NULL, aborting install!\n"); - return FALSE; + return; } debug("%s \t / %s \t defaults \t 0 \t 1\n",GetSelectedRoot(),GetSelectedFilesystemName()); @@ -1188,7 +1188,8 @@ */ GString *GetKernelArgumentsString() { - int length, i; + int i; + gsize length; gchar **contents_array = NULL; GString *kernelarguments = g_string_new(""); gchar *contents = NULL; @@ -1633,9 +1634,9 @@ gchar *hdd_buffer = NULL; gchar model_buffer[256]; - gint part_len; - gint media_len; - gint model_len; + gsize part_len; + gsize media_len; + gsize model_len; gint i = 0; gint j = 0; gint hdd_size; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pa...@us...> - 2007-12-31 17:05:08
|
Revision: 2607 http://morphix.svn.sourceforge.net/morphix/?rev=2607&view=rev Author: paul_c Date: 2007-12-31 09:03:36 -0800 (Mon, 31 Dec 2007) Log Message: ----------- Damned transparent poxy servers caching stale data.... Modified Paths: -------------- trunk/morph-scripts/debian/changelog Modified: trunk/morph-scripts/debian/changelog =================================================================== --- trunk/morph-scripts/debian/changelog 2007-12-31 17:01:26 UTC (rev 2606) +++ trunk/morph-scripts/debian/changelog 2007-12-31 17:03:36 UTC (rev 2607) @@ -1,3 +1,9 @@ +morph-scripts (0.2-35) unstable; urgency=low + + * Workround for transparent poxy servers that cache stale/old files. + + -- Paul Corner <pa...@tu...> Mon, 31 Dec 2007 17:01:14 +0000 + morph-scripts (0.2-34) unstable; urgency=low * Adding morphix-chroot to morphing-tools This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2007-12-31 17:01:38
|
Revision: 2606 http://morphix.svn.sourceforge.net/morphix/?rev=2606&view=rev Author: alextreme Date: 2007-12-31 09:01:26 -0800 (Mon, 31 Dec 2007) Log Message: ----------- * proxies \o/ Modified Paths: -------------- trunk/morph-scripts/deb-get/deb-get Modified: trunk/morph-scripts/deb-get/deb-get =================================================================== --- trunk/morph-scripts/deb-get/deb-get 2007-12-31 16:49:09 UTC (rev 2605) +++ trunk/morph-scripts/deb-get/deb-get 2007-12-31 17:01:26 UTC (rev 2606) @@ -133,7 +133,7 @@ $exfilename = "$exfilename/"; } - our $cmd = "cd $dir && wget -O $filename $url/$exfilename$filename"; + our $cmd = "cd $dir && wget --no-cache --no-proxy -O $filename $url/$exfilename$filename"; print("Executing: $cmd\n"); unlink("$dir/$filename"); system($cmd); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2007-12-31 16:49:16
|
Revision: 2605 http://morphix.svn.sourceforge.net/morphix/?rev=2605&view=rev Author: alextreme Date: 2007-12-31 08:49:09 -0800 (Mon, 31 Dec 2007) Log Message: ----------- * minor stdout modifications Modified Paths: -------------- trunk/morph-scripts/deb-get/deb-get Modified: trunk/morph-scripts/deb-get/deb-get =================================================================== --- trunk/morph-scripts/deb-get/deb-get 2007-12-31 15:08:54 UTC (rev 2604) +++ trunk/morph-scripts/deb-get/deb-get 2007-12-31 16:49:09 UTC (rev 2605) @@ -209,12 +209,14 @@ or die "Couldn't open Package list for reading: $!\n"; our $found = ""; print("Looking for $list[$count]\n"); + $line_nr = 0; while(defined ($line = <SOURCE>)) { chomp $line; + $line_nr++; $filename = ""; if (index($line,"Package: ") >= 0 && index($line," $list[$count]") >= 0) { - print($line); - print("Found Package $list[$count] at line $count\n"); + print($line + "\n"); + print("Found Package $list[$count] at line $line_nr\n"); $found = "yes"; } if ($found eq "yes") { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2007-12-31 15:09:27
|
Revision: 2604 http://morphix.svn.sourceforge.net/morphix/?rev=2604&view=rev Author: alextreme Date: 2007-12-31 07:08:54 -0800 (Mon, 31 Dec 2007) Log Message: ----------- * dh_di_* is _so_ oldstable... Modified Paths: -------------- trunk/scripts-base/miniroot/linuxrc-scripts/debian/control trunk/scripts-base/miniroot/linuxrc-scripts/debian/rules Modified: trunk/scripts-base/miniroot/linuxrc-scripts/debian/control =================================================================== --- trunk/scripts-base/miniroot/linuxrc-scripts/debian/control 2007-12-31 12:05:31 UTC (rev 2603) +++ trunk/scripts-base/miniroot/linuxrc-scripts/debian/control 2007-12-31 15:08:54 UTC (rev 2604) @@ -1,7 +1,7 @@ Source: morphix-miniroot-linuxrc Priority: optional Maintainer: Alex de Landgraaf <al...@de...> -Build-Depends: debhelper (>= 4.0.0), di-packages-build (>= 0.5) +Build-Depends: debhelper (>= 4.0.0) Standards-Version: 3.6.1 Package: morphix-miniroot-linuxrc Modified: trunk/scripts-base/miniroot/linuxrc-scripts/debian/rules =================================================================== --- trunk/scripts-base/miniroot/linuxrc-scripts/debian/rules 2007-12-31 12:05:31 UTC (rev 2603) +++ trunk/scripts-base/miniroot/linuxrc-scripts/debian/rules 2007-12-31 15:08:54 UTC (rev 2604) @@ -71,8 +71,10 @@ dh_fixperms $(DEBHELPER_PACKAGES_UDEB) dh_installdeb $(DEBHELPER_PACKAGES_UDEB) dh_shlibdeps $(DEBHELPER_PACKAGES_UDEB) - dh_di_gencontrol -t udeb - dh_di_builddeb -t udeb + dh_gencontrol + dh_builddeb +# dh_di_gencontrol -t udeb +# dh_di_builddeb -t udeb binary: binary-arch .PHONY: build clean binary-indep binary-arch binary install This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pa...@us...> - 2007-12-31 12:05:37
|
Revision: 2603 http://morphix.svn.sourceforge.net/morphix/?rev=2603&view=rev Author: paul_c Date: 2007-12-31 04:05:31 -0800 (Mon, 31 Dec 2007) Log Message: ----------- If BLK_DEV_IDECD is set for a module, need cdrom.ko loaded before ide-cd.ko Modified Paths: -------------- trunk/scripts-base/miniroot/debian/changelog trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc trunk/scripts-base/miniroot/mkminiroot.sh Modified: trunk/scripts-base/miniroot/debian/changelog =================================================================== --- trunk/scripts-base/miniroot/debian/changelog 2007-12-05 13:28:11 UTC (rev 2602) +++ trunk/scripts-base/miniroot/debian/changelog 2007-12-31 12:05:31 UTC (rev 2603) @@ -1,3 +1,9 @@ +miniroot-morphix (0.1-14) unstable; urgency=low + + * Add cdrom.ko to the list of modules to load. + + -- Paul Corner <pa...@tu...> Mon, 31 Dec 2007 12:01:57 +0000 + miniroot-morphix (0.1-13) unstable; urgency=low * bumping, fixes from Paul Modified: trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog =================================================================== --- trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog 2007-12-05 13:28:11 UTC (rev 2602) +++ trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog 2007-12-31 12:05:31 UTC (rev 2603) @@ -1,3 +1,9 @@ +morphix-miniroot-linuxrc (0.1-9) unstable; urgency=low + + * Add cdrom.ko to the list of modules to load. + + -- Paul Corner <pa...@tu...> Mon, 31 Dec 2007 12:01:57 +0000 + morphix-miniroot-linuxrc (0.1-8) unstable; urgency=low * fixes from Paul Modified: trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc =================================================================== --- trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2007-12-05 13:28:11 UTC (rev 2602) +++ trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2007-12-31 12:05:31 UTC (rev 2603) @@ -155,6 +155,7 @@ echo "0" > /proc/sys/kernel/printk # Check for IDE-SCSI capable CD-Rom(s) first +$INSMOD /modules/cdrom.ko >/dev/null 2>&1 $INSMOD /modules/ide-scsi.ko >/dev/null 2>&1 # Use ide-cd for ATAPI-only CD-Rom(s) $INSMOD /modules/ide-cd.ko >/dev/null 2>&1 Modified: trunk/scripts-base/miniroot/mkminiroot.sh =================================================================== --- trunk/scripts-base/miniroot/mkminiroot.sh 2007-12-05 13:28:11 UTC (rev 2602) +++ trunk/scripts-base/miniroot/mkminiroot.sh 2007-12-31 12:05:31 UTC (rev 2603) @@ -177,6 +177,7 @@ cp $BASEDIR/lib/modules/*/kernel/drivers/fs/vfat/vfat.* $DESTDIR/modules/ cp $BASEDIR/lib/modules/*/kernel/drivers/block/cloop.* $DESTDIR/modules/ cp $BASEDIR/lib/modules/*/extra/cloop.* $DESTDIR/modules/ +cp $BASEDIR/lib/modules/*/kernel/drivers/cdrom/cdrom.* $DESTDIR/modules/ cp $BASEDIR/lib/modules/*/kernel/drivers/ide/ide-cd.* $DESTDIR/modules/ cp $BASEDIR/lib/modules/*/kernel/drivers/scsi/{3w-xxxx.*,BusLogic.*,NCR53c406a.*,a100u2w.*,advansys.*,aha152x.*,aha1542.*,aic7xxx/aic7xxx.*,atp870u.*,dtc.*,eata.*,fdomain.*,gdth.*,initio.*,megaraid.*,pas16.*,psi240i.*,qlogicfas.*,qlogicfc.*,seagate.*,t128.*,tmscsim.*,u14-34f.*,ultrastor.*,wd7000.*} $DESTDIR/modules/scsi cp $BASEDIR/lib/modules/*/kernel/drivers/scsi/{scsi_transport_spi.*,scsi_mod.*,qlogicfas408.*} $DESTDIR/modules/scsi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2007-12-05 13:28:19
|
Revision: 2602 http://morphix.svn.sourceforge.net/morphix/?rev=2602&view=rev Author: alextreme Date: 2007-12-05 05:28:11 -0800 (Wed, 05 Dec 2007) Log Message: ----------- * removing debug-option from unionfs-mount commands Modified Paths: -------------- trunk/scripts-base/etc/init.d/morphix-start Modified: trunk/scripts-base/etc/init.d/morphix-start =================================================================== --- trunk/scripts-base/etc/init.d/morphix-start 2007-11-26 20:28:00 UTC (rev 2601) +++ trunk/scripts-base/etc/init.d/morphix-start 2007-12-05 13:28:11 UTC (rev 2602) @@ -352,15 +352,20 @@ mkdir -p $DIR2/modules >/dev/null 2>&1 if [ -x /sbin/unionctl -o -x /usr/bin/unionctl ];then - mount -t unionfs -o dirs=/mnt/main${UNIONFS_MOUNT_OPT},debug=$DEBUGOVERLAY none /mnt/main + mount -t unionfs -o dirs=/mnt/main${UNIONFS_MOUNT_OPT} none /mnt/main + +# debug is no longer a unionfs-option since unionfs-2.1.x. +# Old mount-line: +# mount -t unionfs -o dirs=/mnt/main${UNIONFS_MOUNT_OPT},debug=$DEBUGOVERLAY none /mnt/main +# unionctl /mnt/main --add --mode ro /mnt/main_ro unionctl /mnt/main --add --mode rw $DIR2/root else - mount -t unionfs -o dirs=$DIR2/root=rw:/mnt/main_ro=ro${UNIONFS_MOUNT_OPT},debug=$DEBUGOVERLAY none /mnt/main + mount -t unionfs -o dirs=$DIR2/root=rw:/mnt/main_ro=ro${UNIONFS_MOUNT_OPT} none /mnt/main fi eend $? - mount -t unionfs -o dirs=$DIR2/modules=rw:/MorphixCD/lib/modules=ro,debug=$DEBUGOVERLAY none /mnt/main/lib/modules + mount -t unionfs -o dirs=$DIR2/modules=rw:/MorphixCD/lib/modules=ro none /mnt/main/lib/modules elif [ -n "$COWLOOP" ]; then ebegin "Overlaying using cowloop" @@ -386,7 +391,7 @@ else if [ -n "$UNIONFS" ]; then - mount -t unionfs -o dirs=$DIR2/dev=rw:/MorphixCD/dev=ro,debug=$DEBUGOVERLAY none /mnt/main/dev 2>&1 + mount -t unionfs -o dirs=$DIR2/dev=rw:/MorphixCD/dev=ro none /mnt/main/dev 2>&1 else mount --bind /MorphixCD/dev /mnt/main/dev fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2007-11-26 20:28:07
|
Revision: 2601 http://morphix.svn.sourceforge.net/morphix/?rev=2601&view=rev Author: bmsleight Date: 2007-11-26 12:28:00 -0800 (Mon, 26 Nov 2007) Log Message: ----------- _Nov_ Modified Paths: -------------- trunk/scripts-main/matchbox/debian/changelog Modified: trunk/scripts-main/matchbox/debian/changelog =================================================================== --- trunk/scripts-main/matchbox/debian/changelog 2007-11-26 20:25:18 UTC (rev 2600) +++ trunk/scripts-main/matchbox/debian/changelog 2007-11-26 20:28:00 UTC (rev 2601) @@ -2,7 +2,7 @@ * Updating xscreensaver and inactivity - -- Brendan M. Sleight <bms...@ba...> Mon, 26 Apr 2007 20:23:06 +0000 + -- Brendan M. Sleight <bms...@ba...> Mon, 26 Nov 2007 20:23:06 +0000 morphix-init-matchbox (0.1-13) unstable; urgency=low This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2007-11-26 20:25:33
|
Revision: 2600 http://morphix.svn.sourceforge.net/morphix/?rev=2600&view=rev Author: bmsleight Date: 2007-11-26 12:25:18 -0800 (Mon, 26 Nov 2007) Log Message: ----------- Changing screensaver as per Jure suggestion. New Package please :) Modified Paths: -------------- trunk/scripts-main/matchbox/debian/changelog trunk/scripts-main/matchbox/launch_inactivity.sh trunk/scripts-main/matchbox/xscreensaver Modified: trunk/scripts-main/matchbox/debian/changelog =================================================================== --- trunk/scripts-main/matchbox/debian/changelog 2007-11-20 19:21:57 UTC (rev 2599) +++ trunk/scripts-main/matchbox/debian/changelog 2007-11-26 20:25:18 UTC (rev 2600) @@ -1,3 +1,9 @@ +morphix-init-matchbox (0.1-14) unstable; urgency=low + + * Updating xscreensaver and inactivity + + -- Brendan M. Sleight <bms...@ba...> Mon, 26 Apr 2007 20:23:06 +0000 + morphix-init-matchbox (0.1-13) unstable; urgency=low * Usage of xserver virtual package Modified: trunk/scripts-main/matchbox/launch_inactivity.sh =================================================================== --- trunk/scripts-main/matchbox/launch_inactivity.sh 2007-11-20 19:21:57 UTC (rev 2599) +++ trunk/scripts-main/matchbox/launch_inactivity.sh 2007-11-26 20:25:18 UTC (rev 2600) @@ -10,7 +10,7 @@ # if the screen has been blank sleep for 60 seconds # then check again, if it's still blank reset the kiosk if [ -n "$(echo $line | egrep '^BLANK.*')" ] ; then - sleep 600 + sleep 60 if [ -z "$(xscreensaver-command -time | grep 'non-blanked')" ]; then sh ~/.inactivity fi Modified: trunk/scripts-main/matchbox/xscreensaver =================================================================== --- trunk/scripts-main/matchbox/xscreensaver 2007-11-20 19:21:57 UTC (rev 2599) +++ trunk/scripts-main/matchbox/xscreensaver 2007-11-26 20:25:18 UTC (rev 2600) @@ -2,8 +2,8 @@ # Written by xscreensaver-demo 4.21 for bms on Sat May 27 19:56:26 2006. # http://www.jwz.org/xscreensaver/ -timeout: 0:05:00 -cycle: 0:10:00 +timeout: 0:20:00 +cycle: 0:25:00 lock: False lockTimeout: 0:00:00 passwdTimeout: 0:00:30 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2007-11-20 19:22:02
|
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> </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. |
From: <bms...@us...> - 2007-11-19 23:07:04
|
Revision: 2598 http://morphix.svn.sourceforge.net/morphix/?rev=2598&view=rev Author: bmsleight Date: 2007-11-19 15:07:00 -0800 (Mon, 19 Nov 2007) Log Message: ----------- Payments set-up - almost there, almost there .... Modified Paths: -------------- trunk/morphixlivekiosk/scripts/mbuild/settings.py trunk/morphixlivekiosk/scripts/mbuild/templates/credits.html trunk/morphixlivekiosk/scripts/mbuild/templates/index.html trunk/morphixlivekiosk/scripts/mbuild/templates/leave-comments.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/404.html trunk/morphixlivekiosk/scripts/mbuild/templates/buy-now.html trunk/morphixlivekiosk/scripts/mbuild/templates/payment-complete.html Modified: trunk/morphixlivekiosk/scripts/mbuild/settings.py =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/settings.py 2007-11-18 23:15:47 UTC (rev 2597) +++ trunk/morphixlivekiosk/scripts/mbuild/settings.py 2007-11-19 23:07:00 UTC (rev 2598) @@ -86,5 +86,5 @@ EMAIL_USE_TLS = True EMAIL_HOST = 'smtp.gmail.com' -EMAIL_HOST_USER = 'liv...@go...' +EMAIL_HOST_USER = 'mb...@li...' EMAIL_PORT = 587 Added: trunk/morphixlivekiosk/scripts/mbuild/templates/404.html =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/404.html (rev 0) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/404.html 2007-11-19 23:07:00 UTC (rev 2598) @@ -0,0 +1,8 @@ +{% extends "html-master.html" %} + +{% block content %} +<h2>Page not found</h2> + +<p>Your <a href=/comments/>comments</a> and feedback are always welcolme.</p> + +{% endblock %} \ No newline at end of file Added: trunk/morphixlivekiosk/scripts/mbuild/templates/buy-now.html =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/buy-now.html (rev 0) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/buy-now.html 2007-11-19 23:07:00 UTC (rev 2598) @@ -0,0 +1,41 @@ +{% extends "html-master.html" %} + +{% block content %} +<h2>All we need now is payment for {{newtemplate.brand}} Kiosk LiveCD</h2> +<p>The cost of building a Customised kiosk LiveCD, Fully customised with your logos, brand names, plugins and homepage is GBP25.00</p> +<p><i>Non-profit organisations etc - contact mbuild - directly for special prices</i></p> + +<p>Google</p> +<form action="https://checkout.google.com/cws/v2/Merchant/837695194792377/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm"> + <input name="item_name_1" type="hidden" value="Customised Kiosk LiveCD - {{newtemplate.brand}} - {{newtemplate.template}}"/> + <input name="item_description_1" type="hidden" value="A LiveCD that contains a locked down version of a browser. Boot the computer using the LiveCD you can use the browser - nothing else (well apart from a screensaver). Fully customised with your logos, brand names, plugins and homepage"/> + <input name="item_quantity_1" type="hidden" value="1"/> + <input name="item_price_1" type="hidden" value="25.0"/> + <input name="item_currency_1" type="hidden" value="GBP"/> + <input name="_charset_" type="hidden" value="utf-8"/> + <input alt="" src="https://checkout.google.com/buttons/buy.gif?merchant_id=837695194792377&w=117&h=48&style=white&variant=text&loc=en_US" type="image"/> +</form> + + +<p>Paypal</p> +<form action="https://www.paypal.com/cgi-bin/webscr" method="post"> +<input type="hidden" name="cmd" value="_xclick"> +<input type="hidden" name="business" value="mb...@li..."> +<input type="hidden" name="item_name" value="Customised Kiosk LiveCD - {{newtemplate.brand}} - {{newtemplate.template}}"> +<input type="hidden" name="amount" value="25.00"> +<input type="hidden" name="shipping" value="0.00"> +<input type="hidden" name="page_style" value="Primary"> +<input type="hidden" name="no_shipping" value="1"> +<input type="hidden" name="return" value="http://mbuild.livecd.org/payment-complete/"> +<input type="hidden" name="no_note" value="1"> +<input type="hidden" name="currency_code" value="GBP"> +<input type="hidden" name="tax" value="0.00"> +<input type="hidden" name="lc" value="GB"> +<input type="hidden" name="bn" value="PP-BuyNowBF"> +<input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-butcc.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"> +<img alt="" border="0" src="https://www.paypal.com/en_GB/i/scr/pixel.gif" width="1" height="1"> +</form> + +<p><a href=/payment-complete/>When Payment Completed ...</a></p> + +{% endblock %} \ No newline at end of file Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/credits.html =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/credits.html 2007-11-18 23:15:47 UTC (rev 2597) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/credits.html 2007-11-19 23:07:00 UTC (rev 2598) @@ -8,7 +8,7 @@ <h2>mbuild</h2> <p>Jure's idea - extended by bmsleight.</p> -<h2><a href=www.morphix.org>Morphix</a></h2> +<h2><a href="http://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> @@ -16,7 +16,7 @@ <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> +<p>Good job by <a href="http://www.barwap.com/blog/">bmsleight</a></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> Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/index.html =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/index.html 2007-11-18 23:15:47 UTC (rev 2597) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/index.html 2007-11-19 23:07:00 UTC (rev 2598) @@ -1,13 +1,13 @@ {% extends "html-master.html" %} {% block content %} -<h2>MorphixLiveKisok</h2> +<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> <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>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> </p> <p>Enjoy,</p> <p><i>mbuild team</i></p> Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/leave-comments.html =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/leave-comments.html 2007-11-18 23:15:47 UTC (rev 2597) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/leave-comments.html 2007-11-19 23:07:00 UTC (rev 2598) @@ -5,7 +5,7 @@ <p>Please feel free to leave comments about mbuild</p> <form enctype="multipart/form-data" method="post" action="."> {{ form.as_p }} - <p><input type="submit" value="Notify →"></p> + <p><input type="submit" value="Leave Coments →"></p> </form> <p>Spam will be deleted - it not worth the touble</p> {% endblock %} \ No newline at end of file Added: trunk/morphixlivekiosk/scripts/mbuild/templates/payment-complete.html =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/payment-complete.html (rev 0) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/payment-complete.html 2007-11-19 23:07:00 UTC (rev 2598) @@ -0,0 +1,11 @@ +{% extends "html-master.html" %} + +{% block content %} +<h2>Payment Complete</h2> + +<p>Payment is being processed </p> +<p>Once we have received the ok from the either paypal or google-checkout. The build can proceed. +In the meantime check the status of the <a href=/view-queue/>build-queue</p> +<p>Your <a href=/comments/>comments</a> and feedback are always welcolme.</p> + +{% 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-18 23:15:47 UTC (rev 2597) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html 2007-11-19 23:07:00 UTC (rev 2598) @@ -1,14 +1,18 @@ {% extends "html-master.html" %} {% block content %} -<p>Below is a listing of the queue. +<p>Below is a listing of the queue. Builds happen at 15:00, 18:00 and 21:00 GMT everyday. </p> {% if queue_list %} <ul> {% for queue in queue_list %} {% if queue.built %} <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> + {% if queue.paid %} + <li><i><a href=/mbuild/status/{{ queue.template }}/>{{ queue.template }}</a> <a href=http://{{ queue.homepage }}>{{ queue.brand }}</a> - Payment Recieved - Has been built ? Not Yet </i></li> + {% else %} + <li><i><a href=/mbuild/status/{{ queue.template }}/>{{ queue.template }}</a> <a href=http://{{ queue.homepage }}>{{ queue.brand }}</a> - Payment being Processed - Has been built ? Not Yet </i></li> + {% endif %} {% endif %} {% endfor %} </ul> Modified: trunk/morphixlivekiosk/scripts/mbuild/urls.py =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-18 23:15:47 UTC (rev 2597) +++ trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-19 23:07:00 UTC (rev 2598) @@ -5,6 +5,7 @@ (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'^mbuild/buynow/(?P<template>[^/]+)/', 'mbuild.web.views.buynow'), (r'^xml/morphix/(?P<template>[^/]+)', 'mbuild.web.views.converttokabtxml'), (r'^mbuild/(?P<template>[^/]+)/', 'mbuild.web.views.mbuild'), (r'^view-queue/', 'mbuild.web.views.viewqueue'), @@ -14,6 +15,7 @@ (r'^comments/leave/', 'mbuild.web.views.leavecomments'), (r'^comments/', 'mbuild.web.views.viewcomments'), (r'^blog/', 'mbuild.web.views.viewblog'), + (r'^payment-complete/', 'mbuild.web.views.paymentcomplete'), # 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-18 23:15:47 UTC (rev 2597) +++ trunk/morphixlivekiosk/scripts/mbuild/web/models.py 2007-11-19 23:07:00 UTC (rev 2598) @@ -13,16 +13,21 @@ flash = models.BooleanField(default=False) java = models.BooleanField(default=False) graphic = models.CharField(maxlength="150") - dhcp = models.BooleanField(default=False) - builtdomain = models.CharField(maxlength="150") - builtiso = models.CharField(maxlength="150") - builtogg = models.CharField(maxlength="150") - builtjpg = models.CharField(maxlength="150") + dhcp = models.BooleanField(default=True) + builtdomain = models.CharField(maxlength="150", blank=True) + builtiso = models.CharField(maxlength="150", blank=True) + builtogg = models.CharField(maxlength="150", blank=True) + builtjpg = models.CharField(maxlength="150", blank=True) oktobuild = models.BooleanField(default=False) + paid = models.BooleanField(default=False) + class Admin: - pass +# pass + list_display = ('brand', 'template', 'paid', 'oktobuild') + list_filter = ('paid', 'oktobuild') + ordering = ('template',) + search_fields = ('brand',) - class Blog(models.Model): title = models.CharField(maxlength=200) pub_date = models.DateTimeField('Date published') Modified: trunk/morphixlivekiosk/scripts/mbuild/web/views.py =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-18 23:15:47 UTC (rev 2597) +++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-19 23:07:00 UTC (rev 2598) @@ -101,13 +101,21 @@ newtemplate.save() except Queue.DoesNotExist: return HttpResponse("Template does not exist") - return HttpResponseRedirect("/mbuild/status/%s/" % template ) + return HttpResponseRedirect("/mbuild/buynow/%s/" % template ) else: form = BuildForm() context = {'form': form} return render_to_response('template.html', context, context_instance=RequestContext(request)) +def buynow(request, template): + try: + newtemplate = Queue.objects.get(pk=template) + return render_to_response("buy-now.html",{"newtemplate":newtemplate}) + except Queue.DoesNotExist: + return HttpResponse("Template does not exist") + + def mbuildstatus(request, template): try: newtemplate = Queue.objects.get(pk=template) @@ -125,7 +133,7 @@ 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 = Queue.objects.filter(built=False, oktobuild=True, paid=True).order_by('template')[0] queue_list.built = True queue_list.builtdomain = request.GET["built"] queue_list.builtiso = request.GET["i"] @@ -139,7 +147,7 @@ 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') + queue_list = Queue.objects.filter(built=False, oktobuild=True, paid=True).order_by('template') return render_to_response('kabt-queue.html', {'queue_list': queue_list}) def sucessfulbuild(request): @@ -170,6 +178,10 @@ #Yes I know Jure - I shoudl use flatpages - I will try to move to flatpages.... return render_to_response('credits.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') + 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. |
From: <bms...@us...> - 2007-11-18 23:15:50
|
Revision: 2597 http://morphix.svn.sourceforge.net/morphix/?rev=2597&view=rev Author: bmsleight Date: 2007-11-18 15:15:47 -0800 (Sun, 18 Nov 2007) Log Message: ----------- mbuild almost ready to go live Modified Paths: -------------- trunk/morphixlivekiosk/scripts/mbuild/media/style.css trunk/morphixlivekiosk/scripts/mbuild/templates/html-master.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/comments.html trunk/morphixlivekiosk/scripts/mbuild/templates/leave-comments.html trunk/morphixlivekiosk/scripts/mbuild/templates/view-blog.html trunk/morphixlivekiosk/scripts/mbuild/templates/view-comments.html Modified: trunk/morphixlivekiosk/scripts/mbuild/media/style.css =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/media/style.css 2007-11-13 18:55:31 UTC (rev 2596) +++ trunk/morphixlivekiosk/scripts/mbuild/media/style.css 2007-11-18 23:15:47 UTC (rev 2597) @@ -61,108 +61,31 @@ a:active { color:#480000 } /* when link is clicked */ a:hover { color:#780000 } /* when mouse is over link */ -/*- Menu Tabs--------------------------- */ +#bblack { + background:#000000; +} - #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; - } +.hbuttons a{ +display: block; +text-decoration: none; +font-size: 75%; +color: #CC0000; +background: #000000; +float: centre; +display: inline; +margin-right: 2px; +margin-left: 2px; +text-align:center; +border-left:1px solid #CC0000; +border-right:1px solid #CC0000; +} -/*- Menu Tabs E--------------------------- */ +.hbuttons a:hover {background-color: #FFFFFF; +color: #780000; +text-decoration: none;} - #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; } Added: trunk/morphixlivekiosk/scripts/mbuild/templates/comments.html =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/comments.html (rev 0) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/comments.html 2007-11-18 23:15:47 UTC (rev 2597) @@ -0,0 +1,11 @@ +{% extends "html-master.html" %} + +{% block content %} + +<p>Please feel free to leave comments about mbuild</p> +<form enctype="multipart/form-data" method="post" action="."> + {{ form.as_p }} + <p><input type="submit" value="Notify →"></p> +</form> +<p>Spam will be deleted - it not worth the touble</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-13 18:55:31 UTC (rev 2596) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/html-master.html 2007-11-18 23:15:47 UTC (rev 2597) @@ -6,19 +6,17 @@ <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="/" 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="/" title="Leave Comments"><span>Leave Comments</span></a></li> - <li><a href="/" title="mbuilder.blog"><span>mbuild.blog</span></a></li> - </ul> +<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="/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> -<br /><br /> - - +</body> <div id="body"> {% block content %}{% endblock %} </div> Added: trunk/morphixlivekiosk/scripts/mbuild/templates/leave-comments.html =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/leave-comments.html (rev 0) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/leave-comments.html 2007-11-18 23:15:47 UTC (rev 2597) @@ -0,0 +1,11 @@ +{% extends "html-master.html" %} + +{% block content %} +<h2>mbuild - Comments</h2> +<p>Please feel free to leave comments about mbuild</p> +<form enctype="multipart/form-data" method="post" action="."> + {{ form.as_p }} + <p><input type="submit" value="Notify →"></p> +</form> +<p>Spam will be deleted - it not worth the touble</p> +{% endblock %} \ No newline at end of file Added: trunk/morphixlivekiosk/scripts/mbuild/templates/view-blog.html =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/view-blog.html (rev 0) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/view-blog.html 2007-11-18 23:15:47 UTC (rev 2597) @@ -0,0 +1,11 @@ +{% extends "html-master.html" %} + +{% block content %} +<h2>mbuild weblog</h2> +{% if blog_list %} + {% for blog in blog_list %} + <p><u>{{blog.title}} on the {{blog.pub_date}}</u><br /> {{blog.body}} </p> + <p> </p> + {% endfor %} +{% endif %} +{% endblock %} Added: trunk/morphixlivekiosk/scripts/mbuild/templates/view-comments.html =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/view-comments.html (rev 0) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/view-comments.html 2007-11-18 23:15:47 UTC (rev 2597) @@ -0,0 +1,12 @@ +{% extends "html-master.html" %} + +{% block content %} +<p>Below is a listing of the comments received about mbuild. +{% if comments_list %} + {% for comment in comments_list %} + <p><u>{{comment.whom}} on the {{comment.pub_date}}</u><br />Wrote: <br /> {{comment.body}} </p> + <p> </p> + {% endfor %} +{% endif %} +<p><a href=/comments/leave/>What to leave a comment ?</a></p> +{% endblock %} Modified: trunk/morphixlivekiosk/scripts/mbuild/urls.py =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-13 18:55:31 UTC (rev 2596) +++ trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-18 23:15:47 UTC (rev 2597) @@ -11,6 +11,9 @@ (r'^kabt-queue/', 'mbuild.web.views.kabtqueue'), (r'^delete-queue/', 'mbuild.web.views.delall'), (r'^credits/', 'mbuild.web.views.credits'), + (r'^comments/leave/', 'mbuild.web.views.leavecomments'), + (r'^comments/', 'mbuild.web.views.viewcomments'), + (r'^blog/', 'mbuild.web.views.viewblog'), # 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-13 18:55:31 UTC (rev 2596) +++ trunk/morphixlivekiosk/scripts/mbuild/web/models.py 2007-11-18 23:15:47 UTC (rev 2597) @@ -19,6 +19,23 @@ builtogg = models.CharField(maxlength="150") builtjpg = models.CharField(maxlength="150") oktobuild = models.BooleanField(default=False) - class Admin: - pass \ No newline at end of file + pass + + +class Blog(models.Model): + title = models.CharField(maxlength=200) + pub_date = models.DateTimeField('Date published') + body = models.TextField() + class Admin: + pass + + +class Comments(models.Model): + whom = models.CharField(maxlength=200) + pub_date = models.DateTimeField('Date published') + body = models.TextField() + class Admin: + pass + + Modified: trunk/morphixlivekiosk/scripts/mbuild/web/views.py =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-13 18:55:31 UTC (rev 2596) +++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-18 23:15:47 UTC (rev 2597) @@ -4,6 +4,8 @@ from django.http import HttpResponse from django.http import HttpResponseRedirect from mbuild.web.models import Queue +from mbuild.web.models import Comments +from mbuild.web.models import Blog from django.core.mail import EmailMessage from django.template import loader, Context @@ -168,8 +170,29 @@ #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() return HttpResponse("The Elves have deleted the whole queue.") + +def viewcomments(request): + comments_list = Comments.objects.all() + return render_to_response('view-comments.html', {'comments_list': comments_list}) + +def leavecomments(request): + class BuildForm(forms.Form): + whom = forms.CharField(max_length=200, required=True, label="Name of Person Leaving Comments:") + body = forms.CharField(widget=forms.Textarea) + if request.POST: + comments = Comments(whom=request.POST["whom"], pub_date=datetime.datetime.today(), body=request.POST["body"]) + comments.save() + return HttpResponseRedirect("/comments/" ) + else: + form = BuildForm() + context = {'form': form} + return render_to_response('leave-comments.html', context, + context_instance=RequestContext(request)) + +def viewblog(request): + blog_list = Blog.objects.all().order_by('-pub_date')[:5] + return render_to_response('view-blog.html', {'blog_list': blog_list}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
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. |
From: <bms...@us...> - 2007-11-11 00:09:35
|
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. |
From: <bms...@us...> - 2007-11-10 22:43:21
|
Revision: 2593 http://morphix.svn.sourceforge.net/morphix/?rev=2593&view=rev Author: bmsleight Date: 2007-11-10 14:43:18 -0800 (Sat, 10 Nov 2007) Log Message: ----------- Adding click-though java terms Modified Paths: -------------- trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html trunk/morphixlivekiosk/scripts/mbuild/templates/index.html trunk/morphixlivekiosk/scripts/mbuild/templates/master.xml trunk/morphixlivekiosk/scripts/mbuild/templates/template.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/delete-queue.html trunk/morphixlivekiosk/scripts/mbuild/templates/java-terms-accept.html trunk/morphixlivekiosk/scripts/mbuild/templates/status.html Added: trunk/morphixlivekiosk/scripts/mbuild/templates/delete-queue.html =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/delete-queue.html (rev 0) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/delete-queue.html 2007-11-10 22:43:18 UTC (rev 2593) @@ -0,0 +1,8 @@ +<h1>Custom Built Kiosk LiveCD</h1> + +{% 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 Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html 2007-11-10 00:25:57 UTC (rev 2592) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html 2007-11-10 22:43:18 UTC (rev 2593) @@ -1,12 +1,7 @@ <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><a href=/templates/{{newtemplate.template}}>Raw Template.xml</a><p> -<p>You can cheak the status of your build request at anytime by visiting this page<p> +<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> Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/index.html =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/index.html 2007-11-10 00:25:57 UTC (rev 2592) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/index.html 2007-11-10 22:43:18 UTC (rev 2593) @@ -2,6 +2,5 @@ <form enctype="multipart/form-data" method="post" action="."> {{ form.as_p }} - <p><input type="submit" value="Continue →"></p> </form> Added: trunk/morphixlivekiosk/scripts/mbuild/templates/java-terms-accept.html =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/java-terms-accept.html (rev 0) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/java-terms-accept.html 2007-11-10 22:43:18 UTC (rev 2593) @@ -0,0 +1,219 @@ +<h1>Custom Built Kiosk LiveCD</h1> +<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>:- +<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. +</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> + Operating System Distributor License for Java version 1.1 + +SUN MICROSYSTEMS, INC. ("SUN") IS WILLING TO LICENSE THE JAVA PLATFORM +STANDARD EDITION DEVELOPER KIT ("JDK" - THE "SOFTWARE") TO YOU ONLY +UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS +LICENSE AGREEMENT (THE "AGREEMENT"). PLEASE READ THE AGREEMENT +CAREFULLY. BY INSTALLING, USING, OR DISTRIBUTING THIS SOFTWARE, YOU +ACCEPT ALL OF THE TERMS OF THE AGREEMENT. + +1. DEFINITIONS. "Software" means the code identified above in binary + form, any other machine readable materials including, but not + limited to, libraries, source files, header files, and data files), + any updates or error corrections provided by Sun, and any user + manuals, programming guides and other documentation provided to you + by Sun under this Agreement, and any subsequent versions that Sun + makes available to you hereunder. "Operating System" means any + version of the Linux or OpenSolaris operating systems that manages + the hardware resources of a general purpose desktop or server + computer and shares these resources with various software programs + that run on top of it. "Programs" means Java technology applets and + applications intended to run on the Java Platform Standard Edition + (Java SE platform) platform on Java-enabled general purpose desktop + computers and servers. + +2. License Grant. Subject to the terms and conditions of this + Agreement, as well as the restrictions and exceptions set forth in + the Software README file, Sun grants you a non-exclusive, + non-transferable, royalty-free limited license to reproduce and use + the Software internally, complete and unmodified, for the sole + purposes of running Programs and designing, developing and testing + Programs. Sun also grants you a non-exclusive, non-transferable, + royalty-free limited license to reproduce and distribute the + Software, directly or indirectly through your licensees, + distributors, resellers, or OEMs, electronically or in physical + form or pre-installed with your Operating System on a general + purpose desktop computer or server, provided that: (a) the Software + and any proprietary legends or notices are complete and unmodified; + (b) the Software is distributed with your Operating System, and + such distribution is solely for the purposes of running Programs + under the control of your Operating System and designing, + developing and testing Programs to be run under the control of your + Operating System; (c) you do not combine, configure or distribute + the Software to run in conjunction with any additional software + that implements the same or similar functionality or APIs as the + Software; (d) you do not remove or modify any included license + agreement or impede or prevent it from displaying and requiring + acceptance; (e) you only distribute the Software subject to this + license agreement; and (f) you agree to defend and indemnify Sun + and its licensors from and against any damages, costs, liabilities, + settlement amounts and/or expenses (including attorneys' fees) + incurred in connection with any claim, lawsuit or action by any + third party that arises or results from (i) the use or distribution + of your Operating System, or any part thereof, in any manner, or + (ii) your use or distribution of the Software in violation of the + terms of this Agreement or applicable law. You shall not be + obligated under Section 2(f)(i) if such claim would not have + occurred but for a modification made to your Operating System by + someone not under your direction or control, and you were in + compliance with all other terms of this Agreement. If the Software + README file permits certain files to be replaced or omitted from + your distribution, then any such replacement(s) or omission(s) + shall not be considered a breach of Section 2(a). + +3. RESTRICTIONS. Software is copyrighted and title to Software and + all associated intellectual property rights is retained by Sun + and/or its licensors. Unless enforcement is prohibited by + applicable law, you may not modify, decompile, or reverse engineer + Software. You may not create, modify, or change the behavior of, + or authorize your licensees, distributors, resellers, OEMs, or end + users (collectively, "Licensees") to create, modify, or change the + behavior of, classes, interfaces, or subpackages that are in any + way identified as "java", "javax", "sun" or similar convention as + specified by Sun in any naming convention designation. You + acknowledge that Licensed Software is not designed or intended for + use in the design, construction, operation or maintenance of any + nuclear facility. Sun Microsystems, Inc. disclaims any express or + implied warranty of fitness for such uses. + +4. COMPATIBILITY. If you exercise the license in Section 2, and Sun + or a licensee of the Software (under section 4(b)) notifies you + that there are compatibility issues (as determined by the + applicable Technology Compatibility Kit) caused by the interaction + of the Software with your Operating System, then within ninety + (90) days you must either: (a) modify the Operating System in a + way that resolves the compatibility issue (as determined by Sun) + and make a patch or replacement version available to your + Licensees who have already received the version of your Operating + System that was the subject of the compatibility issue ("Your + Incompatible Operating System"); or (b) cease distributing the + Software and make commercially reasonable attempts to forward the + notification to your Licensees who have already received Your + Incompatible Operating System. + +5. Trademarks and Logos. No right, title or interest in or to any + trademark, service mark, logo or trade name of Sun or its + licensors is granted under this Agreement. You acknowledge and + agree that, as between you and Sun, Sun owns the SUN and JAVA + trademarks and all SUN and JAVA-related trademarks, service marks, + logos and other brand designations ("Sun Marks"), and you agree to + comply with the Sun Trademark and Logo Usage Requirements + currently located at http://www.sun.com/policies/trademarks. Any + use you make of the Sun Marks inures to Sun's benefit. + +6. LIMITED WARRANTY. If you received the Software directly from Sun + or its authorized resellers, Sun warrants to you that for a period + of ninety (90) days from delivery to you, the media on which + Software is furnished (if any) will be free of defects in + materials and workmanship under normal use. Except for the + foregoing, Software is provided "AS IS". Your exclusive remedy + and Sun's entire liability under this limited warranty will be + replacement of the Software media. This limited warranty gives + you specific legal rights. You may have others, which vary from + state to state. + +7. DISCLAIMER OF WARRANTY. UNLESS SPECIFIED IN THIS AGREEMENT, ALL + EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, + INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A + PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO + THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. + +8. LIMITATION OF LIABILITY. IN NO EVENT WILL SUN OR ITS LICENSORS BE + LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR + PUNITIVE DAMAGES IN CONNECTION WITH OR ARISING OUT OF THIS + AGREEMENT (INCLUDING LOSS OF PROFITS, USE, DATA, OR OTHER ECONOMIC + ADVANTAGE), NO MATTER WHAT THEORY OF LIABILITY, EVEN IF SUN HAS + BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no event will + Sun's liability to you, whether in contract, tort (including + negligence), or otherwise, exceed the amount paid by you for the + Software under this Agreement. The foregoing limitations will + apply even if the above stated warranty fails of its essential + purpose. Some states do not allow the exclusion of incidental or + consequential damages, so some of the terms above may not be + applicable to you. + +9. THIRD PARTY CODE. Additional copyright notices and license terms + applicable to portions of the Software are set forth in the + THIRDPARTYLICENSEREADME.txt file. In addition to any terms and + conditions of any third party opensource/freeware license + identified in the THIRDPARTYLICENSEREADME.txt file, the disclaimer + of warranty and limitation of liability provisions in paragraphs 7 + and 8 of this Agreement shall apply to all Software in this + distribution. + +10. Termination. This Agreement is effective until it is + terminated. You may terminate this Agreement at any time by + ceasing distribution of the Software. This Agreement will + terminate immediately without notice from Sun if you fail to + comply with any material provision herein. Either party may + terminate this Agreement immediately should any Software become, + or in either party's opinion be likely to become, the subject of a + claim of infringement of any intellectual property right. Upon + termination, you must destroy all copies and cease copying and + distribution of the Software. All of your obligations and any + applicable limitations on your rights and remedies under this + Agreement shall survive termination. + +11. SOURCE CODE. Software may contain source code that, unless + expressly licensed for other purposes, is provided solely for + reference purposes pursuant to the terms of this Agreement. + Source code may not be redistributed unless expressly provided for + in this Agreement. + +12. Export Regulations. All Software and technical data delivered + under this Agreement are subject to US export control laws and may + be subject to export or import regulations in other countries. + You acknowledge that you have the responsibility to obtain such + licenses to export, re-export, or import as may be required after + delivery to you. + +13. U.S. GOVERNMENT RESTRICTED RIGHTS. If Software is being acquired + by or on behalf of the U.S. Government or by a U.S. Government + prime contractor or subcontractor (at any tier), then the + Government's rights in Software and accompanying documentation + will be only as set forth in this Agreement; this is in accordance + with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense + (DOD) acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD + acquisitions). + +14. MISCELLANEOUS. Any action related to this Agreement will be + governed by California law and controlling U.S. federal law. No + choice of law rules of any jurisdiction will apply. If any + provision of this Agreement is held to be unenforceable, this + Agreement will remain in effect upon the parties' agreement to + revised terms that most nearly accomplish the same effect. This + Agreement is the entire agreement between you and Sun relating to + its subject matter. It supersedes all prior or contemporaneous + oral or written communications, proposals, representations and + warranties and prevails over any conflicting or additional terms + of any quote, order, acknowledgment, or other communication + between the parties relating to its subject matter during the term + of this Agreement. No modification of this Agreement will be + binding, unless in writing and signed by an authorized + representative of each party. + +For inquiries please contact: Sun Microsystems, Inc., 4150 Network Circle, +Santa Clara, California 95054, U.S.A. + +DLJ v1.1 27APR2006ANS + +</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><input type="submit" value="Notify →"></p> +</form> Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/master.xml =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/master.xml 2007-11-10 00:25:57 UTC (rev 2592) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/master.xml 2007-11-10 22:43:18 UTC (rev 2593) @@ -5,17 +5,11 @@ <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 %} +{% if newtemplate.navbar %} <navbar>true</navbar> {% else %} <navbar>false</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 %} +{% if newtemplate.dhcp %} <dhcp>dhcp</dhcp>{% else %} <dhcp></dhcp>{% endif %} </network> </kiosk> </group> Added: trunk/morphixlivekiosk/scripts/mbuild/templates/status.html =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/status.html (rev 0) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/status.html 2007-11-10 22:43:18 UTC (rev 2593) @@ -0,0 +1,15 @@ +<h1>Custom Built Kiosk LiveCD</h1> +<h2>Status</h2> +{% if newtemplate.built %} + <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> + <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> +{% 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> Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/template.html =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/templates/template.html 2007-11-10 00:25:57 UTC (rev 2592) +++ trunk/morphixlivekiosk/scripts/mbuild/templates/template.html 2007-11-10 22:43:18 UTC (rev 2593) @@ -4,6 +4,5 @@ <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> Modified: trunk/morphixlivekiosk/scripts/mbuild/urls.py =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-10 00:25:57 UTC (rev 2592) +++ trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-10 22:43:18 UTC (rev 2593) @@ -2,11 +2,13 @@ urlpatterns = patterns('', (r'^$', 'mbuild.web.views.index'), + (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'^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'), # Uncomment this for admin: Modified: trunk/morphixlivekiosk/scripts/mbuild/web/models.py =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/web/models.py 2007-11-10 00:25:57 UTC (rev 2592) +++ trunk/morphixlivekiosk/scripts/mbuild/web/models.py 2007-11-10 22:43:18 UTC (rev 2593) @@ -13,7 +13,9 @@ flash = models.BooleanField(default=False) java = models.BooleanField(default=False) graphic = models.CharField(maxlength="150") + dhcp = models.BooleanField(default=False) 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 + builtjpg = models.CharField(maxlength="150") + oktobuild = models.BooleanField(default=False) \ No newline at end of file Modified: trunk/morphixlivekiosk/scripts/mbuild/web/views.py =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-10 00:25:57 UTC (rev 2592) +++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-10 22:43:18 UTC (rev 2593) @@ -11,7 +11,7 @@ def index(request): class BuildForm(forms.Form): - brand_name = forms.CharField(max_length=150, required=True, label="What Brand name would you like to use?", initial="Morphix LiveKiosk") + 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)") 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')]), @@ -32,10 +32,10 @@ #save the image file if cd.get('graphics'): - f = file('/var/www/images/%s' % cd['graphics'].filename, 'wb') + f = file('/var/www/images/%s' % uniq + "-" + cd['graphics'].filename, 'wb') f.write(cd['graphics'].content) f.close() - cd['graphics'] = cd['graphics'].filename + cd['graphics'] = "%s" % uniq + "-" + cd['graphics'].filename root = ET.Element("LIVECD") for v in cd: @@ -49,14 +49,38 @@ template_name = "%s.xml" % uniq 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("/mbuild/%s/" % template_name ) + if template.java: + return HttpResponseRedirect("/mbuild/terms/%s/" % template_name ) + else: + return HttpResponseRedirect('/mbuild/%s/' % template_name ) else: form = BuildForm() - context = {'form': form} return render_to_response('index.html', context, context_instance=RequestContext(request)) + +def acceptterms(request, template): + class BuildForm(forms.Form): + accept = forms.BooleanField(widget=forms.RadioSelect(choices=[("1", 'Yes'), ("0", 'No')]), label="Accept terms and conditions?", initial="0") + if request.POST: + try: + newtemplate = Queue.objects.get(pk=template) + newtemplate.oktobuild = request.POST["accept"] + newtemplate.save() + if newtemplate.oktobuild == "1": + return HttpResponseRedirect('/mbuild/%s/' % template) + else: + return HttpResponse("Elves will not build unless the terms and conditions are accepted") + except Queue.DoesNotExist: + return HttpResponse("Template does not exist") + else: + form = BuildForm() + context = {'form': form} + return render_to_response('java-terms-accept.html', context, + context_instance=RequestContext(request)) + + def mbuild(request, template): class BuildForm(forms.Form): emailnotify = forms.EmailField("Email to recieve notifications?") @@ -71,14 +95,14 @@ return HttpResponseRedirect("/mbuild/status/%s/" % template ) else: form = BuildForm() - context = {'form': form} - return render_to_response('index.html', context, + context = {'form': form} + return render_to_response('template.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}) + return render_to_response("status.html",{"newtemplate":newtemplate}) except Queue.DoesNotExist: return HttpResponse("Template does not exist") @@ -90,13 +114,28 @@ return HttpResponse("Template does not exist") def kabtqueue(request): - queue_list = Queue.objects.filter(built=False).order_by('template') + 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) + if request.GET: + queue_list = Queue.objects.filter(built=False).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() + return render_to_response('delete-queue.html', {'queue_list': queue_list}) + else: + return HttpResponse("Could not determine the successful builds - see kabt.sh documentation") + 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. |
From: <gan...@us...> - 2007-11-10 00:26:02
|
Revision: 2592 http://morphix.svn.sourceforge.net/morphix/?rev=2592&view=rev Author: gandalfar Date: 2007-11-09 16:25:57 -0800 (Fri, 09 Nov 2007) Log Message: ----------- fixed the choices being always True Modified Paths: -------------- trunk/morphixlivekiosk/scripts/mbuild/web/views.py Modified: trunk/morphixlivekiosk/scripts/mbuild/web/views.py =================================================================== --- trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-09 23:36:01 UTC (rev 2591) +++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-10 00:25:57 UTC (rev 2592) @@ -11,17 +11,17 @@ def index(request): class BuildForm(forms.Form): - brand_name = forms.CharField(max_length=150, required=True, label="What Brand name would you like to use?") + brand_name = forms.CharField(max_length=150, required=True, label="What Brand name would you like to use?", initial="Morphix LiveKiosk") graphics = forms.ImageField(required=False, label="Graphics file (1024x768, 32pps, any format works best)") - homepage = forms.CharField(max_length=150, required=True, label="Desired homepage http://") - nav_bar = forms.BooleanField(widget=forms.RadioSelect(choices=[(True, 'Yes'), (False, 'No')]), - initial=True, label="Should the Navigation Bar be visable?") - dhcp = forms.BooleanField(widget=forms.RadioSelect(choices=[(True, 'Yes'), (False, 'No')]), - initial=True, label="Use DHCP?") - flash = forms.BooleanField(widget=forms.RadioSelect(choices=[(True, 'Yes'), (False, 'No')]), - label="Include Flash?", initial=False) - java = forms.BooleanField(widget=forms.RadioSelect(choices=[(True, 'Yes'), (False, 'No')]), - label="Include Java?", initial=False) + 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')]), + initial="1", label="Use DHCP?") + flash = forms.BooleanField(widget=forms.RadioSelect(choices=[("1", 'Yes'), ("0", 'No')]), + label="Include Flash?", initial="0") + java = forms.BooleanField(widget=forms.RadioSelect(choices=[("1", 'Yes'), ("0", 'No')]), + label="Include Java?", initial="0") if request.POST: form = BuildForm(request.POST, request.FILES) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |