Author: jmorliaguet
Date: Sun Nov 13 21:32:16 2005
New Revision: 29498
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/authoring.css
z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/authoring_macros.pt
z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/framework/utils.js
z3lab/cpsskins/branches/jmo-perspectives/engines/configure.zcml
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/configure.zcml
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/content_author.pt
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/configure.zcml
z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/configure.zcml
z3lab/cpsskins/branches/jmo-perspectives/engines/sitedesigner/configure.zcml
Log:
- added hints for each editor screen
- added a dummy location selector to the content author screen
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/authoring.css
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/authoring.css
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/authoring.css
Sun Nov 13 21:32:16 2005
@@ -12,9 +12,18 @@
}
#editSpace {
+ border-top: 2px solid #000;
margin-top: 50px;
}
+div.locationSelector {
+ background-color: #eee;
+ font: 12px Arial, sans-serif;
+ padding: 0.2em;
+ border-bottom: 1px solid #ccc;
+ margin-bottom: 0.5em;
+}
+
div.floatingHeader {
position: absolute;
top: 0;
@@ -81,8 +90,8 @@
border: 1px;
border-style: solid;
border-color: #999 #333 #333 #999;
- padding: 3px 5px 3px 5px;
- margin: 0;
+ padding: 3px 4px 3px 4px;
+ margin: 0 0 0 4px;
}
.actionPad a.selected, .actionPad a:hover {
@@ -96,6 +105,21 @@
background-color: #dfb;
}
+.actionPad .hint {
+ display: none;
+ visibility: hidden;
+ position: absolute;
+ top: 40px;
+ left: 50px;
+ border-style: solid;
+ border-width: 1px 2px 2px 1px;
+ border-color: #666;
+ background-color: #ffc;
+ padding: 0.3em 0.5em;
+ width: 200px;
+ font: 13px Arial, sans-serif;
+}
+
.formClose {
margin-top: 20px;
text-align: center;
@@ -111,7 +135,6 @@
margin-bottom: 3px;
margin-top: 0px;
text-align: center;
- padding-top: 4px;
}
.topTabs img {
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/authoring_macros.pt
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/authoring_macros.pt
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/authoring_macros.pt
Sun Nov 13 21:32:16 2005
@@ -2,12 +2,21 @@
<div class="actionPad"
tal:define="actions
current_theme/@@view_get_menu/cpsskins_authoring_actions"
tal:condition="actions">
- <a href="#"
- tal:repeat="info actions"
- tal:attributes="href info/action;
- class info/selected"
- tal:content="info/title"
- i18n:translate="" />
+ <tal:block repeat="info actions">
+ <a href="#"
+ tal:define="id string:hint${repeat/info/number}"
+ tal:attributes="href info/action;
+ class info/selected;
+ onmouseover string:javascript:showElement('${id}');
+ onmouseout string:javascript:hideElement('${id}')">
+ <tal:block content="info/title" i18n:translate="" />
+ <div class="hint"
+ tal:define="description info/description"
+ tal:condition="description"
+ tal:attributes="id id"
+ tal:content="description" />
+ </a>
+ </tal:block>
</div>
</metal:block>
@@ -141,7 +150,6 @@
</metal:block>
<!-- Generic editor screen -->
-
<metal:block define-macro="editor">
<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"
@@ -170,13 +178,13 @@
<div class="floatingHeader">
<metal:block define-slot="header" />
</div>
+ <div class="floatingFooter">
+ <metal:block define-slot="footer" />
+ </div>
<div id="engine" tal:attributes="name engine" />
<div id="editSpace">
<metal:block define-slot="main" />
</div>
- <div class="floatingFooter">
- <metal:block define-slot="footer" />
- </div>
<metal:block use-macro="context/@@authoring_macros/authoring_footer" />
</body>
</html>
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/framework/utils.js
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/framework/utils.js
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/framework/utils.js
Sun Nov 13 21:32:16 2005
@@ -18,18 +18,22 @@
var node = document.getElementById(id);
if (!node) return;
if (node.style.display != 'none') {
- hideElement(node);
+ hideElement(id);
} else {
- showElement(node);
+ showElement(id);
}
}
-function showElement(node) {
+function showElement(id) {
+ var node = document.getElementById(id);
+ if (!node) return;
node.style.visibility = 'visible';
node.style.display = 'block';
}
-function hideElement(node) {
+function hideElement(id) {
+ var node = document.getElementById(id);
+ if (!node) return;
node.style.visibility = 'hidden';
node.style.display = 'none';
}
Modified: z3lab/cpsskins/branches/jmo-perspectives/engines/configure.zcml
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/engines/configure.zcml
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/engines/configure.zcml Sun Nov
13 21:32:16 2005
@@ -13,14 +13,14 @@
<include package=".sitedesigner" />
- <!-- page designer -->
+ <!-- layout designer -->
- <include package=".pagedesigner" />
+ <include package=".layoutdesigner" />
- <!-- layout designer -->
+ <!-- page designer -->
- <include package=".layoutdesigner" />
+ <include package=".pagedesigner" />
<!-- content author -->
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/configure.zcml
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/configure.zcml
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/configure.zcml
Sun Nov 13 21:32:16 2005
@@ -29,15 +29,12 @@
layer="cpsskins"
/>
- <browser:menuItems
+ <browser:menuItem
menu="cpsskins_authoring_actions"
- for="*">
-
- <menuItem
- title="Content author"
- action="@@content-author.html"
- />
-
- </browser:menuItems>
+ for="*"
+ title="Content author"
+ description="Content authors add content to pages in different contexts."
+ action="@@content-author.html"
+ />
</configure>
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/content_author.pt
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/content_author.pt
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/content_author.pt
Sun Nov 13 21:32:16 2005
@@ -1,5 +1,4 @@
-<tal:block define="engine string:content-author"
- toptabs tmutil/getThemes">
+<tal:block define="engine string:content-author">
<metal:block use-macro="context/@@authoring_macros/editor">
<metal:block fill-slot="css">
@@ -13,8 +12,9 @@
</metal:block>
<metal:block fill-slot="main">
- <metal:block use-macro="context/@@authoring_macros/themetabs" />
- <metal:block use-macro="context/@@authoring_macros/pagetabs" />
+
+ <div class="locationSelector">Choose location: /.../.../</div>
+
<tal:block content="structure python: view.draw(location=context,
engine=engine)" />
</metal:block>
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/configure.zcml
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/configure.zcml
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/configure.zcml
Sun Nov 13 21:32:16 2005
@@ -30,15 +30,12 @@
layer="cpsskins"
/>
- <browser:menuItems
+ <browser:menuItem
menu="cpsskins_authoring_actions"
- for="*">
-
- <menuItem
- title="Layout designer"
- action="@@layout-designer.html"
- />
-
- </browser:menuItems>
+ for="*"
+ title="Layout designer"
+ description="Layout designers define the layout structure of pages."
+ action="@@layout-designer.html"
+ />
</configure>
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/configure.zcml
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/configure.zcml
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/configure.zcml
Sun Nov 13 21:32:16 2005
@@ -24,16 +24,13 @@
layer="cpsskins"
/>
- <browser:menuItems
+ <browser:menuItem
menu="cpsskins_authoring_actions"
- for="*">
-
- <menuItem
- title="Page designer"
- action="@@page-designer.html"
- />
-
- </browser:menuItems>
+ for="*"
+ title="Page designer"
+ description="Page designers are in charge of the site's graphic design.
They also define the areas in which content authors will add the site's
content."
+ action="@@page-designer.html"
+ />
<browser:resource
name="page-designer.css"
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/sitedesigner/configure.zcml
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/sitedesigner/configure.zcml
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/sitedesigner/configure.zcml
Sun Nov 13 21:32:16 2005
@@ -16,7 +16,7 @@
menu="cpsskins_authoring_actions"
title="Site designer"
action="@@site-designer.html"
- description="..."
+ description="Site designers are in charge of the overall site's design.
They manage resources and settings."
/>
<resource
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
