Author: jmorliaguet
Date: Sat Nov 12 16:07:08 2005
New Revision: 29478
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/contentauthor/configure.zcml
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/content_author.pt
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/layout_designer.pt
z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/page_designer.pt
Log:
- added an 'editor' macro to avoid duplicate code
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
Sat Nov 12 16:07:08 2005
@@ -26,7 +26,7 @@
z-index: 10;
}
-div.floatingHeader2 {
+div.floatingFooter {
position: absolute;
bottom: 0;
left: 0;
@@ -63,7 +63,7 @@
}
@media screen {
-body > div.floatingHeader2 {
+body > div.floatingFooter {
position: fixed; }
}
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
Sat Nov 12 16:07:08 2005
@@ -141,3 +141,45 @@
</tal:block>
</ul>
</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"
+ tal:define="tmutil context/@@getThemeManager;
+ current_theme python:tmutil.getThemeInContext(context);
+ effective_page python:tmutil.getEffectivePage(context, request)">
+ <head>
+ <metal:block define-slot="css" />
+ <link rel="Stylesheet" type="text/css"
+ href="/++skin++cpsskins/@@/++resource++authoring.css" />
+ <link rel="Stylesheet" type="text/css"
+ href="/++skin++cpsskins/@@/++resource++widgets.css" />
+ <link rel="Stylesheet" type="text/css" href="./renderCSS" />
+
+ <metal:block define-slot="javascript" />
+ <script type="text/javascript"
+ src="/@@/jsolait/init.js"></script>
+ <script type="text/javascript"
+ src="/++skin++cpsskins/@@/++resource++utils.js"></script>
+ <script type="text/javascript"
+ src="/++skin++cpsskins/@@/++resource++pdlib.js"></script>
+ <script type="text/javascript"
+ src="/++skin++cpsskins/@@/++resource++authoring.js"></script>
+ </head>
+ <body>
+ <div class="floatingHeader">
+ <metal:block define-slot="header" />
+ </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>
+</metal:block>
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
Sat Nov 12 16:07:08 2005
@@ -25,7 +25,7 @@
/>
<browser:resource
- name="content_author.css" file="content_author.css"
+ name="content-author.css" file="content_author.css"
layer="cpsskins"
/>
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
Sat Nov 12 16:07:08 2005
@@ -1,47 +1,26 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"
- tal:define="engine string:content-author;
- tmutil context/@@getThemeManager;
- current_theme python:tmutil.getThemeInContext(context);
- effective_page python:tmutil.getEffectivePage(context,
request)">
- <head>
- <link rel="Stylesheet" type="text/css"
- href="/++skin++cpsskins/@@/++resource++content_author.css" />
- <link rel="Stylesheet" type="text/css"
- href="/++skin++cpsskins/@@/++resource++authoring.css" />
- <link rel="Stylesheet" type="text/css"
- href="/++skin++cpsskins/@@/++resource++widgets.css" />
- <link rel="Stylesheet" type="text/css" href="./renderCSS" />
-
- <script type="text/javascript" src="/@@/jsolait/init.js"></script>
- <script type="text/javascript"
- src="/++skin++cpsskins/@@/++resource++utils.js"></script>
- <script type="text/javascript"
- src="/++skin++cpsskins/@@/++resource++pdlib.js"></script>
- <script type="text/javascript"
- src="/++skin++cpsskins/@@/++resource++authoring.js"></script>
+<tal:block define="engine string:content-author">
- </head>
- <body>
-
- <div class="floatingHeader">
- <metal:block use-macro="context/@@authoring_macros/navigation_pad" />
- <metal:block use-macro="context/@@authoring_macros/perspective_selector"
/>
- </div>
- <div class="floatingHeader2">
- <metal:block use-macro="context/@@authoring_macros/add_content_panel" />
- </div>
-
- <div id="editSpace">
- <metal:block use-macro="context/@@authoring_macros/themetabs" />
- <metal:block use-macro="context/@@authoring_macros/pagetabs" />
- <tal:block content="structure python: view.draw(
- location=context, engine=engine)"/>
- </div>
-
- <div id="engine" tal:attributes="name engine" />
+<metal:block use-macro="context/@@authoring_macros/editor">
+ <metal:block fill-slot="css">
+ <link rel="Stylesheet" type="text/css"
+ href="/++skin++cpsskins/@@/++resource++content-author.css" />
+ </metal:block>
- <metal:block use-macro="context/@@authoring_macros/authoring_footer" />
+ <metal:block fill-slot="header">
+ <metal:block use-macro="context/@@authoring_macros/perspective_selector" />
+ <metal:block use-macro="context/@@authoring_macros/navigation_pad" />
+ </metal:block>
+
+ <metal:block fill-slot="main">
+ <metal:block use-macro="context/@@authoring_macros/themetabs" />
+ <metal:block use-macro="context/@@authoring_macros/pagetabs" />
+ <tal:block content="structure python: view.draw(location=context,
+ engine=engine)" />
+ </metal:block>
+
+ <metal:block fill-slot="footer">
+ <metal:block use-macro="context/@@authoring_macros/add_content_panel" />
+ </metal:block>
+</metal:block>
- </body>
-</html>
+</tal:block>
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/layout_designer.pt
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/layout_designer.pt
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/layout_designer.pt
Sat Nov 12 16:07:08 2005
@@ -1,46 +1,25 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"
- tal:define="engine string:layout-designer;
- tmutil context/@@getThemeManager;
- current_theme python:tmutil.getThemeInContext(context);
- effective_page python:tmutil.getEffectivePage(context, request)">
- <head>
+<tal:block define="engine string:layout-designer">
+
+<metal:block use-macro="context/@@authoring_macros/editor">
+ <metal:block fill-slot="css">
<link rel="Stylesheet" type="text/css"
href="/++skin++cpsskins/@@/++resource++layout_designer.css" />
- <link rel="Stylesheet" type="text/css"
- href="/++skin++cpsskins/@@/++resource++authoring.css" />
- <link rel="Stylesheet" type="text/css"
- href="/++skin++cpsskins/@@/++resource++widgets.css" />
- <link rel="Stylesheet" type="text/css" href="./renderCSS" />
-
- <script type="text/javascript"
- src="/@@/jsolait/init.js"></script>
- <script type="text/javascript"
- src="/++skin++cpsskins/@@/++resource++utils.js"></script>
- <script type="text/javascript"
- src="/++skin++cpsskins/@@/++resource++pdlib.js"></script>
- <script type="text/javascript"
- src="/++skin++cpsskins/@@/++resource++authoring.js"></script>
- </head>
- <body>
+ </metal:block>
- <div class="floatingHeader">
- <div id="message-box"></div>
- <metal:block use-macro="context/@@authoring_macros/perspective_selector"
/>
- <metal:block use-macro="context/@@authoring_macros/navigation_pad" />
- </div>
- <div class="floatingHeader2">
- <metal:block use-macro="context/@@authoring_macros/add_content_panel" />
- </div>
+ <metal:block fill-slot="header">
+ <metal:block use-macro="context/@@authoring_macros/perspective_selector" />
+ <metal:block use-macro="context/@@authoring_macros/navigation_pad" />
+ </metal:block>
- <div id="editSpace">
- <metal:block use-macro="context/@@authoring_macros/themetabs" />
- <metal:block use-macro="context/@@authoring_macros/pagetabs" />
- <tal:block content="structure python: view.draw(engine=engine)" />
- </div>
+ <metal:block fill-slot="main">
+ <metal:block use-macro="context/@@authoring_macros/themetabs" />
+ <metal:block use-macro="context/@@authoring_macros/pagetabs" />
+ <tal:block content="structure python: view.draw(engine=engine)" />
+ </metal:block>
- <div id="engine" tal:attributes="name engine" />
+ <metal:block fill-slot="footer">
+ <metal:block use-macro="context/@@authoring_macros/add_content_panel" />
+ </metal:block>
+</metal:block>
- <metal:block use-macro="context/@@authoring_macros/authoring_footer" />
- </body>
-</html>
+</tal:block>
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/page_designer.pt
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/page_designer.pt
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/page_designer.pt
Sat Nov 12 16:07:08 2005
@@ -1,46 +1,25 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"
- tal:define="engine string:page-designer;
- tmutil context/@@getThemeManager;
- current_theme python:tmutil.getThemeInContext(context);
- effective_page python:tmutil.getEffectivePage(context, request)">
- <head>
- <link rel="Stylesheet" type="text/css"
- href="/++skin++cpsskins/@@/++resource++page_designer.css" />
- <link rel="Stylesheet" type="text/css"
- href="/++skin++cpsskins/@@/++resource++authoring.css" />
- <link rel="Stylesheet" type="text/css"
- href="/++skin++cpsskins/@@/++resource++widgets.css" />
- <link rel="Stylesheet" type="text/css" href="./renderCSS" />
+<tal:block define="engine string:page-designer">
- <script type="text/javascript"
- src="/@@/jsolait/init.js"></script>
- <script type="text/javascript"
- src="/++skin++cpsskins/@@/++resource++utils.js"></script>
- <script type="text/javascript"
- src="/++skin++cpsskins/@@/++resource++pdlib.js"></script>
- <script type="text/javascript"
- src="/++skin++cpsskins/@@/++resource++authoring.js"></script>
- </head>
- <body>
+<metal:block use-macro="context/@@authoring_macros/editor">
+ <metal:block fill-slot="css">
+ <link rel="Stylesheet" type="text/css"
+ href="/++skin++cpsskins/@@/++resource++layout_designer.css" />
+ </metal:block>
- <div class="floatingHeader">
- <div id="message-box"></div>
- <metal:block use-macro="context/@@authoring_macros/perspective_selector"
/>
- <metal:block use-macro="context/@@authoring_macros/navigation_pad" />
- </div>
- <div class="floatingHeader2">
- <metal:block use-macro="context/@@authoring_macros/add_content_panel" />
- </div>
+ <metal:block fill-slot="header">
+ <metal:block use-macro="context/@@authoring_macros/perspective_selector" />
+ <metal:block use-macro="context/@@authoring_macros/navigation_pad" />
+ </metal:block>
- <div id="editSpace">
- <metal:block use-macro="context/@@authoring_macros/themetabs" />
- <metal:block use-macro="context/@@authoring_macros/pagetabs" />
- <tal:block content="structure python: view.draw(engine=engine)" />
- </div>
+ <metal:block fill-slot="main">
+ <metal:block use-macro="context/@@authoring_macros/themetabs" />
+ <metal:block use-macro="context/@@authoring_macros/pagetabs" />
+ <tal:block content="structure python: view.draw(engine=engine)" />
+ </metal:block>
- <div id="engine" tal:attributes="name engine" />
+ <metal:block fill-slot="footer">
+ <metal:block use-macro="context/@@authoring_macros/add_content_panel" />
+ </metal:block>
+</metal:block>
- <metal:block use-macro="context/@@authoring_macros/authoring_footer" />
- </body>
-</html>
+</tal:block>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
