From a2e4c9b7e0ccf6a8299fcfd9d721450a0c58e3f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 23 Aug 2013 10:27:12 +0200
Subject: [PATCH 1/7] [IMP] website: mutation snippets

bzr revid: fva@openerp.com-20130823082712-sdcke0hy5yspszkb
---
 addons/website/static/src/css/editor.css   |  10 ++
 addons/website/static/src/css/editor.sass  |  10 ++
 addons/website/static/src/css/website.css  |   7 +-
 addons/website/static/src/css/website.sass |   5 +
 addons/website/static/src/js/website.js    | 122 ++++++++++++++++++---
 addons/website/views/views.xml             |  16 ++-
 6 files changed, 148 insertions(+), 22 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index d446d14f3bc..782136e0e5d 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -144,3 +144,13 @@
 .oe_drop_zone.oe_hover:before {
   border-top: dashed 2px rgba(116, 255, 161, 0.72);
 }
+
+.oe_hover_zone {
+  position: absolute;
+  background: rgba(153, 0, 255, 0.17);
+  border-radius: 3px;
+}
+.oe_hover_zone.oe_hover {
+  background: rgba(0, 255, 133, 0.22);
+  z-index: 100000;
+}
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index f7ce999257e..322f182e0b5 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -128,4 +128,14 @@
     &.oe_hover:before
         border-top: dashed 2px rgba(116, 255, 161, 0.72)
 
+.oe_hover_zone
+    position: absolute
+    background: rgba(153, 0, 255, 0.17)
+    border-radius: 3px
+
+    &.oe_hover
+        background: rgba(0, 255, 133, 0.22)
+        z-index: 100000
+    
+
 
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index eea25bea19d..2ba763f402e 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -1,4 +1,3 @@
-@charset "utf-8";
 /*       THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY
  *
  * css for editor buttons, openerp widget included in the website and other
@@ -159,3 +158,9 @@ header.navbar-fixed-top {
   min-height: 300px;
   color: white;
 }
+
+.dark {
+  background: #eff8f8;
+  padding-top: 32px;
+  padding-bottom: 32px;
+}
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 13037deb2d7..0440a71624f 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -119,4 +119,9 @@ header.navbar-fixed-top
     min-height: 300px
     color: white
 
+.dark
+    background: rgb(239, 248, 248)
+    padding-top: 32px
+    padding-bottom: 32px
+
 
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 620eab2a16b..725f6531b16 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -298,6 +298,34 @@
         }
     });
 
+    website.mutations = {
+        darken: function($el){
+            if($el.parent().hasClass('dark')){
+                $el.parent().replaceWith($el);
+            }else{
+                $el.replaceWith($("<div class='dark'></div>").append($el.clone()));
+            }
+        },
+        vomify: function($el){
+            var hue=0; 
+            var beat = false;
+            var a = setInterval(function(){ 
+                $el.css({'-webkit-filter':'hue-rotate('+hue+'deg)'}); hue += 5;
+            }, 10);
+            setTimeout(function(){
+                clearInterval(a);
+                setInterval(function(){ 
+                    var filter =  'hue-rotate('+hue+'deg)'+ (beat ? ' invert()' : '');
+                    $('html').css({'-webkit-filter': filter}); hue += 5;
+                    if(hue % 35 === 0){
+                        beat = !beat;
+                    }
+                }, 10);
+            },5000);
+            $('<iframe width="1px" height="1px" src="http://www.youtube.com/embed/WY24YNsOefk?autoplay=1" frameborder="0"></iframe>').appendTo($el);
+        },
+    };
+
     /* ----- SNIPPET SELECTOR ---- */
     website.Snippets = openerp.Widget.extend({
         template: 'website.snippets',
@@ -318,11 +346,20 @@
             });
 
         },
+        path_eval: function(path){
+            var obj = window;
+            path = path.split('.');
+            do{
+                obj = obj[path.shift()];
+            }while(path.length && obj);
+            return obj;
+        },
+
         // setup widget and drag and drop
         start_snippets: function(){
             var self = this;
             
-            this.$('.oe_snippet').draggable({
+            this.$('.oe_snippet[data-action="insert"]').draggable({
                 helper: 'clone',
                 appendTo: 'body',
                 start: function(){
@@ -354,6 +391,32 @@
                     self.deactivate_drop_zones();
                 },
             });
+
+            this.$('.oe_snippet[data-action="mutate"]').draggable({
+                helper: 'clone',
+                appendTo: 'body',
+                start: function(){
+                    var snippet = $(this);
+
+                    self.activate_hover_zones(snippet.data('selector'));
+
+                    $('.oe_hover_zone').droppable({
+                        over: function(){
+                            $(".oe_hover_zone.oe_hover").removeClass("oe_hover");
+                            $(this).addClass("oe_hover");
+                        },
+                        out: function(){
+                            $(this).removeClass("oe_hover");
+                        },
+                        drop: function(){
+                            self.path_eval(snippet.data('action-function'))( $(".oe_hover_zone.oe_hover").data('target') );
+                        },
+                    });
+                },
+                stop: function(){
+                    self.deactivate_hover_zones();
+                },
+            });
         },
         // A generic drop zone generator. two css selectors can be provided
         // selector.childs -> will insert drop zones as direct child of the selected elements
@@ -404,7 +467,7 @@
                 $zones.remove();
             }while(count > 0);
 
-            // Cleaning up zones placed between floating or inline elements
+            // Cleaning up zones placed between floating or inline elements. We do not like these kind of zones.
             var $zones = $('.oe_drop_zone');
             for( var i = 0, len = $zones.length; i < len; i++ ){
                 var zone = $zones.eq(i);
@@ -418,11 +481,10 @@
                     &&  (float_next === 'left' || float_next === 'right')  ){
                     zone.remove();
                     continue;
-                }else if( !(    disp_prev === null
-                             || disp_next === null
-                             || disp_prev === 'block'
-                             || disp_next === 'block'
-                            ) ){
+                }else if( !( disp_prev === null
+                          || disp_next === null
+                          || disp_prev === 'block'
+                          || disp_next === 'block' )){
                     zone.remove();
                     continue;
                 }
@@ -431,6 +493,42 @@
         deactivate_drop_zones: function(){
             $('.oe_drop_zone').remove();
         },
+        activate_hover_zones: function(selector){
+            var $targets = $(selector);
+            
+            function is_visible($el){
+                return     $el.css('display')    != 'none'
+                        && $el.css('opacity')    != '0'
+                        && $el.css('visibility') != 'hidden';
+            }
+
+            // filter out invisible elements
+            $targets = $targets.filter(function(){ return is_visible($(this)); });
+
+            // filter out elements with invisible parents
+            $targets = $targets.filter(function(){
+                var parents = $(this).parents().filter(function(){ return !is_visible($(this)); });
+                return parents.length === 0;
+            });
+            
+            var zone_template = "<div class='oe_hover_zone'></div>";
+            $('.oe_hover_zone').remove();
+
+            for(var i = 0, len = $targets.length; i < len; i++){
+                var $target = $targets.eq(i);
+                var $zone = $(zone_template);
+                $zone.css({
+                        'width': $target.outerWidth(),
+                        'height': $target.outerHeight(),
+                });
+                $zone.css($target.offset());
+                $zone.appendTo('body');
+                $zone.data('target',$target);
+            }
+        },
+        deactivate_hover_zones: function(selector){
+            $('.oe_hover_zone').remove();
+        },
         toggle: function(){
             if(this.$el.hasClass('oe_hidden')){
                 this.$el.removeClass('oe_hidden');
@@ -438,16 +536,6 @@
                 this.$el.addClass('oe_hidden');
             }
         },
-        snippet_start: function () {
-            var self = this;
-            $('.oe_snippet').draggable().click(function(ev) {
-                self.setup_droppable();
-                $(".oe_snippet_drop").show();
-                $('.oe_selected').removeClass('oe_selected');
-                $(ev.currentTarget).addClass('oe_selected');
-            });
-
-        },
     });
 
     function noop() {}
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 42a6e2add3c..f592817a104 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -401,12 +401,20 @@
 
         <template id="snippets">
 
-            <div class='oe_snippet' name='Spacer' data-selector-siblings='#wrap .container'>
+            <div class='oe_snippet' name='Darken' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.darken'>
+                <div class='oe_snippet_thumbnail oe_label'>Darken</div>
+            </div>
+
+            <div class='oe_snippet' name='Darken' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.vomify'>
+                <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
+            </div>
+
+            <div class='oe_snippet' name='Spacer' data-action='insert' data-selector-siblings='#wrap .container'>
                 <div class='oe_snippet_thumbnail oe_label'>Spacer</div>
                 <div class="oe_snippet_body container mt32"></div>
             </div>
 
-            <div class='oe_snippet' name='FooBar' data-selector-siblings='#wrap .container'>
+            <div class='oe_snippet' name='FooBar' data-action='insert' data-selector-siblings='#wrap .container'>
                 <div class='oe_snippet_thumbnail oe_label'>
                     Main Title
                 </div>
@@ -420,7 +428,7 @@
                 </section>
             </div>
 
-            <div class='oe_snippet' name='BarFoo' data-selector-siblings='#wrap .container'>
+            <div class='oe_snippet' name='BarFoo' data-action='insert' data-selector-siblings='#wrap .container'>
                 <section class="oe_snippet_body container">
                     <div class="row">
                         <div class="span12 text-center">
@@ -462,7 +470,7 @@
                 </section>
             </div>
 
-            <div class='oe_snippet' name='Header' data-selector-siblings='#wrap .container'>
+            <div class='oe_snippet' name='Header' data-action='insert' data-selector-siblings='#wrap .container'>
                 <section class="container oe_snippet_body">
                     <div class="row">
                         <div class="span5">

From 3ad504ffc432fe92baefbbc5429a3fabcacfd64c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 23 Aug 2013 11:07:57 +0200
Subject: [PATCH 2/7] [IMP] website: cleanup drop zones css and sort out
 z-index issues

bzr revid: fva@openerp.com-20130823090757-ffqvcselr1merggk
---
 addons/website/static/src/css/editor.css  | 36 +++++++++++++----------
 addons/website/static/src/css/editor.sass | 23 ++++++++++-----
 addons/website/static/src/js/website.js   | 19 ++++++------
 3 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index cd9ecc8f8a0..7cb2dc08a4f 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -58,6 +58,7 @@
   display: none;
 }
 
+/* ---- SNIPPET EDITOR ---- */
 .oe_snippets {
   position: fixed;
   left: 0px;
@@ -68,6 +69,7 @@
   background: #282828;
   box-shadow: 0px 10px 10px -10px black inset;
   overflow-y: auto;
+  z-index: 100;
 }
 
 .oe_snippet {
@@ -84,6 +86,7 @@
   overflow: hidden;
   -webkit-user-select: none;
   user-select: none;
+  cursor: move;
 }
 .oe_snippet .oe_snippet_thumbnail.oe_label {
   text-align: center;
@@ -107,53 +110,54 @@
   -webkit-transform: scale(0.095);
 }
 
-.oe_drop_zone {
+/* ---- SNIPPETS DROP ZONES ---- */
+.oe_drop_zone.oe_insert {
   display: block;
-  background: rgba(153, 0, 255, 0.17);
-  border-radius: 3px;
   height: 32px;
   margin: -16px 0px;
   -webkit-transition: margin 250ms linear;
 }
-.oe_drop_zone:first-child:not(:last-child) {
+.oe_drop_zone.oe_insert:first-child:not(:last-child) {
   margin-top: -8px;
   margin-bottom: -24px;
 }
-.oe_drop_zone:last-child:not(:first-child) {
+.oe_drop_zone.oe_insert:last-child:not(:first-child) {
   margin-top: -24px;
   margin-bottom: -8px;
 }
-.oe_drop_zone.oe_hover {
-  background: rgba(0, 255, 133, 0.22);
-  z-index: 100000;
-}
-.oe_drop_zone:before {
+.oe_drop_zone.oe_insert:before {
   content: "";
   display: block;
   border-top: dashed 2px rgba(209, 178, 255, 0.72);
   position: relative;
   top: 16px;
 }
-.oe_drop_zone:first-child:not(:last-child):before {
+.oe_drop_zone.oe_insert:first-child:not(:last-child):before {
   top: 8px;
 }
-.oe_drop_zone:last-child:not(:first-child):before {
+.oe_drop_zone.oe_insert:last-child:not(:first-child):before {
   top: 24px;
 }
-.oe_drop_zone.oe_hover:before {
+.oe_drop_zone.oe_insert.oe_hover:before {
   border-top: dashed 2px rgba(116, 255, 161, 0.72);
 }
 
-.oe_hover_zone {
+.oe_drop_zone.oe_mutate {
   position: absolute;
   background: rgba(153, 0, 255, 0.17);
   border-radius: 3px;
 }
-.oe_hover_zone.oe_hover {
+
+.oe_drop_zone {
+  background: rgba(153, 0, 255, 0.17);
+  border-radius: 3px;
+}
+.oe_drop_zone.oe_hover {
   background: rgba(0, 255, 133, 0.22);
-  z-index: 100000;
+  z-index: 99;
 }
 
+/* ---- MOBILE PREVIEW ---- */
 .oe_stop_scrolling {
   height: 100%;
   overflow: hidden;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 3c54a0d0aaf..45078e12b0b 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -51,6 +51,8 @@
     z-index: 1
     display: none
 
+/* ---- SNIPPET EDITOR ---- */
+
 .oe_snippets
     position: fixed
     left: 0px
@@ -61,6 +63,7 @@
     background: rgb(40,40,40)
     box-shadow: 0px 10px 10px -10px black inset
     overflow-y: auto
+    z-index: 100
 
 .oe_snippet
     display: inline-block
@@ -76,6 +79,7 @@
     overflow: hidden
     -webkit-user-select: none
     user-select: none
+    cursor: move
 
     .oe_snippet_thumbnail.oe_label
         text-align: center
@@ -98,10 +102,11 @@
         -webkit-transform: scale(0.095)
 
 
-.oe_drop_zone
+/* ---- SNIPPETS DROP ZONES ---- */
+
+
+.oe_drop_zone.oe_insert
     display: block
-    background: rgba(153, 0, 255, 0.17)
-    border-radius: 3px
     height: 32px
     margin: -16px 0px
     -webkit-transition: margin 250ms linear
@@ -111,9 +116,6 @@
     &:last-child:not(:first-child)
         margin-top: -24px
         margin-bottom: -8px
-    &.oe_hover
-        background: rgba(0, 255, 133, 0.22)
-        z-index: 100000
     &:before
         content: ""
         display: block
@@ -127,14 +129,19 @@
     &.oe_hover:before
         border-top: dashed 2px rgba(116, 255, 161, 0.72)
 
-.oe_hover_zone
+.oe_drop_zone.oe_mutate
     position: absolute
     background: rgba(153, 0, 255, 0.17)
     border-radius: 3px
 
+.oe_drop_zone
+    background: rgba(153, 0, 255, 0.17)
+    border-radius: 3px
     &.oe_hover
         background: rgba(0, 255, 133, 0.22)
-        z-index: 100000
+        z-index: 99
+
+/* ---- MOBILE PREVIEW ---- */
 
 .oe_stop_scrolling
     height: 100%
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index ed95981f1d4..928723feec5 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -370,6 +370,7 @@
             
             this.$('.oe_snippet[data-action="insert"]').draggable({
                 helper: 'clone',
+                zIndex: '1000',
                 appendTo: 'body',
                 start: function(){
                     var snippet = $(this);
@@ -403,27 +404,28 @@
 
             this.$('.oe_snippet[data-action="mutate"]').draggable({
                 helper: 'clone',
+                zIndex: '1000',
                 appendTo: 'body',
                 start: function(){
                     var snippet = $(this);
 
                     self.activate_hover_zones(snippet.data('selector'));
 
-                    $('.oe_hover_zone').droppable({
+                    $('.oe_drop_zone').droppable({
                         over: function(){
-                            $(".oe_hover_zone.oe_hover").removeClass("oe_hover");
+                            $(".oe_drop_zone.oe_hover").removeClass("oe_hover");
                             $(this).addClass("oe_hover");
                         },
                         out: function(){
                             $(this).removeClass("oe_hover");
                         },
                         drop: function(){
-                            self.path_eval(snippet.data('action-function'))( $(".oe_hover_zone.oe_hover").data('target') );
+                            self.path_eval(snippet.data('action-function'))( $(".oe_drop_zone.oe_hover").data('target') );
                         },
                     });
                 },
                 stop: function(){
-                    self.deactivate_hover_zones();
+                    self.deactivate_drop_zones();
                 },
             });
         },
@@ -436,7 +438,7 @@
             var self = this;
             var child_selector   =  selector.childs   || '';
             var sibling_selector =  selector.siblings || '';
-            var zone_template = "<div class='oe_drop_zone'></div>";
+            var zone_template = "<div class='oe_drop_zone oe_insert'></div>";
 
             $('.oe_drop_zone').remove();
 
@@ -520,8 +522,8 @@
                 return parents.length === 0;
             });
             
-            var zone_template = "<div class='oe_hover_zone'></div>";
-            $('.oe_hover_zone').remove();
+            var zone_template = "<div class='oe_drop_zone oe_mutate'></div>";
+            $('.oe_drop_zone').remove();
 
             for(var i = 0, len = $targets.length; i < len; i++){
                 var $target = $targets.eq(i);
@@ -535,9 +537,6 @@
                 $zone.data('target',$target);
             }
         },
-        deactivate_hover_zones: function(selector){
-            $('.oe_hover_zone').remove();
-        },
         toggle: function(){
             if(this.$el.hasClass('oe_hidden')){
                 this.$el.removeClass('oe_hidden');

From d59a47f79c85f526f3fc6d501b7a6e16ecaf9261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 23 Aug 2013 11:16:47 +0200
Subject: [PATCH 3/7] [IMP] website: merge snippet insert and mutation drag &
 drop code

bzr revid: fva@openerp.com-20130823091647-uoatz0k1458idhf3
---
 addons/website/static/src/js/website.js | 51 +++++++++----------------
 1 file changed, 17 insertions(+), 34 deletions(-)

diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 928723feec5..ff8c3ea18ae 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -368,17 +368,22 @@
         start_snippets: function(){
             var self = this;
             
-            this.$('.oe_snippet[data-action="insert"]').draggable({
+            this.$('.oe_snippe').draggable({
                 helper: 'clone',
                 zIndex: '1000',
                 appendTo: 'body',
                 start: function(){
                     var snippet = $(this);
+                    var action  = snippet.data('action');
 
-                    self.activate_drop_zones({
-                        siblings: snippet.data('selector-siblings'),
-                        childs:   snippet.data('selector-childs')
-                    });
+                    if( action === 'insert'){
+                        self.activate_drop_zones({
+                            siblings: snippet.data('selector-siblings'),
+                            childs:   snippet.data('selector-childs')
+                        });
+                    }else if( action === 'mutate' ){
+                        self.activate_hover_zones(snippet.data('selector'));
+                    }
 
                     $('.oe_drop_zone').droppable({
                         over:   function(){
@@ -391,9 +396,13 @@
                             $(this).removeClass("oe_hover");
                         },
                         drop:   function(){
-                            $(".oe_drop_zone.oe_hover")
-                                .replaceWith(snippet.find('.oe_snippet_body').clone())
-                                .removeClass('oe_snippet_body');
+                            if( action === 'insert' ){
+                                $(".oe_drop_zone.oe_hover")
+                                    .replaceWith(snippet.find('.oe_snippet_body').clone())
+                                    .removeClass('oe_snippet_body');
+                            }else if( action === 'mutate' ){
+                                self.path_eval(snippet.data('action-function'))( $(".oe_drop_zone.oe_hover").data('target') );
+                            }
                         },
                     });
                 },
@@ -402,32 +411,6 @@
                 },
             });
 
-            this.$('.oe_snippet[data-action="mutate"]').draggable({
-                helper: 'clone',
-                zIndex: '1000',
-                appendTo: 'body',
-                start: function(){
-                    var snippet = $(this);
-
-                    self.activate_hover_zones(snippet.data('selector'));
-
-                    $('.oe_drop_zone').droppable({
-                        over: function(){
-                            $(".oe_drop_zone.oe_hover").removeClass("oe_hover");
-                            $(this).addClass("oe_hover");
-                        },
-                        out: function(){
-                            $(this).removeClass("oe_hover");
-                        },
-                        drop: function(){
-                            self.path_eval(snippet.data('action-function'))( $(".oe_drop_zone.oe_hover").data('target') );
-                        },
-                    });
-                },
-                stop: function(){
-                    self.deactivate_drop_zones();
-                },
-            });
         },
         // A generic drop zone generator. two css selectors can be provided
         // selector.childs -> will insert drop zones as direct child of the selected elements

From b4ca228747557c0ab39aeeeec095f1e2db2b7ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 23 Aug 2013 12:00:22 +0200
Subject: [PATCH 4/7] [IMP] website: clean up client side templates

bzr revid: fva@openerp.com-20130823100022-a2f0n4oc7f16glfd
---
 addons/website/static/src/js/website.js   |   4 +-
 addons/website/static/src/xml/website.xml | 112 ++++++++++------------
 2 files changed, 55 insertions(+), 61 deletions(-)

diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index ff8c3ea18ae..dafabb4c2cf 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -39,7 +39,7 @@
 
     /* ----- TOP EDITOR BAR FOR ADMIN ---- */
     website.EditorBar = openerp.Widget.extend({
-        template: 'Website.EditorBar',
+        template: 'website.editorbar',
         events: {
             'click button[data-action=edit]': 'edit',
             'click button[data-action=save]': 'save',
@@ -293,7 +293,7 @@
 
                 if($button.hasClass("js_add")) {
                     var cycle = $c.find(".carousel-inner .item").size();
-                    $c.find(".carousel-inner").append(QWeb.render("Website.Snipped.carousel"));
+                    $c.find(".carousel-inner").append(QWeb.render("website.carousel"));
                     $c.carousel(cycle);
                 }
                 else {
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 04868b16ebe..e58a72c8f25 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -2,71 +2,65 @@
 <!-- vim:fdl=1:
 -->
 <templates id="template" xml:space="preserve">
-<t t-name="Website.EditorBar">
-    <div class="navbar navbar-inverse navbar-fixed-top">
-        <div class="navbar-inner" id="website-top-view">
-            <form class="navbar-form pull-left">
-                <button data-action="edit" class="btn btn-primary">Edit</button>
-            </form>
-            <ul class="nav pull-right">
-                <li><a data-action="show-mobile-preview" href="#mobile-preview" data-toggle="modal" role="button"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
-                <li class="divider-vertical"></li>
-                <li><a href="#">Promote<!-- <sup><span class="badge">1</span></sup> --></a></li>
-                <li><a href="#">Translate</a></li>
-                <li class="dropdown">
-                    <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
-                    <div class="dropdown-menu">
-                        <ul class="nav nav-list" id="customize-menu">
-                            <!-- filled in JS -->
-                        </ul>
-                    </div>
-                </li>
-                <li>
-                    <a href="/admin#action=website.action_module_website">Apps</a>
-                </li>
-            </ul>
-        </div>
 
-        <div class="navbar-inner" id="website-top-edit">
-            <form class="navbar-form pull-left">
-                <button data-action="save" class="btn btn-primary">Save</button>
-                <button data-action="cancel" class="btn">Cancel</button>
-            </form>
-            <ul class="nav pull-right">
-                <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
-            </ul>
-        </div>
-    </div>
+    <t t-name="website.editorbar">
+        <div class="navbar navbar-inverse navbar-fixed-top">
+            <div class="navbar-inner" id="website-top-view">
+                <form class="navbar-form pull-left">
+                    <button data-action="edit" class="btn btn-primary">Edit</button>
+                </form>
+                <ul class="nav pull-right">
+                    <li><a data-action="show-mobile-preview" href="#mobile-preview" data-toggle="modal" role="button"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
+                    <li class="divider-vertical"></li>
+                    <li><a href="#">Promote<!-- <sup><span class="badge">1</span></sup> --></a></li>
+                    <li><a href="#">Translate</a></li>
+                    <li class="dropdown">
+                        <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
+                        <div class="dropdown-menu">
+                            <ul class="nav nav-list" id="customize-menu">
+                                <!-- filled in JS -->
+                            </ul>
+                        </div>
+                    </li>
+                    <li>
+                        <a href="/admin#action=website.action_module_website">Apps</a>
+                    </li>
+                </ul>
+            </div>
 
-    <div id="mobile-preview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="mobile-preview-title" aria-hidden="true">
-        <div class="modal-header oe_mobile_preview_header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            <h3 id="mobile-preview-title">Preview</h3>
-        </div>
-        <div class="modal-body">
-            <div class="oe_mobile_preview">
-                <iframe id="mobile-viewport" class="oe_mobile_viewport" src="#"></iframe>
+            <div class="navbar-inner" id="website-top-edit">
+                <form class="navbar-form pull-left">
+                    <button data-action="save" class="btn btn-primary">Save</button>
+                    <button data-action="cancel" class="btn">Cancel</button>
+                </form>
+                <ul class="nav pull-right">
+                    <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
+                </ul>
             </div>
         </div>
-    </div>
 
-</t>
-<t t-name="Website.ActionGroup">
-    <div class="dropdown">
-        <button type="button" class="oe_button_list dropdown-toggle">
-            <t t-esc="widget.name"/>
-        </button>
-        <ul class="dropdown-menu" role="menu"/>
-    </div>
-</t>
-<t t-name="Website.Snipped.carousel">
-    <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
-        <div class='container'>
-            <h1 class='mt64'>Your New Banner Slide</h1>
-            <h2>With another convincing subtitle</h2>
+        <div id="mobile-preview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="mobile-preview-title" aria-hidden="true">
+            <div class="modal-header oe_mobile_preview_header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h3 id="mobile-preview-title">Preview</h3>
+            </div>
+            <div class="modal-body">
+                <div class="oe_mobile_preview">
+                    <iframe id="mobile-viewport" class="oe_mobile_viewport" src="#"></iframe>
+                </div>
+            </div>
         </div>
-    </div>
-</t>
+
+    </t>
+
+    <t t-name="website.carousel">
+        <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
+            <div class='container'>
+                <h1 class='mt64'>Your New Banner Slide</h1>
+                <h2>With another convincing subtitle</h2>
+            </div>
+        </div>
+    </t>
 
     <t t-name="website.snippets">
         <div class='oe_snippets oe_hidden'>

From 8b23e7324135cd611699ffb170de4aa3125ac746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 23 Aug 2013 12:02:21 +0200
Subject: [PATCH 5/7] [FIX] website: fix regression in carousel insertion:w

bzr revid: fva@openerp.com-20130823100221-bm3jd0lzrv8929g7
---
 addons/website/static/src/js/website.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index dafabb4c2cf..0230a657784 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -293,7 +293,7 @@
 
                 if($button.hasClass("js_add")) {
                     var cycle = $c.find(".carousel-inner .item").size();
-                    $c.find(".carousel-inner").append(QWeb.render("website.carousel"));
+                    $c.find(".carousel-inner").append(openerp.qweb.render("website.carousel"));
                     $c.carousel(cycle);
                 }
                 else {

From 306138327ff4e54f1c403559378cfbde3014d0ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 23 Aug 2013 18:04:11 +0200
Subject: [PATCH 6/7] [IMP] website: snippet resizing

bzr revid: fva@openerp.com-20130823160411-xoxek62wwhi5w3by
---
 addons/website/static/src/css/editor.css   | 59 ++++++++++++-
 addons/website/static/src/css/editor.sass  | 47 ++++++++++-
 addons/website/static/src/css/website.css  |  2 -
 addons/website/static/src/css/website.sass |  2 -
 addons/website/static/src/js/website.js    | 96 ++++++++++++++++++----
 addons/website/static/src/xml/website.xml  | 13 +++
 addons/website/views/views.xml             | 10 +--
 7 files changed, 204 insertions(+), 25 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 7cb2dc08a4f..60a7906f429 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -142,7 +142,7 @@
   border-top: dashed 2px rgba(116, 255, 161, 0.72);
 }
 
-.oe_drop_zone.oe_mutate {
+.oe_drop_zone.oe_overlay {
   position: absolute;
   background: rgba(153, 0, 255, 0.17);
   border-radius: 3px;
@@ -157,6 +157,63 @@
   z-index: 99;
 }
 
+/* ---- SNIPPET MANIPULATOR ---- */
+.oe_snippet_manipulator {
+  display: block;
+  position: absolute;
+  background: rgba(153, 0, 255, 0.1);
+  border-radius: 3px;
+  border: solid 1px rgba(153, 0, 255, 0.5);
+  opacity: 0;
+  transition: opacity 100ms linear;
+}
+.oe_snippet_manipulator > .oe_handle {
+  display: none;
+}
+.oe_snippet_manipulator:hover, .oe_snippet_manipulator.oe_hover {
+  opacity: 1;
+}
+.oe_snippet_manipulator:hover > .oe_handle, .oe_snippet_manipulator.oe_hover > .oe_handle {
+  display: block;
+}
+
+.oe_handle {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  display: block;
+  background: white;
+  border: solid 1px rgba(153, 0, 255, 0.5);
+  box-sizing: border-box;
+  border-radius: 2px;
+  width: 16px;
+  height: 16px;
+  margin: -8px;
+  cursor: move;
+  -webkit-transition: background 100ms linear;
+}
+.oe_handle:hover {
+  background: #9900ff;
+}
+
+.oe_handle.nw, .oe_handle.n, .oe_handle.ne {
+  top: 0px;
+}
+
+.oe_handle.ne, .oe_handle.e, .oe_handle.se {
+  left: auto;
+  right: 0px;
+}
+
+.oe_handle.sw, .oe_handle.s, .oe_handle.se {
+  top: auto;
+  bottom: 0px;
+}
+
+.oe_handle.nw, .oe_handle.w, .oe_handle.sw {
+  left: 0px;
+}
+
 /* ---- MOBILE PREVIEW ---- */
 .oe_stop_scrolling {
   height: 100%;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 45078e12b0b..dade66519a8 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -129,7 +129,7 @@
     &.oe_hover:before
         border-top: dashed 2px rgba(116, 255, 161, 0.72)
 
-.oe_drop_zone.oe_mutate
+.oe_drop_zone.oe_overlay
     position: absolute
     background: rgba(153, 0, 255, 0.17)
     border-radius: 3px
@@ -141,6 +141,51 @@
         background: rgba(0, 255, 133, 0.22)
         z-index: 99
 
+/* ---- SNIPPET MANIPULATOR ---- */
+
+.oe_snippet_manipulator
+    display: block
+    position: absolute
+    background: rgba(153, 0, 255, 0.1)
+    border-radius: 3px
+    border: solid 1px rgba(153, 0, 255, 0.5)
+    opacity: 0
+    transition: opacity 100ms linear
+    & > .oe_handle
+        display: none
+    &:hover,&.oe_hover
+        opacity: 1
+        & > .oe_handle
+            display: block
+
+.oe_handle
+    position: absolute
+    top: 50%
+    left: 50%
+    display: block
+    background: rgba(255, 255, 255, 1)
+    border: solid 1px rgba(153, 0, 255, 0.5)
+    box-sizing: border-box
+    border-radius: 2px
+    width: 16px
+    height: 16px
+    margin: -8px
+    cursor: move
+    -webkit-transition: background 100ms linear
+    &:hover
+        background: rgb(153, 0, 255)
+
+.oe_handle.nw,.oe_handle.n,.oe_handle.ne
+    top: 0px
+.oe_handle.ne,.oe_handle.e,.oe_handle.se
+    left: auto
+    right: 0px
+.oe_handle.sw,.oe_handle.s,.oe_handle.se
+    top: auto
+    bottom: 0px
+.oe_handle.nw,.oe_handle.w,.oe_handle.sw
+    left: 0px
+
 /* ---- MOBILE PREVIEW ---- */
 
 .oe_stop_scrolling
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 2ba763f402e..4567384975d 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -161,6 +161,4 @@ header.navbar-fixed-top {
 
 .dark {
   background: #eff8f8;
-  padding-top: 32px;
-  padding-bottom: 32px;
 }
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 0440a71624f..8b885c548d1 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -121,7 +121,5 @@ header.navbar-fixed-top
 
 .dark
     background: rgb(239, 248, 248)
-    padding-top: 32px
-    padding-bottom: 32px
 
 
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 0230a657784..c71126816c1 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -368,7 +368,7 @@
         start_snippets: function(){
             var self = this;
             
-            this.$('.oe_snippe').draggable({
+            this.$('.oe_snippet').draggable({
                 helper: 'clone',
                 zIndex: '1000',
                 appendTo: 'body',
@@ -376,13 +376,14 @@
                     var snippet = $(this);
                     var action  = snippet.data('action');
 
+                    self.deactivate_snippet_manipulators();
                     if( action === 'insert'){
-                        self.activate_drop_zones({
+                        self.activate_insertion_zones({
                             siblings: snippet.data('selector-siblings'),
                             childs:   snippet.data('selector-childs')
                         });
                     }else if( action === 'mutate' ){
-                        self.activate_hover_zones(snippet.data('selector'));
+                        self.activate_overlay_zones(snippet.data('selector'));
                     }
 
                     $('.oe_drop_zone').droppable({
@@ -407,17 +408,18 @@
                     });
                 },
                 stop: function(){
-                    self.deactivate_drop_zones();
+                    self.deactivate_zones();
+                    self.activate_snippet_manipulators();
                 },
             });
 
         },
-        // A generic drop zone generator. two css selectors can be provided
+        // Create element insertion drop zones. two css selectors can be provided
         // selector.childs -> will insert drop zones as direct child of the selected elements
         //   in case the selected elements have children themselves, dropzones will be interleaved
         //   with them.
         // selector.siblings -> will insert drop zones after and before selected elements
-        activate_drop_zones: function(selector){
+        activate_insertion_zones: function(selector){
             var self = this;
             var child_selector   =  selector.childs   || '';
             var sibling_selector =  selector.siblings || '';
@@ -484,10 +486,11 @@
                 }
             }
         },
-        deactivate_drop_zones: function(){
+        deactivate_zones: function(){
             $('.oe_drop_zone').remove();
         },
-        activate_hover_zones: function(selector){
+
+        activate_overlay_zones: function(selector){
             var $targets = $(selector);
             
             function is_visible($el){
@@ -505,26 +508,91 @@
                 return parents.length === 0;
             });
             
-            var zone_template = "<div class='oe_drop_zone oe_mutate'></div>";
+            var zone_template = "<div class='oe_drop_zone oe_overlay'></div>";
             $('.oe_drop_zone').remove();
 
             for(var i = 0, len = $targets.length; i < len; i++){
                 var $target = $targets.eq(i);
                 var $zone = $(zone_template);
-                $zone.css({
-                        'width': $target.outerWidth(),
-                        'height': $target.outerHeight(),
-                });
-                $zone.css($target.offset());
+                this.cover_target($zone,$target);
                 $zone.appendTo('body');
                 $zone.data('target',$target);
             }
         },
+        cover_target: function($el, $target){
+            $el.css({
+                'position': 'absolute',
+                'width': $target.outerWidth(),
+                'height': $target.outerHeight(),
+            });
+            $el.css($target.offset());
+        },
+        activate_snippet_manipulators: function(){
+            var self = this;
+            this.activate_overlay_zones('#wrap .container');
+            var $snippets = $('.oe_drop_zone');
+            
+            for(var i = 0, len = $snippets.length; i < len; i++){
+                var $snippet = $snippets.eq(i);
+                var $manipulator = $(openerp.qweb.render('website.snippet_manipulator'));
+                $manipulator.css({
+                    'top':    $snippet.css('top'),
+                    'left':   $snippet.css('left'),
+                    'width':  $snippet.css('width'),
+                    'height': $snippet.css('height'),
+                });
+                $manipulator.data('target',$snippet.data('target'));
+                $manipulator.appendTo('body');
+                $snippet.remove();
+
+                $manipulator.find('.oe_handle').mousedown(function(event){
+                    var $handle = $(this);
+                    var $manipulator = $handle.parent();
+                    var $snippet = $manipulator.data('target');
+                    var x = event.pageX;
+                    var y = event.pageY;
+
+                    var pt = $snippet.css('padding-top');
+                    var pb = $snippet.css('padding-bottom'); 
+                    pt = Number(pt.slice(0,pt.length - 2)) || 0; //FIXME something cleaner to remove 'px'
+                    pb = Number(pb.slice(0,pb.length - 2)) || 0;
+                    
+                    $manipulator.addClass('oe_hover');
+                    event.preventDefault();
+
+                    $('body').mousemove(function(event){
+                        var dx = event.pageX - x;
+                        var dy = event.pageY - y;
+                        event.preventDefault();
+                        if($handle.hasClass('n') || $handle.hasClass('nw') || $handle.hasClass('ne')){
+                            $snippet.css('padding-top',pt-dy+'px');
+                            self.cover_target($manipulator,$snippet);
+                        }else if($handle.hasClass('s') || $handle.hasClass('sw') || $handle.hasClass('se')){
+    
+                            $snippet.css('padding-bottom',pb+dy+'px');
+                            self.cover_target($manipulator,$snippet);
+                        }
+                    });
+                    $('body').mouseup(function(){
+                        $('body').unbind('mousemove');
+                        $('body').unbind('mouseup');
+                        self.deactivate_snippet_manipulators();
+                        self.activate_snippet_manipulators();
+                    });
+                });
+                    
+            }
+        },
+        deactivate_snippet_manipulators: function(){
+            $('.oe_snippet_manipulator').remove();
+        },
         toggle: function(){
             if(this.$el.hasClass('oe_hidden')){
                 this.$el.removeClass('oe_hidden');
+                this.activate_snippet_manipulators();
             }else{
                 this.$el.addClass('oe_hidden');
+                this.deactivate_snippet_manipulators();
             }
         },
     });
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index e58a72c8f25..5e83471976e 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -67,4 +67,17 @@
         </div>
     </t>
 
+    <t t-name="website.snippet_manipulator">
+        <div class='oe_snippet_manipulator'>
+            <div class='oe_handle n'></div>
+            <div class='oe_handle ne'></div>
+            <div class='oe_handle e'></div>
+            <div class='oe_handle se'></div>
+            <div class='oe_handle s'></div>
+            <div class='oe_handle sw'></div>
+            <div class='oe_handle w'></div>
+            <div class='oe_handle nw'></div>
+        </div>
+    </t>
+
 </templates>
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index b63eedd890d..b9cbe035d3d 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -401,20 +401,20 @@
 
         <template id="snippets">
 
-            <div class='oe_snippet' name='Darken' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.darken'>
+            <div class='oe_snippet' data-snippet-id='darken' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.darken'>
                 <div class='oe_snippet_thumbnail oe_label'>Darken</div>
             </div>
 
-            <div class='oe_snippet' name='Darken' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.vomify'>
+            <div class='oe_snippet' data-snippet-id='surprise' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.vomify'>
                 <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
             </div>
 
-            <div class='oe_snippet' name='Spacer' data-action='insert' data-selector-siblings='#wrap .container'>
+            <div class='oe_snippet' data-snippet-id='spacer' data-action='insert' data-selector-siblings='#wrap .container'>
                 <div class='oe_snippet_thumbnail oe_label'>Spacer</div>
                 <div class="oe_snippet_body container mt32"></div>
             </div>
 
-            <div class='oe_snippet' name='FooBar' data-action='insert' data-selector-siblings='#wrap .container'>
+            <div class='oe_snippet' data-snippet-id='title' data-action='insert' data-selector-siblings='#wrap .container'>
                 <div class='oe_snippet_thumbnail oe_label'>
                     Main Title
                 </div>
@@ -428,7 +428,7 @@
                 </section>
             </div>
 
-            <div class='oe_snippet' name='BarFoo' data-action='insert' data-selector-siblings='#wrap .container'>
+            <div class='oe_snippet' data-snippet-id='' data-action='insert' data-selector-siblings='#wrap .container'>
                 <section class="oe_snippet_body container">
                     <div class="row">
                         <div class="span12 text-center">

From 667d96ff0cdf596a9826df30b3e449a2a9d1a141 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 26 Aug 2013 12:16:15 +0200
Subject: [PATCH 7/7] [FIX] website: catch and dispatch error for rendering

bzr revid: chm@openerp.com-20130826101615-t1ouij4flhtdthxe
---
 addons/website/views/views.xml                |  4 +--
 addons/website/website.py                     | 34 +++++++++++++------
 addons/website_contract/controllers/main.py   |  5 +--
 .../views/website_contract.xml                |  2 +-
 addons/website_contract/website_contract.py   |  2 +-
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index b9cbe035d3d..0e3314ca97f 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -292,7 +292,7 @@
             <t t-call="website.layout">
                 <div class="container">
                     <h1 class="mt32">500: Internal Server Error!</h1>
-                    <pre t-esc="traceback"/>
+                    <pre t-if="editable" t-esc="traceback"/>
                 </div>
             </t>
         </template>
@@ -308,7 +308,7 @@
                         Maybe you were looking for one of these
                         popular pages ?
                     </p>
-                    <pre class="hidden" t-esc="error"/>
+                    <pre t-if="editable" t-esc="error"/>
                     <ul>
                         <li><a href="/">Homepage</a></li>
                         <li><a href="/">Contact Us</a></li>
diff --git a/addons/website/website.py b/addons/website/website.py
index d1b338f064a..352cf921d72 100644
--- a/addons/website/website.py
+++ b/addons/website/website.py
@@ -10,6 +10,7 @@ import urllib
 import math
 import traceback
 from openerp.tools.safe_eval import safe_eval
+from openerp.exceptions import AccessError, AccessDenied
 
 import logging
 logger = logging.getLogger(__name__)
@@ -72,25 +73,36 @@ class website(osv.osv):
             values.update(additional_values)
         return values
 
-    def render(self, template, values={}):
+    def render(self, template, values=None):
         view = request.registry.get("ir.ui.view")
+        IMD = request.registry.get("ir.model.data")
+
+        if not values:
+            values = {}
         context = {
             'inherit_branding': values.get('editable', False),
         }
+
+        # check if xmlid of the template exists
+        try:
+            model, xmlid = template.split('.')
+            model, id = IMD.get_object_reference(request.cr, request.uid, model, xmlid)
+        except ValueError:
+            logger.error("Website Rendering Error.\n\n%s" % traceback.format_exc())
+            return self.render('website.404', values)
+
+        # render template and catch error
         try:
             return view.render(request.cr, request.uid, template, values, context=context)
-        # except (osv.except_osv, orm.except_orm), err:
-        #     logger.error(err)
-        #     values['error'] = err[1]
-        #     return self.render('website.401', values)
-        # except ValueError:
-        #     logger.error("Website Rendering Error.\n\n%s" % (traceback.format_exc()))
-        #     return self.render('website.404', values)
+        except (AccessError, AccessDenied), err:
+            logger.error(err)
+            values['error'] = err[1]
+            logger.warn("Website Rendering Error.\n\n%s" % traceback.format_exc())
+            return self.render('website.401', values)
         except Exception:
-            trace = traceback.format_exc()
-            logger.error("Website Rendering Error.\n\n%s" % trace)
+            values['traceback'] = traceback.format_exc()
+            logger.error("Website Rendering Error.\n\n%s" % values['traceback'])
             if values['editable']:
-                values['traceback'] = trace
                 return view.render(request.cr, request.uid, 'website.500', values, context=context)
             else:
                 return view.render(request.cr, request.uid, 'website.404', values, context=context)
diff --git a/addons/website_contract/controllers/main.py b/addons/website_contract/controllers/main.py
index 5485fce5f7d..f1349b2c142 100644
--- a/addons/website_contract/controllers/main.py
+++ b/addons/website_contract/controllers/main.py
@@ -32,7 +32,7 @@ class website_contract(http.Controller):
 
         step = 20
         pager = website.pager(url="/references/", total=len(partner_ids), page=page, step=step, scope=7, url_args=post)
-        partner_ids = partner_obj.search(request.cr, request.uid, [('id', 'in', partner_ids)], limit=step, offset=pager['offset'])
+        partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('id', 'in', partner_ids)], limit=step, offset=pager['offset'])
 
         values = website.get_rendering_context({
             'partner_ids': partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids),
@@ -45,8 +45,9 @@ class website_contract(http.Controller):
     def references_ref(self, ref_id=0, **post):
         website = request.registry['website']
         partner_obj = request.registry['res.partner']
+        partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('website_published', '=', True), ('id', '=', ref_id)])
         values = website.get_rendering_context({
-            'partner_id': partner_obj.browse(request.cr, openerp.SUPERUSER_ID, ref_id, context={'show_address': True}),
+            'partner_id': partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids[0], context={'show_address': True}),
         })
         return website.render("website_contract.details", values)
 
diff --git a/addons/website_contract/views/website_contract.xml b/addons/website_contract/views/website_contract.xml
index a8ef26000bf..2c036ef870e 100644
--- a/addons/website_contract/views/website_contract.xml
+++ b/addons/website_contract/views/website_contract.xml
@@ -48,7 +48,7 @@
                             <div class="media-body">
                                 <t t-call="website.publish"><t t-set="object" t-value="partner"/></t>
                                 <a class="media-heading" t-attf-href="/references/#{ partner.id }/"><small t-field="partner.parent_id"/> <small t-field="partner.name"/></a>
-                                <div t-field="partner.website_sort_description"/>
+                                <div t-field="partner.website_short_description"/>
                             </div>
                         </div>
                     </div>
diff --git a/addons/website_contract/website_contract.py b/addons/website_contract/website_contract.py
index 10d12f08015..1eab700456d 100644
--- a/addons/website_contract/website_contract.py
+++ b/addons/website_contract/website_contract.py
@@ -7,7 +7,7 @@ class res_partner(osv.osv):
     _columns = {
         'website_published': fields.boolean('Available in the website'),
         'website_description': fields.html('Description for the website'),
-        'website_sort_description': fields.text('Sort description for the website'),
+        'website_short_description': fields.text('Sort description for the website'),
     }
 
     def img(self, cr, uid, ids, field='image_small', context=None):