From 6dd657f253d19adb40fe40546699d7af24d2f15a Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 27 Jun 2013 18:15:36 +0200 Subject: [PATCH] [IMP] Webeditor as a webclient module (with more hackery) bzr revid: fme@openerp.com-20130627161536-cp6mdz8junts3316 --- addons/website/__openerp__.py | 8 ++- addons/website/controllers/main.py | 6 +- addons/website/static/src/css/website.css | 24 +++++++ addons/website/static/src/css/website.sass | 22 ++++++ addons/website/static/src/js/website.js | 72 +++++++++++++++++++ ...website_editor.js => website_bootstrap.js} | 27 ++----- addons/website/static/src/xml/website.xml | 12 ++++ 7 files changed, 144 insertions(+), 27 deletions(-) create mode 100644 addons/website/static/src/css/website.css create mode 100644 addons/website/static/src/css/website.sass create mode 100644 addons/website/static/src/js/website.js rename addons/website/static/src/js/{website_editor.js => website_bootstrap.js} (50%) create mode 100644 addons/website/static/src/xml/website.xml diff --git a/addons/website/__openerp__.py b/addons/website/__openerp__.py index d612fac3369..2bb8fedb714 100644 --- a/addons/website/__openerp__.py +++ b/addons/website/__openerp__.py @@ -2,8 +2,7 @@ 'name': 'Website', 'category': 'CMS', 'version': '1.0', - 'description': - """ + 'description': """ OpenERP Website CMS =================== @@ -13,5 +12,8 @@ OpenERP Website CMS 'installable': True, 'data': [ 'views/test.xml' - ] + ], + 'js': ['static/src/js/website.js'], + 'css': ['static/src/css/website.css'], + 'qweb': ['static/src/xml/*.xml'], } diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index 10ebb457adc..ea74b71728b 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -10,7 +10,7 @@ from openerp.addons.web.http import request def get_html_head(): head = ['' % i for i in manifest_list('js', db=request.db)] head += ['' % i for i in manifest_list('css', db=request.db)] - head += [''] + head += [''] return "\n ".join(head) # WIIIP !! @@ -23,13 +23,13 @@ module_template = Template("""
{{ module.shortdesc }}