From efc408e3bf8e9087fe3f5d6b4930bd6f53636ef8 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 2 Sep 2013 12:26:21 +0200
Subject: [PATCH] SEO keywords improvement

bzr revid: ddm@openerp.com-20130902102621-fd02b3mzkd3fm6wv
---
 addons/website/static/src/js/website.seo.js | 22 ++++++++++++---------
 addons/website/static/src/xml/website.xml   |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js
index 7dfc5aecf02..7be8e9494cd 100644
--- a/addons/website/static/src/js/website.seo.js
+++ b/addons/website/static/src/js/website.seo.js
@@ -37,6 +37,8 @@
         },
         init: function (parent, options) {
             this.keyword = options.keyword;
+            // default, primary, success, info, warning, danger
+            this.type = options.type || 'default';
             this.onDelete = options.onDelete;
             this._super(parent);
         },
@@ -58,7 +60,7 @@
             // default, primary, success, info, warning, danger
             this.type = options.type || 'default';
             this._addToSelection = function (keyword) {
-                parent.addKeyword(keyword, parent.$el);
+                parent.addKeyword(keyword, parent.$el, 'info');
             };
             this._super(parent);
         },
@@ -157,16 +159,17 @@
             var requestURL = "http://seo.eu01.aws.af.cm/suggest/" + encodeURIComponent(companyName);
             var self = this;
             $.getJSON(requestURL, function (list) {
-                list.push(companyName);
                 var nameRegex = new RegExp(companyName, "gi");
                 var cleanList = _.map(list, function (word) {
-                    console.log(word);
-                    return word.replace(nameRegex, "");
+                    return word.replace(nameRegex, "").trim();
                 });
-                _.each(_.uniq(list), function (keyword) {
-                    new website.seo.Suggestion(self, {
-                        keyword: keyword
-                    }).appendTo($('.js_seo_company_suggestions'));
+                cleanList.push(companyName);
+                _.each(_.uniq(cleanList), function (keyword) {
+                    if (keyword) {
+                        new website.seo.Suggestion(self, {
+                            keyword: keyword
+                        }).appendTo($('.js_seo_company_suggestions'));
+                    }
                 });
             });
         },
@@ -181,7 +184,7 @@
                 this.$el.find('input[name=seo_page_keywords]').val("");
             }
         },
-        addKeyword: function (keyword, $el) {
+        addKeyword: function (keyword, $el, type) {
             var $modal = $el || this.$el;
             function keywords () {
                 return $('.js_seo_keyword').map(function () {
@@ -212,6 +215,7 @@
             if (word && !isKeywordListFull() && !isExistingKeyword(word)) {
                 new website.seo.Keyword(this, {
                     keyword: word,
+                    type: type,
                     onDelete: enableNewKeywords
                 }).appendTo($modal.find('.js_seo_keywords_list'));
             }
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 94b85182eaa..9d474781e9e 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -135,7 +135,7 @@
 
     <t t-name="website.seo_keyword">
         <li class="oe_seo_keyword">
-            <span t-attf-class="label label-default js_seo_keyword">
+            <span t-attf-class="label label-#{ widget.type } js_seo_keyword">
                 <t t-raw="widget.keyword"/>
                 &amp;nbsp;
                 <a href="#" class="oe_remove" data-action="remove-keyword">x</a>