%(title)s

From 446067f586074249eff00fee4405d3fc82a20c30 Mon Sep 17 00:00:00 2001 From: richard Date: Thu, 21 Feb 2002 06:23:00 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@646 57a73879-2fb5-44c3-a270-3262357dd7e2 --- roundup/cgi_client.py | 34 ++++++++++++++++++---------------- roundup/htmltemplate.py | 14 ++++++++++++-- tools/.cvsignore | 3 +++ 3 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 tools/.cvsignore diff --git a/roundup/cgi_client.py b/roundup/cgi_client.py index 164a252..f816a47 100644 --- a/roundup/cgi_client.py +++ b/roundup/cgi_client.py @@ -15,7 +15,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: cgi_client.py,v 1.105 2002-02-20 05:52:10 richard Exp $ +# $Id: cgi_client.py,v 1.106 2002-02-21 06:23:00 richard Exp $ __doc__ = """ WWW request handler (also used in the stand-alone server). @@ -52,6 +52,11 @@ class Client: self.env = env self.path = env['PATH_INFO'] self.split_path = self.path.split('/') + url = self.env['SCRIPT_NAME'] + '/' + machine = self.env['SERVER_NAME'] + port = self.env['SERVER_PORT'] + if port != '80': machine = machine + ':' + port + self.base = urlparse.urlunparse(('http', machine, url, None,None,None)) if form is None: self.form = cgi.FieldStorage(environ=env) @@ -80,7 +85,7 @@ class Client: if self.debug: self.headers_sent = headers - single_submit_script = ''' + global_javascript = ''' ''' def pagehead(self, title, message=None): - url = self.env['SCRIPT_NAME'] + '/' - machine = self.env['SERVER_NAME'] - port = self.env['SERVER_PORT'] - if port != '80': machine = machine + ':' + port - base = urlparse.urlunparse(('http', machine, url, None, None, None)) if message is not None: message = _('

%(message)s

')%locals() else: @@ -127,12 +131,12 @@ function submit_once() { ''') else: add_links = '' - single_submit_script = self.single_submit_script + global_javascript = self.global_javascript%self.__dict__ self.write(_(''' %(title)s -%(single_submit_script)s +%(global_javascript)s %(message)s @@ -1160,11 +1164,6 @@ class ExtendedClient(Client): default_index_filterspec = {'status': ['1', '2', '3', '4', '5', '6', '7']} def pagehead(self, title, message=None): - url = self.env['SCRIPT_NAME'] + '/' #self.env.get('PATH_INFO', '/') - machine = self.env['SERVER_NAME'] - port = self.env['SERVER_PORT'] - if port != '80': machine = machine + ':' + port - base = urlparse.urlunparse(('http', machine, url, None, None, None)) if message is not None: message = _('

%(message)s

')%locals() else: @@ -1194,12 +1193,12 @@ class ExtendedClient(Client): ''') else: add_links = '' - single_submit_script = self.single_submit_script + global_javascript = self.global_javascript%self.__dict__ self.write(_('''%(title)s -%(single_submit_script)s +%(global_javascript)s %(message)s

@@ -1299,6 +1298,9 @@ def parsePropsFromForm(db, cl, form, nodeid=0): # # $Log: not supported by cvs2svn $ +# Revision 1.105 2002/02/20 05:52:10 richard +# better error handling +# # Revision 1.104 2002/02/20 05:45:17 richard # Use the csv module for generating the form entry so it's correct. # [also noted the sf.net feature request id in the change log] diff --git a/roundup/htmltemplate.py b/roundup/htmltemplate.py index 92c0937..bd28ddc 100644 --- a/roundup/htmltemplate.py +++ b/roundup/htmltemplate.py @@ -15,7 +15,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: htmltemplate.py,v 1.77 2002-02-20 05:05:29 richard Exp $ +# $Id: htmltemplate.py,v 1.78 2002-02-21 06:23:00 richard Exp $ __doc__ = """ Template engine. @@ -655,7 +655,11 @@ class TemplateFunctions: else: return _('[Submit: not called from item]') - + def do_classhelp(self, classname, colums): + '''pop up a javascript window with class help + ''' + return '(?)'%(classname, columns) # # INDEX TEMPLATES # @@ -1077,6 +1081,12 @@ class NewItemTemplate(TemplateFunctions): # # $Log: not supported by cvs2svn $ +# Revision 1.77 2002/02/20 05:05:29 richard +# . Added simple editing for classes that don't define a templated interface. +# - access using the admin "class list" interface +# - limited to admin-only +# - requires the csv module from object-craft (url given if it's missing) +# # Revision 1.76 2002/02/16 09:10:52 richard # oops # diff --git a/tools/.cvsignore b/tools/.cvsignore new file mode 100644 index 0000000..23e56ac --- /dev/null +++ b/tools/.cvsignore @@ -0,0 +1,3 @@ +*.pyc +localconfig.py +build -- 2.30.2