summaryrefslogtreecommitdiff
path: root/addons/web
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2018-05-25 17:00:00 +0200
committerqsm-odoo <qsm@odoo.com>2018-07-27 12:36:54 +0200
commitd48b8593dde7c6adf679359e2dd64dee288e9544 (patch)
treed26e7a77bfd33c66157531918f066377270ef1fb /addons/web
parent54aee4626bd2486ff86df490e4d2350f5702f898 (diff)
[REF] *: BS4, 'pull-left/right' -> 'float-left/right'
Diffstat (limited to 'addons/web')
-rw-r--r--addons/web/static/src/js/views/kanban/kanban_column_quick_create.js2
-rw-r--r--addons/web/static/src/js/views/kanban/kanban_record.js2
-rw-r--r--addons/web/static/src/js/views/search/filters_menu.js2
-rw-r--r--addons/web/static/src/js/views/search/groupby_menu.js2
-rw-r--r--addons/web/static/src/xml/base.xml18
-rw-r--r--addons/web/static/src/xml/kanban.xml4
-rw-r--r--addons/web/static/src/xml/web_calendar.xml2
-rw-r--r--addons/web/static/tests/fields/relational_fields_tests.js10
-rw-r--r--addons/web/static/tests/views/kanban_tests.js2
-rw-r--r--addons/web/views/database_manager.html24
-rw-r--r--addons/web/views/report_templates.xml8
11 files changed, 38 insertions, 38 deletions
diff --git a/addons/web/static/src/js/views/kanban/kanban_column_quick_create.js b/addons/web/static/src/js/views/kanban/kanban_column_quick_create.js
index 170b950a49d..b2a38d4e53e 100644
--- a/addons/web/static/src/js/views/kanban/kanban_column_quick_create.js
+++ b/addons/web/static/src/js/views/kanban/kanban_column_quick_create.js
@@ -184,7 +184,7 @@ var ColumnQuickCreate = Widget.extend({
examples: this.examples,
})),
buttons: [{
- classes: 'btn-primary pull-right',
+ classes: 'btn-primary float-right',
close: true,
text: _t('Got it'),
}],
diff --git a/addons/web/static/src/js/views/kanban/kanban_record.js b/addons/web/static/src/js/views/kanban/kanban_record.js
index 09fb956e52c..627543b3422 100644
--- a/addons/web/static/src/js/views/kanban/kanban_record.js
+++ b/addons/web/static/src/js/views/kanban/kanban_record.js
@@ -349,7 +349,7 @@ var KanbanRecord = Widget.extend({
_setFieldDisplay: function ($el, fieldName) {
// attribute display
if (this.fieldsInfo[fieldName].display === 'right') {
- $el.addClass('pull-right');
+ $el.addClass('float-right');
} else if (this.fieldsInfo[fieldName].display === 'full') {
$el.addClass('o_text_block');
}
diff --git a/addons/web/static/src/js/views/search/filters_menu.js b/addons/web/static/src/js/views/search/filters_menu.js
index cf79bec2640..af5425ec2d7 100644
--- a/addons/web/static/src/js/views/search/filters_menu.js
+++ b/addons/web/static/src/js/views/search/filters_menu.js
@@ -76,7 +76,7 @@ var FiltersMenu = DropdownMenu.extend({
category: 'filterCategory',
title: 'Filters',
icon: 'fa fa-filter',
- symbol: this.isMobile ? 'fa fa-chevron-right pull-right mt4' : false,
+ symbol: this.isMobile ? 'fa fa-chevron-right float-right mt4' : false,
};
this._super(parent, dropdownHeader, filters, this.fields);
},
diff --git a/addons/web/static/src/js/views/search/groupby_menu.js b/addons/web/static/src/js/views/search/groupby_menu.js
index 8540e702589..d686a4d55cb 100644
--- a/addons/web/static/src/js/views/search/groupby_menu.js
+++ b/addons/web/static/src/js/views/search/groupby_menu.js
@@ -85,7 +85,7 @@ var GroupByMenu = DropdownMenu.extend({
category: 'groupByCategory',
title: 'Group By',
icon: 'fa fa-bars',
- symbol: this.isMobile ? 'fa fa-chevron-right pull-right mt4' : false,
+ symbol: this.isMobile ? 'fa fa-chevron-right float-right mt4' : false,
style: style,
};
this._super(parent, dropdownHeader, groupbys, options);
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f5a0f08f408..78b9d1480b5 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -143,7 +143,7 @@
</div>
<div t-name="CrashManager.error" class="o_dialog_error">
<div class="alert alert-warning clearfix" role="alert">
- <button class="btn btn-primary pull-right ml8 o_clipboard_button">
+ <button class="btn btn-primary float-right ml8 o_clipboard_button">
<i class="fa fa-clipboard mr8"/>Copy the full error to clipboard
</button>
<p><b>An error occurred</b></p>
@@ -926,8 +926,8 @@
<div class="o_field_image" aria-atomic="true">
<t t-if="widget.mode !== 'readonly'">
<div class="o_form_image_controls">
- <button class="fa fa-pencil fa-lg pull-left o_select_file_button" title="Edit" aria-label="Edit"/>
- <button class="fa fa-trash-o fa-lg pull-right o_clear_file_button" title="Clear" aria-label="Clear"/>
+ <button class="fa fa-pencil fa-lg float-left o_select_file_button" title="Edit" aria-label="Edit"/>
+ <button class="fa fa-trash-o fa-lg float-right o_clear_file_button" title="Clear" aria-label="Clear"/>
<span class="o_form_binary_progress">Uploading...</span>
<t t-call="HiddenInputFile">
@@ -1040,7 +1040,7 @@
<div t-foreach="widget.value.data" t-as="file" class="oe_attachment">
<t t-if="!file.data.upload">
<div>
- <a href="#" class="fa fa-times pull-right oe_delete" title="Delete this file" aria-label="Delete this file" t-att-data-id="file.data.id"/>
+ <a href="#" class="fa fa-times float-right oe_delete" title="Delete this file" aria-label="Delete this file" t-att-data-id="file.data.id"/>
<t t-raw="file.data.name || file.data.filename"/>
</div>
<a class="o_image" target="_blank" t-att-href="widget.metadata[file.id] ? widget.metadata[file.id].url : false"
@@ -1138,11 +1138,11 @@
<button class="o_enable_searchview btn fa fa-search"/>
<div class="o_mobile_search o_hidden">
<div class="o_mobile_search_header">
- <span class="o_mobile_search_close pull-left mt16 mb16 mr8 ml16">
+ <span class="o_mobile_search_close float-left mt16 mb16 mr8 ml16">
<i class="fa fa-arrow-left"/>
- <strong class="pull-right ml8">FILTER</strong>
+ <strong class="float-right ml8">FILTER</strong>
</span>
- <span class="pull-right o_mobile_search_clear_facets mt16 mr16">CLEAR</span>
+ <span class="float-right o_mobile_search_clear_facets mt16 mr16">CLEAR</span>
</div>
<div class="o_searchview_input_container"/>
<div class="o_mobile_search_filter o_search_options mb8 mt8 ml16 mr16"/>
@@ -1273,7 +1273,7 @@
<div t-name="SearchView.FavoriteMenu" class="btn-group o_dropdown">
<button t-attf-class="o_dropdown_toggler_btn btn btn-secondary dropdown-toggle#{widget.isMobile ? ' o-no-caret' : ''}" data-toggle="dropdown" aria-expanded="false" tabindex="-1" aria-label="Favorites" title="Favorites">
- <span class="fa fa-star"/> Favorites <span t-if="widget.isMobile" class="fa fa-chevron-right pull-right mt4"/>
+ <span class="fa fa-star"/> Favorites <span t-if="widget.isMobile" class="fa fa-chevron-right float-right mt4"/>
</button>
<div class="dropdown-menu o_favorites_menu" role="menu">
<div class="dropdown-divider user_filter"/>
@@ -1339,7 +1339,7 @@
</div>
<div class="o_right_panel">
<h4>
- <a href="#" class="pull-right o_toggle_save_list">Save fields list</a>
+ <a href="#" class="float-right o_toggle_save_list">Save fields list</a>
Fields to export
</h4>
<div class="o_save_list"/>
diff --git a/addons/web/static/src/xml/kanban.xml b/addons/web/static/src/xml/kanban.xml
index d3a6e8d7a3f..11a47263c3c 100644
--- a/addons/web/static/src/xml/kanban.xml
+++ b/addons/web/static/src/xml/kanban.xml
@@ -59,7 +59,7 @@
<t t-if="widget.examples">
<a href="#" role="button" class="btn-link o_kanban_examples">Examples</a>
</t>
- <span class="o_discard_msg text-muted pull-right">Esc to discard</span>
+ <span class="o_discard_msg text-muted float-right">Esc to discard</span>
</div>
<div class="o_kanban_muted_record"/>
<div class="o_kanban_muted_record"/>
@@ -158,7 +158,7 @@
<div class="o_kanban_examples_ghost">
<div class="o_ghost_content"/>
<div class="o_ghost_content o_ghost_tag"/>
- <img class="pull-right o_ghost_avatar" src="/base/static/img/avatar.png" alt="Avatar"/>
+ <img class="float-right o_ghost_avatar" src="/base/static/img/avatar.png" alt="Avatar"/>
</div>
</t>
diff --git a/addons/web/static/src/xml/web_calendar.xml b/addons/web/static/src/xml/web_calendar.xml
index 85b7a168e49..3f32dcbd173 100644
--- a/addons/web/static/src/xml/web_calendar.xml
+++ b/addons/web/static/src/xml/web_calendar.xml
@@ -21,7 +21,7 @@
<div t-attf-class="o_field_#{name} o_field_type_#{fields[name].type}">
<t t-if="widget.displayFields[name].avatar_field">
<t t-if="!isMobile"><t t-esc="fields[name].string"/>:</t>
- <div class="o_calendar_avatars pull-right">
+ <div class="o_calendar_avatars float-right">
<t t-foreach="widget.getAvatars(record, name, widget.displayFields[name].avatar_field).slice(0,3)" t-as="image"><t t-raw="image"/></t>
<span t-if="record[name].length - 3 > 0">+<t t-esc="record[name].length - 3"/></span>
</div>
diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js
index f55a8cb48c1..0910df88766 100644
--- a/addons/web/static/tests/fields/relational_fields_tests.js
+++ b/addons/web/static/tests/fields/relational_fields_tests.js
@@ -4335,7 +4335,7 @@ QUnit.module('relational_fields', {
'<templates>' +
'<t t-name="kanban-box">' +
'<div class="oe_kanban_global_click">' +
- '<a t-if="!read_only_mode" type="delete" class="fa fa-times pull-right delete_icon"/>' +
+ '<a t-if="!read_only_mode" type="delete" class="fa fa-times float-right delete_icon"/>' +
'<span><t t-esc="record.display_name.value"/></span>' +
'</div>' +
'</t>' +
@@ -4766,7 +4766,7 @@ QUnit.module('relational_fields', {
'<templates>' +
'<t t-name="kanban-box">' +
'<div class="oe_kanban_global_click">' +
- '<a t-if="!read_only_mode" type="delete" class="fa fa-times pull-right delete_icon"/>' +
+ '<a t-if="!read_only_mode" type="delete" class="fa fa-times float-right delete_icon"/>' +
'<span><t t-esc="record.display_name.value"/></span>' +
'<span><t t-esc="record.color.value"/></span>' +
'</div>' +
@@ -4890,7 +4890,7 @@ QUnit.module('relational_fields', {
'<templates>' +
'<t t-name="kanban-box">' +
'<div class="oe_kanban_global_click">' +
- '<a t-if="!read_only_mode" type="delete" class="fa fa-times pull-right delete_icon"/>' +
+ '<a t-if="!read_only_mode" type="delete" class="fa fa-times float-right delete_icon"/>' +
'<span><t t-esc="record.display_name.value"/></span>' +
'</div>' +
'</t>' +
@@ -10154,7 +10154,7 @@ QUnit.module('relational_fields', {
'<templates>' +
'<t t-name="kanban-box">' +
'<div class="oe_kanban_global_click">' +
- '<a t-if="!read_only_mode" type="delete" class="fa fa-times pull-right delete_icon"/>' +
+ '<a t-if="!read_only_mode" type="delete" class="fa fa-times float-right delete_icon"/>' +
'<span><t t-esc="record.display_name.value"/></span>' +
'</div>' +
'</t>' +
@@ -10325,7 +10325,7 @@ QUnit.module('relational_fields', {
'<templates>' +
'<t t-name="kanban-box">' +
'<div class="oe_kanban_global_click">' +
- '<a t-if="!read_only_mode" type="delete" class="fa fa-times pull-right delete_icon"/>' +
+ '<a t-if="!read_only_mode" type="delete" class="fa fa-times float-right delete_icon"/>' +
'<span><t t-esc="record.display_name.value"/></span>' +
'</div>' +
'</t>' +
diff --git a/addons/web/static/tests/views/kanban_tests.js b/addons/web/static/tests/views/kanban_tests.js
index c80e0916d21..6df7fe94ea9 100644
--- a/addons/web/static/tests/views/kanban_tests.js
+++ b/addons/web/static/tests/views/kanban_tests.js
@@ -2760,7 +2760,7 @@ QUnit.module('Views', {
'<t t-name="kanban-box">' +
'<div>' +
'<field name="foo"/>' +
- '<button type="object" attrs="{\'invisible\':[\'|\', (\'bar\',\'=\',True), (\'category_ids\', \'!=\', [])]}" class="btn btn-primary pull-right" name="channel_join_and_get_info">Join</button>' +
+ '<button type="object" attrs="{\'invisible\':[\'|\', (\'bar\',\'=\',True), (\'category_ids\', \'!=\', [])]}" class="btn btn-primary float-right" name="channel_join_and_get_info">Join</button>' +
'</div>' +
'</t>' +
'</templates>' +
diff --git a/addons/web/views/database_manager.html b/addons/web/views/database_manager.html
index c7462a3c1b5..dda8a2c59f2 100644
--- a/addons/web/views/database_manager.html
+++ b/addons/web/views/database_manager.html
@@ -101,7 +101,7 @@
<div class="form-group">
<div class="checkbox">
<label>
- <input name="demo" type="checkbox" class="pull-right" value="1">
+ <input name="demo" type="checkbox" class="float-right" value="1">
<span>Load demonstration data</span>
<span class="text-muted"> (Check this box to evaluate Odoo)</span>
</label>
@@ -135,11 +135,11 @@
{% for db in databases %}
<a href="/web?db={{ db }}" class="list-group-item" >
{% if db in incompatible_databases %}
- <i class="icon fa fa-warning pull-right text-warning" title="This database may not be compatible"></i>
+ <i class="icon fa fa-warning float-right text-warning" title="This database may not be compatible"></i>
{% endif %}
{{ db }}
{% if manage %}
- <div class="text-right pull-right">
+ <div class="text-right float-right">
<span data-db="{{ db }}" data-target=".o_database_backup" class="o_database_action btn-link"><i class="fa fa-floppy-o fa-fw"></i> Backup</span>
<span data-db="{{ db }}" data-target=".o_database_duplicate" class="o_database_action btn-link"><i class="fa fa-files-o fa-fw"></i> Duplicate</span>
<span data-db="{{ db }}" data-target=".o_database_delete" class="o_database_action btn-link"><i class="fa fa-trash-o fa-fw"></i> Delete</span>
@@ -168,7 +168,7 @@
{% elif list_db %}
<form role="form" action="/web/database/create" method="post">
{{ create_form() }}
- <input type="submit" value="Create database" class="btn btn-primary pull-left"/>
+ <input type="submit" value="Create database" class="btn btn-primary float-left"/>
</form>
<a role="button" data-toggle="modal" data-target=".o_database_restore" class="btn btn-link">
or restore a database
@@ -190,7 +190,7 @@
{{ create_form() }}
</div>
<div class="modal-footer">
- <input type="submit" value="Continue" class="btn btn-primary pull-right"/>
+ <input type="submit" value="Continue" class="btn btn-primary float-right"/>
</div>
</form>
</div>
@@ -222,20 +222,20 @@
If you don't know, answer "This database is a copy".</p>
<div class="radio">
<label>
- <input name="copy" type="radio" class="pull-right" value="true" checked="1">
+ <input name="copy" type="radio" class="float-right" value="true" checked="1">
This database is a copy
</label>
</div>
<div class="radio">
<label>
- <input name="copy" type="radio" class="pull-right" value="false">
+ <input name="copy" type="radio" class="float-right" value="false">
This database was moved
</label>
</div>
</div>
</div>
<div class="modal-footer">
- <input type="submit" value="Continue" class="btn btn-primary pull-right"/>
+ <input type="submit" value="Continue" class="btn btn-primary float-right"/>
</div>
</form>
</div>
@@ -262,7 +262,7 @@
</div>
</div>
<div class="modal-footer">
- <input type="submit" value="Continue" class="btn btn-primary pull-right"/>
+ <input type="submit" value="Continue" class="btn btn-primary float-right"/>
</div>
</form>
</div>
@@ -291,7 +291,7 @@
</div>
</div>
<div class="modal-footer">
- <input type="submit" value="Continue" class="btn btn-primary pull-right"/>
+ <input type="submit" value="Continue" class="btn btn-primary float-right"/>
</div>
</form>
</div>
@@ -315,7 +315,7 @@
</div>
</div>
<div class="modal-footer">
- <input type="submit" value="Delete" class="btn btn-primary pull-right"/>
+ <input type="submit" value="Delete" class="btn btn-primary float-right"/>
</div>
</form>
</div>
@@ -346,7 +346,7 @@
</div>
</div>
<div class="modal-footer">
- <input type="submit" value="Backup" class="btn btn-primary pull-right"/>
+ <input type="submit" value="Backup" class="btn btn-primary float-right"/>
</div>
</form>
</div>
diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml
index d633c8363b4..6acea265082 100644
--- a/addons/web/views/report_templates.xml
+++ b/addons/web/views/report_templates.xml
@@ -163,11 +163,11 @@
<template id="external_layout_background">
<div class="header o_background_header">
- <div class="pull-right">
+ <div class="float-right">
<h3 class="mt0 text-right" t-field="company.report_header"/>
</div>
- <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % to_text(company.logo)" class="pull-left" alt="Logo"/>
- <div class="pull-left company_address">
+ <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % to_text(company.logo)" class="float-left" alt="Logo"/>
+ <div class="float-left company_address">
<div>
<strong t-field="company.partner_id.name"/>
</div>
@@ -274,7 +274,7 @@
<h4 class="mt0 mb0 text-uppercase" t-field="company.report_header"/>
</div>
<div class="col-1">
- <ul t-if="not type_html" class="list-inline pagenumber pull-right text-center">
+ <ul t-if="not type_html" class="list-inline pagenumber float-right text-center">
<li class="list-inline-item"><strong><span class="page"/></strong></li>
</ul>
</div>