[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r9055 - in trunk/gnue-forms/src/uidrivers/html: . widgets
|
From: |
jan |
|
Subject: |
[gnue] r9055 - in trunk/gnue-forms/src/uidrivers/html: . widgets |
|
Date: |
Mon, 20 Nov 2006 08:28:35 -0600 (CST) |
Author: jan
Date: 2006-11-20 08:28:32 -0600 (Mon, 20 Nov 2006)
New Revision: 9055
Modified:
trunk/gnue-forms/src/uidrivers/html/GFServer.py
trunk/gnue-forms/src/uidrivers/html/Generator.py
trunk/gnue-forms/src/uidrivers/html/widgets/_base.py
trunk/gnue-forms/src/uidrivers/html/widgets/form.py
Log:
Fix charset issues for content
Modified: trunk/gnue-forms/src/uidrivers/html/GFServer.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/GFServer.py 2006-11-20 13:02:26 UTC
(rev 9054)
+++ trunk/gnue-forms/src/uidrivers/html/GFServer.py 2006-11-20 14:28:32 UTC
(rev 9055)
@@ -39,6 +39,7 @@
from UISplashScreen import SplashScreen
from gnue.forms.GFInstance import GFInstance
from gnue.common.apps import GConfig, errors
+from gnue.forms.uidrivers.html.common import textEncode, textDecode
from types import UnicodeType
@@ -231,10 +232,11 @@
uuid=self.path[9:41]
# FIXME: Use standart argument parser
arg_list = self.path[42:].split('&')
+
args = {}
for i in arg_list:
z=i.split('=')
- args[z[0]]=unquote(z[1])
+ args[z[0]]=unquote(z[1]).decode("utf-8")
try:
cmd=args['cmd']
@@ -260,14 +262,14 @@
except:
(group, name, message, detail) = errors.getException()
- message = """<HTML><HEAD></HEAD><BODY><H1>Exception occured!</H1>
+ message = u"""<HTML><HEAD></HEAD><BODY><H1>Exception occured!</H1>
Group: %s<BR>
Name: %s<BR>
Message: %s<BR>
Details: <BR><PRE>%s</PRE></BODY></HTML>
""" % (group, name, message, detail)
self.push_content(message)
- print message
+ print textDecode(message)
# If a shutdown of the connection is requested do so, although we
assume to
# have a persistent connection.
Modified: trunk/gnue-forms/src/uidrivers/html/Generator.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/Generator.py 2006-11-20 13:02:26 UTC
(rev 9054)
+++ trunk/gnue-forms/src/uidrivers/html/Generator.py 2006-11-20 14:28:32 UTC
(rev 9055)
@@ -93,6 +93,7 @@
def build_toolbar(id, content):
return u'<table class="Toolbar"><tr>\n%s\n</tr></table>' % content
+ # FIXME: Use dojotype Toolbar
def build_button(id, label, x, y, width, height):
return u'<input id="%s" type="button" value="%s" %s %s/>\n' % \
@@ -130,6 +131,7 @@
</HTML>""" % (forward_url, VERSION, forward_url)
def build_form(title, header, pages, footer):
+ #FIXME: use "labelPosition" in TabContainer
return u"""<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
<html>
<head>
@@ -212,6 +214,10 @@
elem.focus()
}
}
+ if (item[0]=="set_page") {
+ elem = dojo.widget.getWidgetById(item[2])
+
+ }
if (item[0]=="close") {
// return to main page
window.location="/"
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/_base.py 2006-11-20
13:02:26 UTC (rev 9054)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/_base.py 2006-11-20
14:28:32 UTC (rev 9055)
@@ -280,7 +280,7 @@
self.value = value
else:
self.value = u""
-
+
self._send_update(["set","%s" % self._id,self.value])
def set_sensitive(self, enabled):
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/form.py 2006-11-20 13:02:26 UTC
(rev 9054)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/form.py 2006-11-20 14:28:32 UTC
(rev 9055)
@@ -115,7 +115,7 @@
#
---------------------------------------------------------------------------
def _ui_goto_page_ (self, page):
- self.mainWindow.updates.append(["goto_page","",page])
+ self.mainWindow.updates.append(["goto_page","",page._container._id])
#
---------------------------------------------------------------------------
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r9055 - in trunk/gnue-forms/src/uidrivers/html: . widgets,
jan <=