Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/saas-3-IE9-css-not-loading-ptr into lp:~openerp/openerp-web/saas-3

  1. saas-3-IE9-css-not-loading-ptr
  2. Merge into saas-3
Proposed by Pariket Trivedi(OpenERP)
Status: Rejected
Rejected by: Richard Mathot (Odoo, formerly OpenERP)
Proposed branch: lp:~openerp-dev/openerp-web/saas-3-IE9-css-not-loading-ptr
Merge into: lp:~openerp/openerp-web/saas-3
Diff against target: 70 lines (+20/-4)
4 files modified
addons/web/__openerp__.py (+0/-2)
addons/web/views/webclient_templates.xml (+6/-0)
addons/web_kanban/__openerp__.py (+2/-2)
addons/web_kanban/views/webclient_kanban_templates.xml (+12/-0)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/saas-3-IE9-css-not-loading-ptr
Reviewer Review Type Date Requested Status
Richard Mathot (Odoo, formerly OpenERP) (community) Disapprove
Review via email: mp+208777@code.launchpad.net

Description of the change

hello,

 IE9 doesn't load css file more than 288kb.
 so, reomve css from manifest file and add template call css file directly in <head>.
 - add web_kanban/views/webclient_kanban_template.xml

thank you,
ptr

To post a comment you must log in.
lp:~openerp-dev/openerp-web/saas-3-IE9-css-not-loading-ptr updated
3960. By Pariket Trivedi(OpenERP)

[MERGE] Merged lp:~openerp/openerp-web/saas-3.

Revision history for this message
Richard Mathot (Odoo, formerly OpenERP) (rim-openerp) wrote :

I could not reproduce the problem this patch is intended to solve. Can you give a detailed test scenario?

review: Needs Information
Revision history for this message
Richard Mathot (Odoo, formerly OpenERP) (rim-openerp) wrote :

Fixed in saas-3

review: Disapprove

Unmerged revisions

3960. By Pariket Trivedi(OpenERP)

[MERGE] Merged lp:~openerp/openerp-web/saas-3.

3959. By Pariket Trivedi(OpenERP)

[FIX] IE9: The css files are not loading in IE9 because IE9 doesn't read more than 288kb file size.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/__openerp__.py'
2--- addons/web/__openerp__.py 2014-01-23 15:19:34 +0000
3+++ addons/web/__openerp__.py 2014-03-06 06:55:24 +0000
4@@ -72,8 +72,6 @@
5 "static/lib/fontawesome/css/font-awesome.css",
6 "static/lib/bootstrap/css/bootstrap.css",
7 "static/lib/select2/select2.css",
8- "static/src/css/base.css",
9- "static/src/css/data_export.css",
10 "static/lib/cleditor/jquery.cleditor.css",
11 ],
12 'qweb' : [
13
14=== modified file 'addons/web/views/webclient_templates.xml'
15--- addons/web/views/webclient_templates.xml 2014-02-27 16:14:54 +0000
16+++ addons/web/views/webclient_templates.xml 2014-03-06 06:55:24 +0000
17@@ -4,6 +4,11 @@
18 <openerp>
19 <data>
20
21+ <template id="web.customcss" name="Webclient Custom CSS">
22+ <link rel="stylesheet" href="/web/static/src/css/data_export.css" />
23+ <link id="base_css" rel="stylesheet" href="/web/static/src/css/base.css" />
24+ </template>
25+
26 <template id="web.layout" name="Web layout">&lt;!DOCTYPE html&gt;
27 <html style="height: 100%">
28 <head>
29@@ -12,6 +17,7 @@
30 <title>OpenERP</title>
31 <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
32 <link rel="stylesheet" href="/web/static/src/css/full.css" />
33+ <t t-call="web.customcss"/>
34 <t t-raw="head or ''"/>
35 </head>
36 <body t-att-class="body_classname">
37
38=== modified file 'addons/web_kanban/__openerp__.py'
39--- addons/web_kanban/__openerp__.py 2012-08-22 13:03:36 +0000
40+++ addons/web_kanban/__openerp__.py 2014-03-06 06:55:24 +0000
41@@ -11,8 +11,8 @@
42 'js': [
43 'static/src/js/kanban.js'
44 ],
45- 'css': [
46- 'static/src/css/kanban.css'
47+ 'data': [
48+ 'views/webclient_kanban_templates.xml',
49 ],
50 'qweb' : [
51 'static/src/xml/*.xml',
52
53=== added directory 'addons/web_kanban/views'
54=== added file 'addons/web_kanban/views/webclient_kanban_templates.xml'
55--- addons/web_kanban/views/webclient_kanban_templates.xml 1970-01-01 00:00:00 +0000
56+++ addons/web_kanban/views/webclient_kanban_templates.xml 2014-03-06 06:55:24 +0000
57@@ -0,0 +1,12 @@
58+<?xml version="1.0" encoding="utf-8"?>
59+<!-- vim:fdn=3:
60+-->
61+<openerp>
62+ <data>
63+ <template id="web.kanbancss" inherit_id="web.customcss" name="Web kanban css">
64+ <xpath expr="//link[@id='base_css']" position="after">
65+ <link rel="stylesheet" href="/web_kanban/static/src/css/kanban.css" />
66+ </xpath>
67+ </template>
68+ </data>
69+</openerp>
70\ No newline at end of file

Subscribers

People subscribed via source and target branches