include boostrap

bzr revid: al@openerp.com-20130715124259-a8k0bxjcmoe38fwz
2013-07-15 14:42:59 +02:00 · 2013-07-15 14:42:59 +02:00 · 080852fee3
parent b8357bfa10
commit 080852fee3
6 changed files with 9558 additions and 0 deletions
--- a/addons/website/openerp.py
+++ b/addons/website/openerp.py
@ -14,9 +14,11 @@ OpenERP Website CMS
        'views/views.xml'
     ],
    'js': [
+        'static/lib/bootstrap/js/bootstrap.js',
        'static/src/js/website.js',
    ],
    'css': [
+        'static/lib/bootstrap/css/bootstrap.css',
        'static/src/css/*.css',
    ],
    'qweb': ['static/src/xml/*.xml'],
--- a/addons/website/static/src/lib/bootstrap/css/bootstrap-responsive.css
+++ b/addons/website/static/src/lib/bootstrap/css/bootstrap-responsive.css
--- a/addons/website/static/src/lib/bootstrap/css/bootstrap.css
+++ b/addons/website/static/src/lib/bootstrap/css/bootstrap.css
--- a/addons/website/static/src/lib/bootstrap/img/glyphicons-halflings-white.png
+++ b/addons/website/static/src/lib/bootstrap/img/glyphicons-halflings-white.png
--- a/addons/website/static/src/lib/bootstrap/img/glyphicons-halflings.png
+++ b/addons/website/static/src/lib/bootstrap/img/glyphicons-halflings.png
--- a/addons/website/static/src/lib/bootstrap/js/bootstrap.js
+++ b/addons/website/static/src/lib/bootstrap/js/bootstrap.js