Author: jmorliaguet
Date: Mon Oct  3 22:02:41 2005
New Revision: 27893

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_panel.pt
Log:

- fixed url redirection in the edit panel



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt     
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt     
Mon Oct  3 22:02:41 2005
@@ -1,13 +1,18 @@
 <html metal:use-macro="context/@@popup_macros/page">
   <body metal:fill-slot="body"
-   onload="parent.main.location.reload()"
    class="panel" i18n:domain="cpsskins"
-   tal:define="perspective context/@@getPerspective;
-               tmutil context/@@getThemeManager;
+   tal:define="tmutil context/@@getThemeManager;
+               perspective context/@@getPerspective;
+               format_name request/form/format|nothing;
+               current_theme python:tmutil.getThemeInContext(context);
                displayable context/displayable:this;
                actual_display python: displayable.getDisplay(perspective);
                display python: displayable.getEffectiveDisplay(perspective);
-               current_theme python:tmutil.getThemeInContext(context)">
+               formattable display/formattable:this;
+               format python: format_name is not None and 
formattable.getFormat(format_name) or None;
+               format_url format/@@absolute_url;
+               main_url python: format_name and format_url or '.'"
+   tal:attributes="onload string:parent.main.location.href = 
'$main_url/@@edit.html'">
 
     <metal:block use-macro="context/@@authoring_macros/perspective_selector" />
 
@@ -30,7 +35,7 @@
 
       <!-- edit formats -->
       <tal:block condition="python: display is not None">
-        <li tal:define="formats display/formattable:getFormats"
+        <li tal:define="formats formattable/getFormats"
             tal:condition="formats"
             tal:repeat="format formats">
           <a target="main" class="item format" i18n:translate=""
@@ -49,6 +54,5 @@
       </a>
     </div>
 
-
   </body>
 </html>

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_panel.pt
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_panel.pt    
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_panel.pt    
Mon Oct  3 22:02:41 2005
@@ -3,10 +3,11 @@
     <frameset rows="70px,*,50px" frameborder="0"
      tal:define="tmutil context/@@getThemeManager;
                  id request/form/id;
+                 format request/form/format|string:;
                  element python: tmutil.getElementById(id);
                  element_url element/@@absolute_url">
       <frame name="menu" scrolling="no"
-       tal:attributes="src string:${element_url}/@@edit-menu.html" />
+       tal:attributes="src 
string:${element_url}/@@edit-menu.html?format=$format" />
       <frame name="main"
        tal:attributes="src string:${element_url}/@@edit.html" />
       <frame name="control" scrolling="no"
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to