From 849fc19aa139af3922f2ddc8149668bfc7c45432 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 21 Jan 2014 10:34:15 +0100
Subject: [PATCH 1/7] [FIX] website: import openerp.addons.website_blog.tests

bzr revid: chm@openerp.com-20140121093415-ork5jis48mmq4dp8
---
 addons/website_blog/tests/__init__.py  | 2 +-
 addons/website_event/tests/__init__.py | 2 +-
 addons/website_mail/tests/__init__.py  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website_blog/tests/__init__.py b/addons/website_blog/tests/__init__.py
index b407275c256..5e7b52ddf04 100644
--- a/addons/website_blog/tests/__init__.py
+++ b/addons/website_blog/tests/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.addons.website_blog.tests import test_controllers
+import test_controllers
 
 import test_ui
 
diff --git a/addons/website_event/tests/__init__.py b/addons/website_event/tests/__init__.py
index b407275c256..5e7b52ddf04 100644
--- a/addons/website_event/tests/__init__.py
+++ b/addons/website_event/tests/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.addons.website_blog.tests import test_controllers
+import test_controllers
 
 import test_ui
 
diff --git a/addons/website_mail/tests/__init__.py b/addons/website_mail/tests/__init__.py
index 4d92d6a8823..ad45caf21c9 100644
--- a/addons/website_mail/tests/__init__.py
+++ b/addons/website_mail/tests/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.addons.website_mail.tests import test_controllers
+import test_controllers
 
 checks = [
     test_controllers,

From 5d78f8f0646c855ea1b82e87b044d5aef05ba536 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 21 Jan 2014 11:05:24 +0100
Subject: [PATCH 2/7] [FIX] website: import full_path

bzr revid: chm@openerp.com-20140121100524-elxz0n8qfve1iefr
---
 addons/website_blog/tests/test_ui.py  | 4 ++--
 addons/website_event/tests/test_ui.py | 4 ++--
 addons/website_sale/tests/test_ui.py  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/website_blog/tests/test_ui.py b/addons/website_blog/tests/test_ui.py
index 694bbabc6f9..dad6a4752e7 100644
--- a/addons/website_blog/tests/test_ui.py
+++ b/addons/website_blog/tests/test_ui.py
@@ -1,5 +1,5 @@
-import openerp.addons.website.tests.test_ui as test_ui,full_path
+import openerp.addons.website.tests.test_ui as test_ui
 
 def load_tests(loader, base, _):
-    base.addTest(test_ui.WebsiteUiSuite(full_path(__file__,'post_test.js'),   { 'action': 'website.action_website_homepage' }, 60.0))
+    base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'post_test.js'),   { 'action': 'website.action_website_homepage' }, 60.0))
     return base
\ No newline at end of file
diff --git a/addons/website_event/tests/test_ui.py b/addons/website_event/tests/test_ui.py
index 5706e7a0c34..52cce70defd 100644
--- a/addons/website_event/tests/test_ui.py
+++ b/addons/website_event/tests/test_ui.py
@@ -1,5 +1,5 @@
-import openerp.addons.website.tests.test_ui as test_ui,full_path
+import openerp.addons.website.tests.test_ui as test_ui
 
 def load_tests(loader, base, _):
-    base.addTest(test_ui.WebsiteUiSuite(full_path(__file__,'event_test.js'),   { 'action': 'website.action_website_homepage' }, 60.0))
+    base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'event_test.js'),   { 'action': 'website.action_website_homepage' }, 60.0))
     return base
\ No newline at end of file
diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py
index bde975fdbba..68ba5dc0a05 100644
--- a/addons/website_sale/tests/test_ui.py
+++ b/addons/website_sale/tests/test_ui.py
@@ -1,6 +1,6 @@
-import openerp.addons.website.tests.test_ui as test_ui,full_path
+import openerp.addons.website.tests.test_ui as test_ui
 
 def load_tests(loader, base, _):
-    base.addTest(test_ui.WebsiteUiSuite(full_path(__file__,'website_sale-sale_process-test.js'),
+    base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test.js'),
         { 'action': 'website.action_website_homepage' }, 60.0))
     return base
\ No newline at end of file

From 8d48ce0f5ae70e4ca7c90086ebc69243c89e4ac5 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 21 Jan 2014 11:07:17 +0100
Subject: [PATCH 3/7] [IMP] website: js test/tour: raise an exception when
 cycling or time overlaps

bzr revid: chm@openerp.com-20140121100717-d8foqqz5vmdyowuo
---
 addons/website/static/src/js/website.tour.js  | 66 ++++++++++++-------
 .../static/src/js/website.tour.shop.js        |  9 ++-
 2 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 7bb8b971344..00dba53fe55 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -327,6 +327,7 @@
             var testId = 'test_'+tour.id+'_tour';
             this.tours.push(tour);
             var defaultDelay = 500; //ms
+            var overlapsCrash;
             var test = {
                 id: tour.id,
                 run: function (force) {
@@ -336,45 +337,60 @@
                     var actionSteps = _.filter(tour.steps, function (step) {
                        return step.trigger || step.sampleText;
                     });
+                    window.onbeforeunload = function () {
+                        clearTimeout(overlapsCrash);
+                    };
                     function executeStep (step) {
+                        var lastStep = window.localStorage.getItem(testId);
+                        var tryStep = lastStep != step.stepId ? 0 : parseInt(window.localStorage.getItem("last-"+testId) || 0, 10)+1;
+                        window.localStorage.setItem("last-"+testId, tryStep);
+                        if (tryStep > 2) {
+                            window.localStorage.removeItem(testId);
+                            throw "Test: '" + testId + "' cycling stape: '" + step.stepId + "'";
+                        }
+
                         var _next = false;
                         window.localStorage.setItem(testId, step.stepId);
                         function next () {
+                            clearTimeout(overlapsCrash);
                             _next = true;
                             var nextStep = actionSteps.shift();
                             if (nextStep) {
                                 setTimeout(function () {
                                     executeStep(nextStep);
-                                },0);
+                                }, step.delay || defaultDelay);
                             } else {
                                 window.localStorage.removeItem(testId);
                             }
                         }
-                        setTimeout(function () {
-                            var $element = $(step.element);
-                            if (step.triggers) step.triggers(next);
-                            if ((step.trigger === 'reload' || step.trigger.url) && _next) return;
-                            
-                            if (step.snippet && step.trigger === 'drag') {
-                                website.TestConsole.dragAndDropSnippet(step.snippet);
-                            } else if (step.trigger && step.trigger.id === 'change') {
-                                $element.trigger($.Event("change", { srcElement: $element }));
-                            } else if (step.sampleText) {
-                                $element.val(step.sampleText);
-                                $element.trigger($.Event("change", { srcElement: $element }));
-                            } else if ($element.is(":visible")) { // Click by default
-                                if (step.trigger.id === 'mousedown') {
-                                    $element.trigger($.Event("mousedown", { srcElement: $element }));
-                                }
-                                var evt = document.createEvent("MouseEvents");
-                                evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
-                                $element[0].dispatchEvent(evt);
-                                if (step.trigger.id === 'mouseup') {
-                                    $element.trigger($.Event("mouseup", { srcElement: $element }));
-                                }
-                            }
-                            if (!step.triggers) next();
+                        overlapsCrash = setTimeout(function () {
+                            window.localStorage.removeItem(testId);
+                            throw "Test: '" + testId + "' can't resolve stape: '" + step.stepId + "'";
                         }, step.delay || defaultDelay);
+
+                        var $element = $(step.element);
+                        if (step.triggers) step.triggers(next);
+                        if ((step.trigger === 'reload' || step.trigger.url) && _next) return;
+                        
+                        if (step.snippet && step.trigger === 'drag') {
+                            website.TestConsole.dragAndDropSnippet(step.snippet);
+                        } else if (step.trigger && step.trigger.id === 'change') {
+                            $element.trigger($.Event("change", { srcElement: $element }));
+                        } else if (step.sampleText) {
+                            $element.val(step.sampleText);
+                            $element.trigger($.Event("change", { srcElement: $element }));
+                        } else if ($element.is(":visible")) { // Click by default
+                            if (step.trigger.id === 'mousedown') {
+                                $element.trigger($.Event("mousedown", { srcElement: $element }));
+                            }
+                            var evt = document.createEvent("MouseEvents");
+                            evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+                            $element[0].dispatchEvent(evt);
+                            if (step.trigger.id === 'mouseup') {
+                                $element.trigger($.Event("mouseup", { srcElement: $element }));
+                            }
+                        }
+                        if (!step.triggers) next();
                     }
                     var url = new website.UrlParser(window.location.href);
                     if (tour.path && url.pathname !== tour.path && !window.localStorage.getItem(testId)) {
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index 193d0d5c138..a1908d5d08c 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -269,6 +269,10 @@
                         url:   '/shop/payment/',
                     },
                     beforeTrigger: function (tour, callback) {
+                        if ($("input[name='name']").val() === "")
+                            $("input[name='name']").val("website_sale-test-shoptest");
+                        if ($("input[name='email']").val() === "")
+                            $("input[name='email']").val("website_sale-test-shoptest@website_sale-test-shoptest.optenerp.com");
                         $("input[name='phone']").val("123");
                         $("input[name='street']").val("123");
                         $("input[name='city']").val("123");
@@ -276,11 +280,6 @@
                         $("select[name='country_id']").val("21");
                     },
                 },
-                // {
-                //     stepId:    'delivery-checkout-product',
-                //     element:   'input[name="delivery_type"]:eq(1)',
-                //     trigger:   'reload',
-                // },
                 {
                     stepId:    'acquirer-checkout-product',
                     element:   'input[name="acquirer"]',

From cbbf6f59402e81cb2350e9ca86e237df28b53164 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 21 Jan 2014 11:15:29 +0100
Subject: [PATCH 4/7] [FIX] website_sale: highlight category

bzr revid: chm@openerp.com-20140121101529-2cseit2mq5w1d2z2
---
 addons/website_sale/controllers/main.py    | 2 +-
 addons/website_sale/views/website_sale.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 17c7f3a574a..caa9aad7846 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -246,7 +246,7 @@ class Ecommerce(http.Controller):
             'range': range,
             'search': {
                 'search': search,
-                'category': category,
+                'category': category and category.id,
                 'filters': filters,
             },
             'pager': pager,
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index c4e25644e1d..ae740484537 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -26,7 +26,7 @@
 <!-- List of categories -->
 
 <template id="categories_recursive" name="Category list">
-  <li t-att-class="str(category.id) == search.get('category') and 'active' or ''">
+  <li t-att-class="category.id == search.get('category') and 'active' or ''">
       <a t-href="/shop/category/#{ slug(category) }/" t-field="category.name"></a>
       <ul t-if="category.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
           <t t-foreach="category.child_id" t-as="category">

From 501e88d3ebb628774d30eaccff6a93327853a033 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 20 Jan 2014 16:36:10 +0100
Subject: [PATCH 5/7] [IMP] replace select2 by grid for icons selection

bzr revid: xmo@openerp.com-20140120153610-xktkxjfbpl59xnpz
---
 addons/website/static/src/css/editor.css      | 13 +++++++
 addons/website/static/src/css/editor.sass     | 13 +++++++
 .../website/static/src/js/website.editor.js   | 38 +++++++------------
 .../website/static/src/xml/website.editor.xml |  9 ++++-
 4 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 386fead7ad3..0bb901c3676 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -207,6 +207,19 @@ ul.oe_menu_editor .disclose {
   visibility: visible !important;
 }
 
+.modal .font-icons-icons {
+  font-size: 2em;
+  max-height: 6em;
+  overflow: auto;
+}
+.modal .font-icons-icons .font-icons-icon {
+  display: inline-block;
+  width: 2em;
+  padding: 0.25em;
+  text-align: center;
+  cursor: pointer;
+}
+
 .existing-attachments .pager .disabled {
   display: none;
 }
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 923bd63e7dd..8e29015fac0 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -172,6 +172,19 @@ ul.oe_menu_editor
         display: inline-block !important
         visibility: visible !important
 
+// fontawesome modal
+.modal .font-icons-icons
+    font-size: 2em
+    max-height: 6em
+    overflow: auto
+
+    .font-icons-icon
+        display: inline-block
+        width: 2em
+        padding: 0.25em
+        text-align: center
+        cursor: pointer
+
 .existing-attachments .pager .disabled
     display: none
 
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index e687dbb6a31..35a8fad5707 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -1456,6 +1456,13 @@
         template: 'website.editor.dialog.font-icons',
         events : _.extend({}, website.editor.Dialog.prototype.events, {
             change: 'update_preview',
+            'click .font-icons-icon': function (e) {
+                e.preventDefault();
+                e.stopPropagation();
+
+                this.$('#fa-icon').val(e.target.getAttribute('data-id'));
+                this.update_preview();
+            },
         }),
 
         // List of FontAwesome icons in 4.0.3, extracted from the cheatsheet.
@@ -1474,26 +1481,7 @@
          * isn't customizable (?) and the fontawesome glyphs fail to appear.
          */
         start: function () {
-            var self = this;
-            var started = this._super();
-            this.$('#fa-icon').select2({
-                data: this.icons,
-                initSelection: function (element, callback) {
-                    var id = element.val(), match;
-                    if (id) {
-                        match = _.find(self.icons, function (item) {
-                            return item.id === id;
-                        }) || void 0;
-                    }
-
-                    callback(match);
-                },
-                formatSelection: function (object) {
-                    return $('<span class="fa fa-fw">').text(object.text);
-                },
-                formatResultCssClass: function () { return 'fa'; },
-            });
-            return started.then(this.proxy('load_data'));
+            return this._super().then(this.proxy('load_data'));
         },
         /**
          * Removes existing FontAwesome classes on the bound element, and sets
@@ -1529,15 +1517,15 @@
                 case 'fa-flip-horizontal':case 'fa-rotate-vertical':
                     this.$('#fa-rotation').val(cls);
                     continue;
-                case 'fa-fixed':
-                    this.$('#fa-fixed').prop('checked', true);
+                case 'fa-fw':
+                    this.$('#fa-fw').prop('checked', true);
                     continue;
                 case 'fa-border':
                     this.$('#fa-border').prop('checked', true);
                     continue;
                 default:
                     if (!/^fa-/.test(cls)) { continue; }
-                    this.$('#fa-icon').select2('val', cls);
+                    this.$('#fa-icon').val(cls);
                 }
             }
             this.update_preview();
@@ -1549,10 +1537,10 @@
         get_fa_classes: function () {
             return [
                 'fa',
-                this.$('#fa-icon').select2('val'),
+                this.$('#fa-icon').val(),
                 this.$('#fa-size').val(),
                 this.$('#fa-rotation').val(),
-                this.$('#fa-fixed').prop('checked') ? 'fa-fixed' : '',
+                this.$('#fa-fw').prop('checked') ? 'fa-fw' : '',
                 this.$('#fa-border').prop('checked') ? 'fa-border' : ''
             ];
         },
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 12fd0774f39..fa408ef796b 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -210,9 +210,16 @@
                 <div class="form-group">
                     Preview: <span id="fa-preview"/>
                 </div>
-                <div class="form-group">
+                <div class="form-group fa">
                     <label for="fa-icon">icon</label>
                     <input type="hidden" id="fa-icon" class="form-control"/>
+                    <div class="font-icons-icons">
+                        <span t-foreach="widget.icons" t-as="icon"
+                              class="fa font-icons-icon"
+                              t-att-data-id="icon.id">
+                            <t t-esc="icon.text"/>
+                        </span>
+                    </div>
                 </div>
                 <div class="form-group">
                     <label for="fa-size">size</label>

From ca02581993f0ead8a0c3a6e7111537bf61fc65be Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 20 Jan 2014 17:26:04 +0100
Subject: [PATCH 6/7] [IMP] replace icon size select by selectable multi-size
 preview

bzr revid: xmo@openerp.com-20140120162604-yoyg21bf1z306hwg
---
 addons/website/static/src/css/editor.css      | 10 +++++++
 addons/website/static/src/css/editor.sass     | 29 +++++++++++++------
 .../website/static/src/js/website.editor.js   | 28 ++++++++++++++++--
 .../website/static/src/xml/website.editor.xml | 17 ++---------
 4 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 0bb901c3676..e68d888fbac 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -219,6 +219,16 @@ ul.oe_menu_editor .disclose {
   text-align: center;
   cursor: pointer;
 }
+.modal #fa-preview {
+  text-align: center;
+}
+.modal #fa-preview span {
+  cursor: pointer;
+  padding: 0 15px;
+}
+.modal #fa-preview .font-icons-selected {
+  background-color: #dddddd;
+}
 
 .existing-attachments .pager .disabled {
   display: none;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 8e29015fac0..d35e07e6995 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -173,17 +173,28 @@ ul.oe_menu_editor
         visibility: visible !important
 
 // fontawesome modal
-.modal .font-icons-icons
-    font-size: 2em
-    max-height: 6em
-    overflow: auto
+.modal
+    .font-icons-icons
+        font-size: 2em
+        max-height: 6em
+        overflow: auto
 
-    .font-icons-icon
-        display: inline-block
-        width: 2em
-        padding: 0.25em
+        .font-icons-icon
+            display: inline-block
+            width: 2em
+            padding: 0.25em
+            text-align: center
+            cursor: pointer
+
+    #fa-preview
         text-align: center
-        cursor: pointer
+
+        span
+            cursor: pointer
+            padding: 0 15px
+        .font-icons-selected
+            background-color: #ddd
+
 
 .existing-attachments .pager .disabled
     display: none
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 35a8fad5707..778ab6b699b 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -1463,6 +1463,13 @@
                 this.$('#fa-icon').val(e.target.getAttribute('data-id'));
                 this.update_preview();
             },
+            'click #fa-preview span': function (e) {
+                e.preventDefault();
+                e.stopPropagation();
+
+                this.$('#fa-size').val(e.target.getAttribute('data-size'));
+                this.update_preview();
+            }
         }),
 
         // List of FontAwesome icons in 4.0.3, extracted from the cheatsheet.
@@ -1508,7 +1515,7 @@
             for (var i = 0; i < classes.length; i++) {
                 var cls = classes[i];
                 switch(cls) {
-                case 'fa-lg':case 'fa-2x':case 'fa-3x':case 'fa-4x':case 'fa-5x':
+                case 'fa-2x':case 'fa-3x':case 'fa-4x':case 'fa-5x':
                     // size classes
                     this.$('#fa-size').val(cls);
                     continue;
@@ -1545,7 +1552,24 @@
             ];
         },
         update_preview: function () {
-            this.$('#fa-preview')[0].className = this.get_fa_classes().join(' ');
+            var $preview = this.$('#fa-preview').empty();
+            var sizes = ['', 'fa-2x', 'fa-3x', 'fa-4x', 'fa-5x'];
+            var classes = this.get_fa_classes();
+            var no_sizes = _.difference(classes, sizes).join(' ');
+            var selected = false;
+            for (var i = sizes.length - 1; i >= 0; i--) {
+                var size = sizes[i];
+
+                var $p = $('<span>')
+                        .attr('data-size', size)
+                        .addClass(size)
+                        .addClass(no_sizes);
+                if ((size && _.contains(classes, size)) || (!size && !selected)) {
+                    $p.addClass('font-icons-selected');
+                    selected = true;
+                }
+                $preview.prepend($p);
+            }
         }
     });
 
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index fa408ef796b..1f102ec4a1a 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -207,12 +207,12 @@
         <t t-call="website.editor.dialog">
             <t t-set="title">Icon:</t>
             <form>
-                <div class="form-group">
-                    Preview: <span id="fa-preview"/>
+                <div class="form-group" id="fa-preview">
+
                 </div>
                 <div class="form-group fa">
-                    <label for="fa-icon">icon</label>
                     <input type="hidden" id="fa-icon" class="form-control"/>
+                    <input type="hidden" id="fa-size" class="form-control"/>
                     <div class="font-icons-icons">
                         <span t-foreach="widget.icons" t-as="icon"
                               class="fa font-icons-icon"
@@ -221,17 +221,6 @@
                         </span>
                     </div>
                 </div>
-                <div class="form-group">
-                    <label for="fa-size">size</label>
-                    <select id="fa-size" class="form-control">
-                        <option value="">Default</option>
-                        <option value="fa-lg">Large</option>
-                        <option value="fa-2x">x2</option>
-                        <option value="fa-3x">x3</option>
-                        <option value="fa-4x">x4</option>
-                        <option value="fa-5x">x5</option>
-                    </select>
-                </div>
                 <div class="form-group">
                     <label for="fa-rotation">Rotation</label>
                     <select id="fa-rotation" class="form-control">

From 51f6977f3947b74c7d6f18bea0d9d0e30a9a4454 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 21 Jan 2014 11:04:08 +0100
Subject: [PATCH 7/7] [IMP] icons selection dialog

remove fixed size checkbox
add fayt for icons (by name)

bzr revid: xmo@openerp.com-20140121100408-64e32iio9r77yx9m
---
 addons/website/static/src/css/editor.css      | 15 +++++++++++
 addons/website/static/src/css/editor.sass     | 13 ++++++++++
 .../website/static/src/js/website.editor.js   | 18 ++++++++++---
 .../website/static/src/xml/website.editor.xml | 25 ++++++++++---------
 4 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index e68d888fbac..faf02a57fc0 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -219,6 +219,21 @@ ul.oe_menu_editor .disclose {
   text-align: center;
   cursor: pointer;
 }
+.modal .font-icons {
+  position: relative;
+  display: block;
+}
+.modal .font-icons:before {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70);
+  opacity: 0.7;
+  position: absolute;
+  top: 2px;
+  left: 3px;
+  font-size: 2em;
+}
+.modal #icon-search {
+  padding-left: 2.5em;
+}
 .modal #fa-preview {
   text-align: center;
 }
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index d35e07e6995..27cee9a2eae 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -186,6 +186,19 @@ ul.oe_menu_editor
             text-align: center
             cursor: pointer
 
+    .font-icons
+        position: relative
+        display: block
+
+        &:before
+            +opacity(0.7)
+            position: absolute
+            top: 2px
+            left: 3px
+            font-size: 2em
+    #icon-search
+        padding-left: 2.5em
+
     #fa-preview
         text-align: center
 
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 778ab6b699b..25980633fd2 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -1469,7 +1469,21 @@
 
                 this.$('#fa-size').val(e.target.getAttribute('data-size'));
                 this.update_preview();
-            }
+            },
+            'input input#icon-search': function () {
+                var needle = this.$('#icon-search').val();
+                var icons = this.icons;
+                if (needle) {
+                    icons = _(icons).filter(function (icon) {
+                        return icon.id.substring(3).indexOf(needle) !== -1;
+                    });
+                }
+
+                this.$('div.font-icons-icons').html(
+                    openerp.qweb.render(
+                        'website.editor.dialog.font-icons.icons',
+                        {icons: icons}));
+            },
         }),
 
         // List of FontAwesome icons in 4.0.3, extracted from the cheatsheet.
@@ -1525,7 +1539,6 @@
                     this.$('#fa-rotation').val(cls);
                     continue;
                 case 'fa-fw':
-                    this.$('#fa-fw').prop('checked', true);
                     continue;
                 case 'fa-border':
                     this.$('#fa-border').prop('checked', true);
@@ -1547,7 +1560,6 @@
                 this.$('#fa-icon').val(),
                 this.$('#fa-size').val(),
                 this.$('#fa-rotation').val(),
-                this.$('#fa-fw').prop('checked') ? 'fa-fw' : '',
                 this.$('#fa-border').prop('checked') ? 'fa-border' : ''
             ];
         },
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 1f102ec4a1a..448c615bb07 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -210,15 +210,14 @@
                 <div class="form-group" id="fa-preview">
 
                 </div>
-                <div class="form-group fa">
+                <div class="form-group font-icons fa fa-search">
                     <input type="hidden" id="fa-icon" class="form-control"/>
                     <input type="hidden" id="fa-size" class="form-control"/>
+                    <input type="search" class="form-control" id="icon-search"/>
                     <div class="font-icons-icons">
-                        <span t-foreach="widget.icons" t-as="icon"
-                              class="fa font-icons-icon"
-                              t-att-data-id="icon.id">
-                            <t t-esc="icon.text"/>
-                        </span>
+                        <t t-call="website.editor.dialog.font-icons.icons">
+                            <t t-set="icons" t-value="widget.icons"/>
+                        </t>
                     </div>
                 </div>
                 <div class="form-group">
@@ -235,16 +234,18 @@
                 </div>
                 <div class="form-group">
                     <label>
-                        <input type="checkbox" id="fa-fixed"/> fixed width
-                    </label>
-                </div>
-                <div class="form-group">
-                    <label>
-                        <input type="checkbox" id="fa-border"/> bordered
+                        <input type="checkbox" id="fa-border"/> border
                     </label>
                 </div>
             </form>
         </t>
     </t>
+    <t t-name="website.editor.dialog.font-icons.icons">
+        <span t-foreach="icons" t-as="icon"
+              class="fa font-icons-icon"
+              t-att-data-id="icon.id">
+            <t t-esc="icon.text"/>
+        </span>
+    </t>
 
 </templates>