From a9a6aa7ca2b3a9da548c2f6796c06f1b411e753b Mon Sep 17 00:00:00 2001
From: David Monjoie <dmo@odoo.com>
Date: Mon, 15 Jun 2015 11:38:41 +0200
Subject: [PATCH] [IMP] website: extract default website customize options into
 new theme_default module

---
 addons/theme_bootswatch/views/theme.xml       |   7 -
 addons/theme_default/__init__.py              |   0
 addons/theme_default/__openerp__.py           |  13 ++
 .../theme_default/static/description/icon.png | Bin 0 -> 4482 bytes
 .../static/src/img/theme/layout-boxed.gif     | Bin
 .../static/src/img/theme/layout-full.gif      | Bin
 .../static/src/img/theme/variant-amethyst.gif | Bin
 .../static/src/img/theme/variant-cobalt.gif   | Bin
 .../static/src/img/theme/variant-emerald.gif  | Bin
 .../static/src/img/theme/variant-gold.gif     | Bin
 .../static/src/img/theme/variant-ruby.gif     | Bin
 .../static/src/img/theme/variant-stone.gif    | Bin
 .../static/src/less/colors.less               |   0
 .../src/less/option_color_amethyst.less       |   0
 .../static/src/less/option_color_cobalt.less  |   0
 .../static/src/less/option_color_emerald.less |   0
 .../static/src/less/option_color_gold.less    |   0
 .../static/src/less/option_color_ruby.less    |   0
 .../static/src/less/option_color_stone.less   |   0
 .../static/src/less/option_font.less          |   0
 .../static/src/less/option_layout_boxed.less  |   0
 addons/theme_default/views/templates.xml      | 170 ++++++++++++++
 addons/website/__openerp__.py                 |   1 -
 addons/website/views/themes.xml               | 221 ------------------
 addons/website/views/website_templates.xml    |  56 ++++-
 25 files changed, 237 insertions(+), 231 deletions(-)
 create mode 100644 addons/theme_default/__init__.py
 create mode 100644 addons/theme_default/__openerp__.py
 create mode 100644 addons/theme_default/static/description/icon.png
 rename addons/{website => theme_default}/static/src/img/theme/layout-boxed.gif (100%)
 rename addons/{website => theme_default}/static/src/img/theme/layout-full.gif (100%)
 rename addons/{website => theme_default}/static/src/img/theme/variant-amethyst.gif (100%)
 rename addons/{website => theme_default}/static/src/img/theme/variant-cobalt.gif (100%)
 rename addons/{website => theme_default}/static/src/img/theme/variant-emerald.gif (100%)
 rename addons/{website => theme_default}/static/src/img/theme/variant-gold.gif (100%)
 rename addons/{website => theme_default}/static/src/img/theme/variant-ruby.gif (100%)
 rename addons/{website => theme_default}/static/src/img/theme/variant-stone.gif (100%)
 rename addons/{website => theme_default}/static/src/less/colors.less (100%)
 rename addons/{website => theme_default}/static/src/less/option_color_amethyst.less (100%)
 rename addons/{website => theme_default}/static/src/less/option_color_cobalt.less (100%)
 rename addons/{website => theme_default}/static/src/less/option_color_emerald.less (100%)
 rename addons/{website => theme_default}/static/src/less/option_color_gold.less (100%)
 rename addons/{website => theme_default}/static/src/less/option_color_ruby.less (100%)
 rename addons/{website => theme_default}/static/src/less/option_color_stone.less (100%)
 rename addons/{website => theme_default}/static/src/less/option_font.less (100%)
 rename addons/{website => theme_default}/static/src/less/option_layout_boxed.less (100%)
 create mode 100644 addons/theme_default/views/templates.xml
 delete mode 100644 addons/website/views/themes.xml

diff --git a/addons/theme_bootswatch/views/theme.xml b/addons/theme_bootswatch/views/theme.xml
index 292bcecc94a..11b0066438b 100644
--- a/addons/theme_bootswatch/views/theme.xml
+++ b/addons/theme_bootswatch/views/theme.xml
@@ -2,13 +2,6 @@
 <openerp>
 <data>
 
-<!-- Deactivate default website options before adding the theme ones -->
-<template id="reset_default_options" inherit_id="website.default_options">
-  <xpath expr="//t[@id='default_options']" position="attributes">
-    <attribute name="t-if">False</attribute>
-  </xpath>
-</template>
-
 <template id="theme_customize" inherit_id="website.theme_customize" name="theme_customize Bootswatch">
     <xpath expr="div" position="replace">
 
diff --git a/addons/theme_default/__init__.py b/addons/theme_default/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/theme_default/__openerp__.py b/addons/theme_default/__openerp__.py
new file mode 100644
index 00000000000..243f1cb0c25
--- /dev/null
+++ b/addons/theme_default/__openerp__.py
@@ -0,0 +1,13 @@
+{
+    'name': 'Default Website Theme',
+    'description': 'Default website theme to showcase customization possibilities.',
+    'category': 'Theme/Hidden',
+    'version': '1.0',
+    'author': 'Odoo S.A.',
+    'depends': ['website'],
+    'data': [
+        'views/templates.xml',
+    ],
+    'application': False,
+    'auto_install': True,
+}
diff --git a/addons/theme_default/static/description/icon.png b/addons/theme_default/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ff68dd1789fc5eee4608a8573ba34a64d39f4b7
GIT binary patch
literal 4482
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
UrI+G@+W-In07*qoM6N<$g37GSNdN!<

literal 0
HcmV?d00001

diff --git a/addons/website/static/src/img/theme/layout-boxed.gif b/addons/theme_default/static/src/img/theme/layout-boxed.gif
similarity index 100%
rename from addons/website/static/src/img/theme/layout-boxed.gif
rename to addons/theme_default/static/src/img/theme/layout-boxed.gif
diff --git a/addons/website/static/src/img/theme/layout-full.gif b/addons/theme_default/static/src/img/theme/layout-full.gif
similarity index 100%
rename from addons/website/static/src/img/theme/layout-full.gif
rename to addons/theme_default/static/src/img/theme/layout-full.gif
diff --git a/addons/website/static/src/img/theme/variant-amethyst.gif b/addons/theme_default/static/src/img/theme/variant-amethyst.gif
similarity index 100%
rename from addons/website/static/src/img/theme/variant-amethyst.gif
rename to addons/theme_default/static/src/img/theme/variant-amethyst.gif
diff --git a/addons/website/static/src/img/theme/variant-cobalt.gif b/addons/theme_default/static/src/img/theme/variant-cobalt.gif
similarity index 100%
rename from addons/website/static/src/img/theme/variant-cobalt.gif
rename to addons/theme_default/static/src/img/theme/variant-cobalt.gif
diff --git a/addons/website/static/src/img/theme/variant-emerald.gif b/addons/theme_default/static/src/img/theme/variant-emerald.gif
similarity index 100%
rename from addons/website/static/src/img/theme/variant-emerald.gif
rename to addons/theme_default/static/src/img/theme/variant-emerald.gif
diff --git a/addons/website/static/src/img/theme/variant-gold.gif b/addons/theme_default/static/src/img/theme/variant-gold.gif
similarity index 100%
rename from addons/website/static/src/img/theme/variant-gold.gif
rename to addons/theme_default/static/src/img/theme/variant-gold.gif
diff --git a/addons/website/static/src/img/theme/variant-ruby.gif b/addons/theme_default/static/src/img/theme/variant-ruby.gif
similarity index 100%
rename from addons/website/static/src/img/theme/variant-ruby.gif
rename to addons/theme_default/static/src/img/theme/variant-ruby.gif
diff --git a/addons/website/static/src/img/theme/variant-stone.gif b/addons/theme_default/static/src/img/theme/variant-stone.gif
similarity index 100%
rename from addons/website/static/src/img/theme/variant-stone.gif
rename to addons/theme_default/static/src/img/theme/variant-stone.gif
diff --git a/addons/website/static/src/less/colors.less b/addons/theme_default/static/src/less/colors.less
similarity index 100%
rename from addons/website/static/src/less/colors.less
rename to addons/theme_default/static/src/less/colors.less
diff --git a/addons/website/static/src/less/option_color_amethyst.less b/addons/theme_default/static/src/less/option_color_amethyst.less
similarity index 100%
rename from addons/website/static/src/less/option_color_amethyst.less
rename to addons/theme_default/static/src/less/option_color_amethyst.less
diff --git a/addons/website/static/src/less/option_color_cobalt.less b/addons/theme_default/static/src/less/option_color_cobalt.less
similarity index 100%
rename from addons/website/static/src/less/option_color_cobalt.less
rename to addons/theme_default/static/src/less/option_color_cobalt.less
diff --git a/addons/website/static/src/less/option_color_emerald.less b/addons/theme_default/static/src/less/option_color_emerald.less
similarity index 100%
rename from addons/website/static/src/less/option_color_emerald.less
rename to addons/theme_default/static/src/less/option_color_emerald.less
diff --git a/addons/website/static/src/less/option_color_gold.less b/addons/theme_default/static/src/less/option_color_gold.less
similarity index 100%
rename from addons/website/static/src/less/option_color_gold.less
rename to addons/theme_default/static/src/less/option_color_gold.less
diff --git a/addons/website/static/src/less/option_color_ruby.less b/addons/theme_default/static/src/less/option_color_ruby.less
similarity index 100%
rename from addons/website/static/src/less/option_color_ruby.less
rename to addons/theme_default/static/src/less/option_color_ruby.less
diff --git a/addons/website/static/src/less/option_color_stone.less b/addons/theme_default/static/src/less/option_color_stone.less
similarity index 100%
rename from addons/website/static/src/less/option_color_stone.less
rename to addons/theme_default/static/src/less/option_color_stone.less
diff --git a/addons/website/static/src/less/option_font.less b/addons/theme_default/static/src/less/option_font.less
similarity index 100%
rename from addons/website/static/src/less/option_font.less
rename to addons/theme_default/static/src/less/option_font.less
diff --git a/addons/website/static/src/less/option_layout_boxed.less b/addons/theme_default/static/src/less/option_layout_boxed.less
similarity index 100%
rename from addons/website/static/src/less/option_layout_boxed.less
rename to addons/theme_default/static/src/less/option_layout_boxed.less
diff --git a/addons/theme_default/views/templates.xml b/addons/theme_default/views/templates.xml
new file mode 100644
index 00000000000..b1866c81844
--- /dev/null
+++ b/addons/theme_default/views/templates.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+<template id="customize_modal" inherit_id="website.theme_customize" name="treehouse Customize Modal" priority="1">
+  <xpath expr="div" position="replace">
+    <div id="theme_customize_modal" class="modal fade">
+      <div class="modal-dialog">
+          <div class="modal-content">
+
+              <div class="loading_backdrop"></div>
+              <div class="modal-header text-center">
+                  <button type="button" class="close">×</button>
+                  <!-- <a class="btn btn-primary" href="/web#return_label=Website&amp;action=website.action_module_theme">Click here to change theme</a> -->
+                  <hr style="margin: 20px -10px 10px -10px;"/>
+                  <h4 class="modal-title">Customize this default theme</h4>
+              </div>
+              <div class="modal-body">
+                  <h5 class="modal-h5">LAYOUT</h5>
+                  <table name="layout">
+                      <tr>
+                          <td class=" text-center" width="50%">
+                              <label class=" center-block">
+                                  <div class="text-center" style="background-image: url(/theme_default/static/src/img/theme/layout-full.gif); background-size: 100%; line-height: 40px;">FULL WIDTH</div>
+                                  <input name="layoutvar" type="radio" data-xmlid=""/>
+                              </label>
+                          </td>
+                          <td class=" text-center">
+                              <label class=" center-block">
+                                 <div class="text-center" style="background-image: url(/theme_default/static/src/img/theme/layout-boxed.gif); background-size: 100%; line-height: 40px;">BOXED</div>
+                                  <input name="layoutvar" type="radio" data-xmlid="theme_default.option_layout_boxed"/>
+                              </label>
+                          </td>
+                      </tr>
+                  </table>
+
+                  <h5 class="modal-h5">MAIN COLOR</h5>
+                  <table name="color">
+                      <tr>
+                          <td>
+                              <label class="chd-color-combi">
+                                  <img src="/theme_default/static/src/img/theme/variant-stone.gif" alt="Stone" class="chd-color-combi-img"/>
+                                  <input name="colorvar" type="radio" data-xmlid=""/>
+                              </label>
+                          </td>
+                          <td>
+                              <label class="chd-color-combi">
+                                  <img src="/theme_default/static/src/img/theme/variant-emerald.gif" alt="Emerald" class="chd-color-combi-img"/>
+                                  <input name="colorvar" type="radio" data-xmlid="theme_default.option_color_emerald"/>
+                              </label>
+                          </td>
+                          <td>
+                              <label class="chd-color-combi">
+                                  <img src="/theme_default/static/src/img/theme/variant-cobalt.gif" alt="Cobalt" class="chd-color-combi-img"/>
+                                  <input name="colorvar" type="radio" data-xmlid="theme_default.option_color_cobalt"/>
+                              </label>
+                          </td>
+                          <td>
+                              <label class="chd-color-combi">
+                                  <img src="/theme_default/static/src/img/theme/variant-amethyst.gif" alt="Amethyst" class="chd-color-combi-img"/>
+                                  <input name="colorvar" type="radio" data-xmlid="theme_default.option_color_amethyst"/>
+                              </label>
+                          </td>
+                          <td>
+                              <label class="chd-color-combi">
+                                  <img src="/theme_default/static/src/img/theme/variant-ruby.gif" alt="Blue" class="chd-color-combi-img"/>
+                                  <input name="colorvar" type="radio" data-xmlid="theme_default.option_color_ruby"/>
+                              </label>
+                          </td>
+                          <td>
+                              <label class="chd-color-combi">
+                                  <img src="/theme_default/static/src/img/theme/variant-gold.gif" alt="Gold" class="chd-color-combi-img"/>
+                                  <input name="colorvar" type="radio" data-xmlid="theme_default.option_color_gold"/>
+                              </label>
+                          </td>
+                      </tr>
+                  </table>
+
+                  <h5 class="modal-h5">FONTS COMBINATIONS</h5>
+                  <table name="font">
+                      <tr>
+                          <td width="50%">
+                              <label>
+                                  <div>
+                                      <span style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif; font-size:11px">Helvetica</span>
+                                      <span style="font-family:Georgia, 'Times New Roman', Times, serif; font-size:11px" >/ Georgia</span>
+                                  </div>
+                                  <input name="theme" type="radio" data-xmlid=""/>
+                              </label>
+                          </td>
+                          <td width="50%">
+                              <label>
+                                  <div>
+                                      <span style="font-family:Georgia, 'Times New Roman', Times, serif; font-size:11px" >Georgia</span>
+                                      <span style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif; font-size:11px">/ Helvetica</span>
+                                    <input name="theme" type="radio" data-xmlid="theme_default.option_font"/>
+                                  </div>
+                              </label>
+                          </td>
+                      </tr>
+                  </table>
+              </div>
+          </div>
+      </div>
+  </div>
+  </xpath>
+</template>
+
+<template id="colors" name="Colors" inherit_id="website.assets_frontend">
+  <xpath expr="." position="inside">
+    <link rel="stylesheet" href='/theme_default/static/src/less/colors.less'/>
+  </xpath>
+</template>
+
+<!-- Option layout -->
+
+<template id="option_layout_boxed" name="option_layout_boxed" inherit_id="website.assets_frontend" active="False" customize_show="False">
+  <xpath expr="." position="inside">
+      <link href="/theme_default/static/src/less/option_layout_boxed.less" rel="stylesheet" type="text/less"/>
+  </xpath>
+</template>
+
+<!-- Option color -->
+
+<template id="option_color_stone" name="option_color_stone" inherit_id="website.assets_frontend" active="False" customize_show="False">
+  <xpath expr="." position="inside">
+    <link href="/theme_default/static/src/less/option_color_stone.less" rel="stylesheet" type="text/less"/>
+  </xpath>
+</template>
+
+<template id="option_color_emerald" name="option_color_emerald" inherit_id="website.assets_frontend" active="False" customize_show="False">
+  <xpath expr="." position="inside">
+    <link href="/theme_default/static/src/less/option_color_emerald.less" rel="stylesheet" type="text/less"/>
+  </xpath>
+</template>
+
+<template id="option_color_cobalt" name="option_color_cobalt" inherit_id="website.assets_frontend" active="False" customize_show="False">
+  <xpath expr="." position="inside">
+    <link href="/theme_default/static/src/less/option_color_cobalt.less" rel="stylesheet" type="text/less"/>
+  </xpath>
+</template>
+
+<template id="option_color_amethyst" name="option_color_amethyst" inherit_id="website.assets_frontend" active="False" customize_show="False">
+  <xpath expr="." position="inside">
+    <link href="/theme_default/static/src/less/option_color_amethyst.less" rel="stylesheet" type="text/less"/>
+  </xpath>
+</template>
+
+<template id="option_color_ruby" name="option_color_ruby" inherit_id="website.assets_frontend" active="False" customize_show="False">
+  <xpath expr="." position="inside">
+    <link href="/theme_default/static/src/less/option_color_ruby.less" rel="stylesheet" type="text/less"/>
+  </xpath>
+</template>
+
+<template id="option_color_gold" name="option_color_gold" inherit_id="website.assets_frontend" active="False" customize_show="False">
+  <xpath expr="." position="inside">
+    <link href="/theme_default/static/src/less/option_color_gold.less" rel="stylesheet" type="text/less"/>
+  </xpath>
+</template>
+
+<!-- Option font -->
+
+<template id="option_font" name="option_font" inherit_id="website.assets_frontend" active="False" customize_show="False">
+  <xpath expr="." position="inside">
+    <link href="/theme_default/static/src/less/option_font.less" rel="stylesheet" type="text/less"/>
+  </xpath>
+</template>
+
+</data>
+</openerp>
diff --git a/addons/website/__openerp__.py b/addons/website/__openerp__.py
index efaa43efbcf..8c29c63cf43 100644
--- a/addons/website/__openerp__.py
+++ b/addons/website/__openerp__.py
@@ -21,7 +21,6 @@ OpenERP Website CMS
         'views/website.backend.xml',
         'views/website_views.xml',
         'views/snippets.xml',
-        'views/themes.xml',
         'views/res_config.xml',
         'views/ir_actions.xml',
         'views/website_backend_navbar.xml',
diff --git a/addons/website/views/themes.xml b/addons/website/views/themes.xml
deleted file mode 100644
index da53c83dfd6..00000000000
--- a/addons/website/views/themes.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-
-
-<!--
-    Customize Themes
-
-    Use INPUT type 'checkbox' or 'radio' or use OPTION in select box
-    'data-xmlid' (optional) xml id of the template to add if the input is checked.
-        You can set a list of xml id separate by comma (all template is enable or
-        disable in same time)
-    'data-enable' (optional) to checked one or more HTML ids, or list separate by comma
-    'data-disable' (optional) to unchecked one or more HTML ids, or list separate by comma
-    'data-reload="/"' (optional) force the reloading of the page if the url match with
-        the string ( = regexp).
-        Otherwise, only the '/web/css/website.assets_frontend' is reloaded
-
-    For the sets (data-enable and/or data-disable without data-xmlid), the set is
-    automatically checked if:
-    - all related fields are enabled for data-enable
-    - all related fields are disabled for data-disable
-    else unchecked
-
-    HTML apply classes:
-    - 'checked': on the parent label when input is checked
-    - 'in': on the container (e.g.: bootstrap modal) after added in DOM (removed together
-       out is added)
-    - 'out': on the container 1 second before removed from ths DOM
-    - 'loading': on the container/modal when the new css is loading
--->
-
-<template id="website.theme_customize" name="Theme Modal for Customization">
-  <div id="theme_customize_modal" class="modal fade">
-      <div class="modal-dialog">
-          <div class="modal-content">
-              <input id="less" type="checkbox" data-xmlid="website.option_bootstrap_less" style="display: none;"/>
-
-              <div class="loading_backdrop"></div>
-              <div class="modal-header text-center">
-                  <button type="button" class="close">×</button>
-                  <a class="btn btn-primary" href="/web#return_label=Website&amp;action=website.action_module_theme">Click here to change theme</a>
-                  <hr style="margin: 20px -10px 10px -10px;"/>
-                  <h4 class="modal-title">Customize this default theme</h4>
-              </div>
-              <div class="modal-body">
-                  <h5 class="modal-h5">LAYOUT</h5>
-                  <table name="layout">
-                      <tr>
-                          <td class=" text-center" width="50%">
-                              <label class=" center-block">
-                                  <div class="text-center" style="background-image: url(/website/static/src/img/theme/layout-full.gif); background-size: 100%; line-height: 40px;">FULL WIDTH</div>
-                                  <input name="layoutvar" type="radio" data-xmlid=""/>
-                              </label>
-                          </td>
-                          <td class=" text-center">
-                              <label class=" center-block">
-                                 <div class="text-center" style="background-image: url(/website/static/src/img/theme/layout-boxed.gif); background-size: 100%; line-height: 40px;">BOXED</div>
-                                  <input name="layoutvar" type="radio" data-xmlid="website.option_layout_boxed" data-enable="less"/>
-                              </label>
-                          </td>
-                      </tr>
-                  </table>
-
-                  <h5 class="modal-h5">MAIN COLOR</h5>
-                  <table name="color">
-                      <tr>
-                          <td>
-                              <label class="chd-color-combi">
-                                  <img src="/website/static/src/img/theme/variant-stone.gif" alt="Stone" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="" data-disable="less"/>
-                              </label>
-                          </td>
-                          <td>
-                              <label class="chd-color-combi">
-                                  <img src="/website/static/src/img/theme/variant-emerald.gif" alt="Emerald" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="website.option_color_emerald" data-enable="less"/>
-                              </label>
-                          </td>
-                          <td>
-                              <label class="chd-color-combi">
-                                  <img src="/website/static/src/img/theme/variant-cobalt.gif" alt="Cobalt" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="website.option_color_cobalt" data-enable="less"/>
-                              </label>
-                          </td>
-                          <td>
-                              <label class="chd-color-combi">
-                                  <img src="/website/static/src/img/theme/variant-amethyst.gif" alt="Amethyst" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="website.option_color_amethyst" data-enable="less"/>
-                              </label>
-                          </td>
-                          <td>
-                              <label class="chd-color-combi">
-                                  <img src="/website/static/src/img/theme/variant-ruby.gif" alt="Blue" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="website.option_color_ruby" data-enable="less"/>
-                              </label>
-                          </td>
-                          <td>
-                              <label class="chd-color-combi">
-                                  <img src="/website/static/src/img/theme/variant-gold.gif" alt="Gold" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="website.option_color_gold" data-enable="less"/>
-                              </label>
-                          </td>
-                      </tr>
-                  </table>
-
-                  <h5 class="modal-h5">FONTS COMBINATIONS</h5>
-                  <table name="font">
-                      <tr>
-                          <td width="50%">
-                              <label>
-                                  <div>
-                                      <span style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif; font-size:11px">Helvetica</span>
-                                      <span style="font-family:Georgia, 'Times New Roman', Times, serif; font-size:11px" >/ Georgia</span>
-                                  </div>
-                                  <input name="theme" type="radio" data-xmlid=""/>
-                              </label>
-                          </td>
-                          <td width="50%">
-                              <label>
-                                  <div>
-                                      <span style="font-family:Georgia, 'Times New Roman', Times, serif; font-size:11px" >Georgia</span>
-                                      <span style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif; font-size:11px">/ Helvetica</span>
-                                    <input name="theme" type="radio" data-xmlid="website.option_font" data-enable="less"/>
-                                  </div>
-                              </label>
-                          </td>
-                      </tr>
-                  </table>
-              </div>
-          </div>
-      </div>
-  </div>
-</template>
-
-<!-- color-picker -->
-<!-- HTML class to hide option for one mode : only-text, only-bg -->
-
-<template id="website.colorpicker" name="Color-Picker">
-    <table class="colorpicker">
-        <tr>
-            <td><button class="bg-primary" title="Primary Color"/></td>
-            <td><button class="bg-success" title="Success Color"/></td>
-            <td><button class="bg-info" title="Info Color"/></td>
-            <td><button class="bg-warning" title="Warning Color"/></td>
-            <td><button class="bg-danger" title="Danger Color"/></td>
-        </tr>
-    </table>
-</template>
-
-<!-- Theme -->
-
-<!--
-  Group all option inside a t-if True named default_options, other theme will
-  set the t-if to False to disable all website options
-
--->
-
-<template id="default_options" name="Default Customize Options" inherit_id="website.assets_frontend">
-  <xpath expr="//link[last()]" position="after">
-    <!-- Default options inherit from this view so we can easily disable it to reset all options -->
-    <t id="default_options" t-if="True"></t>
-  </xpath>
-</template>
-
-<!-- Option layout -->
-
-<template id="option_layout_boxed" name="option_layout_boxed" inherit_id="website.default_options" active="False" customize_show="False">
-  <xpath expr="//t[@id='default_options']" position="inside">
-      <link href="/website/static/src/less/option_layout_boxed.less" rel="stylesheet" type="text/less"/>
-  </xpath>
-</template>
-
-<!-- Option color -->
-
-<template id="option_color_stone" name="option_color_stone" inherit_id="website.default_options" active="False" customize_show="False">
-  <xpath expr="//t[@id='default_options']" position="inside">
-    <link href="/website/static/src/less/option_color_stone.less" rel="stylesheet" type="text/less"/>
-  </xpath>
-</template>
-
-<template id="option_color_emerald" name="option_color_emerald" inherit_id="website.default_options" active="False" customize_show="False">
-  <xpath expr="//t[@id='default_options']" position="inside">
-    <link href="/website/static/src/less/option_color_emerald.less" rel="stylesheet" type="text/less"/>
-  </xpath>
-</template>
-
-<template id="option_color_cobalt" name="option_color_cobalt" inherit_id="website.default_options" active="False" customize_show="False">
-  <xpath expr="//t[@id='default_options']" position="inside">
-    <link href="/website/static/src/less/option_color_cobalt.less" rel="stylesheet" type="text/less"/>
-  </xpath>
-</template>
-
-<template id="option_color_amethyst" name="option_color_amethyst" inherit_id="website.default_options" active="False" customize_show="False">
-  <xpath expr="//t[@id='default_options']" position="inside">
-    <link href="/website/static/src/less/option_color_amethyst.less" rel="stylesheet" type="text/less"/>
-  </xpath>
-</template>
-
-<template id="option_color_ruby" name="option_color_ruby" inherit_id="website.default_options" active="False" customize_show="False">
-  <xpath expr="//t[@id='default_options']" position="inside">
-    <link href="/website/static/src/less/option_color_ruby.less" rel="stylesheet" type="text/less"/>
-  </xpath>
-</template>
-
-<template id="option_color_gold" name="option_color_gold" inherit_id="website.default_options" active="False" customize_show="False">
-  <xpath expr="//t[@id='default_options']" position="inside">
-    <link href="/website/static/src/less/option_color_gold.less" rel="stylesheet" type="text/less"/>
-  </xpath>
-</template>
-
-<!-- Option font -->
-
-<template id="option_font" name="option_font" inherit_id="website.default_options" active="False" customize_show="False">
-  <xpath expr="//t[@id='default_options']" position="inside">
-    <link href="/website/static/src/less/option_font.less" rel="stylesheet" type="text/less"/>
-  </xpath>
-</template>
-
-</data>
-</openerp>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 2dd7b30c3a6..5f317ba401a 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -71,9 +71,7 @@
 </template>
 
 <template id="assets_frontend" name="Website assets">
-    <!-- Boostrap Fallback if server can't compute less files -->
     <link id="bootstrap_css" rel="stylesheet" href='/website/static/src/less/import_bootstrap.less'/>
-    <link rel="stylesheet" href='/website/static/src/less/colors.less'/>
 
     <link rel="stylesheet" href='/website/static/src/css/website.css'/>
 
@@ -469,6 +467,60 @@
     </ul>
 </template>
 
+<!--
+    Customize Themes
+
+    Use INPUT type 'checkbox' or 'radio' or use OPTION in select box
+    'data-xmlid' (optional) xml id of the template to add if the input is checked.
+        You can set a list of xml id separate by comma (all template is enable or
+        disable in same time)
+    'data-enable' (optional) to checked one or more HTML ids, or list separate by comma
+    'data-disable' (optional) to unchecked one or more HTML ids, or list separate by comma
+    'data-reload="/"' (optional) force the reloading of the page if the url match with
+        the string ( = regexp).
+        Otherwise, only the '/web/css/website.assets_frontend' is reloaded
+
+    For the sets (data-enable and/or data-disable without data-xmlid), the set is
+    automatically checked if:
+    - all related fields are enabled for data-enable
+    - all related fields are disabled for data-disable
+    else unchecked
+
+    HTML apply classes:
+    - 'checked': on the parent label when input is checked
+    - 'in': on the container (e.g.: bootstrap modal) after added in DOM (removed together
+       out is added)
+    - 'out': on the container 1 second before removed from ths DOM
+    - 'loading': on the container/modal when the new css is loading
+-->
+
+<template id="website.theme_customize" name="Theme Modal for Customization">
+  <div id="theme_customize_modal" class="modal fade">
+      <div class="modal-dialog">
+          <div class="modal-content">
+            <div class="modal-header text-center">
+                <h4 class="modal-title">Please install a theme in order to customize your website.</h4>
+            </div>
+          </div>
+      </div>
+  </div>
+</template>
+
+<!-- color-picker -->
+<!-- HTML class to hide option for one mode : only-text, only-bg -->
+
+<template id="website.colorpicker" name="Color-Picker">
+    <table class="colorpicker">
+        <tr>
+            <td><button class="bg-primary" title="Primary Color"/></td>
+            <td><button class="bg-success" title="Success Color"/></td>
+            <td><button class="bg-info" title="Info Color"/></td>
+            <td><button class="bg-warning" title="Warning Color"/></td>
+            <td><button class="bg-danger" title="Danger Color"/></td>
+        </tr>
+    </table>
+</template>
+
 <template id="kanban">
     <t t-set="step"><t t-esc="step or 0"/></t>
     <t t-set="scope"><t t-esc="scope or 0"/></t>