[Zope3-checkins] CVS: Zope3/src/zope/app/browser/skins/rotterdam - configure.zcml:1.8.2.1 template.pt:1.12.2.1 zope3.css:1.11.2.1 all_links.css:NONE content_links.css:NONE
Sidnei da Silva
sidnei@x3ng.com.br
Tue, 11 Feb 2003 09:41:39 -0500
Update of /cvs-repository/Zope3/src/zope/app/browser/skins/rotterdam
In directory cvs.zope.org:/tmp/cvs-serv18615/src/zope/app/browser/skins/rotterdam
Modified Files:
Tag: paris-copypasterename-branch
configure.zcml template.pt zope3.css
Removed Files:
Tag: paris-copypasterename-branch
all_links.css content_links.css
Log Message:
Updating from HEAD to make sure everything still works before merging
=== Zope3/src/zope/app/browser/skins/rotterdam/configure.zcml 1.8 => 1.8.2.1 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/configure.zcml:1.8 Mon Jan 13 11:06:27 2003
+++ Zope3/src/zope/app/browser/skins/rotterdam/configure.zcml Tue Feb 11 09:41:08 2003
@@ -10,12 +10,6 @@
name="zope3.css" file="zope3.css" layer="rotterdam" />
<browser:resource
- name="all_links.css" file="all_links.css" layer="rotterdam" />
-
-<browser:resource
- name="content_links.css" file="content_links.css" layer="rotterdam" />
-
-<browser:resource
name="xmltree.js" file="xmltree.js" layer="rotterdam" />
<browser:resource
=== Zope3/src/zope/app/browser/skins/rotterdam/template.pt 1.12 => 1.12.2.1 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/template.pt:1.12 Mon Feb 3 15:41:08 2003
+++ Zope3/src/zope/app/browser/skins/rotterdam/template.pt Tue Feb 11 09:41:08 2003
@@ -7,7 +7,7 @@
<head>
- <title metal:define-slot="title">Z3 UI</title>
+ <title metal:define-slot="title">Z3 UI</title>
<style type="text/css"
@@ -17,10 +17,9 @@
>
@import url(zope3.css);
</style>
-
- <link rel="alternate stylesheet" type="text/css" tal:attributes="href context/++resource++all_links.css" title="All links underlined" />
-
- <link rel="alternate stylesheet" type="text/css" tal:attributes="href context/++resource++content_links.css" title="Content box links underlined" />
+
+ <meta http-equiv="Content-Type"
+ content="text/html;charset=utf-8" />
<metal:block define-slot="headers" />
<metal:block define-slot="style_slot" />
@@ -44,16 +43,21 @@
<img tal:attributes="src context/++resource++zope3logo.gif" />
</div>
+
<div id="personal">
- <metal:block define-macro="logged_user">
- User:
- <tal:block replace="request/user/getTitle">
- User
- </tal:block>
- </metal:block>
+ <div id="userDetails">
- (Personal elements)
+ <metal:block define-macro="logged_user">
+ User:
+ <tal:block replace="request/user/getTitle">
+ User
+ </tal:block>
+ </metal:block>
+
+ </div>
+
+ [Personalized Elements]
</div>
@@ -79,9 +83,11 @@
<div class="body">
- <metal:block define-slot="commonTasks">
-
- </metal:block>
+ <div class="content">
+ <metal:block define-slot="commonTasks">
+
+ </metal:block>
+ </div>
</div>
@@ -90,27 +96,10 @@
</div>
- <div id="content">
+ <div id="workspace">
- <div id="breadcrumbs"
- metal:define-macro="breadcrumbs"
- > Location: <tal:block
- repeat="breadcrumb context/@@absolute_url/breadcrumbs"
- ><a href=""
- tal:condition="repeat/breadcrumb/start"
- tal:content="string:[top]"
- tal:attributes="
- href string:${breadcrumb/url}/@@SelectedManagementView.html"
- >XXX should not hardcode root folder name string</a
- ><a href=""
- tal:condition="not:repeat/breadcrumb/start"
- tal:content="string:${breadcrumb/name}"
- tal:attributes="
- href string:${breadcrumb/url}/@@SelectedManagementView.html"
- >breadcrumb item</a>/</tal:block></div>
-
<div class="itemViews"
- metal:define-macro="zmi_tabs">
+ metal:define-slot="tabs">
<tal:block repeat="view context/@@view_get_menu/zmi_views">
@@ -126,15 +115,50 @@
</tal:block>
</div>
+
+ <div id="actions"
+ tal:define="actions context/@@view_get_menu/zmi_actions"
+ tal:condition="actions"
+ metal:define-slot="tabs"
+ >
+ <a href="#"
+ tal:attributes="href info/action"
+ tal:repeat="info actions"
+ tal:content="info/title"
+ >
+ Action name
+ </a>
+
- <div class="itemViewsBar">
-
</div>
+
+ <div id="viewspace">
- <div class="item">
+ <div id="breadcrumbs"
+ metal:define-macro="breadcrumbs"
+ > Location: <tal:block
+ repeat="breadcrumb context/@@absolute_url/breadcrumbs"
+ ><a href=""
+ tal:condition="repeat/breadcrumb/start"
+ tal:content="string:[top]"
+ tal:attributes="
+ href string:${breadcrumb/url}/@@SelectedManagementView.html"
+ >XXX should not hardcode root folder name string</a
+ ><a href=""
+ tal:condition="not:repeat/breadcrumb/start"
+ tal:content="string:${breadcrumb/name}"
+ tal:attributes="
+ href string:${breadcrumb/url}/@@SelectedManagementView.html"
+ >breadcrumb item</a> / </tal:block>
+ </div>
+
+ <div metal:define-slot="message" id="message">
- <metal:block define-slot="body">
+ </div>
+
+ <div id="content">
+ <metal:block define-slot="body">
<table class="listing">
@@ -168,22 +192,9 @@
</table>
</metal:block>
-
- </div>
-
-
- <div id="messages">
-
- Status and error messages
-
- <div id="logger"></div>
-
- </div>
-
</div>
-
- <div id="context_information">
+<div id="context_information">
<div id="helpers">
@@ -210,60 +221,42 @@
<div id="inspectors">
- <div class="box" id="metadata"
- tal:define="view context/@@MetaDataBox|nothing"
- tal:condition="view"
- >
+ <div class="box" id="metadata">
<h4>Metadata</h4>
- <div class="body" tal:content="structure view">
-
- <div class="content odd">
- testing testing
- </div>
-
- <div class="content even">
- and some more
+ <div class="body"
+ tal:define="view context/@@MetaDataBox|nothing"
+ tal:condition="view"
+ >
+
+ <div class="content" tal:content="structure view">
+ Some metadata
</div>
- </div>
-
+ </div>
</div>
- <div class="box"
- id="Actions"
- tal:define="actions context/@@view_get_menu/zmi_actions"
- tal:condition="actions"
- >
-
- <h4>Actions</h4>
+
- <div class="body">
-
- <a href="#"
- tal:attributes="href info/action"
- tal:repeat="info actions"
- >
- <div tal:define="oddrow repeat/info/odd"
- tal:attributes="class python:oddrow and 'even' or 'odd';
- value info/id|default"
- tal:content="info/title">Do something
- </div>
- </a>
-
- </div>
-
- </div>
+ </div>
+
+ </div>
+
+ <div class="spacer">
+
+ </div>
+
+ </div>
<div class="box" id="help"
- tal:define="results view/@@find_help_topics|nothing"
+ tal:define="results view/@@find_help_topics|nothing"
tal:condition="results">
<h4>Online Help</h4>
<div class="body">
<a href="#"
tal:repeat="entry results"
- tal:attributes="href entry/url">
+ tal:attributes="href entry/url">
<div tal:define="oddrow repeat/entry/odd"
tal:attributes="class python:oddrow and 'even' or 'odd'"
tal:content="entry/topic/title">Topic Title
@@ -272,16 +265,17 @@
</div>
</div>
-</div>
+
</div>
<div id="footer"
metal:define-macro="footer">
- Powered by Zope
+
</div>
+ <div id="logger" />
</body>
=== Zope3/src/zope/app/browser/skins/rotterdam/zope3.css 1.11 => 1.11.2.1 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/zope3.css:1.11 Thu Jan 16 14:50:33 2003
+++ Zope3/src/zope/app/browser/skins/rotterdam/zope3.css Tue Feb 11 09:41:08 2003
@@ -11,19 +11,19 @@
/* Basic Elements */
body {
- font: 75% Verdana, Helvetica, Arial, sans-serif;
+ font: 85% Helvetica, Arial, sans-serif;
background: White;
color: Black;
margin: 0;
padding: 0;
/* These work in IE only, changes the look of the scrollbar + textareas */
- scrollbar-base-color: #DEE7EC;
- scrollbar-highlight-color: #DEE7EC;
- scrollbar-track-color: #F7F9FA;
- scrollbar-darkshadow-color: #F7F9FA;
- scrollbar-3dlight-color: #8CACBB;
- scrollbar-shadow-color: #8CACBB;
- scrollbar-arrow-color: #436976;
+ scrollbar-base-color: White;
+ scrollbar-highlight-color: White;
+ scrollbar-track-color: #F8F8F8;
+ scrollbar-darkshadow-color: #F8F8F8;
+ scrollbar-3dlight-color: #336699;
+ scrollbar-shadow-color: #336699;
+ scrollbar-arrow-color: Black;
}
table {
@@ -32,13 +32,10 @@
a {
text-decoration: none;
- color: #436976;
+ color: #336699;
background-color: transparent;
}
-a:hover, div.box div.body a:hover div {
- text-decoration: underline;
-}
table {
@@ -79,7 +76,7 @@
hr {
clear: both;
height: 1px;
- color: #8CACBB;
+ color: #336699;
background-color: transparent;
}
@@ -87,10 +84,10 @@
h1, h2, h3, h4, h5, h6 {
color: Black;
clear: left;
- font: 100% Verdana, Helvetica, Arial, sans-serif;
+ font: 100% bold Verdana, Helvetica, Arial, sans-serif;
margin: 0;
- padding-top: 1em;
- border-bottom: 1px solid #8CACBB;
+ padding-top: 0.5em;
+ border-bottom: 1px solid #336699;
}
h1 {
@@ -148,7 +145,7 @@
fieldset {
- border: 1px solid #8cacbb;
+ border: 1px solid #A0A0A0;
margin: 2em 0em 1em 0em;
padding: 1em 0em;
}
@@ -165,26 +162,21 @@
}
textarea {
- border: 1px solid #8cacbb;
color: Black;
- background-color: white;
- width: 93%;
+ width: 88%;
padding: 0.1em;
}
input {
- font: 100% Verdana, Helvetica, Arial, sans-serif;
- border: 1px solid #8cacbb;
+ font: normal 100% Verdana, Helvetica, Arial, sans-serif;
color: Black;
- background-color: white;
vertical-align: middle;
margin-bottom: 1px; /* IE bug fix */
padding: 0.1em;
}
select {
- font: 100% Verdana, Helvetica, Arial, sans-serif;
- border: 1px solid #8cacbb;
+ font: normal 100% Verdana, Helvetica, Arial, sans-serif;
vertical-align: top;
}
@@ -210,15 +202,15 @@
code {
font-size: 120%;
color: Black;
- background-color: #dee7ec;
+ background-color: #CCCCCC;
}
pre {
font-size: 120%;
padding: 1em;
- border: 1px solid #8cacbb;
+ border: 1px solid #A0A0A0;
color: Black;
- background-color: #dee7ec;
+ background-color: #CCCCCC;
}
.netscape4 {
@@ -231,7 +223,7 @@
#navtreecontents a {
cursor: pointer;
- height: 18px;
+ height: 20px;
}
#navtreecontents loading {
@@ -249,14 +241,14 @@
#navtreecontents icon {
background-repeat: no-repeat;
- padding-left: 17px;
+ padding-left: 20px;
display: inline;
cursor: auto;
}
#navtreecontents collection {
display: block;
- margin-left: 8px;
+ margin-left: 10px;
/* border: red solid 1pt; */
height: auto;
}
@@ -274,38 +266,72 @@
#personal {
border-bottom: 1px solid black;
text-align: left;
+ padding: 0.1em 1em;
+}
+
+#userDetails {
+ float: right;
+}
+
+#actions {
+ background: #336699;
+ border-left: 1px solid #336699;
+ border-right: 1px solid #336699;
+ padding: 0.3em;
+ color: Black;
+ border-collapse: collapse;
+}
+
+#actions a {
+ color: White;
+ float: right;
+ border-left: 1px dashed white;
+ padding: 0 0.5em;
+}
+
+#actions a:hover {
+ color: black;
+ background-color: White;
}
#breadcrumbs {
- border: 1px solid #74AE0B;
- padding: 0.1em 1em;
- margin-top: 0.8em;
+ border: 1px solid #336699;
+ border-style: none none solid none;
+ margin: 0;
}
+
#navigators {
float: left;
- width: 20%;
+ width: 15%;
+ padding: 1em;
+}
+
+#workspace {
+ width: 79%;
+ float: left;
}
#content {
float: left;
- width: 64%;
}
#context_information {
- float: left;
+ float: right;
width: 15%;
+ padding-top: 1em;
+ padding-left: 0.5em;
}
+
#helpers {
}
#inspectors {
}
-
#footer {
border-bottom: 1px solid black;
- float: none;
+ float: left;
clear: both;
}
@@ -326,57 +352,46 @@
}
div.box {
- background: transparent;
- border-collapse: collapse;
- margin: .8em;
- border: none;
-}
-
-div.box h4 {
- background: #DEE7EC;
- border: 1px solid #8CACBB;
- border-style: solid solid none;
- color: Black;
- text-transform: lowercase;
- margin: 0px;
- font-weight: normal;
-
- padding: 0.1em 1em 0.3em 0.5em;
-/* height: 1em; */
+ margin: 0em 0em 2em 0em;
+ padding: 0;
}
-/*div.box h4 {
- background: #DEE7EC;
- border-style: solid solid none;
- border: 1px solid #8CACBB;
- color: Black;
- display: inline;
+div.box h4 {
+ background: #CCCCCC;
+ border: 1px solid #CCCCCC;
+ border-style: solid solid none solid;
+ color: #808080;
+ padding: 0em 1em 0em 1em;
+ display: block;
font-size: 1em;
- font-weight: normal;
height: 1em;
- margin: 0px;
- padding: 0px 1em;
- text-transform: lowercase;
-}*/
+ text-align: center;
+}
+
div.box div.body {
background: transparent;
border-collapse: collapse;
- border: 1px solid #8CACBB;
+ border: 1px solid #CCCCCC;
+}
+
+div.box .content {
+ padding: 0.5em;
+}
+
+div.box h1,
+div.box h2,
+div.box h3,
+div.box h4 {
margin: 0;
- padding: 0.1em 1em 0.3em 0.5em;
}
-div.box div.body a div.odd {
- padding: 0.2em 0;
- background: transparent;
+div.box .even {
+ background-color: #F8F8F8;
}
-div.box div.body a div.even {
- padding: 0.2em 0;
-/* background: #F7F9FA; */
- border-bottom: 1px dotted #8CACBB;
- border-top: 1px dotted #8CACBB;
+div.box .odd {
+ background-color: White;
}
@@ -387,7 +402,7 @@
.itemViews {
background: transparent;
border-collapse: collapse;
- border-bottom: 1px solid #74AE0B;
+ border-bottom: 1px solid #336699;
padding-left: 1em;
margin-top: 0.8em;
white-space: nowrap;
@@ -395,70 +410,50 @@
.itemViews a {
background: transparent;
- border: 1px solid #74AE0B;
- color: #578308;
+ border: 1px solid #336699;
+ color: Black;
font-weight: normal;
margin-right: 0.5em;
padding: 0em 0.5em;
- text-transform: lowercase;
}
.itemViews a.selected {
- background: #CDE2A7;
- border-bottom: #CDE2A7 1px solid;
- color: #578308;
+ background: #336699;
+ border-bottom: #336699 1px solid;
+ color: White;
font-weight: normal;
}
-.itemViews p.selected {
- background: #CDE2A7;
- border: 1px solid #74AE0B;
- border-bottom: #CDE2A7 1px solid;
- color: #578308;
- font-weight: normal;
- margin-right: 0.5em;
- padding: 0em 0.5em;
- text-transform: lowercase;
- display: inline;
-}
.itemViews a:hover {
- background-color: #CDE2A7;
- color: #578308;
+ background-color: #336699;
+ color: White;
}
-.itemViewsBar {
- background: #CDE2A7;
- border-left: 1px solid #74AE0B;
- border-right: 1px solid #74AE0B;
- color: #578308;
- text-align: right;
- text-transform: lowercase;
-}
-
-.item {
- border: 1px solid #74AE0B;
+#viewspace {
+ border: 1px solid #336699;
+ border-collapse: collapse;
padding: 10px;
+ margin: 0;
}
table.listing {
/* The default table for document listings. Contains name, document types, modification times etc in a file-browser-like fashion */
border-collapse: collapse;
- border-left: 1px solid #8CACBB;
- border-bottom: 1px solid #8CACBB;
+ border-left: 1px solid #CCCCCC;
+ border-bottom: 1px solid #CCCCCC;
margin: 1em 0em 1em 0em;
clear: both;
}
table.listing th {
- background: #DEE7EC;
- border-top: 1px solid #8CACBB;
- border-bottom: 1px solid #8CACBB;
- border-right: 1px solid #8CACBB;
- color: Black;
+ background: #CCCCCC;
+ border-top: 1px solid #CCCCCC;
+ border-bottom: 1px solid #CCCCCC;
+ border-right: 1px solid #CCCCCC;
+ color: #808080;
font-weight: normal;
padding: 0em 1em 0em 1em;
- text-transform: lowercase;
white-space: nowrap;
}
@@ -476,15 +471,15 @@
table.listing tr.odd {
/*every second line should be shaded */
- background: transparent;
+ background: White;
}
table.listing tr.even {
- background: #F7F9FA;
+ background: #F8F8F8;
}
table.listing td {
- border-right: 1px solid #8CACBB;
+ border-right: 1px solid #CCCCCC;
padding: 0em 1em;
text-align: left;
}
@@ -495,7 +490,9 @@
}
-
+div.spacer {
+ clear: both;
+}
=== Removed File Zope3/src/zope/app/browser/skins/rotterdam/all_links.css ===
=== Removed File Zope3/src/zope/app/browser/skins/rotterdam/content_links.css ===