Revision: 8106
http://svn.sourceforge.net/mailman/?rev=8106&view=rev
Author: mindlace23
Date: 2006-12-04 18:30:59 -0800 (Mon, 04 Dec 2006)
Log Message:
-----------
makefile attempts
Modified Paths:
--------------
branches/soc2006-webui/Mailman/WebUI/Makefile.in
branches/soc2006-webui/Mailman/WebUI/lists.py
branches/soc2006-webui/Mailman/WebUI/static/Makefile.in
branches/soc2006-webui/Mailman/WebUI/templates/Makefile.in
branches/soc2006-webui/Mailman/WebUI/templates/pieces/lists.html
branches/soc2006-webui/Mailman/WebUI/templates/pieces/signin.html
branches/soc2006-webui/Mailman/WebUI/wsgi_app.py
Modified: branches/soc2006-webui/Mailman/WebUI/Makefile.in
===================================================================
--- branches/soc2006-webui/Mailman/WebUI/Makefile.in 2006-12-03 12:38:59 UTC
(rev 8105)
+++ branches/soc2006-webui/Mailman/WebUI/Makefile.in 2006-12-05 02:30:59 UTC
(rev 8106)
@@ -37,11 +37,11 @@
OPT= @OPT@
CFLAGS= $(OPT) $(DEFS)
-PACKAGEDIR= $(prefix)/Mailman/WebUI
+PACKAGEDIR= Mailman/WebUI
SUBDIRS = static templates
SHELL= /bin/sh
-MODULES= $(prefix)/Mailman/WebUI/*.py
+MODULES= *.py
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
Modified: branches/soc2006-webui/Mailman/WebUI/lists.py
===================================================================
--- branches/soc2006-webui/Mailman/WebUI/lists.py 2006-12-03 12:38:59 UTC
(rev 8105)
+++ branches/soc2006-webui/Mailman/WebUI/lists.py 2006-12-05 02:30:59 UTC
(rev 8106)
@@ -24,7 +24,8 @@
self.context['sitename'] = hostname[:hostname.rfind(':')]
if self.context['bm'].anonymous:
self.add_piece('signin','controls')
-
+
+ self.add_piece('lists','body')
self.lists()
start_response('200 OK', [('content-type','application/xhtml+xml'),])
return self.render_template('content.html')
Modified: branches/soc2006-webui/Mailman/WebUI/static/Makefile.in
===================================================================
--- branches/soc2006-webui/Mailman/WebUI/static/Makefile.in 2006-12-03
12:38:59 UTC (rev 8105)
+++ branches/soc2006-webui/Mailman/WebUI/static/Makefile.in 2006-12-05
02:30:59 UTC (rev 8106)
@@ -37,7 +37,7 @@
OPT= @OPT@
CFLAGS= $(OPT) $(DEFS)
-PACKAGEDIR= $(prefix)/Mailman/WebUI/static/
+PACKAGEDIR= Mailman/WebUI/static/
SHELL= /bin/sh
MODULES= *
Modified: branches/soc2006-webui/Mailman/WebUI/templates/Makefile.in
===================================================================
--- branches/soc2006-webui/Mailman/WebUI/templates/Makefile.in 2006-12-03
12:38:59 UTC (rev 8105)
+++ branches/soc2006-webui/Mailman/WebUI/templates/Makefile.in 2006-12-05
02:30:59 UTC (rev 8106)
@@ -37,7 +37,7 @@
OPT= @OPT@
CFLAGS= $(OPT) $(DEFS)
-PACKAGEDIR= $(prefix)/Mailman/WebUI/templates
+PACKAGEDIR= Mailman/WebUI/templates
SUBDIRS = pieces fragments
SHELL= /bin/sh
Modified: branches/soc2006-webui/Mailman/WebUI/templates/pieces/lists.html
===================================================================
--- branches/soc2006-webui/Mailman/WebUI/templates/pieces/lists.html
2006-12-03 12:38:59 UTC (rev 8105)
+++ branches/soc2006-webui/Mailman/WebUI/templates/pieces/lists.html
2006-12-05 02:30:59 UTC (rev 8106)
@@ -9,7 +9,9 @@
<body py:strip="">
<div id="body" py:match="[EMAIL PROTECTED]'body']" py:attrs="select('@*')">
-<div py:if="lists">
+<pre>
+</pre>
+<div py:if="len(lists)">
<p class="preamble" py:if="bm.anonymous">
This is the list of publically available lists on ${sitename}.
If you sign in, you will be able to see the private lists
@@ -55,7 +57,7 @@
</dd>
</dl>
</div>
-<div py:if="not lists">
+<div py:if="len(lists) == 0">
<p py:if="no_lists" class="preamble">Welcome to your new mailman
installation!</p>
<p py:if="bm.anonymous" class="preamble">If you sign in as user 'admin'
with the password you set during configuration, you'll be able to create a new
list. If you haven't set a password yet, use the mmsitepass script.</p>
<p py:if="bm.anonymous and (not no_lists)" class="preamble">There are no
publically available lists on ${sitename}. Please sign in to view your
subscriptions.</p>
Modified: branches/soc2006-webui/Mailman/WebUI/templates/pieces/signin.html
===================================================================
--- branches/soc2006-webui/Mailman/WebUI/templates/pieces/signin.html
2006-12-03 12:38:59 UTC (rev 8105)
+++ branches/soc2006-webui/Mailman/WebUI/templates/pieces/signin.html
2006-12-05 02:30:59 UTC (rev 8106)
@@ -1,12 +1,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:py="http://genshi.edgewall.org/";
xmlns:xi="http://www.w3.org/2001/XInclude";>
+<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:py="http://genshi.edgewall.org/";
xmlns:xi="http://www.w3.org/2001/XInclude"; py:strip="">
<head py:match="head">
<title py:if="signin_content == 'body'">Sign in to Mailman at
$sitename</title>
<link py:replace="select('*')" />
</head>
-<body>
+<body py:strip="">
<div py:match="[EMAIL PROTECTED]'messages']" py:attrs="select('@*')">
<p class="messages alert" id="login_failed">
Modified: branches/soc2006-webui/Mailman/WebUI/wsgi_app.py
===================================================================
--- branches/soc2006-webui/Mailman/WebUI/wsgi_app.py 2006-12-03 12:38:59 UTC
(rev 8105)
+++ branches/soc2006-webui/Mailman/WebUI/wsgi_app.py 2006-12-05 02:30:59 UTC
(rev 8106)
@@ -51,11 +51,11 @@
return fa(environ, start_response)
if self.is_post_request(environ):
- self.parse_post_form(environ)
+ post = Post()
return post(environ, start_response)
path = environ['PATH_INFO']
# render the lists page
- if path == '/':
+ if path in ('/',''):
from Mailman.WebUI.lists import Lists
lists = Lists(config)
return lists(environ, start_response)
@@ -64,37 +64,7 @@
if (pathparts[1] == 'newlist') or (pathparts[1] in self.list_names):
shift_path_info(environ)
return list(environ, start_response)
-
- def parse_post_form(self, environ):
- """Because we are accepting all form elements on a page, we need
- to know which have actually been submitted. Therefore form elements
- are prefixed with their associated control, and a dictionary of
- {'controlname':{'fieldname':value(s)}} is created. The submit button
- for a control that was actually submitted just has the controlname,
- so we add a 'submitted' value to the dictionary representing the
- submitted form.
- """
- input = environ['wsgi.input']
- fs = cgi.FieldStorage(fp=input,
- environ=environ,
- keep_blank_values=1)
- formvars = {}
- if isinstance(fs.value, list):
- no_namespace = []
- for name in fs.keys():
- if name.find(':') != -1:
- prefix, subname = name.split(':')
- if formvars.has_key('prefix'):
- formvars[prefix].update({subname:fs[name]})
- else:
- formvars[prefix] = {subname:fs[name]}
- else:
- no_namespace.append(name)
- for name in no_namespace:
- if formvars.has_key(name):
- formvars[name].update({'submitted':True})
- else:
- formvars[name] = fs[name]
+
environ['webui.form'] = formvars
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
