[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ZMI/www - standard_macros.pt:1.5 zopetopBasic.css:1.2 zopetopStructure.css:1.2 zopetopWidgets.css:1.2

Stephan Richter srichter@cbu.edu
Sat, 15 Jun 2002 05:10:09 -0400


Update of /cvs-repository/Zope3/lib/python/Zope/App/ZMI/www
In directory cvs.zope.org:/tmp/cvs-serv12363/www

Modified Files:
	standard_macros.pt zopetopBasic.css zopetopStructure.css 
	zopetopWidgets.css 
Log Message:
I hooked up Sidei's stylesheets and icon. Cleaned up th eHTML and CSS a bit
too.

There was also a buglet in the TAL interpreter, where the message id was
sometimes None. This was due to a wrong usage of i18n:attributes, where
someone did:

<input name="Delete"
       i18n:attributes="name string:delete_button">

whereby the right form is:

<input name="Delete"
       tal:attributes="name string:delete_button"
       i18n:attributes="name">

After I removed the wrong syntax no None was sent to translate anymore, but
just to make sure I left the code inside.

I think that an exception should be raised, if i18n:attributes is used
incorrectly like this, but that is really Fred and Barry's department.


=== Zope3/lib/python/Zope/App/ZMI/www/standard_macros.pt 1.4 => 1.5 ===
 <head>
   <title 
-   metal:define-slot="title"
-   tal:content="options/getTitle|view/getTitle|context/getTitle|default"
-   >Zope</title>
+    metal:define-slot="title"
+    tal:content="options/getTitle|view/getTitle|context/getTitle|default"
+    >Zope</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link href="zopetopBasic.css"
-        tal:attributes="href string:zopetopBasic"
-        rel="stylesheet" type="text/css" />
-  <link href="zopetopWidgets.css"
-        tal:attributes="href string:zopetopWidgets"
-        rel="stylesheet" type="text/css" />
-  <link href="zopetopStructure.css"
-        tal:attributes="href string:zopetopStructure"
-        rel="stylesheet" type="text/css" />
-
+  <link href="/@@/zopetopBasic.css" rel="stylesheet" type="text/css"
+        tal:attributes="href string:/@@/zopetopBasic.css" />
+  <link href="/@@/zopetopWidgets.css" rel="stylesheet" type="text/css"
+        tal:attributes="href string:/@@/zopetopWidgets.css" />
+  <link href="/@@/zopetopStructure.css" rel="stylesheet" type="text/css"
+        tal:attributes="href string:/@@/zopetopStructure.css" />
   <div metal:define-slot="headers">
   </div>
 </head>


=== Zope3/lib/python/Zope/App/ZMI/www/zopetopBasic.css 1.1 => 1.2 ===
-
-
-
-
-
-/*
- * Plone Basic CSS v1
+/*****************************************************************************
  *
- * Zope CMF style sheet by Alexander Limi (http://limi.net)
+ * Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+ * All Rights Reserved.
  * 
- * Special thanks to Geir Baekholt (http://elvix.com) and 
- * Stian Soiland (http://stain.portveien.to) for invaluable 
- * input and code examples. You guys rock! :)
- *
- * I've tried to comment everything as concisely as possible. If there's anything
- * that you find confusing or just plain wrong, contact me and I'll fix it before the
- * next release.
- *
- */
+ * 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.
+ * 
+ *****************************************************************************
  
+ These are the basic CSS declarations.
+
+ $Id$
+*/
 
 
 body {
@@ -39,7 +36,7 @@
 
 
 a {
-	text-decoration: none;
+        text-decoration: none;
     color: #336699;
     background-color: transparent;
 }
@@ -66,12 +63,12 @@
 }
 
 p a:visited {
-	color: Purple;
+        color: Purple;
     background-color: transparent;
 }
 
 p a:active {
-	color: Red;
+        color: Red;
     background-color: transparent;
 }
 
@@ -89,7 +86,7 @@
 }
 
 
-h1, h2, h3, h4, h5, h6 {	/* Style for the headlines */
+h1, h2, h3, h4, h5, h6 {        /* Style for the headlines */
     color: Black;
     font: 1em Tahoma, Helvetica, Arial, sans-serif;
     margin-top: 0;
@@ -127,9 +124,10 @@
     padding:0;
 }
 
-/* we advise you to use the div.group and span.legend elements instead of these, 
-    as the only browser showing legends correctly is IE. They are just included here 
-    for completeness */
+/* we advise you to use the div.group and span.legend elements instead of
+these, as the only browser showing legends correctly is IE. They are just
+included here for completeness */
+
 fieldset {
     border: 1px solid #8cacbb;
     margin: 2em 0em 1em 0em;
@@ -195,7 +193,8 @@
 }
 
 .netscape4 {
-/* This hides elements necessary for getting Netscape 4.x to look better. Mostly strategically placed hr tags and &middot;'s */
+/* This hides elements necessary for getting Netscape 4.x to look better.
+   Mostly strategically placed hr tags and &middot;'s */
     display: none;
 }
 


=== Zope3/lib/python/Zope/App/ZMI/www/zopetopStructure.css 1.1 => 1.2 ===
-
-
-
-
-/*
- * Plone Structure CSS v1
- *
- * The Structure CSS contains elements that make up the structure of Plone,
- * generally stuff that is used once on a page - general layout, opposed to the Widgets, that are
- * used several times in a page.
+/*****************************************************************************
  *
- * Zope CMF style sheet by Alexander Limi (http://limi.net)
+ * Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+ * All Rights Reserved.
  * 
- * Special thanks to Geir Bakholt (http://elvix.com) and 
- * Stian Soiland (http://stain.portveien.to) for invaluable 
- * input and code examples. You guys rock! :)
- *
- * I've tried to comment everything as concisely as possible. If there's anything
- * that you find confusing or just plain wrong, contact me and I'll fix it before the
- * next release.
- *
- * KNOWN BUG: The selected tab cannot have image backdrop. FIXME
- *
- */
+ * 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.
+ * 
+ *****************************************************************************
  
+ The Structure CSS contains elements that make up the structure of Plone,
+ generally stuff that is used once on a page - general layout, opposed to the
+ Widgets, that are used several times in a page.
+
+ KNOWN BUG: The selected tab cannot have image backdrop. FIXME
+
+ $Id$
+*/
+
 div.top {
-    /* Top section */
+/* Top section */
     background: transparent;
     margin: 0;
     padding: 0;
@@ -33,13 +30,13 @@
 }
 
 .logo {
-    /* Logo properties */
+/* Logo properties */
     margin: 1em 0em 1em 2em;
     padding: 0;
 }
 
 div.searchBox {
-    /*searchbox style and positioning */
+/*searchbox style and positioning */
     background-color: transparent;
     color: Black;
     float: right;
@@ -53,7 +50,8 @@
 }
 
 div.tabs {
-    /* Navigational Plone Tabs(tm), implemented by customizing the a tag - they are surprisingly elegant. The power of CSS runs strong in these :) */
+/* Navigational Plone Tabs(tm), implemented by customizing the a tag - they
+   are surprisingly elegant. The power of CSS runs strong in these :) */
     background: transparent;
     border-collapse: collapse;
     border-bottom-color: #8CACBB;
@@ -64,7 +62,7 @@
 }
 
 div.tabs a {
-    /* The normal, unselected tabs. They are all links */
+/* The normal, unselected tabs. They are all links */
     background: transparent;
     border-color: #8CACBB;
     border-width: 1px; 
@@ -77,7 +75,7 @@
 }
 
 div.tabs a.selected {
-    /* The selected tab. There's only one of this */
+/* The selected tab. There's only one of this */
     background: #DEE7EC;
     border: 1px solid #8CACBB;
     border-bottom: #DEE7EC 1px solid;
@@ -93,7 +91,7 @@
 }
 
 div.personalBar {
-    /* Bar with personalized menu (user preferences, favorites etc) */
+/* Bar with personalized menu (user preferences, favorites etc) */
     background: #DEE7EC;
     border-bottom-color: #8CACBB;
     border-bottom-style: solid;
@@ -106,12 +104,12 @@
 
 div.personalBar a{
     background-color: transparent;
-	color: #436976;
+    color: #436976;
     font-weight: normal;
 }
 
 div.pathBar {
-    /* The path bar, including breadcrumbs and add to favorites */
+/* The path bar, including breadcrumbs and add to favorites */
     border-bottom-color: #8CACBB;
     border-bottom-style: solid;
     border-bottom-width: 1px;
@@ -137,7 +135,7 @@
 }
 
 table.columns {
-	width: 100%;
+    width: 100%;
 }
 
 table.columns td.left {
@@ -159,7 +157,7 @@
 }
 
 div.contentTabs {
-    /* Local Plone Tabs(tm), used in the content display */
+/* Local Tabs(tm), used in the content display */
     background: transparent;
     border-collapse: collapse;
     border-bottom: 1px solid #74AE0B;
@@ -168,7 +166,7 @@
 }
 
 div.contentTabs a {
-    /* The normal, unselected tabs. They are all links */
+/* The normal, unselected tabs. They are all links */
     background: transparent;
     border: 1px solid #74AE0B;
     color: #578308;
@@ -179,7 +177,7 @@
 }
 
 div.contentTabs a.selected {
-    /* The selected tab. There's only one of this */
+/* The selected tab. There's only one of this */
     background: #CDE2A7;
     border-bottom: #CDE2A7 1px solid;
     color: #578308;
@@ -201,14 +199,15 @@
 }
 
 div.document {
-    /* The document class encloses the object content when editing is not permitted */
+/* The document class encloses the object content when editing is not
+   permitted */
     background: transparent;
     padding: 0;
     margin: 0em 0em 2em 0em;
 }
 
 div.editableDocument {
-    /* The class surrounding content when editing is permitted */
+/* The class surrounding content when editing is permitted */
     background: transparent;
     border: 1px solid #74AE0B;
     margin: 0em 0em 2em 0em;
@@ -216,7 +215,7 @@
 }
 
 div.message {
-    /* The portal messages for cut/paste operations etc */
+/* The portal messages for cut/paste operations etc */
     background: #FFCE7B;
     border: 1px solid #FFA500;
     color: Black;
@@ -228,13 +227,13 @@
 }
 
 div.message a {
-	color: Black;
+    color: Black;
     text-decoration: underline;
 }
 
 
 .description {
-    /* The summary text describing the document */
+/* The summary text describing the document */
     font: bold 1em Tahoma, Helvetica, Arial, sans-serif;
     display: block;
     margin-bottom: 1em;
@@ -251,12 +250,3 @@
     padding: 0.5em 0em 1em 0em;
     text-align: center;
 }
-
-
-
-
-
-
-
-
-


=== Zope3/lib/python/Zope/App/ZMI/www/zopetopWidgets.css 1.1 => 1.2 ===
-
-
-
-
-/*
- * Plone Widgets CSS v1
+/*****************************************************************************
  *
- * Zope CMF style sheet by Alexander Limi (http://limi.net)
+ * Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+ * All Rights Reserved.
  * 
- * Special thanks to Geir Baekholt (http://elvix.com) and 
- * Stian Soiland (http://stain.portveien.to) for invaluable 
- * input and code examples. You guys rock! :)
- *
- * I've tried to comment everything as concisely as possible. If there's anything
- * that you find confusing or just plain wrong, contact me and I'll fix it before the
- * next release.
- *
- * TODO: table.listing, 
- *       table.box
- *
- */
+ * 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.
+ * 
+ *****************************************************************************
+ 
+ These are the Widget CSS declarations.
+
+ TODO: table.listing, 
+       table.box
+
+ $Id$
+*/
 
 input.standalone {
     background: #DEE7EC url(linkOpaque.gif) left no-repeat;
@@ -40,8 +39,8 @@
 }
 
 input.noborder {
-    /* radiobuttons and checkmarks, different behaviour in Moz and IE. 
-       Border necessary in Moz, not in IE */
+/* radiobuttons and checkmarks, different behaviour in Moz and IE. 
+   Border necessary in Moz, not in IE */
     border: none;
     margin: 0;
     background-color: transparent;
@@ -59,6 +58,7 @@
     width: 94%;
     padding: 1em 0em;
 }
+
 .legend {
     position : relative;
     top: -1.8em;
@@ -97,7 +97,7 @@
 }
 
 .required {
-    /* Used in addition to class "label" on required elements */
+/* Used in addition to class "label" on required elements */
     background: url(required.gif) 2em no-repeat;
 }
 
@@ -151,11 +151,11 @@
 }
 
 table.listing img{
-	vertical-align: middle;
+    vertical-align: middle;
 }
 
 table.box {
-    /* The Plone Box(tm) (Navigation, Related etc) */
+/* The Plone Box(tm) (Navigation, Related etc) */
     background: transparent;
     border-collapse: collapse;
     border-bottom: 1px solid #8CACBB;
@@ -183,7 +183,7 @@
 }
 
 table.box tr.odd {
-    /*every second line should be shaded */
+/*every second line should be shaded */
     background: transparent;
 }
 
@@ -197,11 +197,11 @@
 }
 
 table.box img{
-	vertical-align: middle;
+    vertical-align: middle;
 }
 
 div.boxDetails {
-    /*the line that contains the date for news and other info */
+/*the line that contains the date for news and other info */
     text-align: right;
 }
 
@@ -209,7 +209,8 @@
 }
 
 table.box a.comment {
-    /* special link for comments - default behavior is to display the discussion icon next to the link */
+/* special link for comments - default behavior is to display the discussion
+   icon next to the link */
     background-image: url(http://www.x3ng.com.br:8080/ZopeOrg/discussionitem_icon.gif); 
     background-repeat: no-repeat;
     background-position: 0px -2px;
@@ -219,7 +220,9 @@
 }
 
 table.box a.marker {
-    /* special format for links inside boxes - adds link image and displays the link as a block (which in this case means the text will not float under the link image, plus the whole thing is clickable) */
+/* special format for links inside boxes - adds link image and displays the
+   link as a block (which in this case means the text will not float under 
+   the link image, plus the whole thing is clickable) */
     background: url(linkTransparent.gif) -0.5em 0px no-repeat;
     display: block;
     padding: 0em 0em 0em 1.5em;
@@ -227,13 +230,13 @@
 }
 
 span.folderName {
-    /* The folder name in folder_contents */
+/* The folder name in folder_contents */
     font-size: 150%;
     font-weight: bold;
 }
 
 div.category {
-	float: left;
+   float: left;
     margin-right: 1em;
     margin-bottom: 2em;
     width: 20em;
@@ -251,7 +254,7 @@
 }
 
 div.box {
-	float: left;
+    float: left;
     margin-right: 1em;
     margin-bottom: 2em;
     width: 20em;
@@ -271,7 +274,7 @@
 }
 
 div.box a.close {
-	float: right;
+    float: right;
     text-transform: none;
     border-left: 1px solid #8CACBB;
     padding: 0em 0.2em;
@@ -287,11 +290,8 @@
     padding: 1em;
 }
 
-
-
-
 div.spacer {
-	margin: 3em;
+    margin: 3em;
 }
 
 .private {
@@ -351,9 +351,7 @@
 div.workspace span.big {
     float: left;
     height: 40em;
-    width: 40em;	
+    width: 40em;        
     margin-right: 1em;
     margin-bottom: 1em;
 }
-
-