[Checkins] SVN: Sandbox/pcardune/zobby/src/zobby/ moved common
resources to skin directory and made main application view
into a pagelet.
Paul Carduner
paulcarduner at gmail.com
Fri May 4 22:02:43 EDT 2007
Log message for revision 75475:
moved common resources to skin directory and made main application view into a pagelet.
Changed:
D Sandbox/pcardune/zobby/src/zobby/browser/bl.gif
D Sandbox/pcardune/zobby/src/zobby/browser/br.gif
U Sandbox/pcardune/zobby/src/zobby/browser/browser.py
U Sandbox/pcardune/zobby/src/zobby/browser/client.pt
U Sandbox/pcardune/zobby/src/zobby/browser/configure.zcml
D Sandbox/pcardune/zobby/src/zobby/browser/ml.gif
D Sandbox/pcardune/zobby/src/zobby/browser/mr.gif
D Sandbox/pcardune/zobby/src/zobby/browser/ms.jpg
D Sandbox/pcardune/zobby/src/zobby/browser/tl.gif
D Sandbox/pcardune/zobby/src/zobby/browser/tr.gif
D Sandbox/pcardune/zobby/src/zobby/browser/zobby.css
D Sandbox/pcardune/zobby/src/zobby/browser/zobby.png
A Sandbox/pcardune/zobby/src/zobby/skin/bl.gif
A Sandbox/pcardune/zobby/src/zobby/skin/br.gif
U Sandbox/pcardune/zobby/src/zobby/skin/configure.zcml
A Sandbox/pcardune/zobby/src/zobby/skin/ml.gif
A Sandbox/pcardune/zobby/src/zobby/skin/mr.gif
A Sandbox/pcardune/zobby/src/zobby/skin/ms.jpg
U Sandbox/pcardune/zobby/src/zobby/skin/template.pt
A Sandbox/pcardune/zobby/src/zobby/skin/tl.gif
A Sandbox/pcardune/zobby/src/zobby/skin/tr.gif
A Sandbox/pcardune/zobby/src/zobby/skin/zobby.css
A Sandbox/pcardune/zobby/src/zobby/skin/zobby.png
-=-
Deleted: Sandbox/pcardune/zobby/src/zobby/browser/bl.gif
===================================================================
(Binary files differ)
Deleted: Sandbox/pcardune/zobby/src/zobby/browser/br.gif
===================================================================
(Binary files differ)
Modified: Sandbox/pcardune/zobby/src/zobby/browser/browser.py
===================================================================
--- Sandbox/pcardune/zobby/src/zobby/browser/browser.py 2007-05-04 22:57:54 UTC (rev 75474)
+++ Sandbox/pcardune/zobby/src/zobby/browser/browser.py 2007-05-05 02:02:41 UTC (rev 75475)
@@ -7,6 +7,11 @@
from zobby import zobby
from zobby import interfaces
+
+class ZobbyApplicationDisplayForm(object):
+ pass
+
+
class SessionAddForm(layout.AddFormLayoutSupport, form.AddForm):
"""An add form for the zobby application."""
Modified: Sandbox/pcardune/zobby/src/zobby/browser/client.pt
===================================================================
--- Sandbox/pcardune/zobby/src/zobby/browser/client.pt 2007-05-04 22:57:54 UTC (rev 75474)
+++ Sandbox/pcardune/zobby/src/zobby/browser/client.pt 2007-05-05 02:02:41 UTC (rev 75475)
@@ -1,39 +1,20 @@
-<html>
- <head>
- <title>Zobby Client</title>
- <script type="text/javascript" src="/++resource++jsolait/jsolait.js"></script>
- <script type="text/javascript" src="/@@/z3c.javascript.jquery/jquery.js"></script>
- <script type="text/javascript" src="/++resource++client.js"></script>
- <link rel="stylesheet" href="/++resource++zobby.css" type="text/css">
- </head>
- <body>
- <div id="wrapper">
- <div id="insideWrapper">
- <h1 id="header">
- <img src="/++resource++zobby.png" />
- </h1>
- <h4 id="subheader"><u>The</u> web based collaborative editor.</h4>
- <div id="app">
- <div id="status" class="sunk"></div>
- <div id="message"></div>
- <ul id="sessions"></ul>
- <div id="actions">
- <div id="connectActions">
- <label for="connectUsername">Username:</label>
- <input id="connectUsername" type="text" />
- <input id="connectButton" type="button" value="Connect" />
- <input id="newSession" type="button" value="New Session"/>
- <input id="newSessionName" type="text" />
- </div>
- </div>
- <div id="workspace" class="sunk">
- <div id="workspaceMessage" class="sunk"></div>
- <div id="chatbox" class="sunk"></div>
- <input id="chatInput" type="text" class="sunk"/>
- <input id="sendChatInput" type="button" value="Send" />
- </div>
- </div>
- </div>
+<div id="app">
+ <div id="status" class="sunk"></div>
+ <div id="message"></div>
+ <ul id="sessions"></ul>
+ <div id="actions">
+ <div id="connectActions">
+ <label for="connectUsername">Username:</label>
+ <input id="connectUsername" type="text" />
+ <input id="connectButton" type="button" value="Connect" />
+ <input id="newSession" type="button" value="New Session"/>
+ <input id="newSessionName" type="text" />
</div>
- </body>
-</html>
\ No newline at end of file
+ </div>
+ <div id="workspace" class="sunk">
+ <div id="workspaceMessage" class="sunk"></div>
+ <div id="chatbox" class="sunk"></div>
+ <input id="chatInput" type="text" class="sunk"/>
+ <input id="sendChatInput" type="button" value="Send" />
+ </div>
+</div>
Modified: Sandbox/pcardune/zobby/src/zobby/browser/configure.zcml
===================================================================
--- Sandbox/pcardune/zobby/src/zobby/browser/configure.zcml 2007-05-04 22:57:54 UTC (rev 75474)
+++ Sandbox/pcardune/zobby/src/zobby/browser/configure.zcml 2007-05-05 02:02:41 UTC (rev 75475)
@@ -22,6 +22,7 @@
layer="zobby.layer.IZobbyBrowserLayer"
/>
+ <!-- Application Add Form -->
<addform
label="Add Zobby"
name="addZobby.html"
@@ -37,14 +38,23 @@
permission="zope.ManageContent"
/>
- <page
- for="..interfaces.IZobbyApplication"
+ <!-- Application Display Form -->
+ <z3c:pagelet
name="index.html"
+ for="zobby.interfaces.IZobbyApplication"
+ class=".browser.ZobbyApplicationDisplayForm"
+ permission="zope.Public"
+ layer="zobby.layer.IZobbyBrowserLayer"
+ />
+
+ <z3c:template
template="client.pt"
- permission="zope.View"
- menu="zmi_views"
- title="View"
+ for=".browser.ZobbyApplicationDisplayForm"
+ layer="zobby.layer.IZobbyBrowserLayer"
/>
+
+<!-- JSON RPC views -->
+
<jsonrpc:view
for="..interfaces.IZobbyApplication"
permission="zope.View"
@@ -62,50 +72,5 @@
file="client.js"
permission="zope.View"
/>
- <resource
- name="zobby.css"
- file="zobby.css"
- permission="zope.View"
- />
- <resource
- name="zobby.png"
- file="zobby.png"
- permission="zope.View"
- />
- <resource
- name="tl.gif"
- file="tl.gif"
- permission="zope.View"
- />
- <resource
- name="tr.gif"
- file="tr.gif"
- permission="zope.View"
- />
- <resource
- name="ml.gif"
- file="ml.gif"
- permission="zope.View"
- />
- <resource
- name="mr.gif"
- file="mr.gif"
- permission="zope.View"
- />
- <resource
- name="bl.gif"
- file="bl.gif"
- permission="zope.View"
- />
- <resource
- name="br.gif"
- file="br.gif"
- permission="zope.View"
- />
- <resource
- name="ms.jpg"
- file="ms.jpg"
- permission="zope.View"
- />
</configure>
\ No newline at end of file
Deleted: Sandbox/pcardune/zobby/src/zobby/browser/ml.gif
===================================================================
(Binary files differ)
Deleted: Sandbox/pcardune/zobby/src/zobby/browser/mr.gif
===================================================================
(Binary files differ)
Deleted: Sandbox/pcardune/zobby/src/zobby/browser/ms.jpg
===================================================================
(Binary files differ)
Deleted: Sandbox/pcardune/zobby/src/zobby/browser/tl.gif
===================================================================
(Binary files differ)
Deleted: Sandbox/pcardune/zobby/src/zobby/browser/tr.gif
===================================================================
(Binary files differ)
Deleted: Sandbox/pcardune/zobby/src/zobby/browser/zobby.css
===================================================================
--- Sandbox/pcardune/zobby/src/zobby/browser/zobby.css 2007-05-04 22:57:54 UTC (rev 75474)
+++ Sandbox/pcardune/zobby/src/zobby/browser/zobby.css 2007-05-05 02:02:41 UTC (rev 75475)
@@ -1,141 +0,0 @@
-body {
- background: #fff;
-}
-
-#wrapper {
- background: #fff;
- width: 75%;
- padding: 20px;
- margin: 0px auto;
- border: 0px solid #999;
-}
-
-.sunk {
- border-top: 1px solid black;
- border-left: 1px solid #555;
- border-bottom: 1px solid white;
- border-right: 1px solid #ccc;
-}
-
-#header {
- margin-top: -10px;
-}
-
-#subheader {
- margin-top: -40px;
- float: right;
- color: white;
- font-size: small;
-}
-
-#status {
- background: #ccc;
- padding: 3px;
-}
-
-#workspace {
- margin: auto;
- margin-top: 10px;
- padding: 10px;
- background: #777;
-}
-
-#workspaceMessage {
- background: #ffc;
- border: 1px solid #aa0;
- padding: 3px;
- font-size: small;
-}
-
-#chatbox {
- height: 15em;
- overflow: auto;
- border: 1px solid #999;
- background: white;
- margin-bottom: 5px;
- margin-top: 5px;
- padding: 5px;
- font-family: courier, serif;
- font-size: small;
-}
-
-#chatbox div {
- border-bottom: 1px dotted #ccc;
- font-family: courier, serif;
- font-size: small;
-}
-
-#chatInput {
- width: 100%;
- font-family: courier, serif;
- font-size: small;
-}
-
-input {
- border: 1px solid #999;
- margin: 2px;
- background: #eee;
- border-top: 1px solid white;
- border-left: 1px solid #ccc;
- border-bottom: 1px solid black;
- border-right: 1px solid #555;
-}
-
-input[type=text]{
- border-top: 1px solid black;
- border-left: 1px solid #555;
- border-bottom: 1px solid white;
- border-right: 1px solid #ccc;
-}
-
-
-
-
-
-
-
-
-.dialog {
- margin:0px auto;
- min-width:20em;
-}
-
-.dialog .hd .c,
-.dialog .ft .c {
- font-size:1px; /* ensure minimum height */
- height:13px;
-}
-
-.dialog .ft .c {
- height:14px;
-}
-
-.dialog .hd {
- background:transparent url(/++resource++tl.gif) no-repeat 0px 0px;
-}
-
-.dialog .hd .c {
- background:transparent url(/++resource++tr.gif) no-repeat right 0px;
-}
-
-.dialog .bd {
- background:transparent url(/++resource++ml.gif) repeat-y 0px 0px;
-}
-
-.dialog .bd .c {
- background:transparent url(/++resource++mr.gif) repeat-y right 0px;
-}
-
-.dialog .bd .c .s {
- margin:0px 8px 0px 4px;
- background:#808080 url(/++resource++ms.jpg) repeat-x 0px 0px;
- padding:1em;
-}
-
-.dialog .ft {
- background:transparent url(/++resource++bl.gif) no-repeat 0px 0px;
-}
-
-.dialog .ft .c {
- background:transparent url(/++resource++br.gif) no-repeat right 0px;
-}
\ No newline at end of file
Deleted: Sandbox/pcardune/zobby/src/zobby/browser/zobby.png
===================================================================
(Binary files differ)
Copied: Sandbox/pcardune/zobby/src/zobby/skin/bl.gif (from rev 75248, Sandbox/pcardune/zobby/src/zobby/browser/bl.gif)
Copied: Sandbox/pcardune/zobby/src/zobby/skin/br.gif (from rev 75248, Sandbox/pcardune/zobby/src/zobby/browser/br.gif)
Modified: Sandbox/pcardune/zobby/src/zobby/skin/configure.zcml
===================================================================
--- Sandbox/pcardune/zobby/src/zobby/skin/configure.zcml 2007-05-04 22:57:54 UTC (rev 75474)
+++ Sandbox/pcardune/zobby/src/zobby/skin/configure.zcml 2007-05-05 02:02:41 UTC (rev 75475)
@@ -18,4 +18,51 @@
template="template.pt"
/>
+ <!-- Resources -->
+ <resource
+ name="zobby.css"
+ file="zobby.css"
+ permission="zope.View"
+ />
+ <resource
+ name="zobby.png"
+ file="zobby.png"
+ permission="zope.View"
+ />
+ <resource
+ name="tl.gif"
+ file="tl.gif"
+ permission="zope.View"
+ />
+ <resource
+ name="tr.gif"
+ file="tr.gif"
+ permission="zope.View"
+ />
+ <resource
+ name="ml.gif"
+ file="ml.gif"
+ permission="zope.View"
+ />
+ <resource
+ name="mr.gif"
+ file="mr.gif"
+ permission="zope.View"
+ />
+ <resource
+ name="bl.gif"
+ file="bl.gif"
+ permission="zope.View"
+ />
+ <resource
+ name="br.gif"
+ file="br.gif"
+ permission="zope.View"
+ />
+ <resource
+ name="ms.jpg"
+ file="ms.jpg"
+ permission="zope.View"
+ />
+
</configure>
\ No newline at end of file
Copied: Sandbox/pcardune/zobby/src/zobby/skin/ml.gif (from rev 75248, Sandbox/pcardune/zobby/src/zobby/browser/ml.gif)
Copied: Sandbox/pcardune/zobby/src/zobby/skin/mr.gif (from rev 75248, Sandbox/pcardune/zobby/src/zobby/browser/mr.gif)
Copied: Sandbox/pcardune/zobby/src/zobby/skin/ms.jpg (from rev 75248, Sandbox/pcardune/zobby/src/zobby/browser/ms.jpg)
Modified: Sandbox/pcardune/zobby/src/zobby/skin/template.pt
===================================================================
--- Sandbox/pcardune/zobby/src/zobby/skin/template.pt 2007-05-04 22:57:54 UTC (rev 75474)
+++ Sandbox/pcardune/zobby/src/zobby/skin/template.pt 2007-05-05 02:02:41 UTC (rev 75475)
@@ -3,10 +3,10 @@
i18n:domain="z3c.formdemo">
<head>
<title>Zobby</title>
- <script type="text/javascript" src="/++resource++jsolait/jsolait.js"></script>
+ <script type="text/javascript" src="/@@/jsolait/jsolait.js"></script>
<script type="text/javascript" src="/@@/z3c.javascript.jquery/jquery.js"></script>
- <script type="text/javascript" src="/++resource++client.js"></script>
- <link rel="stylesheet" href="/++resource++zobby.css" type="text/css">
+ <script type="text/javascript" src="/@@/client.js"></script>
+ <link rel="stylesheet" href="/@@/zobby.css" type="text/css">
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta http-equiv="cache-control" content="no-cache" />
<meta http-equiv="pragma" content="no-cache" />
Copied: Sandbox/pcardune/zobby/src/zobby/skin/tl.gif (from rev 75248, Sandbox/pcardune/zobby/src/zobby/browser/tl.gif)
Copied: Sandbox/pcardune/zobby/src/zobby/skin/tr.gif (from rev 75248, Sandbox/pcardune/zobby/src/zobby/browser/tr.gif)
Copied: Sandbox/pcardune/zobby/src/zobby/skin/zobby.css (from rev 75248, Sandbox/pcardune/zobby/src/zobby/browser/zobby.css)
Copied: Sandbox/pcardune/zobby/src/zobby/skin/zobby.png (from rev 75248, Sandbox/pcardune/zobby/src/zobby/browser/zobby.png)
More information about the Checkins
mailing list