[Checkins] SVN: grokui.base/branches/0.2/ try to fix the dependencies for the 0.2.x maintenance branch

Fri May 28 06:52:05 EDT 2010

Log message for revision 112789:
  try to fix the dependencies for the 0.2.x maintenance branch

Changed:
  U   grokui.base/branches/0.2/CHANGES.txt
  U   grokui.base/branches/0.2/LICENSE.txt
  U   grokui.base/branches/0.2/src/grokui/base/layout.py
  A   grokui.base/branches/0.2/src/grokui/base/layout_templates/
  A   grokui.base/branches/0.2/src/grokui/base/layout_templates/grokuilayout.pt
  D   grokui.base/branches/0.2/src/grokui/base/templates/grokuilayout.pt

-=-
Modified: grokui.base/branches/0.2/CHANGES.txt
===================================================================

--- grokui.base/branches/0.2/CHANGES.txt	2010-05-28 10:47:28 UTC (rev 112788)
+++ grokui.base/branches/0.2/CHANGES.txt	2010-05-28 10:52:05 UTC (rev 112789)
@@ -1,6 +1,19 @@
 CHANGES
 *******
 
+0.2.2 (unreleased)
+==================
+
+* Fix dependencies that got removed too early for this version.
+
+0.2.1 (2010-05-19)
+==================
+
+* Package modified to comply with repository policy (license, etc.).
+
+* Use own template dir for layout module in order not to provoke
+  (erraneous) warnings of template registry.
+
 0.2 (2010-03-06)
 ================
 

Modified: grokui.base/branches/0.2/LICENSE.txt
===================================================================
--- grokui.base/branches/0.2/LICENSE.txt	2010-05-28 10:47:28 UTC (rev 112788)
+++ grokui.base/branches/0.2/LICENSE.txt	2010-05-28 10:52:05 UTC (rev 112789)
@@ -1,54 +1,45 @@
 Zope Public License (ZPL) Version 2.1
 -------------------------------------
 
-A copyright notice accompanies this license document that
-identifies the copyright holders.
+A copyright notice accompanies this license document that identifies the
+copyright holders.
 
-This license has been certified as open source. It has also
-been designated as GPL compatible by the Free Software
-Foundation (FSF).
+This license has been certified as open source. It has also been designated as
+GPL compatible by the Free Software Foundation (FSF).
 
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-1. Redistributions in source code must retain the
-   accompanying copyright notice, this list of conditions,
-   and the following disclaimer.
+1. Redistributions in source code must retain the accompanying copyright
+notice, this list of conditions, and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the accompanying
-   copyright notice, this list of conditions, and the
-   following disclaimer in the documentation and/or other
-   materials provided with the distribution.
+2. Redistributions in binary form must reproduce the accompanying copyright
+notice, this list of conditions, and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
 
-3. Names of the copyright holders must not be used to
-   endorse or promote products derived from this software
-   without prior written permission from the copyright
-   holders.
+3. Names of the copyright holders must not be used to endorse or promote
+products derived from this software without prior written permission from the
+copyright holders.
 
-4. The right to distribute this software or to use it for
-   any purpose does not give you the right to use
-   Servicemarks (sm) or Trademarks (tm) of the copyright
-   holders. Use of them is covered by separate agreement
-   with the copyright holders.
+4. The right to distribute this software or to use it for any purpose does not
+give you the right to use Servicemarks (sm) or Trademarks (tm) of the
+copyright
+holders. Use of them is covered by separate agreement with the copyright
+holders.
 
-5. If any files are modified, you must cause the modified
-   files to carry prominent notices stating that you changed
-   the files and the date of any change.
+5. If any files are modified, you must cause the modified files to carry
+prominent notices stating that you changed the files and the date of any
+change.
 
 Disclaimer
 
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
-  AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-  NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
-  NO EVENT SHALL THE COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-  DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: grokui.base/branches/0.2/src/grokui/base/layout.py
===================================================================
--- grokui.base/branches/0.2/src/grokui/base/layout.py	2010-05-28 10:47:28 UTC (rev 112788)
+++ grokui.base/branches/0.2/src/grokui/base/layout.py	2010-05-28 10:52:05 UTC (rev 112789)
@@ -8,7 +8,6 @@
 from zope.traversing.browser.absoluteurl import absoluteURL
 
 grok.layer(GrokUILayer)
-grok.templatedir("templates")
 
 
 class GrokUILayout(Layout):

Added: grokui.base/branches/0.2/src/grokui/base/layout_templates/grokuilayout.pt
===================================================================
--- grokui.base/branches/0.2/src/grokui/base/layout_templates/grokuilayout.pt	                        (rev 0)
+++ grokui.base/branches/0.2/src/grokui/base/layout_templates/grokuilayout.pt	2010-05-28 10:52:05 UTC (rev 112789)
@@ -0,0 +1,25 @@
+<html xmlns="http://www.w3.org/1999/xhtml" i18n:domain="zope">
+  <head>
+    <title tal:content="layout/title" />
+    <base tal:attributes="href layout/baseurl" />
+    <link rel="stylesheet" type="text/css" 
+	  tal:attributes="href static/grok.css" />
+    <link rel="shortcut icon" type="image/x-icon"
+	  tal:attributes="href static/favicon.ico" />
+  </head>
+  <body>
+    <div id="grokui-page">
+      <div id="grokui-header"
+	   tal:content="structure provider:grokui_header" />
+
+      <div id="grokui-messages"
+	   tal:content="structure provider:grokui_messages" />
+
+      <div id="grokui-content"
+	   tal:content="structure view/content" />
+
+      <div id="grokui-footer"
+	   tal:content="structure provider:grokui_footer" />
+    </div>
+  </body>
+</html>

Deleted: grokui.base/branches/0.2/src/grokui/base/templates/grokuilayout.pt
===================================================================
--- grokui.base/branches/0.2/src/grokui/base/templates/grokuilayout.pt	2010-05-28 10:47:28 UTC (rev 112788)
+++ grokui.base/branches/0.2/src/grokui/base/templates/grokuilayout.pt	2010-05-28 10:52:05 UTC (rev 112789)
@@ -1,25 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" i18n:domain="zope">
-  <head>
-    <title tal:content="layout/title" />
-    <base tal:attributes="href layout/baseurl" />
-    <link rel="stylesheet" type="text/css" 
-	  tal:attributes="href static/grok.css" />
-    <link rel="shortcut icon" type="image/x-icon"
-	  tal:attributes="href static/favicon.ico" />
-  </head>
-  <body>
-    <div id="grokui-page">
-      <div id="grokui-header"
-	   tal:content="structure provider:grokui_header" />
-
-      <div id="grokui-messages"
-	   tal:content="structure provider:grokui_messages" />
-
-      <div id="grokui-content"
-	   tal:content="structure view/content" />
-
-      <div id="grokui-footer"
-	   tal:content="structure provider:grokui_footer" />
-    </div>
-  </body>
-</html>

