From a34de5902c667f355fa2ae1d154f0f8ea8dd0084 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 22 Jul 2013 16:21:30 +0200 Subject: [PATCH 1/2] [IMP] website: Use manifest_list helper for css too bzr revid: fme@openerp.com-20130722142130-lywtwzxeudniho3y --- addons/website/controllers/main.py | 4 +++- addons/website/views/views.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index f15f132250a..925dcf737f3 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -7,6 +7,7 @@ from openerp.addons.web.http import request def template_values(): script = "\n".join(['' % i for i in manifest_list('js', db=request.db)]) + css = "\n".join('' % i for i in manifest_list('css', db=request.db)) try: request.session.check_security() loggued = True @@ -21,7 +22,8 @@ def template_values(): 'registry': request.registry, 'cr': request.cr, 'uid': uid, - 'script' : script, + 'script': script, + 'css': css, } return values diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml index 872a5e07549..bd82a663510 100644 --- a/addons/website/views/views.xml +++ b/addons/website/views/views.xml @@ -54,7 +54,7 @@ <t t-esc="res_company.name"/> - + From 9e3c561fc507bfd9fc0974b0e9f0089c6be9a8fe Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 22 Jul 2013 16:57:32 +0200 Subject: [PATCH 2/2] [FIX] bootstrap location bzr revid: fme@openerp.com-20130722145732-lnqjpbp6nbbcr3ko --- .../lib/bootstrap/css/bootstrap-responsive.css | 0 .../{src => }/lib/bootstrap/css/bootstrap.css | 0 .../bootstrap/img/glyphicons-halflings-white.png | Bin .../lib/bootstrap/img/glyphicons-halflings.png | Bin .../static/{src => }/lib/bootstrap/js/bootstrap.js | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename addons/website/static/{src => }/lib/bootstrap/css/bootstrap-responsive.css (100%) rename addons/website/static/{src => }/lib/bootstrap/css/bootstrap.css (100%) rename addons/website/static/{src => }/lib/bootstrap/img/glyphicons-halflings-white.png (100%) rename addons/website/static/{src => }/lib/bootstrap/img/glyphicons-halflings.png (100%) rename addons/website/static/{src => }/lib/bootstrap/js/bootstrap.js (100%) diff --git a/addons/website/static/src/lib/bootstrap/css/bootstrap-responsive.css b/addons/website/static/lib/bootstrap/css/bootstrap-responsive.css similarity index 100% rename from addons/website/static/src/lib/bootstrap/css/bootstrap-responsive.css rename to addons/website/static/lib/bootstrap/css/bootstrap-responsive.css diff --git a/addons/website/static/src/lib/bootstrap/css/bootstrap.css b/addons/website/static/lib/bootstrap/css/bootstrap.css similarity index 100% rename from addons/website/static/src/lib/bootstrap/css/bootstrap.css rename to addons/website/static/lib/bootstrap/css/bootstrap.css diff --git a/addons/website/static/src/lib/bootstrap/img/glyphicons-halflings-white.png b/addons/website/static/lib/bootstrap/img/glyphicons-halflings-white.png similarity index 100% rename from addons/website/static/src/lib/bootstrap/img/glyphicons-halflings-white.png rename to addons/website/static/lib/bootstrap/img/glyphicons-halflings-white.png diff --git a/addons/website/static/src/lib/bootstrap/img/glyphicons-halflings.png b/addons/website/static/lib/bootstrap/img/glyphicons-halflings.png similarity index 100% rename from addons/website/static/src/lib/bootstrap/img/glyphicons-halflings.png rename to addons/website/static/lib/bootstrap/img/glyphicons-halflings.png diff --git a/addons/website/static/src/lib/bootstrap/js/bootstrap.js b/addons/website/static/lib/bootstrap/js/bootstrap.js similarity index 100% rename from addons/website/static/src/lib/bootstrap/js/bootstrap.js rename to addons/website/static/lib/bootstrap/js/bootstrap.js