Permalink
Browse files

Merge remote-tracking branch 'origin/ux2' into ux2

  • Loading branch information...
2 parents 9cac754 + 9328e41 commit e4661abcc6456ce822a09b307f0bd5885f30fad8 @pauleveritt pauleveritt committed Apr 23, 2012
View
@@ -7,6 +7,8 @@ Unreleased
- Fix bug where rendering a template from a console script would raise an
exception.
+- Fix error when rendering Edit Reference Manual Page view in UX1. (LP #987257)
+
3.83 (2012-04-19)
-----------------
@@ -291,6 +291,6 @@ def show_page_view(context, request):
backto=backto,
previous_entry=previous,
next_entry=next,
- layout=layout),
+ old_layout=layout),
request = request,
)
@@ -190,7 +190,7 @@ def reference_outline_view(context, request):
# Get a layout
layout_provider = get_layout_provider(context, request)
- layout = layout_provider('intranet')
+ old_layout = layout_provider('intranet')
# provide client data for rendering current tags in the tagbox
client_json_data = dict(
@@ -207,7 +207,7 @@ def reference_outline_view(context, request):
head_data=convert_to_script(client_json_data),
tree=getTree(context, request, api),
backto=backto,
- layout=layout,
+ old_layout=old_layout,
previous_entry=previous,
next_entry=next),
request=request,
@@ -238,7 +238,7 @@ def reference_viewall_view(context, request):
# Get a layout
layout_provider = get_layout_provider(context, request)
- layout = layout_provider('intranet')
+ old_layout = layout_provider('intranet')
# provide client data for rendering current tags in the tagbox
client_json_data = dict(
@@ -254,7 +254,7 @@ def reference_viewall_view(context, request):
head_data=convert_to_script(client_json_data),
tree=getTree(context, request, api),
backto=backto,
- layout=layout,
+ old_layout=old_layout,
previous_entry=previous,
next_entry=next),
request=request,
@@ -37,7 +37,7 @@
<div class="visualClear"></div>
</div>
<div id="main">
- <div id="left" tal:content="structure layout.navigation"/>
+ <div id="left" tal:content="structure old_layout.navigation"/>
<div id="center" class="clearafter center_boards">
<div metal:define-slot="content"/>
</div>
@@ -1,7 +1,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal"
- metal:use-macro="layout">
+ metal:use-macro="old_layout">
<div metal:fill-slot="content">
@@ -1,7 +1,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal"
- metal:use-macro="layout">
+ metal:use-macro="old_layout">
<body>
@@ -1,7 +1,7 @@
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal"
- metal:use-macro="layout">
+ metal:use-macro="old_layout">
<div metal:fill-slot="content"
tal:define="ol_types ['1', 'A', 'i', 'a'] + ['1'] * 1000;

0 comments on commit e4661ab

Please sign in to comment.