[Zope3-checkins] CVS: zopeproducts/zwiki/browser/skin - dialog_macros.pt:1.1 configure.zcml:1.2 template.pt:1.2 wiki.css:1.2
Stephan Richter
srichter@cbu.edu
Thu, 10 Apr 2003 02:28:46 -0400
Update of /cvs-repository/zopeproducts/zwiki/browser/skin
In directory cvs.zope.org:/tmp/cvs-serv26676/browser/skin
Modified Files:
configure.zcml template.pt wiki.css
Added Files:
dialog_macros.pt
Log Message:
- Fully functional 'wiki' skin for viewing Wiki Pages. I tried very hard
(and was successful) in writing only one screen for both interfaces: the
ZMI and the end user. Here is how you can get to the new skin:
http://localhost:8080/++skin++wiki/wiki/FrontPage
- Internationalized all of the skin as good as I could. So most of the
Site's Software text is displayed in German, including some complex
message strings.
- Improved 'Add Comment' screen.
=== Added File zopeproducts/zwiki/browser/skin/dialog_macros.pt ===
<metal:block define-macro="dialog">
<metal:block define-slot="doctype">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
</metal:block>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title metal:define-slot="title">ZWiki for Zope 3</title>
<style type="text/css" media="all"
tal:content="string: @import url(${context/++resource++wiki.css});">
@import url(wiki.css);
</style>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<link rel="icon" type="image/png"
tal:attributes="href context/++resource++favicon.png" />
</head>
<body>
<div id="workspace">
<div metal:define-slot="message" id="message"></div>
<div id="content">
<metal:block define-slot="body">
This is the content.
</metal:block>
</div>
</div>
</body>
</html>
</metal:block>
=== zopeproducts/zwiki/browser/skin/configure.zcml 1.1 => 1.2 ===
--- zopeproducts/zwiki/browser/skin/configure.zcml:1.1 Wed Apr 9 17:47:17 2003
+++ zopeproducts/zwiki/browser/skin/configure.zcml Thu Apr 10 02:28:15 2003
@@ -16,5 +16,11 @@
template="template.pt"
/>
+<browser:page
+ for="*"
+ name="dialog_macros"
+ permission="zope.View"
+ layer="wiki"
+ template="dialog_macros.pt" />
</zopeConfigure>
=== zopeproducts/zwiki/browser/skin/template.pt 1.1 => 1.2 ===
--- zopeproducts/zwiki/browser/skin/template.pt:1.1 Wed Apr 9 17:47:17 2003
+++ zopeproducts/zwiki/browser/skin/template.pt Thu Apr 10 02:28:15 2003
@@ -23,69 +23,61 @@
<body>
- <div id="personal">
- <div id="userDetails">
- <metal:block define-macro="logged_user">
- User:
- <tal:block replace="request/user/getTitle">
- User
- </tal:block>
- </metal:block>
+ <div id="wikipage_header" tal:on-error="nothing" i18n:domain="wiki">
+ <div id="wikipage_path"
+ tal:content="structure context/@@breadcrumbs">Wikis/WikiPage
+ </div>
+ <div id="wikipage_info" i18n:translate="">Last modified by
+ <b tal:content="context/@@author" i18n:name="user">srichter</b> on
+ <span tal:replace="context/@@modified"
+ i18n:name="date">March 4, 2002.</span>
</div>
</div>
<div id="workspace">
- <div class="itemViews"
- metal:define-slot="tabs">
- <tal:block repeat="view context/@@view_get_menu/zmi_views">
- <a href=""
- tal:attributes="href view/action;
- class view/selected;"
- tal:content="view/title">
- label
- </a>
- </tal:block>
+ <div metal:define-slot="message" id="message"></div>
+
+ <div id="content">
+ <metal:block define-slot="body">
+ This is the content.
+ </metal:block>
</div>
-
+
+ </div>
+
+ <div id="footer" i18n:domain="wiki">
+
<div id="actions"
- tal:define="actions context/@@view_get_menu/zmi_actions"
- tal:condition="actions"
- metal:define-slot="tabs">
+ tal:define="actions context/@@view_get_menu/wikipage_actions"
+ tal:condition="actions">
<a href="#"
tal:attributes="href info/action"
tal:repeat="info actions"
- tal:content="info/title">
+ tal:content="info/title"
+ i18n:translate="">
Action name
</a>
+
+ <div id="jumpto">
+ <form action="jumpto.html">
+ <span i18n:translate="">Jump to:</span><input name="jumpto"/>
+ </form>
+ </div>
</div>
-
- <div metal:define-slot="message" id="message" />
-
- <div id="content">
- <metal:block define-slot="body">
- <table class="listing">
- <thead>
- <th>Test</th>
- <th>Another</th>
- </thead>
- <tbody>
- <tr>
- <td>content</td>
- <td>thingy</td>
- </tr>
- <tr class="even">
- <td>more</td>
- <td>data</td>
- </tr>
- </tbody>
- </table>
- </metal:block>
+
+ <div id="personal">
+ <div id="userDetails" i18n:translate="">
+ User:
+ <tal:block replace="request/user/getTitle"
+ i18n:name="user">User</tal:block>
+ (<tal:block replace="request/user/getLogin"
+ tal:on-error="string:anonymous"
+ i18n:name="login">login</tal:block>)
+ </div>
</div>
</div>
-
- <div id="footer" metal:define-macro="footer" />
</body>
=== zopeproducts/zwiki/browser/skin/wiki.css 1.1 => 1.2 ===
--- zopeproducts/zwiki/browser/skin/wiki.css:1.1 Wed Apr 9 17:47:17 2003
+++ zopeproducts/zwiki/browser/skin/wiki.css Thu Apr 10 02:28:15 2003
@@ -4,41 +4,73 @@
*/
body {
- font: 85% Verdana, Arial, Helvetica, sans-serif;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
background: white;
color: black;
margin: 0;
- padding: 5pt;
+ padding: 0pt;
}
-H1, H2, H3, H4, H5, H6 {
-font-family: Verdana, Arial, Helvetica, sans-serif;
-font-weight: bold;
-color: black;
+h1, h2, h3, h4, h5, h6 {
+ font-weight: bold;
+ color: black;
}
-H2 { font-size: 16pt;
- margin-top: 0px;
- margin-bottom: 0px;}
+h2 {
+ font-size: 16pt;
+ margin-top: 0px;
+ margin-bottom: 0px;
+}
+p {
+ margin-top: 0.4em;
+ margin-bottom: 0.4em;
+}
+
+a {
+ color: #000066;
+}
+
+a:visited {
+ color: #000066;
+}
+
+textarea {
+ font-family: monospace;
+}
/* Structural Elements */
#personal {
- border-bottom: 1px solid black;
+ padding-top: 0.5em;
text-align: left;
- padding: 0.1em 1em;
}
#userDetails {
- float: right;
}
#workspace {
- width: 79%;
+ padding: 0.5em;
+}
+
+#actions {
+ color: black;
+ margin: 0;
+}
+
+#actions a {
+ border-left: 1px dashed #AAAAAA;
+ border-collapse: collapse;
+ margin: 0;
+ padding: 0 0.5em;
float: left;
}
+#actions a:hover {
+ color: black;
+ background-color: #AAAAAA;
+}
+
#wikipage_header {
background: #EEEEEE;
border: solid 1px #AAAAAA;
@@ -54,4 +86,36 @@
#wikipage_info {
border-top: solid 1px #CCCCCC;
font-size: 85%;
+}
+
+#footer {
+ background: #EEEEEE;
+ border: solid 1px #AAAAAA;
+ padding: 0.5em;
+ font-size: 85%;
+}
+
+#jumpto {
+ float: right;
+}
+
+#jumpto input {
+ width: 10em;
+}
+
+div.row {
+ clear: both;
+ padding-top: 10px;
+}
+
+div.row div.label {
+ float: left;
+ width: 100px;
+ text-align: right;
+ margin-right: 0.8em;
+}
+# XXX someone please come and do this properly
+div.row div.field {
+ float: right;
+ text-align: left;
}