From f9463c0490fb8f06b7881a2799ba3cf258033f4e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 12 Aug 2013 12:55:21 +0200
Subject: [PATCH] [FIX] Customize menu. Added data-view-xmlid in html's
 rendered dom

bzr revid: fme@openerp.com-20130812105521-esswt5zckea0lzuc
---
 addons/website/static/src/js/website.js | 37 ++++++++++++-------------
 addons/website/views/views.xml          |  2 +-
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 4da86132769..13a307201a0 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -29,31 +29,30 @@ instance.website.EditorBar = instance.web.Widget.extend({
     },
     customize_setup: function() {
         var self = this;
+        var view_name = $('html').data('view-xmlid');
+        var menu = $('#customize-menu');
         this.$('#customize-menu-button').click(function(event) {
-            // TODO: replace contactus by the current view name (from website.render?)
-            self.rpc('/website/customize_template_get', {'xml_id': 'website.contactus'}).then(
+            menu.empty();
+            self.rpc('/website/customize_template_get', { 'xml_id': view_name }).then(
                 function(result) {
-                    node = $('#customize-menu').empty()
-                    for (var i in result) {
-                        item = result[i];
+                    _.each(result, function (item) {
                         if (item.header) {
-                            li = '<li class="nav-header">'+item.name+'</li>'
+                            menu.append('<li class="nav-header">' + item.name + '</li>');
                         } else {
-                            li = '<li><a href="#" data-view-id="'+item.id+'"><strong class="icon-check'+
-                                  (item.active?'':'-empty')+
-                                  '"></strong> '+item.name+'</a></li>'
+                            menu.append(_.str.sprintf('<li><a href="#" data-view-id="%s"><strong class="icon-check%s"></strong> %s</a></li>',
+                                item.id, item.active ? '' : '-empty', item.name));
                         }
-                        node.append(li);
-                    }
-                    $('a', node).on('click', function (event) {
-                        self.rpc('/website/customize_template_toggle', {
-                            'view_id': $(event.target).attr('data-view-id')
-                        }).then( function(result) {
-                            window.location.reload();
-                        })
                     });
                 }
-            )
+            );
+        });
+        menu.on('click', 'a', function (event) {
+            var view_id = $(event.target).data('view-id');
+            self.rpc('/website/customize_template_toggle', {
+                'view_id': view_id
+            }).then( function(result) {
+                window.location.reload();
+            });
         });
     },
     start: function() {
@@ -276,7 +275,7 @@ instance.website.RTE = instance.web.Widget.extend({
         var self = this;
         $('.carousel .js_carousel_options .label').on('click', function (e) {
             e.preventDefault();
-            var $button = $(e.currentTarget)
+            var $button = $(e.currentTarget);
             var $c = $button.parents(".carousel:first");
 
             if($button.hasClass("js_add")) {
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 8a5dd323d26..f55b18d0410 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -20,7 +20,7 @@
 
         <template id="layout">
                 &lt;!DOCTYPE html&gt;
-                <html>
+                <html t-att-data-view-xmlid="__stack__[0]">
                     <head>
                         <title><t t-esc="title or res_company.name"/></title>
                         <script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>