summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2016-11-15 13:50:36 +0100
committerqsm-odoo <qsm@odoo.com>2016-11-23 10:21:43 +0100
commitd4d00dcd2e61c0403e77c111b70d3c602cd09f62 (patch)
treecd71cded53990823c4934f960c998c0ac198ebad /addons
parente348330b57721052104b94310055f996cad941c4 (diff)
[FIX] website_portal, *: correct layout issues
* web_editor, website_portal_sale, website_project, website_project_issue, website_project_issue_sheet - Use bootstrap grid the right way (missing row) - Use table-responsive for website portal tables - Remove web_editor table layout style if inside a table-responsive in mobile mode
Diffstat (limited to 'addons')
-rw-r--r--addons/web_editor/static/src/less/web_editor.common.less5
-rw-r--r--addons/website_portal/static/src/less/website_portal.less17
-rw-r--r--addons/website_portal/views/website_portal_templates.xml26
-rw-r--r--addons/website_portal_sale/views/website_portal_sale_templates.xml12
-rw-r--r--addons/website_project/views/project_templates.xml8
-rw-r--r--addons/website_project_issue/views/project_issue_templates.xml4
-rw-r--r--addons/website_project_issue_sheet/views/project_issue_templates.xml4
7 files changed, 36 insertions, 40 deletions
diff --git a/addons/web_editor/static/src/less/web_editor.common.less b/addons/web_editor/static/src/less/web_editor.common.less
index 8b1b31e2334..9cef6b8e32f 100644
--- a/addons/web_editor/static/src/less/web_editor.common.less
+++ b/addons/web_editor/static/src/less/web_editor.common.less
@@ -30,6 +30,11 @@ html, body {
min-width: 20px;
}
}
+ @media (max-width: @screen-xs-max) {
+ .table-responsive > table.table {
+ table-layout: auto;
+ }
+ }
}
/* Media */
diff --git a/addons/website_portal/static/src/less/website_portal.less b/addons/website_portal/static/src/less/website_portal.less
index 1de553fa7cb..11f4219abbd 100644
--- a/addons/website_portal/static/src/less/website_portal.less
+++ b/addons/website_portal/static/src/less/website_portal.less
@@ -1,20 +1,9 @@
+
.o_my_status_table {
- th,td {
- text-align: right;
- }
- th:nth-last-child(2) {
- width: 150px;
- }
- th:nth-last-child(1), {
- width: 120px;
- }
- th:nth-child(1),
- td:nth-child(1) {
- width: auto;
- min-width: 150px;
+ text-align: right;
+ tr > :first-child {
text-align: left;
}
- table-layout: fixed;
}
.o_my_home_content > .page-header > a:hover {
diff --git a/addons/website_portal/views/website_portal_templates.xml b/addons/website_portal/views/website_portal_templates.xml
index 16fba9dc246..654e44994b3 100644
--- a/addons/website_portal/views/website_portal_templates.xml
+++ b/addons/website_portal/views/website_portal_templates.xml
@@ -92,19 +92,21 @@
</div>
<div id="wrap">
<div class="container mb64">
- <div class="col-md-8">
- <t t-raw="0"/>
- </div>
- <div id="o_my_sidebar" class="col-md-3 col-md-offset-1 o_my_sidebar">
- <div class="o_my_contact" t-if="sales_rep">
- <t t-call="website_portal.contact"/>
- </div>
- <div class="o_my_details">
- <h3 class="page-header">Your Details <a href="/my/account" class="btn btn-default btn-xs">Change</a></h3>
- <div t-field="user.partner_id" t-options='{"widget": "contact", "fields": ["email", "phone", "address", "name"]}'/>
+ <div class="row">
+ <div class="col-md-9 col-lg-8">
+ <t t-raw="0"/>
</div>
- <div class="o_my_archives" t-if="archive_groups">
- <t t-call="website_portal.portal_archive_groups"/>
+ <div id="o_my_sidebar" class="col-md-3 col-lg-offset-1 o_my_sidebar">
+ <div class="o_my_contact" t-if="sales_rep">
+ <t t-call="website_portal.contact"/>
+ </div>
+ <div class="o_my_details">
+ <h3 class="page-header">Your Details <a href="/my/account" class="btn btn-default btn-xs">Change</a></h3>
+ <div t-field="user.partner_id" t-options='{"widget": "contact", "fields": ["email", "phone", "address", "name"]}'/>
+ </div>
+ <div class="o_my_archives" t-if="archive_groups">
+ <t t-call="website_portal.portal_archive_groups"/>
+ </div>
</div>
</div>
</div>
diff --git a/addons/website_portal_sale/views/website_portal_sale_templates.xml b/addons/website_portal_sale/views/website_portal_sale_templates.xml
index 5bdbfcc1681..8ad388da3c0 100644
--- a/addons/website_portal_sale/views/website_portal_sale_templates.xml
+++ b/addons/website_portal_sale/views/website_portal_sale_templates.xml
@@ -71,7 +71,7 @@
<p>There are currently no quotes for your account.</p>
</t>
<t t-if="quotations">
- <table class="table table-hover o_my_status_table">
+ <div class="table-responsive"><table class="table table-hover o_my_status_table">
<thead>
<tr class="active">
<th>Quotation #</th>
@@ -100,7 +100,7 @@
</td>
</tr>
</t>
- </table>
+ </table></div>
<div t-if="pager" class="o_portal_pager text-center">
<t t-call="website.pager"/>
</div>
@@ -118,7 +118,7 @@
<p>There are currently no orders for your account.</p>
</t>
<t t-if="orders">
- <table class="table table-hover o_my_status_table">
+ <div class="table-responsive"><table class="table table-hover o_my_status_table">
<thead>
<tr class="active">
<th>Sale Order #</th>
@@ -147,7 +147,7 @@
<td><span t-field="order.amount_total" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/></td>
</tr>
</t>
- </table>
+ </table></div>
<div t-if="pager" class="o_portal_pager text-center">
<t t-call="website.pager"/>
</div>
@@ -165,7 +165,7 @@
<p>There are currently no invoices for your account.</p>
</t>
<t t-if="invoices">
- <table class="table table-hover o_my_status_table">
+ <div class="table-responsive"><table class="table table-hover o_my_status_table">
<thead>
<tr class="active">
<th>Invoice #</th>
@@ -200,7 +200,7 @@
<td><span t-field="invoice.residual" t-options='{"widget": "monetary", "display_currency": invoice.currency_id}'/></td>
</tr>
</t>
- </table>
+ </table></div>
<div t-if="pager" class="o_portal_pager text-center">
<t t-call="website.pager"/>
</div>
diff --git a/addons/website_project/views/project_templates.xml b/addons/website_project/views/project_templates.xml
index ae884000b15..c40e30438f0 100644
--- a/addons/website_project/views/project_templates.xml
+++ b/addons/website_project/views/project_templates.xml
@@ -54,7 +54,7 @@
</div>
</t>
<div t-if="projects" class="panel panel-default">
- <table class="table table-hover status_table">
+ <div class="table-responsive"><table class="table table-hover status_table">
<thead>
<tr class="active">
<th class="col-md-6">Name</th>
@@ -74,7 +74,7 @@
</td>
</tr>
</tbody>
- </table>
+ </table></div>
</div>
<div t-if="pager" class="o_portal_pager text-center">
<t t-call="website.pager"/>
@@ -165,7 +165,7 @@
</div>
</t>
<div t-if="tasks" class="panel panel-default">
- <table class="table table-hover status_table">
+ <div class="table-responsive"><table class="table table-hover status_table">
<thead>
<tr class="active">
<th class="col-md-10">Task</th>
@@ -184,7 +184,7 @@
</tr>
</t>
</tbody>
- </table>
+ </table></div>
</div>
<div t-if="pager" class="o_portal_pager text-center">
<t t-call="website.pager"/>
diff --git a/addons/website_project_issue/views/project_issue_templates.xml b/addons/website_project_issue/views/project_issue_templates.xml
index 71d51f99512..f8fc8ff7e89 100644
--- a/addons/website_project_issue/views/project_issue_templates.xml
+++ b/addons/website_project_issue/views/project_issue_templates.xml
@@ -38,7 +38,7 @@
</div>
</t>
<div t-if="issues" class="panel panel-default">
- <table class="table table-hover status_table">
+ <div class="table-responsive"><table class="table table-hover status_table">
<thead>
<tr class="active">
<th>Issue</th>
@@ -57,7 +57,7 @@
</td>
</tr>
</t>
- </table>
+ </table></div>
</div>
<div t-if="pager" class="o_portal_pager text-center">
<t t-call="website.pager"/>
diff --git a/addons/website_project_issue_sheet/views/project_issue_templates.xml b/addons/website_project_issue_sheet/views/project_issue_templates.xml
index 131f8e63e88..98892295a81 100644
--- a/addons/website_project_issue_sheet/views/project_issue_templates.xml
+++ b/addons/website_project_issue_sheet/views/project_issue_templates.xml
@@ -4,7 +4,7 @@
<xpath expr="//div[@class='panel-body']" position="inside">
<t t-if="issue.timesheet_ids">
<hr/>
- <table class="table table-hover o_my_status_table">
+ <div class="table-responsive"><table class="table table-hover o_my_status_table">
<thead>
<tr class="active">
<th>Date</th>
@@ -19,7 +19,7 @@
<td><span t-esc="timesheet.sudo().user_id.name"/></td>
<td><span t-field="timesheet.unit_amount" t-options='{"widget": "duration", "unit": "hour"}'/></td>
</tr>
- </table>
+ </table></div>
</t>
</xpath>
</template>