Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/trunk-improve-css-all-browsers into lp:openerp-web

  1. trunk-improve-css-all-browsers
  2. Merge into trunk
Proposed by Antony Lesuisse (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/trunk-improve-css-all-browsers
Merge into: lp:openerp-web
Diff against target: 1371 lines (+611/-60)
12 files modified
addons/web/controllers/main.py (+3/-0)
addons/web/static/lib/jquery.blockUI/jquery.blockUI.js (+1/-1)
addons/web/static/src/css/base-ie.css (+131/-0)
addons/web/static/src/css/base-ie.sass (+121/-0)
addons/web/static/src/css/base.css (+165/-11)
addons/web/static/src/css/base.sass (+121/-8)
addons/web/static/src/js/view_form.js (+24/-1)
addons/web_calendar/static/src/css/web_calendar.css (+26/-35)
addons/web_gantt/static/src/js/gantt.js (+1/-1)
addons/web_graph/static/lib/flotr2/js/DOM.js (+0/-1)
addons/web_kanban/static/src/css/kanban.css (+10/-1)
addons/web_kanban/static/src/css/kanban.sass (+8/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-improve-css-all-browsers
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+132701@code.launchpad.net
To post a comment you must log in.
lp:~openerp-dev/openerp-web/trunk-improve-css-all-browsers updated
3240. By Jiten (OpenERP)

[MERGE] Merged trunk.

3241. By Niko (OpenERP)

[IMP] css improvement ( for ie9 )

3242. By Niko (OpenERP)

[MERGE] SYNC TRUNK - css improvement ( for ie9 )

3243. By Niko (OpenERP)

[IMP] improve css (ie9)

3244. By Niko (OpenERP)

[FIX] use unix-newlines for sass compil (under windows)

3245. By Jiten (OpenERP)

[MERGE] Merged trunk.

Unmerged revisions

3245. By Jiten (OpenERP)

[MERGE] Merged trunk.

3244. By Niko (OpenERP)

[FIX] use unix-newlines for sass compil (under windows)

3243. By Niko (OpenERP)

[IMP] improve css (ie9)

3242. By Niko (OpenERP)

[MERGE] SYNC TRUNK - css improvement ( for ie9 )

3241. By Niko (OpenERP)

[IMP] css improvement ( for ie9 )

3240. By Jiten (OpenERP)

[MERGE] Merged trunk.

3239. By Jiten (OpenERP)

[MERGE] Merged trunk.

3238. By Jiten (OpenERP)

[MERGE] Merged trunk.

3237. By Bhumi Thakkar (Open ERP)

[FIX] Fix issue of file field.

3236. By Anand

[IMP]improve css code for the required form field in header

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/controllers/main.py'
2--- addons/web/controllers/main.py 2012-11-16 13:58:22 +0000
3+++ addons/web/controllers/main.py 2012-11-19 06:37:29 +0000
4@@ -563,6 +563,9 @@
5 <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
6 <link rel="stylesheet" href="/web/static/src/css/full.css" />
7 %(css)s
8+ <!--[if IE 9]>
9+ <link rel="stylesheet" href="/web/static/src/css/base-ie.css" />
10+ <![endif]-->
11 %(js)s
12 <script type="text/javascript">
13 $(function() {
14
15=== modified file 'addons/web/static/lib/jquery.blockUI/jquery.blockUI.js'
16--- addons/web/static/lib/jquery.blockUI/jquery.blockUI.js 2012-09-11 08:15:59 +0000
17+++ addons/web/static/lib/jquery.blockUI/jquery.blockUI.js 2012-11-19 06:37:29 +0000
18@@ -265,7 +265,7 @@
19 }
20
21 // style the overlay
22- if (!opts.theme && (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform))))
23+ if (!opts.theme && (opts.applyPlatformOpacityRules || ($.browser.mozilla && /Linux/.test(navigator.platform))))
24 lyr2.css(opts.overlayCSS);
25 lyr2.css('position', full ? 'fixed' : 'absolute');
26
27
28=== added file 'addons/web/static/src/css/base-ie.css'
29--- addons/web/static/src/css/base-ie.css 1970-01-01 00:00:00 +0000
30+++ addons/web/static/src/css/base-ie.css 2012-11-19 06:37:29 +0000
31@@ -0,0 +1,131 @@
32+.openerp input[type='checkbox'] {
33+ border: none;
34+ background: none;
35+ box-shadow: none;
36+}
37+.openerp .oe_logo img {
38+ border: none;
39+}
40+.openerp .oe_login button {
41+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)";
42+ background: url(/web/static/src/img/ui/bkg-ie-button.gif) repeat-x #dc5f59;
43+}
44+.openerp .oe_login button:hover {
45+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)";
46+ background: url(/web/static/src/img/ui/bkg-ie-hover-button.gif) repeat-x #dc5f59;
47+}
48+.openerp .oe_header_row button.oe_highlight {
49+ padding-top: 0;
50+ padding-bottom: 0;
51+}
52+.openerp .oe_view_manager_buttons button.oe_write_full {
53+ padding-top: 0;
54+ padding-bottom: 0;
55+}
56+.openerp .oe_view_manager_buttons button.oe_highlight {
57+ padding-top: 0;
58+ padding-bottom: 0;
59+}
60+.openerp .oe_view_manager_buttons button .oe_form_button_edit {
61+ padding-top: 0;
62+ padding-bottom: 0;
63+}
64+.openerp .oe_view_manager_buttons button .oe_form_button_create {
65+ padding-top: 0;
66+ padding-bottom: 0;
67+}
68+.openerp button.oe_searchview_search {
69+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)";
70+ background: url(/web/static/src/img/ui/bkg-ie-button.gif) repeat-x #dc5f59;
71+}
72+.openerp button.oe_searchview_search:hover {
73+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)";
74+ background: url(/web/static/src/img/ui/bkg-ie-hover-button.gif) repeat-x #dc5f59;
75+}
76+.openerp button.oe_highlight {
77+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)";
78+ background: url(/web/static/src/img/ui/bkg-ie-button.gif) repeat-x #dc5f59;
79+}
80+.openerp button.oe_highlight:hover {
81+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)";
82+ background: url(/web/static/src/img/ui/bkg-ie-hover-button.gif) repeat-x #dc5f59;
83+}
84+.openerp .oe_kanban_image {
85+ border: none;
86+}
87+.openerp .oe_msg_icon {
88+ border: none;
89+}
90+.openerp .oe_form header ul {
91+ height: 29px;
92+}
93+.openerp .oe_attach {
94+ filter: none;
95+}
96+.openerp .oe_link {
97+ filter: none;
98+}
99+.openerp .oe_kanban_show_more {
100+ clear: both;
101+ text-align: center;
102+}
103+.openerp.oe_kanban_grouped .oe_kanban_show_more .oe_button {
104+ width: 100%;
105+ padding: 3px 12px;
106+}
107+.openerp .oe_form_buttons button {
108+ padding-top: 0;
109+ padding-bottom: 0;
110+}
111+.openerp .oe_sidebar button {
112+ padding-top: 0;
113+ padding-bottom: 0;
114+}
115+.openerp .oe_form_field.oe_tags {
116+ float: left;
117+}
118+.openerp ul.oe_form_status li {
119+ background-color/*\**/: #e8e8e8 \9;
120+ background: -ms-linear-gradient(top, #fcfcfc, #dedede);
121+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dedede');
122+}
123+.openerp ul.oe_form_status li .label {
124+ padding-bottom: 10px;
125+}
126+.openerp ul.oe_form_status li .arrow span {
127+ background-color/*\**/: #e8e8e8 \9;
128+ background: -ms-linear-gradient(top, #fcfcfc, #dedede);
129+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dedede');
130+}
131+.openerp ul.oe_form_status li.oe_active {
132+ background-color: #729fcf;
133+ background: -ms-linear-gradient(top, #729fcf, #3465a4);
134+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#729fcf', endColorstr='#3465a4');
135+}
136+.openerp ul.oe_form_status li.oe_active .label {
137+ padding-bottom: 10px;
138+}
139+.openerp ul.oe_form_status_clickable li {
140+ background-color: #e8e8e8;
141+ background: -ms-linear-gradient(top, #fcfcfc, #dedede);
142+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dedede');
143+}
144+.openerp ul.oe_form_status_clickable li .label {
145+ padding-bottom: 10px;
146+}
147+.openerp ul.oe_form_status_clickable li .arrow span {
148+ background-color/*\**/: #e8e8e8 \9;
149+ background: -ms-linear-gradient(top, #fcfcfc, #dedede);
150+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dedede');
151+}
152+.openerp ul.oe_form_status_clickable li.oe_active {
153+ background-color: #729fcf;
154+ background: -ms-linear-gradient(top, #729fcf, #3465a4);
155+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#729fcf', endColorstr='#3465a4');
156+}
157+.openerp ul.oe_form_status_clickable li.oe_active .label {
158+ padding-bottom: 0;
159+}
160+.openerp .oe_mail .oe_msg .oe_msg_icons span {
161+ -ms-filter: "progid:DXImageTransform.Microsoft.shadow(color=#aaaaaa,strength=2)";
162+}
163
164=== added file 'addons/web/static/src/css/base-ie.sass'
165--- addons/web/static/src/css/base-ie.sass 1970-01-01 00:00:00 +0000
166+++ addons/web/static/src/css/base-ie.sass 2012-11-19 06:37:29 +0000
167@@ -0,0 +1,121 @@
168+@charset "utf-8"
169+
170+// Mixing for I9 only 9 ( red buttons with gradient and round border) {{{
171+@mixin vertical-gradient-ie()
172+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"
173+ background: url(/web/static/src/img/ui/bkg-ie-button.gif) repeat-x #DC5F59
174+ &:hover
175+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"
176+ background: url(/web/static/src/img/ui/bkg-ie-hover-button.gif) repeat-x #DC5F59
177+// }}}
178+
179+// fixes for ie9 only
180+.openerp
181+ input[type='checkbox']
182+ border: none
183+ background: none
184+ box-shadow: none
185+ .oe_logo
186+ img
187+ border: none
188+ .oe_login button
189+ @include vertical-gradient-ie()
190+ .oe_header_row
191+ button.oe_highlight
192+ padding-top: 0
193+ padding-bottom: 0
194+ .oe_view_manager_buttons
195+ button.oe_write_full
196+ padding-top: 0
197+ padding-bottom: 0
198+ button.oe_highlight
199+ padding-top: 0
200+ padding-bottom: 0
201+ button .oe_form_button_edit
202+ padding-top: 0
203+ padding-bottom: 0
204+ button .oe_form_button_create
205+ padding-top: 0
206+ padding-bottom: 0
207+ button.oe_searchview_search
208+ @include vertical-gradient-ie()
209+ button.oe_highlight
210+ @include vertical-gradient-ie()
211+ .oe_kanban_image
212+ border: none
213+ .oe_msg_icon
214+ border: none
215+ .oe_form
216+ header
217+ ul
218+ height: 29px
219+
220+ .oe_attach
221+ filter: none
222+ .oe_link
223+ filter: none
224+
225+ .oe_kanban_show_more
226+ clear: both
227+ text-align: center
228+ &.oe_kanban_grouped .oe_kanban_show_more .oe_button
229+ width: 100%
230+ padding: 3px 12px
231+
232+
233+ .oe_form_buttons button
234+ padding-top: 0
235+ padding-bottom: 0
236+ .oe_sidebar button
237+ padding-top: 0
238+ padding-bottom: 0
239+
240+ .oe_form_field.oe_tags
241+ float: left
242+ ul.oe_form_status
243+ li
244+ background-color/*\**/: #e8e8e8\9
245+ background: -ms-linear-gradient(top, #fcfcfc, #dedede) /* For IE 10 */
246+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dedede') /* For IE 9 */
247+ .label
248+ padding-bottom: 10px
249+ .arrow
250+ span
251+ background-color/*\**/: #e8e8e8\9
252+ background: -ms-linear-gradient(top, #fcfcfc, #dedede) /* For IE 10 */
253+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dedede') /* For IE 9 */
254+ li.oe_active
255+ background-color: #729fcf
256+ background: -ms-linear-gradient(top, #729fcf, #3465a4) /* For IE 10 */
257+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#729fcf', endColorstr='#3465a4') /* For IE 9 */
258+ .label
259+ padding-bottom: 10px
260+
261+ ul.oe_form_status_clickable
262+ li
263+ background-color: #e8e8e8
264+ background: -ms-linear-gradient(top, #fcfcfc, #dedede) /* For IE 10 */
265+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dedede') /* For IE 9 */
266+ .label
267+ padding-bottom: 10px
268+ .arrow
269+ span
270+ background-color/*\**/: #e8e8e8\9
271+ background: -ms-linear-gradient(top, #fcfcfc, #dedede) /* For IE 10 */
272+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dedede') /* For IE 9 */
273+ li.oe_active
274+ background-color: #729fcf
275+ background: -ms-linear-gradient(top, #729fcf, #3465a4) /* For IE 10 */
276+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#729fcf', endColorstr='#3465a4') /* For IE 9 */
277+ .label
278+ padding-bottom: 0
279+
280+ // mail addon
281+ .oe_mail
282+ .oe_msg
283+ .oe_msg_icons
284+ span
285+ -ms-filter: "progid:DXImageTransform.Microsoft.shadow(color=#aaaaaa,strength=2)"
286+
287+
288+// }}}
289\ No newline at end of file
290
291=== modified file 'addons/web/static/src/css/base.css'
292--- addons/web/static/src/css/base.css 2012-11-15 17:51:46 +0000
293+++ addons/web/static/src/css/base.css 2012-11-19 06:37:29 +0000
294@@ -1,4 +1,4 @@
295-@charset "utf-8";
296+@charset "UTF-8";
297 @font-face {
298 font-family: "mnmliconsRegular";
299 src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
300@@ -43,6 +43,10 @@
301 color: #afafb6 !important;
302 font-style: italic !important;
303 }
304+.openerp :-ms-input-placeholder {
305+ color: #afafb6 !important;
306+ font-style: italic !important;
307+}
308 .openerp a {
309 text-decoration: none;
310 cursor: pointer !important;
311@@ -84,6 +88,7 @@
312 background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6);
313 background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6);
314 background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6);
315+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFF0F0FA', endColorstr='#FFEEEEF6')";
316 }
317 .openerp .zebra tbody tr:hover td {
318 background-color: #eeeeee;
319@@ -93,6 +98,7 @@
320 background-image: -ms-linear-gradient(top, #eeeeee, #dedede);
321 background-image: -o-linear-gradient(top, #eeeeee, #dedede);
322 background-image: linear-gradient(to bottom, #eeeeee, #dedede);
323+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFEEEEEE', endColorstr='#FFDEDEDE')";
324 }
325 .openerp input, .openerp textarea, .openerp select {
326 padding: 2px 4px;
327@@ -123,6 +129,7 @@
328 background-image: -ms-linear-gradient(top, #efefef, #d8d8d8);
329 background-image: -o-linear-gradient(top, #efefef, #d8d8d8);
330 background-image: linear-gradient(to bottom, #efefef, #d8d8d8);
331+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFEFEFEF', endColorstr='#FFD8D8D8')";
332 -moz-border-radius: 3px;
333 -webkit-border-radius: 3px;
334 border-radius: 3px;
335@@ -141,6 +148,7 @@
336 background-image: -ms-linear-gradient(top, #f6f6f6, #e3e3e3);
337 background-image: -o-linear-gradient(top, #f6f6f6, #e3e3e3);
338 background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3);
339+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFF6F6F6', endColorstr='#FFE3E3E3')";
340 cursor: pointer;
341 background-position: 0;
342 }
343@@ -154,6 +162,7 @@
344 background-image: -ms-linear-gradient(top, #f6f6f6, #e3e3e3);
345 background-image: -o-linear-gradient(top, #f6f6f6, #e3e3e3);
346 background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3);
347+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFF6F6F6', endColorstr='#FFE3E3E3')";
348 -moz-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
349 -webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
350 box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
351@@ -166,6 +175,7 @@
352 background-image: -ms-linear-gradient(top, #e3e3e3, #f6f6f6);
353 background-image: -o-linear-gradient(top, #e3e3e3, #f6f6f6);
354 background-image: linear-gradient(to bottom, #e3e3e3, #f6f6f6);
355+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFE3E3E3', endColorstr='#FFF6F6F6')";
356 -moz-box-shadow: none;
357 -webkit-box-shadow: none;
358 box-shadow: none;
359@@ -227,6 +237,7 @@
360 background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
361 background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
362 background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
363+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFFCFCFC', endColorstr='#FFDEDEDE')";
364 }
365 .openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title {
366 margin: 0;
367@@ -310,6 +321,7 @@
368 background-image: -ms-linear-gradient(top, #b41616, #600606);
369 background-image: -o-linear-gradient(top, #b41616, #600606);
370 background-image: linear-gradient(to bottom, #b41616, #600606);
371+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFB41616', endColorstr='#FF600606')";
372 color: #eeeeee;
373 padding: 0 16px;
374 -moz-border-radius: 0 0 2px 2px;
375@@ -382,6 +394,7 @@
376 background-image: -ms-linear-gradient(top, #df3f3f, #a21a1a);
377 background-image: -o-linear-gradient(top, #df3f3f, #a21a1a);
378 background-image: linear-gradient(to bottom, #df3f3f, #a21a1a);
379+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFDF3F3F', endColorstr='#FFA21A1A')";
380 -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
381 -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
382 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
383@@ -394,6 +407,7 @@
384 background-image: -ms-linear-gradient(top, #e25858, #ab1b1b);
385 background-image: -o-linear-gradient(top, #e25858, #ab1b1b);
386 background-image: linear-gradient(to bottom, #e25858, #ab1b1b);
387+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFE25858', endColorstr='#FFAB1B1B')";
388 }
389 .openerp button.oe_highlight:active {
390 background-color: #c52020;
391@@ -403,6 +417,7 @@
392 background-image: -ms-linear-gradient(top, #c52020, #d22323);
393 background-image: -o-linear-gradient(top, #c52020, #d22323);
394 background-image: linear-gradient(to bottom, #c52020, #d22323);
395+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFC52020', endColorstr='#FFD22323')";
396 }
397 .openerp .oe_background_grey {
398 background: #eeeeee !important;
399@@ -420,6 +435,7 @@
400 background-image: -ms-linear-gradient(top, #dc5f59, #b33630);
401 background-image: -o-linear-gradient(top, #dc5f59, #b33630);
402 background-image: linear-gradient(to bottom, #dc5f59, #b33630);
403+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFDC5F59', endColorstr='#FFB33630')";
404 -moz-box-shadow: none;
405 -webkit-box-shadow: none;
406 box-shadow: none;
407@@ -439,7 +455,7 @@
408 visibility: hidden;
409 }
410 .openerp .oe_button_box {
411- width: 270px;
412+ width: 280px;
413 text-align: right;
414 }
415 .openerp .oe_button_box button {
416@@ -694,6 +710,7 @@
417 background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6);
418 background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6);
419 background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6);
420+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFF0F0FA', endColorstr='#FFEEEEF6')";
421 -moz-box-shadow: none;
422 -webkit-box-shadow: none;
423 box-shadow: none;
424@@ -745,6 +762,7 @@
425 background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6);
426 background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6);
427 background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6);
428+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFF0F0FA', endColorstr='#FFEEEEF6')";
429 -moz-box-shadow: none;
430 -webkit-box-shadow: none;
431 box-shadow: none;
432@@ -799,7 +817,7 @@
433 background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=);
434 text-align: center;
435 font-size: 14px;
436- height: 100%;
437+ height: 600px;
438 }
439 .openerp .oe_login ul, .openerp .oe_login li {
440 margin: 0;
441@@ -821,6 +839,7 @@
442 background-image: -ms-linear-gradient(top, #b92020, #600606);
443 background-image: -o-linear-gradient(top, #b92020, #600606);
444 background-image: linear-gradient(to bottom, #b92020, #600606);
445+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFB92020', endColorstr='#FF600606')";
446 -moz-border-radius: 4px;
447 -webkit-border-radius: 4px;
448 border-radius: 4px;
449@@ -878,6 +897,7 @@
450 background-image: -ms-linear-gradient(top, #b41616, #600606);
451 background-image: -o-linear-gradient(top, #b41616, #600606);
452 background-image: linear-gradient(to bottom, #b41616, #600606);
453+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFB41616', endColorstr='#FF600606')";
454 }
455 .openerp .oe_login .oe_login_pane {
456 position: absolute;
457@@ -912,8 +932,8 @@
458 .openerp .oe_login .oe_login_footer {
459 position: absolute;
460 bottom: -40px;
461- left: 0;
462- width: 100%;
463+ left: -134px;
464+ width: 600px;
465 text-align: center;
466 }
467 .openerp .oe_login .oe_login_footer a {
468@@ -975,6 +995,7 @@
469 background-image: -ms-linear-gradient(top, #646060, #262626);
470 background-image: -o-linear-gradient(top, #646060, #262626);
471 background-image: linear-gradient(to bottom, #646060, #262626);
472+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FF646060', endColorstr='#FF262626')";
473 }
474 .openerp .oe_topbar .oe_topbar_item {
475 display: block;
476@@ -1043,6 +1064,7 @@
477 background-image: -ms-linear-gradient(top, #292929, #191919);
478 background-image: -o-linear-gradient(top, #292929, #191919);
479 background-image: linear-gradient(to bottom, #292929, #191919);
480+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FF292929', endColorstr='#FF191919')";
481 -moz-box-shadow: none;
482 -webkit-box-shadow: none;
483 box-shadow: none;
484@@ -1180,7 +1202,7 @@
485 color: white;
486 padding: 2px 4px;
487 margin: 1px 6px 0 0;
488- border: 1px solid lightGray;
489+ border: 1px solid lightgrey;
490 text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
491 -moz-border-radius: 4px;
492 -webkit-border-radius: 4px;
493@@ -1205,7 +1227,7 @@
494 transform: scale(1.1);
495 }
496 .openerp .oe_secondary_submenu .oe_active {
497- border-top: 1px solid lightGray;
498+ border-top: 1px solid lightgrey;
499 border-bottom: 1px solid #dedede;
500 text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
501 -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
502@@ -1288,6 +1310,7 @@
503 background-image: -ms-linear-gradient(top, #b41616, #600606);
504 background-image: -o-linear-gradient(top, #b41616, #600606);
505 background-image: linear-gradient(to bottom, #b41616, #600606);
506+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFB41616', endColorstr='#FF600606')";
507 color: #eeeeee;
508 padding: 0 16px;
509 -moz-border-radius: 0 0 2px 2px;
510@@ -1310,12 +1333,14 @@
511 height: 100%;
512 }
513 .openerp .oe_application .oe_breadcrumb_item:not(:last-child) {
514- display: inline-block;
515 max-width: 7em;
516 white-space: nowrap;
517- overflow: hidden;
518 text-overflow: ellipsis;
519 }
520+.openerp .oe_application .oe_breadcrumb_title > * {
521+ display: inline-block;
522+ overflow: hidden;
523+}
524 .openerp .oe_view_manager .oe_view_manager_body {
525 height: inherit;
526 }
527@@ -1323,6 +1348,7 @@
528 height: inherit;
529 }
530 .openerp .oe_view_manager table.oe_view_manager_header {
531+ border-collapse: separate;
532 width: 100%;
533 table-layout: fixed;
534 }
535@@ -1501,6 +1527,7 @@
536 background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
537 background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
538 background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
539+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFFCFCFC', endColorstr='#FFDEDEDE')";
540 -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1);
541 -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1);
542 box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1);
543@@ -1950,6 +1977,7 @@
544 background-image: -ms-linear-gradient(top, #efefef, #d8d8d8);
545 background-image: -o-linear-gradient(top, #efefef, #d8d8d8);
546 background-image: linear-gradient(to bottom, #efefef, #d8d8d8);
547+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFEFEFEF', endColorstr='#FFD8D8D8')";
548 -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
549 -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
550 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
551@@ -1962,6 +1990,7 @@
552 background-image: -ms-linear-gradient(top, #e3e3e3, #f6f6f6);
553 background-image: -o-linear-gradient(top, #e3e3e3, #f6f6f6);
554 background-image: linear-gradient(to bottom, #e3e3e3, #f6f6f6);
555+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFE3E3E3', endColorstr='#FFF6F6F6')";
556 -moz-box-shadow: none;
557 -webkit-box-shadow: none;
558 box-shadow: none;
559@@ -1974,6 +2003,7 @@
560 background-image: -ms-linear-gradient(top, #f6f6f6, #e3e3e3);
561 background-image: -o-linear-gradient(top, #f6f6f6, #e3e3e3);
562 background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3);
563+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFF6F6F6', endColorstr='#FFE3E3E3')";
564 -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
565 -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
566 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
567@@ -2034,6 +2064,7 @@
568 background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
569 background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
570 background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
571+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFFCFCFC', endColorstr='#FFDEDEDE')";
572 }
573 .openerp .oe_form header > span {
574 margin-left: 4px;
575@@ -2130,7 +2161,7 @@
576 }
577 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
578 font-size: 80%;
579- color: darkGreen;
580+ color: darkgreen;
581 vertical-align: top;
582 position: relative;
583 top: -4px;
584@@ -2178,6 +2209,9 @@
585 .openerp .oe_form_field_progressbar.ui-progressbar .ui-widget-header {
586 background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
587 }
588+.openerp .oe_form h1 .oe_form_required {
589+ float: inherit;
590+}
591 .openerp .oe_form .oe_form_field_text {
592 width: 100%;
593 }
594@@ -2255,6 +2289,7 @@
595 }
596 .openerp .oe_form .oe_form_required input:not([disabled]):not([readonly]), .openerp .oe_form .oe_form_required select:not([disabled]):not([readonly]), .openerp .oe_form .oe_form_required textarea:not([disabled]):not([readonly]) {
597 background-color: #d2d2ff !important;
598+ width: 100%;
599 }
600 .openerp .oe_form .oe_form_invalid input, .openerp .oe_form .oe_form_invalid select, .openerp .oe_form .oe_form_invalid textarea {
601 background-color: #ff6666 !important;
602@@ -2284,12 +2319,14 @@
603 border-bottom-left-radius: 0px;
604 height: 22px;
605 }
606+.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) > div {
607+ overflow: hidden;
608+}
609 .openerp .oe_form .oe_form_field_with_button input {
610 width: 100%;
611 }
612 .openerp .oe_form .oe_form_field_with_button > div {
613 position: relative;
614- overflow: hidden;
615 }
616 .openerp .oe_form .oe_form_embedded_html {
617 position: relative;
618@@ -2466,6 +2503,10 @@
619 background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
620 background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
621 background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
622+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFFCFCFC', endColorstr='#FFDEDEDE')";
623+ background-color/*\**/: #e8e8e8 \9;
624+ background: -ms-linear-gradient(top, #fcfcfc, #dedede);
625+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFFCFCFC', endColorstr='#FFDEDEDE')";
626 }
627 .openerp ul.oe_form_status li:first-child .label, .openerp ul.oe_form_status_clickable li:first-child .label {
628 border-left: 1px solid #cacaca;
629@@ -2508,6 +2549,12 @@
630 background: -moz-linear-gradient(135deg, #dedede, #fcfcfc);
631 background: -o-linear-gradient(135deg, #fcfcfc, #dedede);
632 background: -webkit-gradient(linear, left top, right bottom, from(#fcfcfc), to(#dedede));
633+ background: -ms-linear-gradient(top, #fcfcfc, #dedede);
634+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFFCFCFC', endColorstr='#FFDEDEDE', enabled=true)";
635+ background: -o-linear-gradient(135deg, #dedede, #fcfcfc);
636+ background-color/*\**/: #e8e8e8 \9;
637+ background: -ms-linear-gradient(top, #fcfcfc, #dedede);
638+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dedede');
639 -moz-border-radius: 3px;
640 -webkit-border-radius: 3px;
641 border-radius: 3px;
642@@ -2525,12 +2572,19 @@
643 background-image: -ms-linear-gradient(top, #729fcf, #3465a4);
644 background-image: -o-linear-gradient(top, #729fcf, #3465a4);
645 background-image: linear-gradient(to bottom, #729fcf, #3465a4);
646+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FF729FCF', endColorstr='#FF3465A4')";
647 }
648 .openerp ul.oe_form_status li.oe_active .arrow span, .openerp ul.oe_form_status_clickable li.oe_active .arrow span {
649 background-color: #3465a4;
650 background: -moz-linear-gradient(135deg, #3465a4, #729fcf);
651 background: -o-linear-gradient(135deg, #729fcf, #3465a4);
652 background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4));
653+ background: -ms-linear-gradient(top, #729fcf, #3465a4);
654+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FF729FCF', endColorstr='#FF3465A4', enabled=true)";
655+ background: -o-linear-gradient(135deg, #3465a4, #729fcf);
656+ background-color/*\**/: #729fcf \9;
657+ background: -ms-linear-gradient(top, #729fcf, #3465a4);
658+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#729fcf', endColorstr='#3465a4');
659 }
660 .openerp ul.oe_form_status li.oe_active .label, .openerp ul.oe_form_status_clickable li.oe_active .label {
661 color: white;
662@@ -2547,6 +2601,10 @@
663 background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca);
664 background-image: -o-linear-gradient(top, #e8e8e8, #cacaca);
665 background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
666+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFE8E8E8', endColorstr='#FFCACACA')";
667+ background-color/*\**/: #dedede \9;
668+ background: -ms-linear-gradient(top, #e8e8e8, #cacaca);
669+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e8e8e8', endColorstr='#cacaca');
670 }
671 .openerp ul.oe_form_status_clickable li:hover .label {
672 text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede;
673@@ -2559,6 +2617,10 @@
674 background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca);
675 background-image: -o-linear-gradient(top, #e8e8e8, #cacaca);
676 background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
677+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFE8E8E8', endColorstr='#FFCACACA')";
678+ background-color/*\**/: #dedede \9;
679+ background: -ms-linear-gradient(top, #e8e8e8, #cacaca);
680+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e8e8e8', endColorstr='#cacaca');
681 }
682 .openerp ul.oe_form_status_clickable li .label {
683 color: #7c7bad;
684@@ -2571,6 +2633,9 @@
685 background-image: -ms-linear-gradient(top, #4c85c2, #284d7d);
686 background-image: -o-linear-gradient(top, #4c85c2, #284d7d);
687 background-image: linear-gradient(to bottom, #4c85c2, #284d7d);
688+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FF4C85C2', endColorstr='#FF284D7D')";
689+ background: -ms-linear-gradient(top, #4c85c2, #284d7d);
690+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4c85c2', endColorstr='#284d7d');
691 }
692 .openerp ul.oe_form_status_clickable li.oe_active:hover .label {
693 text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4;
694@@ -2580,6 +2645,10 @@
695 background: -moz-linear-gradient(135deg, #284d7d, #4c85c2);
696 background: -o-linear-gradient(135deg, #4c85c2, #284d7d);
697 background: -webkit-gradient(linear, left top, right bottom, from(#4c85c2), to(#284d7d));
698+ background: -ms-linear-gradient(top, #4c85c2, #284d7d);
699+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FF4C85C2', endColorstr='#FF284D7D', enabled=true)";
700+ background: -ms-linear-gradient(top, #4c85c2, #284d7d);
701+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4c85c2', endColorstr='#284d7d');
702 }
703 .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
704 display: none;
705@@ -2726,6 +2795,7 @@
706 background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
707 background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
708 background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
709+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFFCFCFC', endColorstr='#FFDEDEDE')";
710 }
711 .openerp .oe_list_content {
712 width: 100%;
713@@ -2820,6 +2890,7 @@
714 background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6);
715 background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6);
716 background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6);
717+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFF0F0FA', endColorstr='#FFEEEEF6')";
718 }
719 .openerp .oe_list_content > tfoot {
720 border-top: 2px solid #cacaca;
721@@ -2958,6 +3029,17 @@
722 color: #333333;
723 }
724
725+@-moz-document url-prefix() {
726+ .openerp .oe_view_manager .oe_view_manager_switch li {
727+ line-height: 21px;
728+ }
729+}
730+
731+@media screen and (-webkit-min-device-pixel-ratio: 0) {
732+ .openerp .oe_login {
733+ height: 100%;
734+ }
735+}
736 .kitten-mode-activated {
737 background-image: url(http://placekitten.com/g/1365/769);
738 background-size: cover;
739@@ -3012,6 +3094,78 @@
740 border-radius: 3px;
741 }
742
743+.openerp .oe_fileupload {
744+ display: inline-block;
745+ clear: both;
746+ width: 100%;
747+}
748+.openerp .oe_fileupload .oe_add {
749+ float: left;
750+ position: relative;
751+ width: 100%;
752+ left: 2px;
753+ top: 7px;
754+}
755+.openerp .oe_fileupload .oe_add button {
756+ display: inline;
757+ height: 24px;
758+ font-size: 12px;
759+ line-height: 12px;
760+ vertical-align: middle;
761+}
762+.openerp .oe_fileupload .oe_add button.oe_attach {
763+ width: 24px;
764+ overflow: hidden;
765+ width: 24px;
766+ overflow: hidden;
767+ background: transparent;
768+ color: #7c7bad;
769+ box-shadow: none;
770+ border: none;
771+ text-shadow: none;
772+}
773+.openerp .oe_fileupload .oe_add button.oe_attach .oe_e {
774+ position: relative;
775+ top: -1px;
776+ left: -9px;
777+}
778+.openerp .oe_fileupload .oe_add input.oe_form_binary_file {
779+ display: inline-block;
780+ margin-left: -5px;
781+ height: 28px;
782+ width: 52px;
783+ margin-top: -26px;
784+}
785+.openerp .oe_fileupload .oe_add .oe_attach_label {
786+ color: #7c7bad;
787+ margin-left: -3px;
788+}
789+.openerp .oe_fileupload .oe_attachments {
790+ margin-bottom: 4px;
791+ margin-right: 0px;
792+ font-size: 12px;
793+ border-radius: 2px;
794+ border: solid 1px rgba(124, 123, 173, 0.14);
795+}
796+.openerp .oe_fileupload .oe_attachments .oe_attachment {
797+ padding: 2px;
798+ padding-left: 4px;
799+ padding-right: 4px;
800+}
801+.openerp .oe_fileupload .oe_attachments .oe_attachment .oe_e {
802+ font-size: 23px;
803+ margin-top: -5px;
804+}
805+.openerp .oe_fileupload .oe_attachments .oe_attachment .oe_e:hover {
806+ text-decoration: none;
807+}
808+.openerp .oe_fileupload .oe_attachments .oe_attachment:nth-child(odd) {
809+ background: white;
810+}
811+.openerp .oe_fileupload .oe_attachments .oe_attachment:nth-child(even) {
812+ background: #f4f5fa;
813+}
814+
815 @media print {
816 .openerp {
817 text-shadow: none;
818
819=== modified file 'addons/web/static/src/css/base.sass'
820--- addons/web/static/src/css/base.sass 2012-11-15 17:51:46 +0000
821+++ addons/web/static/src/css/base.sass 2012-11-19 06:37:29 +0000
822@@ -49,6 +49,7 @@
823 background-image: -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */
824 background-image: -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */
825 background-image: linear-gradient(to bottom, $startColor, $endColor)
826+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}')"/* IE9 */
827
828 @mixin radial-gradient($gradient)
829 background-position: center center
830@@ -95,6 +96,8 @@
831 background: -moz-linear-gradient(135deg, $endColor, $startColor)
832 background: -o-linear-gradient(135deg, $startColor, $endColor)
833 background: -webkit-gradient(linear, left top, right bottom, from($startColor), to($endColor))
834+ background: -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */
835+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', enabled=true)"/* IE9 */
836
837 @mixin transform($transform)
838 -webkit-transform: $transform
839@@ -115,7 +118,6 @@
840 @keyframes #{$name}
841 @content
842
843-
844 // Transforms the (readable) text of an inline element into an mmlicons icon,
845 // allows for actual readable text in-code (and in readers?) with iconic looks
846 @mixin text-to-icon($icon-name, $color: #404040)
847@@ -159,6 +161,9 @@
848 \::-webkit-input-placeholder
849 color: $tag-border !important
850 font-style: italic !important
851+ \:-ms-input-placeholder
852+ color: $tag-border !important
853+ font-style: italic !important
854 //}}}
855 // Tag reset {{{
856 a
857@@ -412,7 +417,7 @@
858 clear: both
859 visibility: hidden
860 .oe_button_box
861- width: 270px
862+ width: 280px
863 text-align: right
864 button
865 margin: 4px
866@@ -680,7 +685,7 @@
867 background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=)
868 text-align: center
869 font-size: 14px
870- height: 100%
871+ height: 600px
872 ul, li
873 margin: 0
874 list-style-type: none
875@@ -755,8 +760,8 @@
876 .oe_login_footer
877 position: absolute
878 bottom: -40px
879- left: 0
880- width: 100%
881+ left: -134px
882+ width: 600px
883 text-align: center
884 a
885 color: #eee
886@@ -1059,11 +1064,12 @@
887 > div
888 height: 100%
889 .oe_breadcrumb_item:not(:last-child)
890- display: inline-block
891 max-width: 7em
892 white-space: nowrap
893- overflow: hidden
894 text-overflow: ellipsis
895+ .oe_breadcrumb_title > *
896+ display: inline-block
897+ overflow: hidden
898 // }}}
899 // ViewManager common {{{
900 .oe_view_manager
901@@ -1073,6 +1079,7 @@
902 height: inherit
903
904 table.oe_view_manager_header
905+ border-collapse: separate
906 width: 100%
907 table-layout: fixed
908 .oe_header_row
909@@ -1739,6 +1746,9 @@
910 // }}}
911 // FormView.fields {{{
912 .oe_form
913+ h1
914+ .oe_form_required
915+ float: inherit
916 .oe_form_field_text
917 width: 100%
918 .oe_form_field_char input,
919@@ -1793,6 +1803,7 @@
920 .oe_form_required
921 input:not([disabled]):not([readonly]), select:not([disabled]):not([readonly]), textarea:not([disabled]):not([readonly])
922 background-color: #D2D2FF !important
923+ width : 100%
924 .oe_form_invalid
925 input, select, textarea
926 background-color: #F66 !important
927@@ -1816,12 +1827,13 @@
928 @include radius(0)
929 border-bottom-left-radius: 0px
930 height: 22px
931+ > div
932+ overflow: hidden
933 .oe_form_field_with_button
934 input
935 width: 100%
936 > div
937 position: relative
938- overflow: hidden
939 .oe_form_embedded_html
940 position: relative
941 width: 600px
942@@ -1862,6 +1874,7 @@
943 -ms-filter: "alpha(opacity=0)"
944 margin: 0
945 padding: 0
946+
947 .oe_form
948 .oe_form_field_image
949 padding: 0
950@@ -1974,6 +1987,10 @@
951 margin: 0 -18px 0 0
952 padding: 0
953 @include vertical-gradient(#fcfcfc, #dedede)
954+ background-color/*\**/: #e8e8e8\9
955+ background: -ms-linear-gradient(top, #fcfcfc, #dedede)
956+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#{ie-hex-str(#fcfcfc)}', endColorstr='#{ie-hex-str(#dedede)}')"/* IE9 */
957+ //-ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dedede')
958 &:first-child .label
959 border-left: 1px solid #cacaca
960 padding-left: 14px
961@@ -2006,12 +2023,23 @@
962 margin-top: 3px
963 box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2)
964 @include skew-gradient(#fcfcfc, #dedede)
965+ background: -o-linear-gradient(135deg, #dedede, #fcfcfc)
966+ background-color/*\**/: #e8e8e8\9
967+ background: -ms-linear-gradient(top, #fcfcfc, #dedede)
968+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dedede')
969 @include radius(3px)
970 @include transform(rotate(45deg))
971 li.oe_active
972 @include vertical-gradient(#729fcf, #3465a4)
973+ //background-color/*\**/: #729fcf\9
974+ //background: -ms-linear-gradient(top, #729fcf, #3465a4)
975+ //-ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#729fcf', endColorstr='#3465a4')
976 .arrow span
977 @include skew-gradient(#729fcf, #3465a4)
978+ background: -o-linear-gradient(135deg, #3465a4, #729fcf)
979+ background-color/*\**/: #729fcf\9
980+ background: -ms-linear-gradient(top, #729fcf, #3465a4)
981+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#729fcf', endColorstr='#3465a4')
982 .label
983 color: white
984 text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4
985@@ -2020,19 +2048,31 @@
986 cursor: pointer
987 &:hover
988 @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
989+ background-color/*\**/: #dedede\9
990+ background: -ms-linear-gradient(top, #e8e8e8, #cacaca)
991+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e8e8e8', endColorstr='#cacaca')
992 .label
993 text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede
994 .arrow span
995 @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
996+ background-color/*\**/: #dedede\9
997+ background: -ms-linear-gradient(top, #e8e8e8, #cacaca)
998+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e8e8e8', endColorstr='#cacaca')
999 .label
1000 color: $link-color
1001 li.oe_active
1002 &:hover
1003 @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
1004+ //background-color/*\**/: #4c85c2\9;
1005+ background: -ms-linear-gradient(top, #4c85c2, #284d7d)
1006+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4c85c2', endColorstr='#284d7d')
1007 .label
1008 text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4
1009 .arrow span
1010 @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
1011+ //background-color/*\**/: #4c85c2\9;
1012+ background: -ms-linear-gradient(top, #4c85c2, #284d7d)
1013+ -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4c85c2', endColorstr='#284d7d')
1014 // }}}
1015 // FormView.one2many {{{
1016 .oe_form .oe_form_field_one2many > .oe_view_manager
1017@@ -2342,6 +2382,18 @@
1018 float: right
1019 color: #333
1020 // }}}
1021+
1022+@-moz-document url-prefix()
1023+ .openerp
1024+ .oe_view_manager
1025+ .oe_view_manager_switch
1026+ li
1027+ line-height: 21px
1028+@media screen and (-webkit-min-device-pixel-ratio:0)
1029+ .openerp
1030+ .oe_login
1031+ height: 100%
1032+
1033 // Kitten Mode {{{
1034 .kitten-mode-activated
1035 background-image: url(http://placekitten.com/g/1365/769)
1036@@ -2384,6 +2436,67 @@
1037
1038 .ui-corner-all
1039 @include radius(3px)
1040+
1041+.openerp
1042+ .oe_fileupload
1043+ display: inline-block
1044+ clear: both
1045+ width: 100%
1046+ .oe_add
1047+ float: left
1048+ position: relative
1049+ width: 100%
1050+ left: +2px
1051+ top: +7px
1052+ button
1053+ display: inline
1054+ height: 24px
1055+ font-size: 12px
1056+ line-height: 12px
1057+ vertical-align: middle
1058+ button.oe_attach
1059+ width: 24px
1060+ overflow: hidden
1061+ width: 24px
1062+ overflow: hidden
1063+ background: transparent
1064+ color: #7C7BAD
1065+ box-shadow: none
1066+ border: none
1067+ text-shadow: none
1068+ .oe_e
1069+ position: relative
1070+ top: -1px
1071+ left: -9px
1072+ input.oe_form_binary_file
1073+ display: inline-block
1074+ margin-left: -5px
1075+ height: 28px
1076+ width: 52px
1077+ margin-top: -26px
1078+ .oe_attach_label
1079+ color: #7C7BAD
1080+ margin-left: -3px
1081+ .oe_attachments
1082+ margin-bottom: 4px
1083+ margin-right: 0px
1084+ font-size: 12px
1085+ border-radius: 2px
1086+ border: solid 1px rgba(124,123,173,0.14)
1087+ .oe_attachment
1088+ padding: 2px
1089+ padding-left: 4px
1090+ padding-right: 4px
1091+ .oe_e
1092+ font-size: 23px
1093+ margin-top: -5px
1094+ .oe_e:hover
1095+ text-decoration: none
1096+ .oe_attachment:nth-child(odd)
1097+ background: white
1098+ .oe_attachment:nth-child(even)
1099+ background: #F4F5FA
1100+
1101 // }}}
1102
1103 // @media print {{{
1104
1105=== added file 'addons/web/static/src/img/ui/bkg-ie-button.gif'
1106Binary files addons/web/static/src/img/ui/bkg-ie-button.gif 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/ui/bkg-ie-button.gif 2012-11-19 06:37:29 +0000 differ
1107=== added file 'addons/web/static/src/img/ui/bkg-ie-hover-button.gif'
1108Binary files addons/web/static/src/img/ui/bkg-ie-hover-button.gif 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/ui/bkg-ie-hover-button.gif 2012-11-19 06:37:29 +0000 differ
1109=== modified file 'addons/web/static/src/js/view_form.js'
1110--- addons/web/static/src/js/view_form.js 2012-11-16 16:44:16 +0000
1111+++ addons/web/static/src/js/view_form.js 2012-11-19 06:37:29 +0000
1112@@ -1229,6 +1229,7 @@
1113 this.process_version();
1114
1115 this.fields_to_init = [];
1116+ this.buttons = [];
1117 this.tags_to_init = [];
1118 this.widgets_to_init = [];
1119 this.labels = {};
1120@@ -1256,7 +1257,8 @@
1121 self.view.register_field(w, $elem.attr("name"));
1122 self.to_replace.push([w, $elem]);
1123 });
1124- _.each(this.tags_to_init, function($elem) {
1125+ _.each(this.tags_to_init, function($elem, k) {
1126+ if(self.buttons[k] && self.buttons[k].type) $elem[0].setAttribute("type", self.buttons[k].type)
1127 var tag_name = $elem[0].tagName.toLowerCase();
1128 var obj = self.tags_registry.get_object(tag_name);
1129 var w = new (obj)(self.view, instance.web.xml_to_json($elem[0]));
1130@@ -1295,10 +1297,25 @@
1131 }
1132 this.$target.toggleClass('oe_layout_debugging');
1133 },
1134+ get_button_json: function(obj, child){
1135+ this.buttons = child || [];
1136+ if (obj.children && obj.children.length) {
1137+ for (var i = 0, ii = obj.children.length; i < ii; i++) {
1138+ if(obj.children[i].tag=="button"){
1139+ this.buttons.push(obj.children[i].attrs)
1140+ }
1141+ if(obj.children[i].children){
1142+ this.get_button_json(obj.children[i], this.buttons)
1143+ }
1144+ }
1145+ return this.buttons;
1146+ }
1147+ },
1148 process: function($tag) {
1149 var self = this;
1150 var tagname = $tag[0].nodeName.toLowerCase();
1151 if (this.tags_registry.contains(tagname)) {
1152+ this.get_button_json(this.fvg.arch)
1153 this.tags_to_init.push($tag);
1154 return $tag;
1155 }
1156@@ -3033,6 +3050,12 @@
1157 }
1158 }
1159 });
1160+ // Autocomplete close on dialog content scroll
1161+ this.$input.closest(".ui-dialog .ui-dialog-content").scroll(function(){
1162+ if(self.$input.autocomplete("widget").is(":visible")){
1163+ self.$input.autocomplete("close");
1164+ }
1165+ });
1166 self.ed_def = $.Deferred();
1167 self.uned_def = $.Deferred();
1168 var ed_delay = 200;
1169
1170=== modified file 'addons/web_calendar/static/src/css/web_calendar.css'
1171--- addons/web_calendar/static/src/css/web_calendar.css 2012-10-29 10:53:03 +0000
1172+++ addons/web_calendar/static/src/css/web_calendar.css 2012-11-19 06:37:29 +0000
1173@@ -1,35 +1,26 @@
1174-@charset "utf-8";
1175-.openerp .oe_view_manager_view_calendar {
1176- position: relative;
1177-}
1178-
1179-.openerp .oe_calendar_sidebar {
1180- width: 200px;
1181- padding: 5px;
1182-}
1183-.openerp .oe_calendar {
1184- background-color: white;
1185- height: 600px;
1186- border-right: 1px solid #eeeeee;
1187-}
1188-.openerp .oe_calendar .oe_calendar_table {
1189- position: absolute;
1190- left: 0px;
1191- right: 0px;
1192- top: 0px;
1193- border-top: 3px solid #eeeeee;
1194- width: 100%;
1195- overflow: hidden;
1196-}
1197-.openerp .oe_calendar .oe_calendar_filter {
1198- padding: 0 10px;
1199-}
1200-.openerp .oe_calendar .dhx_cal_select_menu .dhx_menu_icon.icon_edit {
1201- display: none;
1202-}
1203-.openerp .oe_calendar.oe_cal_month .dhx_cal_data {
1204- overflow-y: hidden;
1205-}
1206-.openerp .oe_calendar.oe_cal_month .dhx_cal_data table tr td:last-child div.dhx_month_body {
1207- padding-right: 5px;
1208-}
1209+.openerp .oe_view_manager_view_calendar {
1210+ position: relative; }
1211+
1212+.openerp .oe_calendar_sidebar {
1213+ width: 200px;
1214+ padding: 5px; }
1215+.openerp .oe_calendar {
1216+ background-color: white;
1217+ height: 600px;
1218+ border-right: 1px solid #eeeeee; }
1219+ .openerp .oe_calendar .oe_calendar_table {
1220+ position: absolute;
1221+ left: 0px;
1222+ right: 0px;
1223+ top: 0px;
1224+ border-top: 3px solid #eeeeee;
1225+ width: 100%;
1226+ overflow: hidden; }
1227+ .openerp .oe_calendar .oe_calendar_filter {
1228+ padding: 0 10px; }
1229+ .openerp .oe_calendar .dhx_cal_select_menu .dhx_menu_icon.icon_edit {
1230+ display: none; }
1231+ .openerp .oe_calendar.oe_cal_month .dhx_cal_data {
1232+ overflow-y: hidden; }
1233+ .openerp .oe_calendar.oe_cal_month .dhx_cal_data table tr td:last-child div.dhx_month_body {
1234+ padding-right: 5px; }
1235
1236=== modified file 'addons/web_gantt/static/src/js/gantt.js'
1237--- addons/web_gantt/static/src/js/gantt.js 2012-10-30 14:06:30 +0000
1238+++ addons/web_gantt/static/src/js/gantt.js 2012-11-19 06:37:29 +0000
1239@@ -152,7 +152,7 @@
1240 } else { // we assume date_duration is defined
1241 var tmp = instance.web.format_value(task[self.fields_view.arch.attrs.date_delay],
1242 self.fields[self.fields_view.arch.attrs.date_delay]);
1243- if (!tmp)
1244+ if (!tmp || tmp < 1)
1245 return;
1246 task_stop = task_start.clone().addMilliseconds(tmp * 60 * 60 * 1000);
1247 }
1248
1249=== modified file 'addons/web_graph/static/lib/flotr2/js/DOM.js'
1250--- addons/web_graph/static/lib/flotr2/js/DOM.js 2012-05-07 08:19:08 +0000
1251+++ addons/web_graph/static/lib/flotr2/js/DOM.js 2012-11-19 06:37:29 +0000
1252@@ -18,7 +18,6 @@
1253 var div = Flotr.DOM.create('div'), n;
1254 div.innerHTML = html;
1255 n = div.children[0];
1256- div.innerHTML = '';
1257 return n;
1258 },
1259 /**
1260
1261=== modified file 'addons/web_kanban/static/src/css/kanban.css'
1262--- addons/web_kanban/static/src/css/kanban.css 2012-11-15 14:30:59 +0000
1263+++ addons/web_kanban/static/src/css/kanban.css 2012-11-19 06:37:29 +0000
1264@@ -1,7 +1,12 @@
1265 @charset "utf-8";
1266+.openerp .oe_application {
1267+ height: 100%;
1268+}
1269+
1270 .openerp .oe_kanban_view {
1271 background: white;
1272 height: inherit;
1273+ position: relative;
1274 }
1275 .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_dummy_cell {
1276 background: url(/web/static/src/img/form_sheetbg.png);
1277@@ -127,6 +132,7 @@
1278 }
1279 .openerp .oe_kanban_view .oe_kanban_group_title_vertical {
1280 writing-mode: tb-rl;
1281+ -ms-writing-mode: tb;
1282 -webkit-transform: rotate(90deg);
1283 -moz-transform: rotate(90deg);
1284 -o-transform: rotate(90deg);
1285@@ -139,6 +145,7 @@
1286 position: relative;
1287 opacity: 0.75;
1288 top: 20px;
1289+ -o-transform-origin: 80% 50%; /* Opera */
1290 }
1291 .openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
1292 margin-left: 4px;
1293@@ -196,12 +203,14 @@
1294 height: 64px;
1295 text-align: center;
1296 overflow: hidden;
1297+ border-collapse: separate;
1298 -moz-border-radius: 3px;
1299 -webkit-border-radius: 3px;
1300 border-radius: 3px;
1301 -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
1302 -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
1303 -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
1304+ box-shadow: 0 1px 4px 3px rgba(0, 0, 0, 0.4);
1305 }
1306 .openerp .oe_kanban_view .oe_kanban_details {
1307 display: inline-block;
1308@@ -284,7 +293,7 @@
1309 -webkit-box-sizing: border-box;
1310 }
1311 .openerp .oe_kanban_view .oe_kanban_action_button {
1312- height: 22px;
1313+ height: 20%;
1314 margin: 0;
1315 }
1316 .openerp .oe_kanban_view .oe_kanban_action_a {
1317
1318=== modified file 'addons/web_kanban/static/src/css/kanban.sass'
1319--- addons/web_kanban/static/src/css/kanban.sass 2012-11-15 14:30:59 +0000
1320+++ addons/web_kanban/static/src/css/kanban.sass 2012-11-19 06:37:29 +0000
1321@@ -46,11 +46,14 @@
1322 transition: $transition
1323 // }}}
1324
1325+.openerp .oe_application
1326+ height: 100%
1327 .openerp .oe_kanban_view
1328 // KanbanView {{{
1329 //background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==)
1330 background: white
1331 height: inherit
1332+ position: relative
1333 &.oe_kanban_grouped .oe_kanban_dummy_cell
1334 background: url(/web/static/src/img/form_sheetbg.png)
1335 .ui-sortable-placeholder
1336@@ -150,6 +153,7 @@
1337 color: #666666
1338 .oe_kanban_group_title_vertical
1339 writing-mode: tb-rl
1340+ -ms-writing-mode: tb
1341 -webkit-transform: rotate(90deg)
1342 -moz-transform: rotate(90deg)
1343 -o-transform: rotate(90deg)
1344@@ -162,6 +166,7 @@
1345 position: relative
1346 opacity: 0.75
1347 top: 20px
1348+ -o-transform-origin: 80% 50%
1349 // }}}
1350 // KanbanQuickCreate {{{
1351 .oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle
1352@@ -207,8 +212,10 @@
1353 height: 64px
1354 text-align: center
1355 overflow: hidden
1356+ border-collapse: separate
1357 @include radius(3px)
1358 @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.4))
1359+ box-shadow: 0 1px 4px 3px rgba(0, 0, 0, 0.4)
1360 .oe_kanban_details
1361 display: inline-block
1362 vertical-align: top
1363@@ -270,7 +277,7 @@
1364 -moz-box-sizing: border-box
1365 -webkit-box-sizing: border-box
1366 .oe_kanban_action_button
1367- height: 22px
1368+ height: 20%
1369 margin: 0
1370 .oe_kanban_action_a
1371 text-decoration: none