Jiten (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-improve-css-all-browsers into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-css-all-browsers/+merge/129651
Test in different browsers like Chrome, FirFox, IE9, Opera.
And find some issue which is not worked as same in all above browsers.
So Fix all css issues with this branch.
Improve CSS to tested in Chrome, FirFox, IE9 and Opera.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-css-all-browsers/+merge/129651
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-improve-css-all-browsers.
=== modified file 'addons/web/__openerp__.py'
--- addons/web/__openerp__.py 2012-09-11 06:36:07 +0000
+++ addons/web/__openerp__.py 2012-10-15 11:00:30 +0000
@@ -61,6 +61,7 @@
"static/lib/jquery.tipsy/tipsy.css",
"static/lib/jquery.textext/jquery.textext.css",
"static/src/css/base.css",
+ "static/src/css/base-ie.css",
"static/src/css/data_export.css",
"static/lib/cleditor/jquery.cleditor.css",
],
=== modified file 'addons/web/static/lib/jquery.blockUI/jquery.blockUI.js'
--- addons/web/static/lib/jquery.blockUI/jquery.blockUI.js 2012-09-11 08:15:59 +0000
+++ addons/web/static/lib/jquery.blockUI/jquery.blockUI.js 2012-10-15 11:00:30 +0000
@@ -265,7 +265,7 @@
}
// style the overlay
- if (!opts.theme && (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform))))
+ if (!opts.theme && (opts.applyPlatformOpacityRules || ($.browser.mozilla && /Linux/.test(navigator.platform))))
lyr2.css(opts.overlayCSS);
lyr2.css('position', full ? 'fixed' : 'absolute');
=== added file 'addons/web/static/src/css/base-ie.css'
--- addons/web/static/src/css/base-ie.css 1970-01-01 00:00:00 +0000
+++ addons/web/static/src/css/base-ie.css 2012-10-15 11:00:30 +0000
@@ -0,0 +1,35 @@
+.openerp .oe_form .oe_form_field_selection {
+ width/*\**/:60%\9;
+}
+a:link img {
+ border/*\**/: none\9;
+ text-decoration/*\**/: none\9;
+}
+.openerp input[type=checkbox]{
+ padding/*\**/: 2px 4px\9;
+ border-radius/*\**/: 3px\9;
+ box-shadow/*\**/: inset rgba(0, 0, 0, 0.1);\9;
+ border/*\**/:0px solid #cccccc\9;
+ background: white;
+}
+.openerp .oe_login {
+ background-image/*\**/: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=)\9;
+ text-align/*\**/: center\9;
+ font-size/*\**/: 14px\9;
+ height/*\**/: 600px\9;
+}
+.openerp .oe_form input[type="file"] {
+ width/*\**/: 85px\9;
+}
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {
+ filter/*\**/:none\9;
+}
+.openerp .oe_form_field_text {
+ float/*\**/: left\9;
+}
+.openerp .oe_form_field.oe_tags {
+ float/*\**/: left\9;
+}
+.openerp ul.oe_form_status li .label, .openerp ul.oe_form_status_clickable li .label {
+ padding-bottom/*\**/: 10px\9;
+}
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css 2012-10-14 19:55:14 +0000
+++ addons/web/static/src/css/base.css 2012-10-15 11:00:30 +0000
@@ -56,6 +56,10 @@
color: #afafb6 !important;
font-style: italic !important;
}
+.openerp :-ms-input-placeholder {
+ color: #afafb6 !important;
+ font-style: italic !important;
+}
.openerp a {
text-decoration: none;
cursor: pointer !important;
@@ -445,7 +449,7 @@
visibility: hidden;
}
.openerp .oe_button_box {
- width: 270px;
+ width: 280px;
text-align: right;
}
.openerp .oe_button_box button {
@@ -807,6 +811,11 @@
font-size: 14px;
height: 100%;
}
+@-moz-document url-prefix() {
+ .openerp .oe_login {
+ height: 600px
+ }
+}
.openerp .oe_login ul, .openerp .oe_login li {
margin: 0;
list-style-type: none;
@@ -1314,11 +1323,13 @@
.openerp .oe_application > div {
height: 100%;
}
+.openerp .oe_application .oe_breadcrumb_title > * {
+ overflow: hidden;
+ display: inline-block;
+}
.openerp .oe_application .oe_breadcrumb_item:not(:last-child) {
- display: inline-block;
max-width: 7em;
white-space: nowrap;
- overflow: hidden;
text-overflow: ellipsis;
}
.openerp .oe_view_manager .oe_view_manager_body {
@@ -1459,6 +1470,11 @@
text-align: center;
list-style-type: none;
}
+@-moz-document url-prefix(){
+ .openerp .oe_view_manager .oe_view_manager_switch li {
+ line-height: 21px;
+ }
+}
.openerp .oe_view_manager .oe_view_manager_switch li a {
position: relative;
}
@@ -2120,6 +2136,7 @@
.openerp .oe_form .oe_form_group {
width: 100%;
margin: 9px 0 9px 0;
+ float:right;
}
.openerp .oe_form .oe_form_group .oe_form_group_cell.oe_group_right {
padding-left: 20px;
@@ -2204,6 +2221,9 @@
display: inline-block;
padding: 2px 2px 2px 0px;
}
+.openerp .oe_form .oe_form_field {
+ display: -moz-stack;
+}
.openerp .oe_form .oe_form_field input {
margin: 0px;
}
@@ -2256,6 +2276,7 @@
}
.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]) {
background-color: #d2d2ff !important;
+ width : 100%;
}
.openerp .oe_form .oe_form_invalid input, .openerp .oe_form .oe_form_invalid select, .openerp .oe_form .oe_form_invalid textarea {
background-color: #ff6666 !important;
@@ -2300,6 +2321,9 @@
margin-bottom: 32px;
text-align: justify;
}
+.openerp .oe_form h1 .oe_form_required{
+ float: left;
+}
.openerp .oe_form_editable .oe_form .oe_form_field_integer input {
width: 6em !important;
}
@@ -2578,14 +2602,14 @@
border: 1px solid #aaaaff;
margin: 0;
}
-.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input {
+.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input {
text-align: right;
width: 100%;
}
.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime > span, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date > span {
width: 100%;
}
-.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime input.oe_datepicker_master, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date input.oe_datepicker_master {
+.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime input.oe_datepicker_master, input.oe_datepicker_master, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date input.oe_datepicker_master {
width: 100% !important;
}
.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field .oe_form_field_float, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field .oe_form_view_integer, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date {
@@ -2651,9 +2675,6 @@
background: #eeeeee;
vertical-align: top;
}
-.openerp .oe_list_content > thead th {
- position: relative;
-}
.openerp .oe_list_content td, .openerp .oe_list_content th {
padding: 3px 6px;
line-height: 18px;
=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass 2012-10-14 19:55:14 +0000
+++ addons/web/static/src/css/base.sass 2012-10-15 11:00:30 +0000
@@ -168,6 +168,9 @@
\::-webkit-input-placeholder
color: $tag-border !important
font-style: italic !important
+ \:-ms-input-placeholder
+ color: $tag-border !important
+ font-style: italic !important
//}}}
// Tag reset {{{
a
@@ -411,7 +414,7 @@
clear: both
visibility: hidden
.oe_button_box
- width: 270px
+ width: 280px
text-align: right
button
margin: 4px
@@ -1056,11 +1059,12 @@
text-decoration: underline
> div
height: 100%
+ .oe_breadcrumb_title > *
+ overflow: hidden
+ display: inline-block
.oe_breadcrumb_item:not(:last-child)
- display: inline-block
max-width: 7em
white-space: nowrap
- overflow: hidden
text-overflow: ellipsis
// }}}
// ViewManager common {{{
@@ -1753,6 +1757,8 @@
width: 100%
display: inline-block
padding: 2px 2px 2px 0px
+ .oe_form_field
+ display: -moz-stack
input
margin: 0px
input[type="text"], input[type="password"], input[type="file"], select
@@ -1824,6 +1830,9 @@
margin-top: 32px
margin-bottom: 32px
text-align: justify
+ h1 .oe_form_required
+ float: left
+
.oe_form_editable
.oe_form
@@ -2098,8 +2107,6 @@
border-bottom: 2px solid #cacaca
background: #eee
vertical-align: top
- th
- position: relative
td, th
padding: 3px 6px
line-height: 18px
=== modified file 'addons/web/static/src/js/coresetup.js'
--- addons/web/static/src/js/coresetup.js 2012-10-06 16:32:38 +0000
+++ addons/web/static/src/js/coresetup.js 2012-10-15 11:00:30 +0000
@@ -3,7 +3,13 @@
*--------------------------------------------------------*/
var console;
if (!console) {
- console = {log: function () {}};
+ console = {};
+ var noop = function () {};
+ _.each('log error debug info warn assert clear dir dirxml trace group \
+ groupCollapsed groupEnd time timeEnd profile profileEnd count \
+ exception'.split(/\s+/), function (property) {
+ console[property] = noop;
+ });
}
if (!console.debug) {
console.debug = console.log;
=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js 2012-10-15 07:53:20 +0000
+++ addons/web/static/src/js/view_form.js 2012-10-15 11:00:30 +0000
@@ -1221,6 +1221,7 @@
this.process_version();
this.fields_to_init = [];
+ this.buttons = [];
this.tags_to_init = [];
this.widgets_to_init = [];
this.labels = {};
@@ -1249,7 +1250,8 @@
_.each(ws, function(w) {
w[0].replace(w[1]);
});
- _.each(this.tags_to_init, function($elem) {
+ _.each(this.tags_to_init, function($elem, k) {
+ if(self.buttons[k] && self.buttons[k].type) $elem[0].setAttribute("type", self.buttons[k].type)
var tag_name = $elem[0].tagName.toLowerCase();
var obj = self.tags_registry.get_object(tag_name);
var w = new (obj)(self.view, instance.web.xml_to_json($elem[0]));
@@ -1281,10 +1283,25 @@
}
this.$target.toggleClass('oe_layout_debugging');
},
+ get_button_json: function(obj, child){
+ this.buttons = child || [];
+ if (obj.children && obj.children.length) {
+ for (var i = 0, ii = obj.children.length; i < ii; i++) {
+ if(obj.children[i].tag=="button"){
+ this.buttons.push(obj.children[i].attrs)
+ }
+ if(obj.children[i].children){
+ this.get_button_json(obj.children[i], this.buttons)
+ }
+ }
+ return this.buttons;
+ }
+ },
process: function($tag) {
var self = this;
var tagname = $tag[0].nodeName.toLowerCase();
if (this.tags_registry.contains(tagname)) {
+ this.get_button_json(this.fvg.arch)
this.tags_to_init.push($tag);
return $tag;
}
@@ -3027,6 +3044,12 @@
}
}
});
+ // Autocomplete close on dialog content scroll
+ this.$input.closest(".ui-dialog .ui-dialog-content").scroll(function(){
+ if(self.$input.autocomplete("widget").is(":visible")){
+ self.$input.autocomplete("close");
+ }
+ });
self.ed_def = $.Deferred();
self.uned_def = $.Deferred();
var ed_delay = 200;
@@ -4579,7 +4602,7 @@
});
});
});
- this.searchview.appendTo($(".oe_popup_list", self.$el));
+ this.searchview.appendTo($(".oe_popup_search", self.$el));
},
do_search: function(domains, contexts, groupbys) {
var self = this;
=== modified file 'addons/web_calendar/static/src/css/web_calendar.css'
--- addons/web_calendar/static/src/css/web_calendar.css 2012-10-05 14:08:31 +0000
+++ addons/web_calendar/static/src/css/web_calendar.css 2012-10-15 11:00:30 +0000
@@ -99,13 +99,16 @@
font-weight:normal;
}
.openerp .dhx_cal_prev_button {
+ background: url("/web_calendar/static/src/img/minical_left.png") no-repeat 8px 7px;
background: url("/web_calendar/static/src/img/minical_left.png") no-repeat 8px 7px, -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
background: url("/web_calendar/static/src/img/minical_left.png") no-repeat 8px 7px, -webkit-linear-gradient(#efefef, #d8d8d8);
background: url("/web_calendar/static/src/img/minical_left.png") no-repeat 8px 7px, -moz-linear-gradient(#efefef, #d8d8d8);
background: url("/web_calendar/static/src/img/minical_left.png") no-repeat 8px 7px, -o-linear-gradient(top, #efefef, #d8d8d8);
background: url("/web_calendar/static/src/img/minical_left.png") no-repeat 8px 7px, -khtml-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
}
+
.openerp .dhx_cal_next_button {
+ background: url("/web_calendar/static/src/img/minical_right.png") no-repeat 8px 7px;
background: url("/web_calendar/static/src/img/minical_right.png") no-repeat 8px 7px, -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
background: url("/web_calendar/static/src/img/minical_right.png") no-repeat 8px 7px, -webkit-linear-gradient(#efefef, #d8d8d8);
background: url("/web_calendar/static/src/img/minical_right.png") no-repeat 8px 7px, -moz-linear-gradient(#efefef, #d8d8d8);
=== modified file 'addons/web_gantt/static/src/js/gantt.js'
--- addons/web_gantt/static/src/js/gantt.js 2012-10-12 13:10:44 +0000
+++ addons/web_gantt/static/src/js/gantt.js 2012-10-15 11:00:30 +0000
@@ -150,7 +150,7 @@
} else { // we assume date_duration is defined
var tmp = instance.web.format_value(task[self.fields_view.arch.attrs.date_delay],
self.fields[self.fields_view.arch.attrs.date_delay]);
- if (!tmp)
+ if (!tmp || tmp < 1)
return;
task_stop = task_start.clone().addMilliseconds(tmp * 60 * 60 * 1000);
}
=== modified file 'addons/web_graph/static/lib/flotr2/js/DOM.js'
--- addons/web_graph/static/lib/flotr2/js/DOM.js 2012-05-07 08:19:08 +0000
+++ addons/web_graph/static/lib/flotr2/js/DOM.js 2012-10-15 11:00:30 +0000
@@ -18,7 +18,6 @@
var div = Flotr.DOM.create('div'), n;
div.innerHTML = html;
n = div.children[0];
- div.innerHTML = '';
return n;
},
/**
=== modified file 'addons/web_kanban/static/src/css/kanban.css'
--- addons/web_kanban/static/src/css/kanban.css 2012-10-01 15:49:16 +0000
+++ addons/web_kanban/static/src/css/kanban.css 2012-10-15 11:00:30 +0000
@@ -1,7 +1,11 @@
@charset "utf-8";
+.openerp .oe_application{
+ height: 100%;
+}
.openerp .oe_kanban_view {
background: white;
height: inherit;
+ position:relative;
}
.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_dummy_cell {
background: url(/web/static/src/img/form_sheetbg.png);
@@ -127,6 +131,7 @@
}
.openerp .oe_kanban_view .oe_kanban_group_title_vertical {
writing-mode: tb-rl;
+ -ms-writing-mode: tb;
-webkit-transform: rotate(90deg);
-moz-transform: rotate(90deg);
-o-transform: rotate(90deg);
@@ -191,12 +196,13 @@
height: 64px;
text-align: center;
overflow: hidden;
+ border-collapse: separate;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
- -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+ box-shadow: 0 1px 4px 1px rgba(0, 0, 0, 0.4);
}
.openerp .oe_kanban_view .oe_kanban_details {
display: inline-block;
=== modified file 'addons/web_kanban/static/src/css/kanban.sass'
--- addons/web_kanban/static/src/css/kanban.sass 2012-10-01 15:49:16 +0000
+++ addons/web_kanban/static/src/css/kanban.sass 2012-10-15 11:00:30 +0000
@@ -204,6 +204,7 @@
height: 64px
text-align: center
overflow: hidden
+ border-collapse: separate
@include radius(3px)
@include box-shadow(0 1px 4px rgba(0, 0, 0, 0.4))
.oe_kanban_details
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
