openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #00200
[Merge] lp:~openerp-dev/openobject-client-web/web-ie8 into lp:openobject-client-web
Jra (Open ERP) has proposed merging lp:~openerp-dev/openobject-client-web/web-ie8 into lp:openobject-client-web.
Requested reviews:
OpenERP SA's Web Client R&D (openerp-dev-web)
--
https://code.launchpad.net/~openerp-dev/openobject-client-web/web-ie8/+merge/39511
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client-web/web-ie8.
=== modified file 'addons/openerp/controllers/templates/index.mako'
--- addons/openerp/controllers/templates/index.mako 2010-10-21 12:53:16 +0000
+++ addons/openerp/controllers/templates/index.mako 2010-10-28 11:24:43 +0000
@@ -67,7 +67,7 @@
</script>
</div>
</td>
- <td id="primary" width="100%" height="100%">
+ <td id="primary" width="100%">
<div class="wrap">
<div id="appContent"></div>
</div>
@@ -75,8 +75,8 @@
</tr>
% else:
<tr>
- <td colspan="3" height="100%" valign="top">
- <table width="100%">
+ <td colspan="3" valign="top">
+ <table width="100%" height="100%">
<tr>
<td id="primary" width="70%">
<div class="wrap" style="padding: 10px;">
=== modified file 'addons/openerp/controllers/templates/login.mako'
--- addons/openerp/controllers/templates/login.mako 2010-10-21 12:53:16 +0000
+++ addons/openerp/controllers/templates/login.mako 2010-10-28 11:24:43 +0000
@@ -16,7 +16,7 @@
</%def>
<%def name="content()">
- <table width="100%">
+ <table width="100%" style="height:65px;">
<tr><%include file="header.mako"/></tr>
</table>
@@ -34,7 +34,7 @@
<img src="/openerp/static/images/stock/stock_person.png" alt=""/>
</legend>
<div class="box2" style="padding: 5px 5px 20px 5px">
- <table width="100%" align="center" cellspacing="2px" cellpadding="0" style="border:none;">
+ <table width="100%" align="center" cellspacing="2px" cellpadding="0" style="border:none;" height="100%">
<tr>
<td class="label"><label for="db">${_("Database:")}</label></td>
<td style="padding: 5px 5px 5px 2px;">
@@ -79,7 +79,7 @@
<div class="information">${info|n}</div>
% endif
<div style="margin-top: 10px">
- <table cellpadding="0" cellspacing="0" width="100%" style="border:none;">
+ <table cellpadding="0" cellspacing="0" width="100%" style="border:none;" height="100%">
<tr>
<td style="padding-left:0;"><h3> ${_("Top Contributor:")}</h3></td>
</tr>
@@ -94,7 +94,7 @@
<p>${_("We think that daily job activities can be more intuitive, efficient, automated, .. and even fun.")}</p>
<h3>${_("OpenERP's vision to be:")}</h3>
- <table cellpadding="0" cellspacing="0" width="100%" style="border:none;">
+ <table cellpadding="0" cellspacing="0" width="100%" height="100%" style="border:none;">
<tr>
<td class="feature-image">
<img src="/openerp/static/images/icons/product.png"/>
=== modified file 'addons/openerp/controllers/templates/openm2m.mako'
--- addons/openerp/controllers/templates/openm2m.mako 2010-09-15 12:55:07 +0000
+++ addons/openerp/controllers/templates/openm2m.mako 2010-10-28 11:24:43 +0000
@@ -41,11 +41,11 @@
</%def>
<%def name="content()">
- <table class="view" cellspacing="5" border="0" width="100%" style="border: none;">
+ <table class="view" cellspacing="5" border="0" width="100%" style="border: none;" height="100%">
<tr>
<td>
<input type="hidden" id="_terp_load_counter" value="${params.load_counter or 0}"/>
- <table width="100%" class="titlebar" style="border: none;">
+ <table width="100%" class="titlebar" style="border: none;" height="100%">
<tr>
<td width="100%"><h1>${form.screen.string}</h1></td>
</tr>
@@ -55,7 +55,7 @@
<tr>
<td>
<div class="footer_tool_box">
- <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border: none;">
+ <table height="100%" border="0" cellpadding="0" cellspacing="0" width="100%" style="border: none;">
<tr>
<td class="save_close">
<a class="button-a" href="javascript: void(0)" onclick="submit_form('save')">${_("Save")}</a>
=== modified file 'addons/openerp/controllers/templates/openm2o.mako'
--- addons/openerp/controllers/templates/openm2o.mako 2010-09-29 10:26:28 +0000
+++ addons/openerp/controllers/templates/openm2o.mako 2010-10-28 11:24:43 +0000
@@ -32,11 +32,11 @@
</%def>
<%def name="content()">
- <table class="view" cellspacing="5" border="0" width="100%" style="border: none;">
+ <table height="100%" class="view" cellspacing="5" border="0" width="100%" style="border: none;">
<tr>
<td style="padding: 0pt 2px 2px 5px;">
<input type="hidden" id="_terp_load_counter" value="${params.load_counter or 0}"/>
- <table width="100%" class="titlebar" style="border: none;">
+ <table width="100%" class="titlebar" style="border: none;" height="100%">
<tr>
<td width="100%"><h1>${form.screen.string}</h1></td>
</tr>
@@ -46,7 +46,7 @@
<tr>
<td>
<div class="footer_tool_box">
- <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border: none;">
+ <table height="100%" border="0" cellpadding="0" cellspacing="0" width="100%" style="border: none;">
<tr>
% if form.screen.editable:
<td class="save_close">
=== modified file 'addons/openerp/controllers/templates/openo2m.mako'
--- addons/openerp/controllers/templates/openo2m.mako 2010-10-22 05:39:43 +0000
+++ addons/openerp/controllers/templates/openo2m.mako 2010-10-28 11:24:43 +0000
@@ -60,11 +60,11 @@
</%def>
<%def name="content()">
- <table class="view" cellspacing="5" border="0" width="100%" style="border: none;">
+ <table class="view" cellspacing="5" border="0" width="100%" style="border: none;" height="100%">
<tr>
<td>
<input type="hidden" id="_terp_load_counter" value="${params.load_counter}"/>
- <table width="100%" class="titlebar" style="border: none;">
+ <table width="100%" class="titlebar" style="border: none;" height="100%">
<tr>
<td width="100%"><h1>${form.screen.string}</h1></td>
</tr>
@@ -75,7 +75,7 @@
<tr>
<td>
<div class="footer_tool_box">
- <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border: none;">
+ <table height="100%" border="0" cellpadding="0" cellspacing="0" width="100%" style="border: none;">
<tr>
% if form.screen.editable:
<td class="save_close">
=== modified file 'addons/openerp/controllers/templates/preferences.mako'
--- addons/openerp/controllers/templates/preferences.mako 2010-10-28 07:54:01 +0000
+++ addons/openerp/controllers/templates/preferences.mako 2010-10-28 11:24:43 +0000
@@ -11,7 +11,7 @@
<div class="view">
<form name="view_form" id="view_form" action="/openerp/pref/ok" method="post">
- <table align="center" style="border: none;" width="100%">
+ <table height="100%" align="center" style="border: none;" width="100%">
<tr>
<td class="error_message_header">${params.string}</td>
</tr>
=== modified file 'addons/openerp/controllers/templates/save_filter.mako'
--- addons/openerp/controllers/templates/save_filter.mako 2010-10-26 12:27:54 +0000
+++ addons/openerp/controllers/templates/save_filter.mako 2010-10-28 11:24:43 +0000
@@ -9,10 +9,10 @@
<input type="hidden" id="model" name="model" value="${model}"/>
<input type="hidden" id="domain" name="domain" value="${domain}"/>
<input type="hidden" id="group_by" name="group_by" value="${group_by}"/>
- <table class="view" width="100%" border="0">
+ <table class="view" width="100%" border="0" height="100%">
<tr>
<td style="padding: 0">
- <table width="100%" style="border: none;">
+ <table width="100%" style="border: none;" height="100%">
<tr>
<td style="padding: 0 10px 5px 10px">
<h1>${_("Save as Filter")}</h1>
@@ -24,7 +24,7 @@
<tr>
<td style="padding: 0 10px">
<div class="box2">
- <table border="0" width="100%" align="center">
+ <table height="100%" border="0" width="100%" align="center">
<tr>
<td class="label" style="padding: 0 4px 0 0;">
<label for="sc_name">${_("Filter Name")}:</label>
=== modified file 'addons/openerp/controllers/templates/search.mako'
--- addons/openerp/controllers/templates/search.mako 2010-10-19 09:02:53 +0000
+++ addons/openerp/controllers/templates/search.mako 2010-10-28 11:24:43 +0000
@@ -138,10 +138,10 @@
<input type="hidden" id="_terp_filter_domain" name="_terp_filter_domain" value="${params.filter_domain}"/>
<input type="hidden" id="_terp_search_data" name="_terp_search_data" value="${params.search_data}"/>
<input type="hidden" id="_terp_search_text" name="_terp_search_text" value="${params.search_text}"/>
- <table width="100%" border="0" cellpadding="2">
+ <table width="100%" border="0" cellpadding="2" height="100%">
<tr>
<td>
- <table width="100%" class="titlebar" style="border: none;">
+ <table height="100%" width="100%" class="titlebar" style="border: none;">
<tr>
<td width="100%">
<h1>${_("Search %(name)s", name=form.screen.string)}</h1>
@@ -155,7 +155,7 @@
</tr>
<tr>
<td class="toolbar" style="padding: 0 5px;">
- <table cellpadding="0" cellspacing="0">
+ <table cellpadding="0" cellspacing="0" height="100%">
<tr>
<td width="100%">
<a class="button-a" style="margin-right:10px;" href="javascript: void(0)" onclick="do_select()">${_("Select")}</a>
=== modified file 'addons/openerp/controllers/templates/selection.mako'
--- addons/openerp/controllers/templates/selection.mako 2010-07-09 06:08:40 +0000
+++ addons/openerp/controllers/templates/selection.mako 2010-10-28 11:24:43 +0000
@@ -25,7 +25,7 @@
<div class="spacer"></div>
- <table width="100%" border="0" class="fields">
+ <table width="100%" border="0" class="fields" height="100%">
% for i, (key, value) in enumerate(values.iteritems()):
<tr>
<td width="25px"><input type="radio" id="_terp_action_${i}" name="_terp_action" value="${value}"/></td>
@@ -37,7 +37,7 @@
<div class="spacer"></div>
<div class="toolbar">
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <table height="100%" border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td width="100%" align="right">
<button class="static_boxes" onclick="window.opener ? window.close() : history.back()">${_("Cancel")}</button>
=== modified file 'addons/openerp/controllers/templates/tree.mako'
--- addons/openerp/controllers/templates/tree.mako 2010-10-22 12:56:47 +0000
+++ addons/openerp/controllers/templates/tree.mako 2010-10-28 11:24:43 +0000
@@ -24,7 +24,7 @@
else:
shortcut_class = "shortcut-add"
%>
- <table id="treeview" class="view" width="100%" border="0" cellpadding="0" cellspacing="0">
+ <table height="100%" id="treeview" class="view" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td id="body_form_td" width="100%" valign="top">
<h1>
@@ -45,7 +45,7 @@
</select>
</div>
% endif
- <table cellpadding="0" cellspacing="0" border="0" width="100%">
+ <table height="100%" cellpadding="0" cellspacing="0" border="0" width="100%">
<tr>
<td width="100%" valign="top" class="tree_grid">${tree.display()}</td>
</tr>
=== modified file 'addons/openerp/static/css/screen.css'
--- addons/openerp/static/css/screen.css 2010-10-27 13:38:59 +0000
+++ addons/openerp/static/css/screen.css 2010-10-28 11:24:43 +0000
@@ -497,6 +497,7 @@
#main_nav {
background: url(../images/nav-bg-a.png) repeat-x;
width: 100%;
+ height: 36px;
}
#applications_menu {
@@ -568,7 +569,7 @@
}
#primary {
- min-height: 100%;
+ min-height: 100px;
vertical-align: top;
padding: 0;
}
@@ -1921,7 +1922,7 @@
/* sidebar */
td.tertiary {
background: url(../images/tertiary-bg-a.gif) repeat-y scroll 0 0 #EAE7E7;
- min-height: 100%;
+ min-height: 100px;
border-left: 1px solid #D2CFCF;
vertical-align: top;
}
@@ -1933,7 +1934,7 @@
#tertiary {
position: relative;
float: right;
- min-height: 100%;
+ min-height: 100px;
width: 180px;
}
#tertiary.closed {
@@ -2160,7 +2161,7 @@
font-weight: bold;
line-height: 16px;
text-shadow: #fff 0 1px 0;
- min-width: 99%;
+ min-width: 100px;
}
.button-b img {
vertical-align: -30%;
=== modified file 'addons/openerp/static/css/style-ie.css'
--- addons/openerp/static/css/style-ie.css 2010-08-25 15:23:01 +0000
+++ addons/openerp/static/css/style-ie.css 2010-10-28 11:24:43 +0000
@@ -29,13 +29,6 @@
width: 98%;
}
-.item input,
-.item select,
-.item textarea,
-.item button {
- width: 98%;
-}
-
.resizable-textarea .grip {
width: 98%;
}
=== modified file 'addons/openerp/static/css/style.css'
--- addons/openerp/static/css/style.css 2010-10-28 09:31:41 +0000
+++ addons/openerp/static/css/style.css 2010-10-28 11:24:43 +0000
@@ -591,7 +591,7 @@
}
.item input,
.item select {
- min-width: 100%;
+ min-width: 100px;
}
.item .fields {
@@ -616,7 +616,7 @@
.item input.m2o,
.item input.reference {
padding-right: 0;
- min-width: 100%;
+ min-width: 100px;
}
.m2o_container {
=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js 2010-10-28 09:31:41 +0000
+++ addons/openerp/static/javascript/form.js 2010-10-28 11:24:43 +0000
@@ -807,7 +807,7 @@
});
}
jQuery('#contextmenu').empty().append(
- jQuery('<table cellpadding="0" cellspacing="0">').append($tbody));
+ jQuery('<table height="100%" cellpadding="0" cellspacing="0">').append($tbody));
showContextMenu();
});
=== modified file 'addons/openerp/widgets/form/_form.py'
--- addons/openerp/widgets/form/_form.py 2010-10-27 09:36:11 +0000
+++ addons/openerp/widgets/form/_form.py 2010-10-28 11:24:43 +0000
@@ -669,7 +669,7 @@
class HPaned(TinyWidget):
template = """
- <table width="100%" class="hpaned">
+ <table width="100%" height="100%" class="hpaned">
<tr>
% for child in children:
<td style="padding: 0 3px 0 0;" valign="top">
@@ -692,7 +692,7 @@
class VPaned(TinyWidget):
template = """
- <table width="100%" class="vpaned">
+ <table width="100%" height="100%" class="vpaned">
% for child in children:
<tr>
<td style="padding: 0 3px 0 0;" valign="top">
=== modified file 'addons/openerp/widgets/form/templates/group.mako'
--- addons/openerp/widgets/form/templates/group.mako 2010-09-21 09:13:26 +0000
+++ addons/openerp/widgets/form/templates/group.mako 2010-10-28 11:24:43 +0000
@@ -15,7 +15,7 @@
</div>
% endif
- <table id="groupdata_table">
+ <table height="100%" id="groupdata_table">
<tr>
<td>
% if default:
=== modified file 'addons/openerp/widgets/form/templates/many2many.mako'
--- addons/openerp/widgets/form/templates/many2many.mako 2010-08-31 07:05:04 +0000
+++ addons/openerp/widgets/form/templates/many2many.mako 2010-10-28 11:24:43 +0000
@@ -1,4 +1,4 @@
-<table border="0" width="100%" id="_m2m_${name}" class="many2many m2m_box" detail="${inline}" relation="${relation}" ${py.attrs(attrs, domain=domain, context=ctx)}>
+<table height="100%" border="0" width="100%" id="_m2m_${name}" class="many2many m2m_box" detail="${inline}" relation="${relation}" ${py.attrs(attrs, domain=domain, context=ctx)}>
% if editable:
<tr>
<td style="display:none;">
=== modified file 'addons/openerp/widgets/form/templates/one2many.mako'
--- addons/openerp/widgets/form/templates/one2many.mako 2010-10-22 11:06:26 +0000
+++ addons/openerp/widgets/form/templates/one2many.mako 2010-10-28 11:24:43 +0000
@@ -10,7 +10,7 @@
% if screen.editable and not readonly and view_type == 'form':
<tr>
<td class="o2m_cell">
- <table width="100%" class="gridview" style="border-bottom: 1px solid black;"cellpadding="0" cellspacing="0">
+ <table height="100%" width="100%" class="gridview" style="border-bottom: 1px solid black;"cellpadding="0" cellspacing="0">
<tr class="pagerbar">
<td class="pagerbar-cell" align="left" width="${pager_width}">
<div class="pagerbar-header">
=== modified file 'addons/openerp/widgets/form/templates/reference.mako'
--- addons/openerp/widgets/form/templates/reference.mako 2010-10-25 06:14:36 +0000
+++ addons/openerp/widgets/form/templates/reference.mako 2010-10-28 11:24:43 +0000
@@ -1,5 +1,5 @@
% if editable:
-<table class="item-wrapper reference">
+<table height="100%" class="item-wrapper reference">
<tr>
<td>
<input type="hidden" id='${name}' name='${name}' class="${css_class}"
=== modified file 'addons/openerp/widgets/templates/listgrid.mako'
--- addons/openerp/widgets/templates/listgrid.mako 2010-10-25 12:46:53 +0000
+++ addons/openerp/widgets/templates/listgrid.mako 2010-10-28 11:24:43 +0000
@@ -113,11 +113,11 @@
<div class="box-a list-a">
<div class="inner">
- <table id="${name}" class="gridview" width="100%" cellspacing="0" cellpadding="0">
+ <table height="100%" id="${name}" class="gridview" width="100%" cellspacing="0" cellpadding="0">
% if pageable:
<tr class="pagerbar">
<td colspan="2" class="pagerbar-cell" align="right">
- <table class="pager-table">
+ <table height="100%" class="pager-table">
<tr>
<td class="pager-cell">
<h2>${string}</h2>
@@ -195,7 +195,7 @@
% endif
<tr>
<td colspan="2" class="grid-content">
- <table id="${name}_grid" class="grid" width="100%" cellspacing="0" cellpadding="0" style="background: none;">
+ <table height="100%" id="${name}_grid" class="grid" width="100%" cellspacing="0" cellpadding="0" style="background: none;">
<thead>
<tr class="grid-header">
% if selector:
@@ -307,7 +307,7 @@
connectToSortable: 'tr.grid-row',
helper: function(){
var htmlStr = jQuery(this).html();
- return jQuery('<table><tr id class="ui-widget-header">'+htmlStr+'</tr></table>');
+ return jQuery('<table height="100%"><tr id class="ui-widget-header">'+htmlStr+'</tr></table>');
},
axis: 'y'
});
=== modified file 'addons/openerp/widgets/templates/listgroup.mako'
--- addons/openerp/widgets/templates/listgroup.mako 2010-10-25 11:11:01 +0000
+++ addons/openerp/widgets/templates/listgroup.mako 2010-10-28 11:24:43 +0000
@@ -3,11 +3,11 @@
%>
<div class="box-a list-a">
<div class="inner">
-<table id="${name}" groups="${group_by_ctx}" class="gridview" width="100%" cellspacing="0" cellpadding="0">
+<table height="100%" id="${name}" groups="${group_by_ctx}" class="gridview" width="100%" cellspacing="0" cellpadding="0">
% if pageable:
<tr class="pagerbar">
<td colspan="2" class="pagerbar-cell" align="right">
- <table class="pager-table">
+ <table height="100%" class="pager-table">
<tr>
<td class="pager-cell">
<h2>${string}</h2>
@@ -26,7 +26,7 @@
<tr>
<td colspan="2" class="grid-content">
- <table id="${name}_grid" class="grid" width="100%" cellspacing="0" cellpadding="0">
+ <table height="100%" id="${name}_grid" class="grid" width="100%" cellspacing="0" cellpadding="0">
<thead>
<tr class="grid-header">
% if editable:
@@ -188,7 +188,7 @@
connectToSortable: 'tr.grid-row-group',
helper: function() {
var htmlStr = jQuery(this).html();
- return jQuery('<table><tr class="ui-widget-header">'+htmlStr+'</tr></table>');
+ return jQuery('<table height="100%"><tr class="ui-widget-header">'+htmlStr+'</tr></table>');
},
axis: 'y'
});
=== modified file 'addons/openerp/widgets/templates/viewform.mako'
--- addons/openerp/widgets/templates/viewform.mako 2010-10-26 12:27:54 +0000
+++ addons/openerp/widgets/templates/viewform.mako 2010-10-28 11:24:43 +0000
@@ -12,14 +12,14 @@
% if screen:
<div id="server_logs"></div>
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <table height="100%" border="0" cellpadding="0" cellspacing="0" width="100%">
% if search:
<tr>
<td valign="top">${display_member(search)}</td>
</tr>
<tr>
<td class="view_form_options" width="100%">
- <table width="100%">
+ <table height="100%" width="100%">
<tr>
<td align="left">
<button title="${_('Filter records.')}" onclick="search_filter(); return false;">
=== modified file 'addons/view_diagram/controllers/templates/process.mako'
--- addons/view_diagram/controllers/templates/process.mako 2010-10-21 13:09:54 +0000
+++ addons/view_diagram/controllers/templates/process.mako 2010-10-28 11:24:43 +0000
@@ -46,7 +46,7 @@
<%def name="content()">
<table class="view" border="0" width="100%" height="100%" cellpadding="0" cellspacing="0">
<tr>
- <td width="75%" valign="top" style="padding-top:10px;">
+ <td width="100%" valign="top" style="padding-top:10px;">
<h1>${_("Help:")} ${title}</h1>
<p class="process-links">
<a target="_blank" href="${context_help}">
@@ -69,14 +69,14 @@
</tr>
<tr>
- <td style="padding-bottom:0" colspan="1" valign="bottom">
+ <td style="padding-bottom:0" valign="bottom">
<h2 style="padding:0 0 0 10px; font-weight:bold">${process_title} ${_("Process")}</h2>
</td>
</tr>
% if selection:
<tr>
- <td colspan="1">
+ <td>
<input type="hidden" id="res_model" value="${res_model}"/>
<input type="hidden" id="res_id" value="${res_id}"/>
<fieldset style="margin: 0 0 10px 10px">
@@ -93,7 +93,7 @@
%else:
<tr>
- <td colspan="2">
+ <td>
<input type="hidden" id="id" value="${id}"/>
<input type="hidden" id="res_model" value="${res_model}"/>
<input type="hidden" id="res_id" value="${res_id}"/>
@@ -107,7 +107,7 @@
% if fields:
<tr>
- <td colspan="2" class="fields collapsed">
+ <td class="fields collapsed">
<h2 style="padding: 5px 10px; font-weight:bold">
${res_model} ${_("fields")}
<span class="expand-button">(${_("show")})</span>
@@ -135,7 +135,7 @@
</td>
</tr>
<tr>
- <td valign="top" colspan="2"> </td>
+ <td valign="top"> </td>
</tr>
% endfor
</table>
Follow ups
