Changeset 1373 for Trunk

Timestamp:

09/26/09 10:45:22 (3 years ago)

Author:

todd

Message:

fixed: htmlpage doctypes now a more comprehesive data structure;
updated: we now default to the HTML5 doctype;
updated: we now send charset in our headers and embed content-type in a meta-tag on the page;
remove: obsolete Controls directory

Location:

Trunk/TurtolCMS

Files:

• BootStrap/AdminPage.py (modified) (1 diff)
• BootStrap/InitializeCMS.py (modified) (1 diff)
• Controls (deleted)
• Core/Context.py (modified) (1 diff)
• Storage/__init__.py (modified) (1 diff)
• Types/HtmlPage.py (modified) (8 diffs)

Trunk/TurtolCMS/BootStrap/AdminPage.py

@@ -27 +27 @@
     Asset.__init__ (self, '$AdminLayout', ctx, types=['TurtolCMS.Types.HtmlLayout'])
     self['TurtolCMS.Types.HtmlLayout'] = {
-        'docType' : 'xml10trans'
+        'docType' : 'html'
       , 'tcmsLogo' : 'none'
       , 'wrapper' : True

Trunk/TurtolCMS/BootStrap/InitializeCMS.py

@@ -100 +100 @@
 class _InitJs (Asset):
   def __init__ (self, ctx):
+    base = ctx.BaseLocation()
     Asset.__init__ (self, '$_InitJs', ctx, types=['TurtolCMS.Types.Widget', 'TurtolCMS.Types.JsLinkWidget'])
     self['TurtolCMS.Types.Widget'] = { 'position': 50, 'container' : 'head'}
-    # FIXME: need baselocation
-    self['TurtolCMS.Types.JsLinkWidget.target'] = [ '/tcms/js/jquery.blockUI.js'
-                                                  , '/tcms/js/initcms.js'
+    self['TurtolCMS.Types.JsLinkWidget.target'] = [ '%s/tcms/js/jquery.blockUI.js' % base
+                                                  , '%s/tcms/js/initcms.js' % base
                                                   ]
 

Trunk/TurtolCMS/Core/Context.py

@@ -60 +60 @@
     '''
     return self._store.GetAsset (cms=True)
+
+  def BaseLocation (self):
+    return self._params.get ('BaseLocation', '')
 
   def LoadInitModule (self, req):

Trunk/TurtolCMS/Storage/__init__.py

@@ -220 +220 @@
     sessobj = None
     try:
-      sessobj = self.Q(Session).filter_by(Session.key=key).one()
+      sessobj = self.Q(Session).filter_by(Session.key==key).one()
     except MultipleResultsFound, e:
       # should never happen, if this code is right
       # but if it does, let's delete ALL these sessions
-      sesslist = sql.Q(Session).filter_by(Session.key=key).all()
+      sesslist = sql.Q(Session).filter_by(Session.key==key).all()
       for s in sesslist:
         self._session.delete (s)

Trunk/TurtolCMS/Types/HtmlPage.py

@@ -62 +62 @@
     req.write ('\n')
 
+class ContentTypeWidget (Asset):
+  def __init__ (self, charset, ctx):
+    Asset.__init__ (self, '', ctx)
+    self._charset = charset
+    self['TurtolCMS.Types.Widget.position'] = 2
+
+  def Render (self, ctx, req):
+    req.write ('''<meta http-equiv="Content-type" content="text/html;charset=%s" />\n''' % self._charset)
+
 class GeneratorWidget (Asset):
   def __init__ (self, close, ctx):
@@ -90 +99 @@
 
   def Render (self, ctx, req):
-    # FIXME: need baselocation working
-    req.write ('''<div id="tcms_logo"><img src="/tcms/logo.png"/></div>\n''')
+    req.write ('''<div id="tcms_logo"><img src="%s/tcms/logo.png"/></div>\n''' % ctx.BaseLocation())
 
 class HtmlPage (AssetType):
@@ -109 +117 @@
     asset['$.layout'] = asset['parent']
 
+    # Set the asset's doctype
+    asset['$.dtd'] = HtmlPage._DocTypes.get (asset['$.doctype'], None)
+    if asset['$.dtd'] is None:
+      asset['$.dtd'] = HtmlPage._DocTypes.get ('html')
+
     asset['$.layercount'] = 1
     while (asset['$.layout.parent']):
@@ -119 +132 @@
 
     # Calculate our document type
-    asset['$.doctype'] = asset['$.layout'].get ('TurtolCMS.Types.HtmlLayout.docType', 'xml10trans') 
+    asset['$.doctype'] = asset['$.layout'].get ('TurtolCMS.Types.HtmlLayout.docType', 'html') 
       
     # Construct an list of widgets broken down by div
@@ -151 +164 @@
         pass  # TODO: this should be an error, but how to handle?
 
+    # Add the content-type widget
+    divs['head'].addWidget (ContentTypeWidget ('UTF-8', ctx))
     # Add the generator meta widget
-    divs['head'].addWidget (GeneratorWidget (asset['$.doctype'][:3] == 'xml', ctx))
-
+    divs['head'].addWidget (GeneratorWidget (asset['$.dtd'][2], ctx))
     # Add the title widget
     divs['head'].addWidget (TitleWidget (asset['$.title'], ctx))
 
     # gather all our widgets and put them into the divs structure
-    # TODO: collect prereqs from our widgets, reduce and insert into head?
     iLayer = asset['$.layercount']
     layer = asset
@@ -179 +192 @@
   @staticmethod
   def Head (ctx, req, asset):
-    req.SetResponseHeader ('Content-Type', 'text/html')
+    req.SetResponseHeader ('Content-Type', 'text/html; charset=UTF-8')
 
   @staticmethod
@@ -185 +198 @@
     layout = asset['$.layout']
 
-    # Set our doctype
-    dtd = HtmlPage._DocTypes.get (asset['$.doctype'], None)
-    if dtd is None:
-      dtd = HtmlPage._DocTypes.get ('xml10trans')
-    req.write (dtd)
+    # write our dtd
+    req.write (asset['$.dtd'][0])
     
     # Open the html
-    if 'xhtml' in dtd:
-      req.write ('''<html xmlns="http://www.w3.org/1999/xhtml">\n''')
-    else:
-      req.write ('''<html>\n''')
+    req.write (asset['$.dtd'][1])
 
     # render each tagged container
@@ -211 +218 @@
   # Raw data begins here
   #==========================================================================
-  _DocTypes = { 'xml10trans'  : '''<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-                  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd>\n'''
-              , 'xml10strict' : '''<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
-                  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n'''
-              , 'html40strict'  : '''<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-                  "http://www.w3.org/TR/html4/strict.dtd">\n'''
-              , 'html40trans' : '''<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-                  "http://www.w3.org/TR/html4/loose.dtd">\n'''
+  # _DocTypes lists the "types" of documents we can output
+  #  each entry in the dictionary is a tuple of:
+  #   (doctype declaration, html open tag, bool: use xml-style tag closes)
+  _DocTypes = { 'html' : ( '''<!DOCTYPE html>\n'''
+                         , '''<html>\n'''
+                         , False
+                         )
+              , 'xml10trans'  : ( '''<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+                                  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd>\n'''
+                                , '''<html xmlns="http://www.w3.org/1999/xhtml\n'''
+                                , True
+                                )
+              , 'xml10strict' : ( '''<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
+                                  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n'''
+                                , '''<html xmlns="http://www.w3.org/1999/xhtml\n'''
+                                , True
+                                )
+              , 'html40strict'  : ( '''<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+                                    "http://www.w3.org/TR/html4/strict.dtd">\n'''
+                                , '''<html>\n'''
+                                , False
+                                )
+              , 'html40trans' : ( '''<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+                                  "http://www.w3.org/TR/html4/loose.dtd">\n'''
+                                , '''<html>\n'''
+                                , False
+                                )
               }