[Zope3-checkins] CVS: Zope3/src/zope/app/browser/skins/rotterdam - configure.zcml:1.12.14.1 standardmacros.py:1.1.28.1 zope3.css:1.19.10.1 folder_contents.pt:NONE

Grégoire Weber zope@i-con.ch
Sun, 22 Jun 2003 10:24:20 -0400


Update of /cvs-repository/Zope3/src/zope/app/browser/skins/rotterdam
In directory cvs.zope.org:/tmp/cvs-serv24874/src/zope/app/browser/skins/rotterdam

Modified Files:
      Tag: cw-mail-branch
	configure.zcml standardmacros.py zope3.css 
Removed Files:
      Tag: cw-mail-branch
	folder_contents.pt 
Log Message:
Synced up with HEAD

=== Zope3/src/zope/app/browser/skins/rotterdam/configure.zcml 1.12 => 1.12.14.1 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/configure.zcml:1.12	Fri Apr 11 18:15:46 2003
+++ Zope3/src/zope/app/browser/skins/rotterdam/configure.zcml	Sun Jun 22 10:22:49 2003
@@ -76,16 +76,6 @@
     template="dialog_macros.pt" />
 
 <browser:page
-    name="contents.html"
-    for="zope.app.interfaces.content.folder.IFolder"
-    permission="zope.ManageContent"
-    layer="rotterdam"
-    class="zope.app.browser.container.contents.Contents"
-    template="folder_contents.pt"
-    usage="objectview"
-    />
-
-<browser:page
     permission="zope.Public"
     allowed_interface="zope.app.interfaces.browser.form.IBrowserWidget"
     for="zope.schema.interfaces.ISourceText"


=== Zope3/src/zope/app/browser/skins/rotterdam/standardmacros.py 1.1 => 1.1.28.1 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/standardmacros.py:1.1	Thu Dec 26 15:20:48 2002
+++ Zope3/src/zope/app/browser/skins/rotterdam/standardmacros.py	Sun Jun 22 10:22:49 2003
@@ -1,8 +1,22 @@
+##############################################################################
+#
+# Copyright (c) 2003 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""
+$Id$
+"""
 from zope.app.browser.skins.basic.standardmacros import StandardMacros
 
 BaseMacros = StandardMacros
 
 class StandardMacros(BaseMacros):
-    __implements__ = BaseMacros.__implements__
     macro_pages = ('skin_macros', 'view_macros', 'dialog_macros')
-


=== Zope3/src/zope/app/browser/skins/rotterdam/zope3.css 1.19 => 1.19.10.1 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/zope3.css:1.19	Thu May  1 17:41:55 2003
+++ Zope3/src/zope/app/browser/skins/rotterdam/zope3.css	Sun Jun 22 10:22:49 2003
@@ -511,6 +511,15 @@
     text-decoration: underline;
 }
 
+/* Style for page error divs.  Use this for displaying errors for a
+   page as a whole.
+ */
+div.page_error { 
+    background: #FFCE7B; 
+    font: bold 80% Verdana, Helvetica, Arial, sans-serif; 
+    padding: 0.5em 1em; 
+    vertical-align: middle; 
+}
 
 
 

=== Removed File Zope3/src/zope/app/browser/skins/rotterdam/folder_contents.pt ===