Changeset 1150

Timestamp:

01/15/08 14:02:46 (4 years ago)

Author:

william

Message:

changes after code review

Location:

Branches/wljohnston/starting_ie/TurtolCMS

Files:

• ConfigProcs.py (modified) (2 diffs)
• Core/__init__.py (modified) (2 diffs)
• TcmsApiRoutines.py (modified) (1 diff)

Branches/wljohnston/starting_ie/TurtolCMS/ConfigProcs.py

@@ -195 +195 @@
   if theme != "NoTheme":
     theme = "/tcms/themes/%s" % theme
+  
+  #dynamically set copyright date
+  import datetime
+  currentYear = datetime.date.today().year
   
   cmds = [ ('Libraries'
@@ -346 +350 @@
 (2, 'en', '<h3>Navigation</h3>\n<ul><li><a href="/">Home Page</a></li><li><a href="http://turtolcms.org">TurtolCMS Project</a></li></li></ul>\n'),
 (3, 'en', '<h3>Help</h3>\n<p>Instructions and tutorials in the use of the TurtolCMS can be found at the <a href="http://turtolcms.org">TurtolCMS project site</a>.</p><p>Hosting for the TurtolCMS can be provided by (who else?) <a href="http://www.turtol.com/">Turtol.</a><br></p>'),
-(4, 'en', '<span class="copyright">TurtolCMS copyright 2006 by Turtol, LLC.</span>'),
+(4, 'en', '<span class="copyright">TurtolCMS copyright %s by Turtol, LLC.</span>'),
 (5, 'en', '<h1>TurtolCMS</h1>'),
 (6, 'en', '<h1>Page Not Found</h1>\n<p>We are Sorry, but the requested page could not be found on our server. Please make sure the requeseted URL is correct</p>'),
-(7, 'en', '<style type="text/css">\n.error{\n    color: red;\n  }\n</style>\n<h1>Forbidden</h1>\n<p class="error">We are sorry but you do not have permission to view the contents  of this page.<br />Please log in and try again</p><br /><br />\n<p>Click<a href="/"> here to go to the HOME page</a></p>') ''')]
+(7, 'en', '<style type="text/css">\n.error{\n    color: red;\n  }\n</style>\n<h1>Forbidden</h1>\n<p class="error">We are sorry but you do not have permission to view the contents  of this page.<br />Please log in and try again</p><br /><br />\n<p>Click<a href="/"> here to go to the HOME page</a></p>') ''' % (currentYear))]
 
 #FIXME: USE AN IMAGE THAT DOESN'T HAVE A WHITE BACK GROUND TO WORK BETTER WITH THEMES

Branches/wljohnston/starting_ie/TurtolCMS/Core/__init__.py

@@ -272 +272 @@
       #query for widgets with the same name on this page (including templates)
       from TurtolCMS.TcmsApiRoutines import _GetLayers
-      existingNameWidgets = ""
-      if self.id == "0":
-        sql = '''select id from tcms_widgets where name=%''' + '''s and page_id in (%s)''' \
-          % ','.join([str(i[0]) for i in _GetLayers(context, pageid)])
-      else: 
-        sql = '''select id from tcms_widgets where name=%''' + '''s and page_id in (%s) and id<>%s''' \
-          % (','.join([str(i[0]) for i in _GetLayers(context, pageid)]), self.id)
-        context.Log("SQL %s" % sql)
-      existingNameWidgets = context.ExecuteSQL(sql, name)
-      if existingNameWidgets:
+      extraSql = ""
+      if self.id != "0":
+        extraSql = '''and id<> %s''' % (self.id)
+      sql = '''select id from tcms_widgets where name=%''' + '''s and page_id in (%s) %s''' \
+          % (','.join([str(i[0]) for i in _GetLayers(context, pageid)]), extraSql)
+      if context.ExecuteSQL(sql, name):
         context.Write("Please enter a unique Widget Name")
         err = "Duplicate Widget Name"
@@ -744 +740 @@
         name = name.rstrip("/")
       #validate that name is not already in use
-      if self._id == "0":
-        existingPages = ctx.ExecuteSQL('''SELECT name FROM tcms_pages WHERE name="%s"''' %(name))
-      else:
-        existingPages = ctx.ExecuteSQL('''SELECT name FROM tcms_pages WHERE name="%s" and id<>"%s"''' % (name, self._id))
-      if existingPages:
+      sql = '''SELECT name FROM tcms_pages WHERE name="%s"''' % name
+      #alter sql if editing
+      if self._id != "0":
+        sql = "%s%s" % (sql, '''and id <>"%s"''' % self._id)
+      if ctx.ExecuteSQL(sql):
         if self._pagetype == "roottemplate" or self._pagetype == "template":
           ctx.Write("Please enter a unique Template Name")

Branches/wljohnston/starting_ie/TurtolCMS/TcmsApiRoutines.py

@@ -416 +416 @@
       self._noFfMessage=""
       if userAgent.lower().find("firefox") < 0:
-        self._noFfMessage = '''The TurtolCMS editor has currently been tested only with the <a href="http://www.getfirefox.net" id='fflink'>Firefox</a> web browser. Using other browsers may lead to unexpected results.'''
+        self._noFfMessage = '''It is currently recommended to use the TurtolCMS editor with the <a href="http://www.getfirefox.net" id='fflink'>Firefox</a> web browser.'''
       self.Write ('''
       <div id="tcms_login">