Author: jmorliaguet
Date: Mon Jun 12 23:34:21 2006
New Revision: 3401

Removed:
   cpsskins/branches/paris-sprint-2006/ui/screens/common/add_content_selector.pt
Modified:
   cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css
   cpsskins/branches/paris-sprint-2006/ui/screens/common/configure.zcml
   cpsskins/branches/paris-sprint-2006/ui/screens/common/content_factory.pt
   cpsskins/branches/paris-sprint-2006/ui/screens/common/images/bg-header.png
   cpsskins/branches/paris-sprint-2006/ui/screens/common/page_modes.pt
   cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py
   cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt

Log:

- trying a new layout / UI, the portlet factory is at the bottom of the screen:

  http://www.medic.chalmers.se/~jmo/Zope3/ui-2006-06-16.png



Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css 
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css Mon Jun 
12 23:34:21 2006
@@ -39,13 +39,22 @@
   z-index: 10;
 }
 
-div.floatingHeader2 {
+div.floatingFooter {
   position: absolute;
-  top: 51px;
+  bottom: 0;
   left: 0;
   width: 100%;
-  background-color: #fff;
-  z-index: 10;
+  background-color: #ccc;
+  border-top: 2px solid #666;
+  height: 17px;
+  z-index: 20;
+  font: 13px arial;
+  padding-left: 10px;
+}
+
+div.floatingFooter a {
+  color: #006;
+  padding-right: 4px;
 }
 
 @media screen {
@@ -54,18 +63,16 @@
 }
 
 @media screen {
-body > div.floatingHeader2 {
+body > div.floatingFooter {
   position: fixed; }
 }
 
-.leftPanel {
-  vertical-align: top;
-  cursor: default;
-}
-
 .toolbox {
   border: 1px solid #666;
   margin: 0 5px 0 5px;
+  width: 200px;
+  bottom: 23px;
+  position: fixed;
 }
 
 .toolbox .header {
@@ -84,7 +91,6 @@
   border: none
 }
 .toolbox .section {
-  width: 200px;
   border-top: 1px solid #fff;
   border-bottom: 1px solid #999;
   font: bold 11px arial;
@@ -109,6 +115,11 @@
   background-color: #ffc;
 }
 
+.toolbox div.items {
+  height: 250px;
+  overflow-y: scroll;
+}
+
 .toolbox img.icon {
   border: 0;
   width: 16px;

Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/configure.zcml        
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/configure.zcml        
Mon Jun 12 23:34:21 2006
@@ -84,11 +84,6 @@
     />
 
     <page
-      name="add-content-selector.html"
-      template="add_content_selector.pt"
-    />
-
-    <page
       name="content-factory.html"
       template="content_factory.pt"
     />

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/common/content_factory.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/content_factory.pt    
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/content_factory.pt    
Mon Jun 12 23:34:21 2006
@@ -1,7 +1,7 @@
 <div id="toolbox" class="toolbox" i18n:domain="cpsskins">
   <div class="header">
     <a class="button" 
href="javascript:CPSSkins.getControllerById('panel-perspectives').hide('content-factory')"><img
 src="++resource++close-button.png" /></a>
-   Portlets
+   Select a portlet
   </div>
   <tal:block repeat="info view/listPortlets">
     <a i18n:translate=""
@@ -9,15 +9,17 @@
      tal:attributes="href string:@@selectPortletProvider?provider=$provider;
                      class python: selected and 'selected section' or 
'section'"
      tal:content="string:provider.$provider" />
-    <div class="factory" tal:condition="info/selected"
-         tal:repeat="factory info/factories"
-         tal:attributes="type_name factory/type_name">
-      <div tal:define="title factory/title; odd repeat/factory/odd;"
-           tal:attributes="class python: odd and 'item odd' or 'item'">
-        <img class="icon" i18n:attributes="title"
-         tal:attributes="title title; src string:++resource++${factory/icon}" 
/>
-        <span class="title" tal:content="factory/title" /> &mdash;
-        <span class="description" tal:content="factory/description" />
+    <div class="items" tal:omit-tag="not:info/selected">
+      <div class="factory" tal:condition="info/selected"
+           tal:repeat="factory info/factories"
+           tal:attributes="type_name factory/type_name">
+        <div class="item" tal:define="title factory/title">
+          <img class="icon" i18n:attributes="title"
+               tal:attributes="title title;
+                               src string:++resource++${factory/icon}" />
+          <span class="title" tal:content="factory/title" /> &mdash;
+          <span class="description" tal:content="factory/description" />
+        </div>
       </div>
     </div>
   </tal:block>

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/common/images/bg-header.png
==============================================================================
Binary files. No diff available.

Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/page_modes.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/page_modes.pt 
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/page_modes.pt Mon Jun 
12 23:34:21 2006
@@ -1,9 +1,6 @@
-<ul class="inlineButtons" style="float:right">
-  <span>Page mode:</span>
-  <li>
-    <a 
href="javascript:CPSSkins.getControllerById('page-mode-perspectives').switchTo('layout')">Layout</a></li>
-  <li>
-    <a 
href="javascript:CPSSkins.getControllerById('page-mode-perspectives').switchTo('wysiwyg')">WYSIWYG</a></li>
-</ul>
-<br style="clear:right" />
 
+  <a 
href="javascript:CPSSkins.getControllerById('panel-perspectives').switchTo('content-factory')">Add
 a portlet</a>
+
+    <span>Page mode</span>
+    <a 
href="javascript:CPSSkins.getControllerById('page-mode-perspectives').switchTo('layout')">Layout</a>
+    <a 
href="javascript:CPSSkins.getControllerById('page-mode-perspectives').switchTo('wysiwyg')">WYSIWYG</a>

Modified: cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py       
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py       Mon Jun 
12 23:34:21 2006
@@ -461,17 +461,7 @@
         'controllers': ['main-editor-perspectives', 'element-editor-actions'],
     },
 
-    # Left panel
-    'add-content-selector': {
-        'id': 'add-content-selector',
-        'widget': {
-            'type': 'panel',
-        },
-        'model': 'add-content-selector',
-        'perspectives': ['page-designer'],
-        'controllers': ['main-editor-perspectives'],
-    },
-
+    # bottom right menu
     'content-factory': {
         'id': 'content-factory',
         'widget': {

Modified: cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt    (original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt    Mon Jun 12 
23:34:21 2006
@@ -29,26 +29,6 @@
       <ins class="view" tal:content="python: view('perspective-selector')" />
     </div>
 
-      <!-- top tabs -->
-    <div class="floatingHeader2">
-      <ins class="model" tal:content="python: model('theme-tabs')" />
-      <ins class="view" tal:content="python: view('theme-tabs')" />
-      <ins class="model" tal:content="python: model('page-tabs')" />
-      <ins class="view" tal:content="python: view('page-tabs')" />
-
-      <ins class="model" tal:content="python: model('location-selector')" />
-      <ins class="view" tal:content="python: view('location-selector')" />
-
-      <ins class="model" tal:content="python: model('add-content-selector')" />
-      <ins class="view" tal:content="python: view('add-content-selector')" />
-
-      <ins class="model" tal:content="python: model('page-mode-selector')" />
-      <ins class="view" tal:content="python: view('page-mode-selector')" />
-      <ins class="controller"
-       tal:content="python: controller('page-mode-perspectives')" />
-    </div>
-
-    <ins class="model" tal:content="python: model('panels')" />
     <ins class="controller"
          tal:content="python: controller('panel-perspectives')" />
 
@@ -65,37 +45,34 @@
       <ins class="controller"
            tal:content="python: controller('disable-links')" />
 
-      <!-- Main area for other screens -->
-      <div id="mainArea">
-        <ins class="model" tal:content="python: model('site-manager')" />
-        <ins class="view" tal:content="python: view('site-manager')" />
-        <!-- element editor -->
-        <ins class="model" tal:content="python: model('element-editor')" />
-        <ins class="view" tal:content="python: view('element-editor')" />
-      </div>
+      <!-- top tabs -->
+      <ins class="model" tal:content="python: model('theme-tabs')" />
+      <ins class="view" tal:content="python: view('theme-tabs')" />
+      <ins class="model" tal:content="python: model('page-tabs')" />
+      <ins class="view" tal:content="python: view('page-tabs')" />
+
+      <ins class="model" tal:content="python: model('location-selector')" />
+      <ins class="view" tal:content="python: view('location-selector')" />
 
-      <table style="width:100%; margin-top: 102px">
-        <tr>
-          <!-- left panel -->
-          <td class="leftPanel">
-            <ins class="model"
-             tal:content="python: model('content-factory')" />
-            <ins class="view"
-             tal:content="python: view('content-factory')" />
-            <ins class="controller"
-             tal:content="python: controller('content-factory')" />
-          </td>
-          <!-- rendered pages -->
-          <td id="canvasArea" style="width: 100%;" valign="top">
-            <ins class="model" tal:content="python: model('page-designer')" />
-            <ins class="view" tal:content="python: view('page-designer')" />
-            <ins class="model" tal:content="python: model('content-author')" />
-            <ins class="view" tal:content="python: view('content-author')" />
-            <ins class="controller"
-             tal:content="python: controller('element-mover')" />
-          </td>
-        </tr>
-      </table>
+
+      <ins class="model" tal:content="python: model('panels')" />
+
+      <ins class="model"
+       tal:content="python: model('content-factory')" />
+      <ins class="view"
+       tal:content="python: view('content-factory')" />
+      <ins class="controller"
+       tal:content="python: controller('content-factory')" />
+
+      <!-- rendered pages -->
+      <div id="canvasArea">
+        <ins class="model" tal:content="python: model('page-designer')" />
+        <ins class="view" tal:content="python: view('page-designer')" />
+        <ins class="model" tal:content="python: model('content-author')" />
+        <ins class="view" tal:content="python: view('content-author')" />
+        <ins class="controller"
+         tal:content="python: controller('element-mover')" />
+      </div>
 
       <!-- Contextual menu -->
       <ins class="view" tal:content="python: view('context-menu')" />
@@ -104,5 +81,20 @@
       <ins class="controller"
        tal:content="python: controller('show-hide-menu')" />
     </div>
+    <!-- Main area for other screens -->
+    <div id="mainArea">
+      <ins class="model" tal:content="python: model('site-manager')" />
+      <ins class="view" tal:content="python: view('site-manager')" />
+      <!-- element editor -->
+      <ins class="model" tal:content="python: model('element-editor')" />
+      <ins class="view" tal:content="python: view('element-editor')" />
+    </div>
+
+    <div class="floatingFooter">
+      <ins class="model" tal:content="python: model('page-mode-selector')" />
+      <ins class="view" tal:content="python: view('page-mode-selector')" />
+      <ins class="controller"
+       tal:content="python: controller('page-mode-perspectives')" />
+    </div>
   </body>
 </html>
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to