funformkit-cvs — CVS commits

[FFK-cvs] FunFormKit Field.py,1.28,1.29

[Kevin J. R. <jus...@us...>]

Update of /cvsroot/funformkit/FunFormKit
In directory sc8-pr-cvs17:/tmp/cvs-serv30196

Modified Files:
	Field.py 
Log Message:
Changed references in Field.py from whrandom to random.
The whrandom module was deprecated in Python2.1 and removed in Python2.5.


Index: Field.py
===================================================================
RCS file: /cvsroot/funformkit/FunFormKit/Field.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Field.py	26 Sep 2003 05:42:18 -0000	1.28
--- Field.py	29 Jul 2007 10:42:45 -0000	1.29
***************
*** 54,58 ****
  import Validator
  import Form
! import time, md5, whrandom, os
  from types import *
  from SimpleHTMLGen import html, Exclude, NoValue
--- 54,58 ----
  import Validator
  import Form
! import time, md5, random, os
  from types import *
  from SimpleHTMLGen import html, Exclude, NoValue
***************
*** 724,728 ****
  
  def _generateSecretKey():
!     return hex(whrandom.randint(0, 0xffff))[2:]
  
  class TextField(Field):
--- 724,728 ----
  
  def _generateSecretKey():
!     return hex(random.randint(0, 0xffff))[2:]
  
  class TextField(Field):

[FFK-cvs] FunFormKit Form.py,1.17,1.18

[<el...@us...>]

Update of /cvsroot/funformkit/FunFormKit
In directory sc8-pr-cvs1:/tmp/cvs-serv24319

Modified Files:
	Form.py 
Log Message:
Changed formID generation function to assign and track formIDs based on servlet URL so that formIDs are no longer sensitive to instantiation order.

Index: Form.py
===================================================================
RCS file: /cvsroot/funformkit/FunFormKit/Form.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Form.py	11 Feb 2003 07:52:09 -0000	1.17
--- Form.py	26 Sep 2003 05:59:22 -0000	1.18
***************
*** 498,508 ****
      
  
! nameCount = 1
  nameCountLock = threading.Lock()
! def getName():
      global nameCount, nameCountLock
      nameCountLock.acquire()
!     name = 'form%i' % nameCount
!     nameCount = nameCount + 1
      nameCountLock.release()
      return name
--- 498,511 ----
      
  
! nameCount = {}
  nameCountLock = threading.Lock()
! def getName(servletName):
      global nameCount, nameCountLock
      nameCountLock.acquire()
!     if servletName in nameCount:
!         nameCount[servletName] += 1
!     else:
!         nameCount[servletName] = 1
!     name = '%s%i' % (servletName, nameCount[servletName])
      nameCountLock.release()
      return name
***************
*** 540,544 ****
          self._handlerServletURL = handlerServletURL
          if not name:
!             name = getName()
          self._name = name
          self._method = method
--- 543,547 ----
          self._handlerServletURL = handlerServletURL
          if not name:
!             name = getName(handlerServletURL)
          self._name = name
          self._method = method

[FFK-cvs] FunFormKit Field.py,1.27,1.28

[<el...@us...>]

Update of /cvsroot/funformkit/FunFormKit
In directory sc8-pr-cvs1:/tmp/cvs-serv21781

Modified Files:
	Field.py 
Log Message:
Patched SelectField to show labels instead of values when field is static

Index: Field.py
===================================================================
RCS file: /cvsroot/funformkit/FunFormKit/Field.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Field.py	1 Apr 2003 00:29:07 -0000	1.27
--- Field.py	26 Sep 2003 05:42:18 -0000	1.28
***************
*** 1057,1060 ****
--- 1057,1078 ----
                 for key, value in selections]))
  
+     def htWidget(self, default, options, nameMap=identity):
+         if options.get("static"):
+             selections = options.get("selections")
+             if selections:
+                 f = filter(lambda x: x[0] == default, selections)
+                 if f:
+                     dispVal = f[0][1]
+                 else:
+                     dispVal = ""
+             else:
+                 dispVal = default
+             return htmlEncode(dispVal) + \
+                    self.htHidden(default, options, nameMap=nameMap)
+         elif options.get("hide"):
+             return self.htHidden(default, options, nameMap=nameMap)
+         else:
+             return self.htInput(default, options, nameMap=nameMap)
+ 
      def selected(self, key, default):
          if not self._dynamic and self._encodedKeys.has_key(key):

[FFK-cvs] FunFormKit Field.py,1.26,1.27

[<el...@us...>]

Update of /cvsroot/funformkit/FunFormKit
In directory sc8-pr-cvs1:/tmp/cvs-serv25868

Modified Files:
	Field.py 
Log Message:
Fixed JavaScript to generate confirm dialog box in SubmitButton. Submitted by Luke Opperman, closes #660078

Index: Field.py
===================================================================
RCS file: /cvsroot/funformkit/FunFormKit/Field.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Field.py	31 Mar 2003 00:07:15 -0000	1.26
--- Field.py	1 Apr 2003 00:29:07 -0000	1.27
***************
*** 594,598 ****
      def htInput(self, default, options, nameMap=identity):
          if self._confirm:
!             query = ' onClick="return window.confirm(\'%s\')"' % htmlEncode(javascriptQuote(self._confirm))
          else:
              query = Exclude
--- 594,599 ----
      def htInput(self, default, options, nameMap=identity):
          if self._confirm:
!             query = ' return window.confirm(\'%s\')' % \
!                 htmlEncode(javascriptQuote(self._confirm))
          else:
              query = Exclude

[FFK-cvs] FunFormKit SimpleHTMLGen.py,1.4,1.5

[<el...@us...>]

Update of /cvsroot/funformkit/FunFormKit
In directory sc8-pr-cvs1:/tmp/cvs-serv26193

Modified Files:
	SimpleHTMLGen.py 
Log Message:
Modified SimpleHTMLGen.py to have a space before closing /> tags to improve compatibility with older browsers as per #711869 and #712002

Index: SimpleHTMLGen.py
===================================================================
RCS file: /cvsroot/funformkit/FunFormKit/SimpleHTMLGen.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SimpleHTMLGen.py	30 Mar 2003 18:58:41 -0000	1.4
--- SimpleHTMLGen.py	31 Mar 2003 00:20:57 -0000	1.5
***************
*** 108,114 ****
      if not args and emptyTags.has_key(tag):
          if blockTags.has_key(tag):
!             return "<%s%s/>\n" % (tag, "".join(htmlArgs))
          else:
!             return "<%s%s/>" % (tag, "".join(htmlArgs))
      else:
          if blockTags.has_key(tag):
--- 108,114 ----
      if not args and emptyTags.has_key(tag):
          if blockTags.has_key(tag):
!             return "<%s%s />\n" % (tag, "".join(htmlArgs))
          else:
!             return "<%s%s />" % (tag, "".join(htmlArgs))
      else:
          if blockTags.has_key(tag):

[FFK-cvs] FunFormKit Field.py,1.25,1.26

[<el...@us...>]

Update of /cvsroot/funformkit/FunFormKit
In directory sc8-pr-cvs1:/tmp/cvs-serv20350

Modified Files:
	Field.py 
Log Message:
Changed class names of TextareaField and TextareaFileField to TextAreaField and TextAreaFileField to match docs and expectations. Closes #690230

Index: Field.py
===================================================================
RCS file: /cvsroot/funformkit/FunFormKit/Field.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Field.py	30 Mar 2003 19:09:53 -0000	1.25
--- Field.py	31 Mar 2003 00:07:15 -0000	1.26
***************
*** 746,750 ****
              size=self._size)
  
! class TextareaField(Field):
  
      def __init__(self, name, rows=10, cols=60, wrap="SOFT", **kw):
--- 746,750 ----
              size=self._size)
  
! class TextAreaField(Field):
  
      def __init__(self, name, rows=10, cols=60, wrap="SOFT", **kw):
***************
*** 1600,1604 ****
              return field
  
! class TextareaFileField(TextareaField):
      """
      A textarea field that also has a file upload button -- unlike just
--- 1600,1604 ----
              return field
  
! class TextAreaFileField(TextAreaField):
      """
      A textarea field that also has a file upload button -- unlike just

[FFK-cvs] FunFormKit Field.py,1.24,1.25

[<el...@us...>]

Update of /cvsroot/funformkit/FunFormKit
In directory sc8-pr-cvs1:/tmp/cvs-serv2113

Modified Files:
	Field.py 
Log Message:
Fixed SubmitButton to accept and allow special characters like '>' in description. Submitted by Max Ischenko <ma...@ma...>

Index: Field.py
===================================================================
RCS file: /cvsroot/funformkit/FunFormKit/Field.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Field.py	30 Mar 2003 18:58:41 -0000	1.24
--- Field.py	30 Mar 2003 19:09:53 -0000	1.25
***************
*** 615,618 ****
--- 615,621 ----
          return fields.has_key(nameMap(self.name()))
  
+     def description(self):
+         return self._description
+ 
      def isSubmit(self, options={}):
          return True

[FFK-cvs] FunFormKit SimpleHTMLGen.py,1.3,1.4 Field.py,1.23,1.24

[<el...@us...>]

Update of /cvsroot/funformkit/FunFormKit
In directory sc8-pr-cvs1:/tmp/cvs-serv27447

Modified Files:
	SimpleHTMLGen.py Field.py 
Log Message:
Changed SimpleHTMLGen and Field.py to properly support static option. Also changed CheckboxField to return 1 and 0 instead of 'on' and 0. Behavior now matchs docs and expectations.

Index: SimpleHTMLGen.py
===================================================================
RCS file: /cvsroot/funformkit/FunFormKit/SimpleHTMLGen.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SimpleHTMLGen.py	29 Oct 2002 05:21:49 -0000	1.3
--- SimpleHTMLGen.py	30 Mar 2003 18:58:41 -0000	1.4
***************
*** 96,102 ****
      if type(args) not in (type(()), type([])):
          args = (args,)
!     htmlArgs = [' %s="%s"' % (attrEncode(attr), htmlEncode(value))
!                 for attr, value in kw.items()
!                 if value is not Exclude]
      if not args and emptyTags.has_key(tag):
          if blockTags.has_key(tag):
--- 96,109 ----
      if type(args) not in (type(()), type([])):
          args = (args,)
!     #htmlArgs = [' %s="%s"' % (attrEncode(attr), htmlEncode(value))
!     #            for attr, value in kw.items()
!     #            if value is not Exclude]
!     htmlArgs = []
!     for attr, value in kw.items():
!         if value is Exclude: continue
!         if value is NoValue:
!             htmlArgs.append(' %s' % attrEncode(attr))
!         else:
!             htmlArgs.append(' %s="%s"' % (attrEncode(attr), htmlEncode(value)))
      if not args and emptyTags.has_key(tag):
          if blockTags.has_key(tag):
***************
*** 139,142 ****
--- 146,152 ----
  
  class Exclude:
+     pass
+ 
+ class NoValue:
      pass
  

Index: Field.py
===================================================================
RCS file: /cvsroot/funformkit/FunFormKit/Field.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Field.py	30 Mar 2003 17:25:31 -0000	1.23
--- Field.py	30 Mar 2003 18:58:41 -0000	1.24
***************
*** 56,60 ****
  import time, md5, whrandom, os
  from types import *
! from SimpleHTMLGen import html, Exclude
  
  class NotImplementedError(Exception): pass
--- 56,60 ----
  import time, md5, whrandom, os
  from types import *
! from SimpleHTMLGen import html, Exclude, NoValue
  
  class NotImplementedError(Exception): pass
***************
*** 1290,1293 ****
--- 1290,1332 ----
              out.write(html.br())
  
+     def htHidden(self, default, options, nameMap=identity):
+         """The HTML for a hidden input (<input type="hidden">)
+         This should be overridden if you override valueFromFields()"""
+         id = 0
+         out = ""
+         selections = options["selections"]
+         static = options.get("static")
+         if static:
+             flag = NoValue
+         for key, value in selections:
+             id = id + 1
+             if static:
+                 out += html.input.checkbox(
+                     name=nameMap(self.name()), 
+                     disabled = flag,
+                     id="%s_%2i" % (nameMap(self.name()), id),
+                     value=self.encode(key),
+                     checked=self.selected(key, default) and "checked" \
+                         or Exclude)
+                 out += html.label(
+                     " " + htmlEncode(value),
+                     for_="%s_%2i" % (nameMap(self.name()), id))
+             if self.selected(key, default):
+                 out += html.input.hidden(
+                     name=nameMap(self.name()), 
+                     id="%s_%2i" % (nameMap(self.name()), id),
+                     value=self.encode(key))
+             out += html.br()
+         return out
+ 
+     def htWidget(self, default, options, nameMap=identity):
+         if options.get("static"):
+             return self.htHidden(default, options, nameMap=nameMap)
+         elif options.get("hide"):
+             return self.htHidden(default, options, nameMap=nameMap)
+         else:
+             return self.htInput(default, options, nameMap=nameMap)
+ 
+ 
  class CheckboxField(Field):
  
***************
*** 1298,1307 ****
  
      def valueFromFields(self, fields, nameMap=identity):
!         return fields.get(nameMap(self.name()), False)
  
      def htHidden(self, default, options, nameMap=identity):
!         if default: value="checked"
!         else: value=""
!         return html.input.hidden(name=nameMap(self.name()), value=value)
  
  class DateField(Field):
--- 1337,1362 ----
  
      def valueFromFields(self, fields, nameMap=identity):
!         return fields.get(nameMap(self.name()), False) == "on"
  
+     def htWidget(self, default, options, nameMap=identity):
+         if options.get("static"):
+             return self.htHidden(default, options, nameMap=nameMap) + \
+                 self.htHidden(default, {}, nameMap=nameMap)    
+         elif options.get("hide"):
+             return self.htHidden(default, options, nameMap=nameMap)
+         else:
+             return self.htInput(default, options, nameMap=nameMap)
+     
      def htHidden(self, default, options, nameMap=identity):
!         if default:
!             value = "on"
!         else:
!             value = ""
!         if options.get("static"):
!             return html.input.checkbox(disabled=NoValue,
!                 name=nameMap(self.name()),
!                 checked = default and "checked" or Exclude)
!         else:
!             return html.input.hidden(name=nameMap(self.name()), value=value)
  
  class DateField(Field):

[FFK-cvs] FunFormKit/Docs UserGuide.txt,1.4,1.5

[<ian...@us...>]

Update of /cvsroot/funformkit/FunFormKit/Docs
In directory sc8-pr-cvs1:/tmp/cvs-serv16871/Docs

Modified Files:
	UserGuide.txt 
Log Message:
Per Luke O.'s suggestion, image submits now take options for the images,
small bug fix in same, docs.


Index: UserGuide.txt
===================================================================
RCS file: /cvsroot/funformkit/FunFormKit/Docs/UserGuide.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** UserGuide.txt	11 Feb 2003 07:31:48 -0000	1.4
--- UserGuide.txt	30 Mar 2003 17:25:31 -0000	1.5
***************
*** 523,527 ****
  an image.  Instead of using ``description`` for the text, you
  pass the arguments ``imgSrc`` (the URL of the image), ``imgWidth``,
! ``imgHeight``, and ``border``.
  
  HiddenField
--- 523,528 ----
  an image.  Instead of using ``description`` for the text, you
  pass the arguments ``imgSrc`` (the URL of the image), ``imgWidth``,
! ``imgHeight``, and ``border``.  ``imgSrc``, ``imgWidth``, and
! ``imgHeight`` are also all options.
  
  HiddenField

[FFK-cvs] FunFormKit Field.py,1.22,1.23

[<ian...@us...>]

Update of /cvsroot/funformkit/FunFormKit
In directory sc8-pr-cvs1:/tmp/cvs-serv16871

Modified Files:
	Field.py 
Log Message:
Per Luke O.'s suggestion, image submits now take options for the images,
small bug fix in same, docs.


Index: Field.py
===================================================================
RCS file: /cvsroot/funformkit/FunFormKit/Field.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Field.py	11 Feb 2003 07:52:08 -0000	1.22
--- Field.py	30 Mar 2003 17:25:31 -0000	1.23
***************
*** 637,643 ****
              name=nameMap(self.name()),
              value=self.description(),
!             srg=self._imgSrc,
!             height=self._imgHeight,
!             width=self._imgWidth,
              border=self._border)
  
--- 637,646 ----
              name=nameMap(self.name()),
              value=self.description(),
!             src=self.option('imgSrc', options=options,
!                             default=self._imgSrc),
!             height=self.option('imgHeight', options=options,
!                                default=self._imgHeight),
!             width=self.option('imgWidth', options=options,
!                               default=self._imgWidth),
              border=self._border)
  

[FFK-cvs] FunFormKit/Docs NEWS,1.2,1.3 TODO,1.2,1.3 QuickStart.html,1.5,NONE Tips.html,1.1,NONE UserGuide.html,1.3,NONE

[<ian...@us...>]

Update of /cvsroot/funformkit/FunFormKit/Docs
In directory sc8-pr-cvs1:/tmp/cvs-serv15689

Modified Files:
	NEWS TODO 
Removed Files:
	QuickStart.html Tips.html UserGuide.html 
Log Message:
Got rid of derivative HTML files


Index: NEWS
===================================================================
RCS file: /cvsroot/funformkit/FunFormKit/Docs/NEWS,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NEWS	24 Oct 2002 04:57:12 -0000	1.2
--- NEWS	30 Mar 2003 17:22:29 -0000	1.3
***************
*** 1,2 ****
--- 1,6 ----
+ 0.4.1:
+ * Removed some very minor Webware dependencies
+ * Several bugs fixed by Edmund Lian
+ 
  0.4.0:
  * All new thorough documentation.

Index: TODO
===================================================================
RCS file: /cvsroot/funformkit/FunFormKit/Docs/TODO,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TODO	24 Oct 2002 04:57:12 -0000	1.2
--- TODO	30 Mar 2003 17:22:30 -0000	1.3
***************
*** 1,3 ****
! FunFormKit v0.4.0
  
  Here's what I still want to do:
--- 1,3 ----
! FunFormKit v0.4.1
  
  Here's what I still want to do:

--- QuickStart.html DELETED ---

--- Tips.html DELETED ---

--- UserGuide.html DELETED ---

[FFK-cvs] FunFormKit/Docs default.css,1.1,1.2

[<ian...@us...>]

Update of /cvsroot/funformkit/FunFormKit/Docs
In directory sc8-pr-cvs1:/tmp/cvs-serv15365

Modified Files:
	default.css 
Log Message:
style changes


Index: default.css
===================================================================
RCS file: /cvsroot/funformkit/FunFormKit/Docs/default.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** default.css	5 Oct 2002 06:45:44 -0000	1.1
--- default.css	30 Mar 2003 17:21:48 -0000	1.2
***************
*** 9,12 ****
--- 9,25 ----
  */
  
+ body {
+   background-color: #eeeeee;
+   font-family: Arial, sans-serif;
+ }
+ 
+ em {
+   font-family: Times New Roman, Times, serif;
+ }
+ 
+ li {
+   list-style-type: circle;
+ }
+ 
  a.target {
    color: blue }
***************
*** 16,19 ****
--- 29,42 ----
    color: black }
  
+ a:hover {
+   background-color: #cccccc;
+ }
+ 
+ cite {
+   font-style: normal;
+   font-family: monospace;
+   font-weight: bold;
+ }
+ 
  dd {
    margin-bottom: 0.5em }
***************
*** 28,34 ****
  div.attention, div.caution, div.danger, div.error, div.hint,
  div.important, div.note, div.tip, div.warning {
!   margin: 2em ;
!   border: medium outset ;
!   padding: 1em }
  
  div.attention p.admonition-title, div.caution p.admonition-title,
--- 51,61 ----
  div.attention, div.caution, div.danger, div.error, div.hint,
  div.important, div.note, div.tip, div.warning {
!   // margin: 2em ;
!   background-color: #cccccc;
!   align: center;
!   //width: 60%;
!   // border: medium outset ;
!   padding: 3px;
!  }
  
  div.attention p.admonition-title, div.caution p.admonition-title,
***************
*** 37,46 ****
    color: red ;
    font-weight: bold ;
!   font-family: sans-serif }
  
  div.hint p.admonition-title, div.important p.admonition-title,
  div.note p.admonition-title, div.tip p.admonition-title {
    font-weight: bold ;
!   font-family: sans-serif }
  
  div.dedication {
--- 64,75 ----
    color: red ;
    font-weight: bold ;
!   font-family: sans-serif;
!   text-align: center }
  
  div.hint p.admonition-title, div.important p.admonition-title,
  div.note p.admonition-title, div.tip p.admonition-title {
    font-weight: bold ;
!   font-family: sans-serif;
!   text-align: center }
  
  div.dedication {
***************
*** 77,84 ****
  
  h1, h2, h3, h4, h5, h6 {
!   font-family: Helvetica, Arial, sans-serif }
  
  h1.title {
!   text-align: center }
  
  h2.subtitle {
--- 106,123 ----
  
  h1, h2, h3, h4, h5, h6 {
!   font-family: Helvetica, Arial, sans-serif;
!   border: thin solid black;
!   background-color: #cccccc;
!   -moz-border-radius: 8px;
!   padding: 4px;
!  }
  
  h1.title {
!   text-align: center;
!   background-color: #444499;
!   color: #eeeeee;
!   border: medium solid black;
!   -moz-border-radius: 20px;
!  }
  
  h2.subtitle {
***************
*** 135,139 ****
    margin-left: 2em ;
    margin-right: 2em ;
!   background-color: #eeeeee }
  
  span.classifier {
--- 174,181 ----
    margin-left: 2em ;
    margin-right: 2em ;
!   background-color: #ffffff;
!   border: thin black solid;
!   padding: 5px;
! }
  
  span.classifier {
***************
*** 188,193 ****
    font-size: 100% }
  
! /* tt {
!   background-color: #eeeeee } */
  
  ul.auto-toc {
--- 230,236 ----
    font-size: 100% }
  
! tt {
!   //background-color: #eeeeee;
!   color: #000066 }
  
  ul.auto-toc {

[FFK-cvs] FunFormKit/Docs .cvsignore,NONE,1.1

[<ian...@us...>]

Update of /cvsroot/funformkit/FunFormKit/Docs
In directory sc8-pr-cvs1:/tmp/cvs-serv14894/Docs

Added Files:
	.cvsignore 
Log Message:
cvsignore


--- NEW FILE: .cvsignore ---
*.html

[FFK-cvs] FunFormKit/Examples .cvsignore,NONE,1.1

[<ian...@us...>]

Update of /cvsroot/funformkit/FunFormKit/Examples
In directory sc8-pr-cvs1:/tmp/cvs-serv14894/Examples

Added Files:
	.cvsignore 
Log Message:
cvsignore


--- NEW FILE: .cvsignore ---
*.pyc *.pyo

[FFK-cvs] FunFormKit .cvsignore,NONE,1.1

[<ian...@us...>]

Update of /cvsroot/funformkit/FunFormKit
In directory sc8-pr-cvs1:/tmp/cvs-serv14894

Added Files:
	.cvsignore 
Log Message:
cvsignore


--- NEW FILE: .cvsignore ---
*.pyc *.pyo