pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Syntax of icons (#25577)

Browse Source 
Description of the issue/feature this PR addresses:

Accessibility improvements forbids the use of the syntax
`<i class="fa fa-check"/> Some text`
to create a labelled icon. But, by this, some fonts are changed.

Desired behavior after PR is merged:
The old syntax can be used.
This commit is contained in:
kujiu
2018-07-04 09:55:52 +02:00
committed by GitHub
parent ad0f8fd0b7
commit f90cf060a3
78 changed files with 342 additions and 2434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/static/src/xml/account_reconciliation.xml
+1 -1
View File
@@ -205,7 +205,7 @@
</tbody>
</table>
<div class="add_line_container">
<a class="add_line fa fa-plus-circle" t-att-style="!state.balance.amout ? 'display: none;' : null">Save and New</a>
<a class="add_line" t-att-style="!state.balance.amout ? 'display: none;' : null"><i class="fa fa-plus-circle"/> Save and New</a>
</div>
</div>
addons/account/views/account_view.xml
+1 -1
View File
@@ -353,7 +353,7 @@
</div>
</div>
<div class="content-group" attrs="{'invisible': [('alias_domain', '!=', False)]}">
<a type='action' name='%(action_open_settings)d' class="btn btn-sm btn-link" role="button"><span class="fa fa-fw o_button_icon fa-arrow-right"> Configure Email Servers</span></a>
<a type='action' name='%(action_open_settings)d' class="btn btn-sm btn-link" role="button"><i class="fa fa-fw o_button_icon fa-arrow-right"/> Configure Email Servers</a>
</div>
</group>
</group>
addons/account_analytic_default/views/account_analytic_default_view.xml
+1 -1
View File
@@ -57,7 +57,7 @@
<strong><span><field name="analytic_id"/></span></strong>
<img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/>
</div>
<div t-if="record.date_start.value"><span class="fa fa-calendar"> From</span> <field name="date_start"/> <t t-if="record.date_stop.value">to <field name="date_stop"/></t></div>
<div t-if="record.date_start.value"><i class="fa fa-calendar"></i> From <field name="date_start"/> <t t-if="record.date_stop.value">to <field name="date_stop"/></t></div>
<div t-if="record.product_id.value"><strong>Product</strong> <field name="product_id"/> </div>
<div t-if="record.partner_id.value"><strong>Customer</strong> <field name="partner_id"/> </div>
</div>
addons/account_payment/views/account_portal_templates.xml
+3 -3
View File
@@ -73,15 +73,15 @@
<div class="mb8 ml16 mr16">
<a t-if="invoice.state == 'open' and invoice.amount_total and invoice.type == 'out_invoice' and (pending_manual_txs or not tx_ids)"
class="btn btn-primary btn-block" data-toggle="modal" data-target="#pay_with">
<span class="fa fa-arrow-circle-right">Pay Now</span>
<i class="fa fa-arrow-circle-right"/> Pay Now
</a>
<a t-if="tx_ids and not pending_manual_txs and invoice.state != 'paid'"
class="btn btn-warning btn-block" disabled="disabled">
<span class="fa fa-check-circle">Pending</span>
<i class="fa fa-check-circle"/> Pending
</a>
<a t-if="invoice.state == 'paid'"
class="btn btn-success btn-block" disabled="disabled">
<span class="fa fa-check-circle">Paid</span>
<i class="fa fa-check-circle"/> Paid
</a>
</div>
</xpath>
addons/auth_oauth/views/res_config_settings_views.xml
+1 -1
View File
@@ -27,7 +27,7 @@
<label for="auth_oauth_google_client_id" string="Client ID:" class="col-md-3 o_light_label"/>
<field name="auth_oauth_google_client_id" placeholder="e.g. 1234-xyz.apps.googleusercontent.com"/>
</div>
<a class="fa fa-fw fa-arrow-right" href="https://www.odoo.com/documentation/user/online/general/auth/google.html" target="_blank">Tutorial</a>
<a href="https://www.odoo.com/documentation/user/online/general/auth/google.html" target="_blank"><i class="fa fa-fw fa-arrow-right"/>Tutorial</a>
</div>
</div>
</div>
addons/event/views/event_views.xml
+2 -1
View File
@@ -327,7 +327,8 @@
<h4 class="o_kanban_record_title"><field name="name"/></h4>
<div>
<t t-if="record.country_id.raw_value"> <b class="o_kanban_record_subtitle"> <field name="country_id"/> </b> <br/> </t>
<b class="fa fa-clock-o">To</b> <t t-esc="moment(record.date_end.raw_value).format('lll')"/>
<b><i class="fa fa-clock-o"/>
To</b> <t t-esc="moment(record.date_end.raw_value).format('lll')"/>
</div>
<h4>
<a name="%(act_event_registration_from_event)d" type="action">
addons/google_calendar/views/res_config_settings_views.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<label for="cal_client_secret" string="Client Secret" class="col-xs-3 col-md-3 o_light_label"/>
<field name="cal_client_secret" password="True" nolabel="1"/>
</div>
<a href="https://www.odoo.com/documentation/user/11.0/crm/optimize/google_calendar_credentials.html" class="oe-link fa fa-fw fa-arrow-right" target="_blank">Tutorial</a>
<a href="https://www.odoo.com/documentation/user/11.0/crm/optimize/google_calendar_credentials.html" class="oe-link" target="_blank"><i class="fa fa-fw fa-arrow-right"/>Tutorial</a>
</div>
</div>
</field>
addons/hr_attendance/static/src/xml/attendance.xml
+2 -2
View File
@@ -60,8 +60,8 @@
<div class="o_hr_attendance_kiosk_mode">
<t t-set="checked_in" t-value="widget.employee_state=='checked_in'"/>
<div class="o_hr_attendance_back_button">
<span class="btn btn-default btn-lg visible-xs"><span class="fa fa-chevron-left mr8"> Go back</span></span>
<span class="btn btn-default hidden-xs"><i role="img" class="fa fa-chevron-left" aria-label="Go back" title="Go back"/></span>
<span class="btn btn-default btn-lg visible-xs"><i class="fa fa-chevron-left mr8"/> Go back</span>
<span class="btn btn-default hidden-xs"><i class="fa fa-chevron-left" role="img" aria-label="Go back" title="Go back"/></span>
</div>
<t t-if="widget.employee_id">
<div class="o_hr_attendance_user_badge o_home_menu_background">
addons/iap/static/src/xml/iap_templates.xml
+2 -2
View File
@@ -19,8 +19,8 @@
<t t-extend="DashboardApps">
<t t-jquery=".o_web_settings_dashboard_pills" t-operation="after">
<div class="text-center" style="display: inline-block">
<a t-att-href="widget.data.url" target="_blank" class="fa fa-money fa-2x text-muted">
In-App Purchases</a>
<a t-att-href="widget.data.url" target="_blank">
<i class="fa fa-money fa-2x text-muted"/> In-App Purchases</a>
</div>
</t>
</t>
addons/lunch/static/src/xml/lunch.xml
+2 -1
View File
@@ -11,7 +11,8 @@
<h3><t t-esc="supplier"/></h3>
<div t-foreach='categories[supplier]' t-as='order' class="o_lunch_vignette">
<button type="button" class="pull-right o_add_button oe_edit_only oe_link" t-att-data-id="order.line_id">
<span class="fa fa-plus-square">Add</span>
<span class="fa fa-plus-square"></span>
<span>Add</span>
</button>
<div>
<t t-esc="order.product_name"/>
addons/mail/static/src/xml/activity.xml
+5 -5
View File
@@ -3,8 +3,8 @@
<t t-name="mail.activity_items">
<div class="o_thread_date_separator o_border_dashed" data-toggle="collapse" data-target="#o_chatter_planned_activities">
<a href="#" role="button" class="o_thread_date btn">
<span class="fa fa-fw fa-caret-down">
Planned activities</span>
<i class="fa fa-fw fa-caret-down"/>
Planned activities
<small class="o_chatter_planned_activities_summary ml8">
<span class="label img-circle label-danger"><t t-esc="nbOverdueActivities"/></span>
<span class="label img-circle label-warning"><t t-esc="nbTodayActivities"/></span>
@@ -56,13 +56,13 @@
</div>
<div class="o_thread_message_tools btn-group">
<a role="button" href="#" class="btn btn-link btn-success text-muted btn-sm o_activity_done o_activity_link mr8" t-att-data-activity-id="activity.id" t-att-data-previous-activity-type-id="activity.activity_type_id[0]" data-toggle="popover">
<span class="fa fa-check">Mark Done</span>
<i class="fa fa-check"/> Mark Done
</a>
<a role="button" href="#" class="btn btn-link btn-default text-muted btn-sm o_activity_edit o_activity_link" t-att-data-activity-id="activity.id">
<span class="fa fa-pencil">Edit</span>
<i class="fa fa-pencil"/> Edit
</a>
<a role="button" href="#" class="btn btn-link btn-sm btn-danger text-muted o_activity_unlink o_activity_link" t-att-data-activity-id="activity.id">
<span class="fa fa-times">Cancel</span>
<i class="fa fa-times"/> Cancel
</a>
</div>
</div>
addons/mail/static/src/xml/discuss.xml
+10 -6
View File
@@ -30,13 +30,13 @@
<div class="o_mail_discuss_sidebar">
<div t-attf-class="o_mail_discuss_title_main o_mail_discuss_item #{(activeThreadID === 'mailbox_inbox') ? 'o_active': ''}"
data-thread-id="mailbox_inbox">
<span class="o_thread_name fa fa-inbox mr8">Inbox</span>
<span class="o_channel_name"><i class="fa fa-inbox mr8"/>Inbox</span>
<t t-set="counter" t-value="needactionCounter"/>
<t t-call="mail.discuss.SidebarCounter"/>
</div>
<div t-attf-class="o_mail_discuss_title_main o_mail_mailbox_title_starred o_mail_discuss_item #{(activeThreadID === 'mailbox_starred') ? 'o_active': ''}"
data-thread-id="mailbox_starred">
<span class="o_thread_name fa fa-star-o mr8">Starred</span>
<span class="o_channel_name"><i class="fa fa-star-o mr8"/>Starred</span>
<t t-set="counter" t-value="starredCounter"/>
<t t-call="mail.discuss.SidebarCounter"/>
</div>
@@ -218,16 +218,20 @@
<div class="o_mail_discuss_content"/>
<div class="o_mail_mobile_tabs">
<div class="o_mail_mobile_tab" data-type="mailbox_inbox">
<span class="o_tab_title fa fa-inbox">Inbox</span>
<span class="fa fa-inbox"/>
<span class="o_tab_title">Inbox</span>
</div>
<div class="o_mail_mobile_tab" data-type="dm">
<span class="o_tab_title fa fa-user">Chat</span>
<span class="fa fa-user"/>
<span class="o_tab_title">Chat</span>
</div>
<div class="o_mail_mobile_tab" data-type="public">
<span class="o_tab_title fa fa-users">Channels</span>
<span class="fa fa-users"/>
<span class="o_tab_title">Channels</span>
</div>
<div class="o_mail_mobile_tab" data-type="private">
<span class="o_tab_title fa fa-eye-slash">Private Channels</span>
<span class="fa fa-eye-slash"/>
<span class="o_tab_title">Private Channels</span>
</div>
</div>
</div>
addons/mail/static/src/xml/followers.xml
+6 -4
View File
@@ -18,8 +18,10 @@
<div class="btn-group btn-group-sm o_subtypes_list">
<button class="btn btn-sm btn-link o_followers_follow_button o_followers_notfollow">
<span class="o_follow">Follow</span>
<span class="fa fa-times o_followers_unfollow"> Unfollow</span>
<span class="fa fa-check o_followers_following"> Following</span>
<span class="fa fa-times o_followers_unfollow"/>
<span class="o_followers_unfollow"> Unfollow</span>
<span class="fa fa-check o_followers_following"/>
<span class="o_followers_following"> Following</span>
</button><button class="btn btn-sm btn-link dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span class="fa fa-bell" role="img" aria-label="Alarm menu" title="Alarm menu"/>
</button>
@@ -85,8 +87,8 @@
</li>
</t>
<t t-name="mail.Followers.subtypes.warning">
<span class="text-warning" role="alert">
<span class="fa fa-warning"> Be careful with channels following internal notifications</span>
<span class="text-warning">
<i class="fa fa-warning"/> Be careful with channels following internal notifications
</span>
</t>
addons/mail/static/src/xml/systray.xml
+6 -3
View File
@@ -27,13 +27,16 @@
<li role="menuitem" t-if="widget.isMobile()">
<div class="o_mail_mobile_tabs">
<div class="o_mail_mobile_tab o_filter_button active">
<span class="o_tab_title fa fa-envelope">All</span>
<span class="fa fa-envelope"/>
<span class="o_tab_title">All</span>
</div>
<div class="o_mail_mobile_tab o_filter_button" data-filter='chat'>
<span class="o_tab_title fa fa-user">Chat</span>
<span class="fa fa-user"/>
<span class="o_tab_title">Chat</span>
</div>
<div class="o_mail_mobile_tab o_filter_button" data-filter='channels'>
<span class="o_tab_title fa fa-users">Channels</span>
<span class="fa fa-users"/>
<span class="o_tab_title">Channels</span>
</div>
</div>
</li>
addons/mail/static/src/xml/web_kanban_activity.xml
+1 -1
View File
@@ -54,7 +54,7 @@
</li>
<li role="menuitem" class="o_schedule_activity text-center">
<a role="button" class="btn btn-link btn-block">
<strong class="fa fa-plus fa-fw">Schedule an activity</strong>
<i class="fa fa-plus fa-fw"></i><strong>Schedule an activity</strong>
</a>
</li>
</t>
addons/mail/wizard/mail_resend_message_views.xml
+1 -1
View File
@@ -20,7 +20,7 @@
<field name="resend" widget="boolean_toggle"/>
</tree>
</field>
<p attrs="{'invisible':[('has_cancel', '==', False)]}"> <span class="fa fa-info-circle"> Caution: It won't be possible to send this mail again to the recipients you did not select.</span></p>
<p attrs="{'invisible':[('has_cancel', '==', False)]}"> <span class="fa fa-info-circle"/> Caution: It won't be possible to send this mail again to the recipients you did not select.</p>
<footer>
<button string="Resend to selected" name="resend_mail_action" type="object" class="btn-primary o_mail_send"/>
<button string="Ignore all failures" name="cancel_mail_action" type="object" class="btn-default" />
addons/mass_mailing/static/src/xml/mass_mailing.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<templates id="template" xml:space="preserve">
<div t-name="mass_mailing.theme_selector" class="o_mail_theme_selector">
<a role="button" href="#" class="btn btn-xs dropdown-toggle" data-toggle="dropdown">
<span class="fa fa-paint-brush">Change Style</span>
<i class="fa fa-paint-brush"/> Change Style
</a>
<div class="dropdown-menu" role="menu">
<li t-foreach="themes" t-as="theme">
addons/mass_mailing/views/snippets_themes.xml
+4 -4
View File
@@ -22,7 +22,7 @@
</div>
<div id="email_designer_default_headers" class="o_panel">
<div class="o_panel_header">
<span class="fa fa-angle-double-up">Headers</span>
<i class="fa fa-angle-double-up"/> Headers
</div>
<div class="o_panel_body">
<t t-snippet="mass_mailing.s_mail_block_header_social" t-thumbnail="/mass_mailing/static/src/img/blocks/block_header_social.png"/>
@@ -33,7 +33,7 @@
</div>
<div id="email_designer_default_body" class="o_panel">
<div class="o_panel_header">
<span class="fa fa-clone">Body</span>
<i class="fa fa-clone"/> Body
</div>
<div class="o_panel_body">
<t t-snippet="mass_mailing.s_mail_block_title_text" t-thumbnail="/mass_mailing/static/src/img/blocks/block_title_text.png"/>
@@ -51,7 +51,7 @@
</div>
<div id="email_designer_default_extra" class="o_panel">
<div class="o_panel_header">
<span class="fa fa-plus">Marketing Content</span>
<i class="fa fa-plus"/> Marketing Content
</div>
<div class="o_panel_body">
<t t-snippet="mass_mailing.s_mail_block_discount2" t-thumbnail="/mass_mailing/static/src/img/blocks/block_discount2.png"/>
@@ -62,7 +62,7 @@
</div>
<div id="email_designer_default_footer" class="o_panel">
<div class="o_panel_header">
<span class="fa fa-angle-double-down">Footers</span>
<i class="fa fa-angle-double-down"/> Footers
</div>
<div class="o_panel_body">
<t t-snippet="mass_mailing.s_mail_block_footer_social" t-thumbnail="/mass_mailing/static/src/img/blocks/block_footer_social.png"/>
addons/mass_mailing/views/snippets_themes_options.xml
+1 -1
View File
@@ -42,7 +42,7 @@
data-selector="[data-oe-field='body_html'] > div:not(.o_layout), [data-oe-field='body_html'] .oe_structure > div, td, th"
data-exclude=".o_mail_no_colorpicker, .o_mail_no_options">
<li class="dropdown-submenu">
<a tabindex="-1" href="#"><span class="fa fa-eyedropper">Background Color</span></a>
<a tabindex="-1" href="#"><i class="fa fa-eyedropper"/>Background Color</a>
<ul class="dropdown-menu" role="menu">
<li></li>
</ul>
addons/payment/data/payment_acquirer_data.xml
+24 -24
View File
@@ -22,8 +22,8 @@
A payment gateway to accept online payments via credit cards.
</p>
<ul class="list-inline">
<li><span class="fa fa-check">Online Payment</span></li>
<li><span class="fa fa-check">Payment Status Tracking</span></li>
<li><i class="fa fa-check"/>Online Payment</li>
<li><i class="fa fa-check"/>Payment Status Tracking</li>
</ul>
</field>
<!-- https://www.buckaroo-payments.com/products/payment-methods/ -->
@@ -45,10 +45,10 @@
Ingenico Payment Services (formerly Ogone) supports credit cards, debit cards and bank transfers.
</p>
<ul class="list-inline">
<li><span class="fa fa-check">Online Payment</span></li>
<li><span class="fa fa-check">Payment Status Tracking</span></li>
<li><span class="fa fa-check">Subscriptions</span></li>
<li><span class="fa fa-check">Save Cards</span></li>
<li><i class="fa fa-check"/>Online Payment</li>
<li><i class="fa fa-check"/>Payment Status Tracking</li>
<li><i class="fa fa-check"/>Subscriptions</li>
<li><i class="fa fa-check"/>Save Cards</li>
</ul>
</field>
<!-- https://payment-services.ingenico.com/~/media/files/130806_product_sheet_ingenico_collect_en.ashx?la=en -->
@@ -68,8 +68,8 @@
A payment gateway to accept online payments via credit cards, debit cards and bank transfers.
</p>
<ul class="list-inline">
<li><span class="fa fa-check">Online Payment</span></li>
<li><span class="fa fa-check">Payment Status Tracking</span></li>
<li><i class="fa fa-check"/>Online Payment</li>
<li><i class="fa fa-check"/>Payment Status Tracking</li>
</ul>
</field>
<!-- https://www.adyen.com/payment-methods -->
@@ -94,11 +94,11 @@
A payment gateway to accept online payments via credit cards and e-checks.
</p>
<ul class="list-inline">
<li><span class="fa fa-check">Online Payment</span></li>
<li><span class="fa fa-check">Payment Status Tracking</span></li>
<li><span class="fa fa-check">Subscriptions</span></li>
<li><span class="fa fa-check">Save Cards</span></li>
<li><span class="fa fa-check">Manual Capture</span></li>
<li><i class="fa fa-check"/>Online Payment</li>
<li><i class="fa fa-check"/>Payment Status Tracking</li>
<li><i class="fa fa-check"/>Subscriptions</li>
<li><i class="fa fa-check"/>Save Cards</li>
<li><i class="fa fa-check"/>Manual Capture</li>
</ul>
</field>
<!-- https://www.authorize.net/solutions/merchantsolutions/onlinemerchantaccount/ -->
@@ -134,8 +134,8 @@
A payment gateway from Atos Worldline to accept online payments via credit cards.
</p>
<ul class="list-inline">
<li><span class="fa fa-check">Online Payment</span></li>
<li><span class="fa fa-check">Payment Status Tracking</span></li>
<li><i class="fa fa-check"/>Online Payment</li>
<li><i class="fa fa-check"/>Payment Status Tracking</li>
</ul>
</field>
<!-- http://sips.worldline.com/en-us/home/features/payment-types-and-acquirers.html -->
@@ -161,8 +161,8 @@
PayPal is the easiest way to accept payments via Paypal or credit cards.
</p>
<ul class="list-inline">
<li><span class="fa fa-check">Online Payment</span></li>
<li><span class="fa fa-check">Payment Status Tracking</span></li>
<li><i class="fa fa-check"/>Online Payment</li>
<li><i class="fa fa-check"/>Payment Status Tracking</li>
</ul>
</field>
<!-- https://www.paypal.com/us/selfhelp/article/Which-credit-cards-can-I-accept-with-PayPal-Merchant-Services-FAQ1525#business -->
@@ -186,10 +186,10 @@
A payment gateway to accept online payments via credit cards.
</p>
<ul class="list-inline">
<li><span class="fa fa-check">Online Payment</span></li>
<li><span class="fa fa-check">Payment Status Tracking</span></li>
<li><span class="fa fa-check">Subscriptions</span></li>
<li><span class="fa fa-check">Save Cards</span></li>
<li><i class="fa fa-check"/>Online Payment</li>
<li><i class="fa fa-check"/>Payment Status Tracking</li>
<li><i class="fa fa-check"/>Subscriptions</li>
<li><i class="fa fa-check"/>Save Cards</li>
</ul>
</field>
<!--
@@ -215,7 +215,7 @@
A generic payment acquirer to send payment instructions to any payment acquirer.
</p>
<ul class="list-inline">
<li><span class="fa fa-check">Online Payment</span></li>
<li><i class="fa fa-check"/>Online Payment</li>
</ul>
</field>
</record>
@@ -230,8 +230,8 @@
PayU India is an online payments solutions company serving the Indian market.
</p>
<ul class="list-inline">
<li><span class="fa fa-check">Online Payment</span></li>
<li><span class="fa fa-check">Payment Status Tracking</span></li>
<li><i class="fa fa-check"/>Online Payment</li>
<li><i class="fa fa-check"/>Payment Status Tracking</li>
</ul>
</field>
<!-- https://www.payumoney.com/selfcare.html?userType=seller
addons/payment/views/payment_portal_templates.xml
+1 -1
View File
@@ -98,7 +98,7 @@
</div>
</div>
<div class="col-sm-12">
<a role="button" t-attf-class="btn btn-#{status} pull-right" href="/my/home"><span class="fa fa-arrow-circle-right"> Back to My Account</span></a>
<a role="button" t-attf-class="btn btn-#{status} pull-right" href="/my/home"><i class="fa fa-arrow-circle-right"/> Back to My Account</a>
</div>
<div class="col-sm-6 col-sm-offset-6 text-muted mt16">
<span t-field="tx.acquirer_id.image_small" t-att-title="tx.acquirer_id.name" role="img" t-att-aria-label="tx.acquirer_id.name" t-options='{"widget": "image", "style":"max-width: 60px; display: inline-block"}'/>
addons/payment/views/payment_templates.xml
+1 -1
View File
@@ -135,7 +135,7 @@
</t>
</label>
<button t-if="mode == 'manage'" name="delete_pm" t-att-value="pm.id" class="btn btn-primary btn-xs pull-right">
<span class="fa fa-trash"> Delete</span>
<i class="fa fa-trash"></i> Delete
</button>
</div>
</t>
addons/point_of_sale/static/src/xml/pos.xml
+18 -11
View File
@@ -293,7 +293,8 @@
<div class="screen-content">
<div class="top-content">
<span class='button back'>
<span class='fa fa-angle-double-left'>Back</span>
<i class='fa fa-angle-double-left'></i>
Back
</span>
<h1 class='product-name'><t t-esc="widget.get_product_name()" /></h1>
</div>
@@ -308,7 +309,8 @@
123.14 €
</div>
<div class='buy-product'>
<span class='fa fa-suffix-angle-double-right'>Order </span>
Order
<i class='fa fa-angle-double-right'></i>
</div>
</div>
</div>
@@ -474,7 +476,8 @@
<div class="screen-content">
<section class="top-content">
<span class='button back'>
<span class='fa fa-angle-double-left'>Cancel</span>
<i class='fa fa-angle-double-left'></i>
Cancel
</span>
<span class='searchbox'>
<input placeholder='Search Customers' />
@@ -486,7 +489,8 @@
<i class='fa fa-plus'></i>
</span>
<span class='button next oe_hidden highlight'>
<span class='fa fa-angle-double-right'>Select Customer</span>
Select Customer
<i class='fa fa-angle-double-right'></i>
</span>
</section>
<section class="full-content">
@@ -639,11 +643,13 @@
<div class='screen-content'>
<div class='top-content'>
<span class='button back'>
<i class='fa fa-angle-double-left'>Back</i>
<i class='fa fa-angle-double-left'></i>
Back
</span>
<h1>Payment</h1>
<span class='button next'>
<i class='fa fa-angle-double-right'>Validate</i>
Validate
<i class='fa fa-angle-double-right'></i>
</span>
</div>
<div class='left-content pc40 touch-scrollable scrollable-y'>
@@ -675,18 +681,18 @@
<t t-if='widget.pos.config.module_account_invoicing'>
<t t-if='widget.pos.get_order()'>
<div t-attf-class='button js_invoice #{ widget.pos.get_order().is_to_invoice() ? "highlight" : ""} '>
<i class='fa fa-file-text-o'> Invoice</i>
<i class='fa fa-file-text-o' /> Invoice
</div>
</t>
</t>
<t t-if='widget.pos.config.tip_product_id'>
<div class='button js_tip'>
<i class='fa fa-heart'> Tip</i>
<i class='fa fa-heart' /> Tip
</div>
</t>
<t t-if='widget.pos.config.iface_cashdrawer'>
<div class='button js_cashdrawer'>
<i class='fa fa-archive'> Open Cashbox</i>
<i class='fa fa-archive' /> Open Cashbox
</div>
</t>
</div>
@@ -701,12 +707,13 @@
<div class='top-content'>
<h1>Change: <span class='change-value'>0.00</span></h1>
<span class='button next'>
<span class='fa fa-suffix-angle-double-right'>Next Order </span>
Next Order
<i class='fa fa-angle-double-right'></i>
</span>
</div>
<div class="centered-content touch-scrollable">
<div class="button print">
<i class='fa fa-print'> Print Receipt</i>
<i class='fa fa-print'></i> Print Receipt
</div>
<div class="pos-receipt-container">
</div>
addons/point_of_sale/views/pos_templates.xml
+1 -1
View File
@@ -117,7 +117,7 @@
<li data-choose-image="true" data-no-preview="true"><a href="#"><b>Set Custom Image...</b></a></li>
<li class="hidden pos-use_default_logo" data-background=""><a href="#">Default company logo</a></li>
<li class="divider"/>
<li data-toggle-class="pos-hidden"><a href="#"><i class="fa fa-eye-slash">Hide</i></a></li>
<li data-toggle-class="pos-hidden"><a href="#"><i class="fa fa-eye-slash"/>Hide</a></li>
</div>
</div>
</template>
addons/portal/views/portal_templates.xml
+2 -1
View File
@@ -343,7 +343,8 @@
</div>
<div class="clearfix">
<button type="submit" class="btn btn-primary pull-right mb32 ">
<span class="fa fa-long-arrow-right">Confirm</span>
Confirm
<span class="fa fa-long-arrow-right" />
</button>
</div>
</div>
addons/pos_discount/static/src/xml/discount_templates.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<t t-name="DiscountButton">
<div class='control-button js_discount'>
<i class='fa fa-tag'> Discount</i>
<i class='fa fa-tag' /> Discount
</div>
</t>
addons/pos_mercury/views/pos_config_setting_views.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<button name="%(pos_mercury.action_configuration_form)d" icon="fa-arrow-right" type="action" string="Vantiv Accounts" class="btn-link"/>
</div>
<div>
<a href="https://www.odoo.com/page/point-of-sale-hardware#part_8" target="_blank"><span class="fa fa-fw fa-arrow-right">Buy a card reader</span></a>
<a href="https://www.odoo.com/page/point-of-sale-hardware#part_8" target="_blank"><i class="fa fa-fw fa-arrow-right"/>Buy a card reader</a>
</div>
</div>
</field>
addons/pos_reprint/static/src/xml/reprint.xml
+3 -2
View File
@@ -3,13 +3,14 @@
<t t-name="ReprintButton">
<div class='control-button js_reprint'>
<span class="fa fa-retweet"> Reprint Receipt</span>
<i class="fa fa-retweet"></i> Reprint Receipt
</div>
</t>
<t t-name="ReprintReceiptScreenWidget" t-extend="ReceiptScreenWidget">
<t t-jquery="div.top-content" t-operation="inner">
<span class='button back fa fa-angle-double-left'>
<span class='button back'>
<i class='fa fa-angle-double-left'></i>
Back
</span>
</t>
addons/pos_restaurant/static/src/xml/floors.xml
+1 -1
View File
@@ -34,7 +34,7 @@
<t t-name="TransferOrderButton">
<div class='control-button'>
<span class='fa fa-arrow-right' > Transfer</span>
<i class='fa fa-arrow-right' /> Transfer
</div>
</t>
addons/pos_restaurant/static/src/xml/multiprint.xml
+2 -1
View File
@@ -2,7 +2,8 @@
<templates id="template" xml:space="preserve">
<t t-name="SubmitOrderButton">
<span class="control-button order-submit fa fa-cutlery">
<span class="control-button order-submit">
<i class="fa fa-cutlery"></i>
Order
</span>
</t>
addons/pos_restaurant/static/src/xml/notes.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<t t-name="OrderlineNoteButton">
<div class='control-button'>
<span class='fa fa-tag'> Note</span>
<i class='fa fa-tag' /> Note
</div>
</t>
addons/pos_restaurant/static/src/xml/printbill.xml
+7 -4
View File
@@ -6,16 +6,18 @@
<div class='screen-content'>
<div class='top-content'>
<span class='button back'>
<span class='fa fa-angle-double-left'> Back</span>
<i class='fa fa-angle-double-left'></i>
Back
</span>
<h1>Bill Printing</h1>
<span class='button next'>
<span class='fa fa-suffix-angle-double-right'> Ok</span>
Ok
<i class='fa fa-angle-double-right'></i>
</span>
</div>
<div class="centered-content">
<div class="button print">
<span class='fa fa-print'> Print</span>
<i class='fa fa-print'></i> Print
</div>
<div class="pos-receipt-container">
</div>
@@ -26,7 +28,8 @@
<t t-name="PrintBillButton">
<span class="control-button order-printbill">
<span class="fa fa-print"> Bill</span>
<i class="fa fa-print"></i>
Bill
</span>
</t>
addons/pos_restaurant/static/src/xml/splitbill.xml
+5 -3
View File
@@ -3,7 +3,8 @@
<t t-name="SplitbillButton">
<span class="control-button order-split">
<span class="fa fa-files-o"> Split</span>
<i class="fa fa-files-o"></i>
Split
</span>
</t>
@@ -57,7 +58,8 @@
<div class='screen-content'>
<div class='top-content'>
<span class='button back'>
<span class='fa fa-angle-double-left'> Back</span>
<i class='fa fa-angle-double-left'></i>
Back
</span>
<h1>Bill Splitting</h1>
</div>
@@ -73,7 +75,7 @@
</div>
<div class='paymentmethods'>
<div class='button payment'>
<span class='fa fa-chevron-right'> Payment</span>
<i class='fa fa-chevron-right' /> Payment
</div>
</div>
</div>
addons/project/views/project_rating_templates.xml
+3 -3
View File
@@ -27,10 +27,10 @@
<span class="label label-default pull-right"><t t-esc="project.privacy_visibility"/></span>
<h4><t t-esc="project.name"/></h4>
<p t-if="project.date" class="text-muted">
<span class="fa fa-calendar"> End date</span> : <t t-esc="project.date"/>
<i class="fa fa-calendar"/> End date : <t t-esc="project.date"/>
</p>
<p t-if="project.alias_name and project.alias_domain" class="text-muted">
<span class="fa fa-envelope"> Email</span> : <t t-esc="project.alias_name"/>@<t t-esc="project.alias_domain"/>
<i class="fa fa-envelope"/> Email : <t t-esc="project.alias_name"/>@<t t-esc="project.alias_domain"/>
</p>
<div class="row">
<div class="col-md-6 text-center">
@@ -42,7 +42,7 @@
<div class="caption">
<p>
<a role="button" t-att-href="'/project/rating/%s' % project.id" class="btn btn-primary btn-lg btn-block">
<span class="fa fa-arrow-circle-right "> See the feedbacks</span>
<i class="fa fa-arrow-circle-right "/> See the feedbacks
</a>
</p>
</div>
addons/project/views/project_views.xml
+1 -1
View File
@@ -314,7 +314,7 @@
<div t-if="record.rating_status.raw_value != 'no'" class="mt8 text-primary" title="Percentage of happy ratings over the past 30 days. Get rating details from the More menu." groups="project.group_project_rating">
<b>
<t t-if="record.percentage_satisfaction_project.value == -1">
<span class="fa fa-smile-o"> No rating yet</span>
<i class="fa fa-smile-o"/> No rating yet
</t>
<t t-if="record.percentage_satisfaction_project.value != -1">
<a name="action_view_all_rating" type="object" context="{'search_default_rating_last_30_days':1}">
addons/purchase/views/portal_templates.xml
+1 -1
View File
@@ -48,7 +48,7 @@
<span class="label label-info"><i class="fa fa-fw fa-file-text"/> Waiting for Bill</span>
</t>
<t t-if="order.state == 'cancel'">
<span class="label label-default fa fa-fw fa-remove"> Cancelled</span>
<span class="label label-default"><i class="fa fa-fw fa-remove"/> Cancelled</span>
</t>
</td>
<td><span t-field="order.amount_total" t-options='{"widget": "monetary", "display_currency": order.currency_id}'/>
addons/sale/views/sale_portal_templates.xml
+8 -8
View File
@@ -58,10 +58,10 @@
<td><span t-field="quotation.validity_date"/></td>
<td>
<t t-if="quotation.state == 'cancel'">
<span class="label label-default"><span class="fa fa-fw fa-remove"> Cancelled</span></span>
<span class="label label-default"><i class="fa fa-fw fa-remove"/> Cancelled</span>
</t>
<t t-if="quotation.is_expired">
<span class="label label-default"><span class="fa fa-fw fa-clock-o"> Expired</span></span>
<span class="label label-default"><i class="fa fa-fw fa-clock-o"/> Expired</span>
</t>
</td>
<td><span t-field="quotation.amount_total" t-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
@@ -138,23 +138,23 @@
<t t-else="">Order</t>
<span t-esc="order.name"/>
<t t-if="order.state == 'cancel'">
<span class="label label-default"><span class="fa fa-fw fa-remove"> Cancelled</span></span>
<span class="label label-default"><i class="fa fa-fw fa-remove"/> Cancelled</span>
</t>
<t t-if="order.state == 'done'">
<span class="label label-success"><span class="fa fa-fw fa-check"> Done</span></span>
<span class="label label-success"><i class="fa fa-fw fa-check" /> Done</span>
</t>
</h4>
</div>
<div class="col-md-6 col-sm-3 col-xs-3 hidden-print" id="o_portal_order_actions">
<t t-if="order.state == 'sent' and portal_confirmation == 'sign'" name="portal_confirmation_sign">
<a role="button" class="btn btn-primary ml8 pull-right" href="#portal_sign">
<span class="fa fa-arrow-circle-right"> Accept &amp; Sign</span>
<i class="fa fa-arrow-circle-right"/> Accept &amp; Sign
</a>
</t>
<t t-if="order.state == 'sale' and portal_confirmation == 'sign'">
<a role="button" class="btn btn-success ml8 pull-right" disabled="disabled"
t-attf-title="Order signed on #{order.confirmation_date} by #{order.partner_id.name}">
<span class="fa fa-check-circle"> Signed</span>
<i class="fa fa-check-circle"/> Signed
</a>
</t>
<a target="_blank" t-att-href="'/my/orders/pdf/%s?%s' % (order.id, keep_query())" class="ml8 pull-right mt4 mr8" title="Download">
@@ -192,10 +192,10 @@
<a t-att-href="report_url"><span t-esc="i.number"/></a>
<span class="text-muted" t-field="i.date_invoice"/>
<t t-if="i.state == 'paid'">
<span class="label label-success orders_label_text_align"><span class="fa fa-fw fa-check"> Paid</span></span>
<span class="label label-success orders_label_text_align"><i class="fa fa-fw fa-check"/> Paid</span>
</t>
<t t-if="i.state != 'paid'">
<span class="label label-info orders_label_text_align"><span class="fa fa-fw fa-clock-o"> Waiting</span></span>
<span class="label label-info orders_label_text_align"><i class="fa fa-fw fa-clock-o"/> Waiting</span>
</t>
</div>
</t>
addons/sale_payment/views/sale_portal_templates.xml
+4 -4
View File
@@ -4,12 +4,12 @@
<t t-set="payment_tx_id" t-value="order.get_portal_last_transaction()"/>
<t t-if="order.amount_total and not invoices and order.state in ('sent', 'sale') and portal_confirmation == 'pay' and payment_tx_id.state != 'done'" name="portal_confirmation_pay">
<a class="btn btn-primary ml8 pull-right" href="#portal_pay" role="button">
<span class="fa fa-arrow-circle-right"> Pay Now</span>
<i class="fa fa-arrow-circle-right"/> Pay Now
</a>
</t>
<t t-if="invoices and order.state in ('sale', 'done') and portal_confirmation == 'pay'">
<a role="button" class="btn btn-primary ml8 pull-right" disabled="disabled">
<span class="fa fa-check-circle"> Done</span>
<i class="fa fa-check-circle"/> Done
</a>
</t>
</xpath>
@@ -57,10 +57,10 @@
<span t-esc="tx.reference"/>
<span class="text-muted" t-field="tx.create_date"/>
<t t-if="tx.state == 'done'">
<span class="label label-success orders_label_text_align"><span class="fa fa-fw fa-check"> Done</span></span>
<span class="label label-success orders_label_text_align"><i class="fa fa-fw fa-check"/> Done</span>
</t>
<t t-if="tx.state != 'done'">
<span class="label label-info orders_label_text_align"><span class="fa fa-fw fa-clock-o"> Waiting</span></span>
<span class="label label-info orders_label_text_align"><i class="fa fa-fw fa-clock-o"/> Waiting</span>
<t t-if="tx.state_message"><br /><span t-esc="tx.state_message"/></t>
</t>
</div>
addons/sale_stock/views/sale_stock_portal_template.xml
+4 -4
View File
@@ -14,16 +14,16 @@
<a t-att-href="report_url"><span t-field="i.name"/></a>
<span class="text-muted" t-field="i.date" t-options='{"widget": "date"}'/>
<t t-if="i.state == 'done'">
<span class="label label-success label-text-align"><span class="fa fa-fw fa-truck"> Shipped</span></span>
<span class="label label-success label-text-align"><i class="fa fa-fw fa-truck"/> Shipped</span>
</t>
<t t-if="i.state == 'partially_available'">
<span class="label label-warning label-text-align"><span class="fa fa-fw fa-clock-o"> Partially Available</span></span>
<span class="label label-warning label-text-align"><i class="fa fa-fw fa-clock-o"/> Partially Available</span>
</t>
<t t-if="i.state == 'cancel'">
<span class="label label-danger label-text-align"><span class="fa fa-fw fa-times"> Cancelled</span></span>
<span class="label label-danger label-text-align"><i class="fa fa-fw fa-times"/> Cancelled</span>
</t>
<t t-if="i.state in ['draft', 'waiting', 'confirmed', 'assigned']">
<span class="label label-info label-text-align"><span class="fa fa-fw fa-clock-o"> Preparation</span></span>
<span class="label label-info label-text-align"><i class="fa fa-fw fa-clock-o"/> Preparation</span>
</t>
</div>
</t>
addons/survey/views/survey_result.xml
+12 -9
View File
@@ -11,7 +11,7 @@
<div t-field="survey.description" class="oe_no_empty" />
</div>
<div class="panel panel-default hidden-print">
<div class="panel-heading"><span class="fa fa-filter"> Filters </span><span t-if="filter_display_data" class="pull-right text-primary clear_survey_filter"><i class="fa fa-times"> Clear All Filters</i></span></div>
<div class="panel-heading"><span class="fa fa-filter"></span> Filters <span t-if="filter_display_data" class="pull-right text-primary clear_survey_filter"><i class="fa fa-times"></i> Clear All Filters</span></div>
<div class="panel-body">
<span t-if="filter_finish == True">
<span class="label label-default only_left_radius filter-all">All surveys</span><span class="label label-primary only_right_radius filter-finished">Finished surveys</span>
@@ -138,17 +138,17 @@
<ul class="nav nav-tabs hidden-print" role="tablist">
<li class="active" t-if="question.type != 'simple_choice'">
<a t-att-href="'#graph_question_%d' % question.id" t-att-aria-controls="'graph_question_%d' % question.id" data-toggle="tab" role="tab">
<span class="fa fa-bar-chart-o"> Graph</span>
<i class="fa fa-bar-chart-o"></i> Graph
</a>
</li>
<li class="active" t-if="question.type == 'simple_choice'">
<a t-att-href="'#graph_question_%d' % question.id" t-att-aria-controls="'graph_question_%d' % question.id" data-toggle="tab" role="tab">
<span class="fa fa-bar-chart-o"> Pie Chart</span>
<i class="fa fa-bar-chart-o"></i> Pie Chart
</a>
</li>
<li>
<a t-att-href="'#data_question_%d' % question.id" t-att-aria-controls="'data_question_%d' % question.id" data-toggle="tab" role="tab">
<span class="fa fa-list-alt"> Data</span>
<i class="fa fa-list-alt"></i> Data
</a>
</li>
</ul>
@@ -202,12 +202,14 @@
<ul class="nav nav-tabs hidden-print" role="tablist">
<li class="active">
<a t-att-href="'#graph_question_%d' % question.id" t-att-aria-controls="'graph_question_%d' % question.id" data-toggle="tab" role="tab">
<span class="fa fa-bar-chart">Graph</span>
<i class="fa fa-bar-chart"></i>
Graph
</a>
</li>
<li>
<a t-att-href="'#data_question_%d' % question.id" t-att-aria-controls="'data_question_%d' % question.id" data-toggle="tab" role="tab">
<span class="fa fa-list-alt">Data</span>
<i class="fa fa-list-alt"></i>
Data
</a>
</li>
</ul>
@@ -262,13 +264,14 @@
<ul class="nav nav-tabs hidden-print" role="tablist">
<li class="active">
<a t-att-href="'#most_common_%d' % question.id" t-att-aria-controls="'most_common_%d' % question.id" data-toggle="tab" role="tab">
<span class="fa fa-list-ol">Most Common </span>
<span t-esc="len(number_result['most_common'])"></span>
<i class="fa fa-list-ol"></i>
Most Common <span t-esc="len(number_result['most_common'])"></span>
</a>
</li>
<li>
<a t-att-href="'#data_question_%d' % question.id" t-att-aria-controls="'data_question_%d' % question.id" data-toggle="tab" role="tab">
<span class="fa fa-list-alt">All Data</span>
<i class="fa fa-list-alt"></i>
All Data
</a>
</li>
</ul>
addons/web/static/lib/fontawesome/css/font-awesome-suffix.css
Vendored
-2145
View File
File diff suppressed because it is too large Load Diff
addons/web/static/src/xml/base.xml
+8 -8
View File
@@ -144,7 +144,7 @@
<div t-name="CrashManager.error" class="o_dialog_error">
<div class="alert alert-warning clearfix" role="alert">
<button class="btn btn-sm btn-primary pull-right ml8 o_clipboard_button">
<span class="fa fa-clipboard mr8">Copy the full error to clipboard</span>
<i class="fa fa-clipboard mr8"/>Copy the full error to clipboard
</button>
<p><b>An error occurred</b></p>
<p>Please use the copy button to report the error to your support service.</p>
@@ -630,7 +630,7 @@
<div aria-atomic="true" t-name="DomainSelector" t-attf-class="o_domain_node o_domain_tree o_domain_selector #{widget.readonly ? 'o_read_mode' : 'o_edit_mode'}">
<t t-if="widget.children.length === 0">
<span>Match <strong>all records</strong></span>
<button t-if="!widget.readonly" class="btn btn-xs btn-primary o_domain_add_first_node_button"><span class="fa fa-plus"> Add filter</span></button>
<button t-if="!widget.readonly" class="btn btn-xs btn-primary o_domain_add_first_node_button"><i class="fa fa-plus"/> Add filter</button>
</t>
<t t-else="">
<div class="o_domain_tree_header">
@@ -1458,12 +1458,12 @@
<div class="col-xs-6">
Get this feature and much more with Odoo Enterprise!
<ul class="list-unstyled">
<li><span class="fa fa-check"> Access to all Enterprise Apps</span></li>
<li><span class="fa fa-check"> New design</span></li>
<li><span class="fa fa-check"> Mobile support</span></li>
<li><span class="fa fa-check"> Upgrade to future versions</span></li>
<li><span class="fa fa-check"> Bugfixes guarantee</span></li>
<li><a href="http://www.odoo.com/editions" target="_blank"><span class="fa fa-plus"> And more</span></a></li>
<li><i class="fa fa-check"></i> Access to all Enterprise Apps</li>
<li><i class="fa fa-check"></i> New design</li>
<li><i class="fa fa-check"></i> Mobile support</li>
<li><i class="fa fa-check"></i> Upgrade to future versions</li>
<li><i class="fa fa-check"></i> Bugfixes guarantee</li>
<li><a href="http://www.odoo.com/editions" target="_blank"><i class="fa fa-plus"></i> And more</a></li>
</ul>
</div>
<div class="col-xs-6">
addons/web/views/database_manager.html
-1
View File
@@ -5,7 +5,6 @@
<title>Odoo</title>
<link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css">
<link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome-suffix.css">
<link rel="stylesheet" href="/web/static/lib/bootstrap/css/bootstrap.css">
<script src="/web/static/lib/jquery/jquery.js" type="text/javascript"></script>
<script src="/web/static/lib/bootstrap/js/modal.js"></script>
addons/web/views/report_templates.xml
-1
View File
@@ -18,7 +18,6 @@
<link href="https://fonts.googleapis.com/css?family=Work+Sans:thin,light,regular,medium,bold,semi-bold" rel="stylesheet"/>
<link href="/web/static/lib/fontawesome/css/font-awesome.css" rel="stylesheet" type="text/css"/>
<link href="/web/static/lib/fontawesome/css/font-awesome-suffix.css" rel="stylesheet" type="text/css"/>
<link rel="stylesheet" type="text/scss" href="/web/static/src/scss/report.scss"/>
addons/web/views/webclient_templates.xml
-1
View File
@@ -39,7 +39,6 @@
<link rel="stylesheet" type="text/css" href="/web/static/lib/jquery.ui/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="/web/static/lib/fontawesome/css/font-awesome.css"/>
<link rel="stylesheet" type="text/css" href="/web/static/lib/fontawesome/css/font-awesome-suffix.css"/>
<link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap-datetimepicker/src/scss/_bootstrap-datetimepicker.scss"/>
<link rel="stylesheet" type="text/css" href="/web/static/lib/select2/select2.css"/>
<link rel="stylesheet" type="text/css" href="/web/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
addons/web_editor/static/src/xml/ace.xml
+1 -1
View File
@@ -33,7 +33,7 @@
<div id="ace-view-id">
<span/>
<div class="pull-right">
<button data-action="reset" type="button" class="btn btn-xs btn-danger" icon="fa-undo" string="Reset"></button>
<button data-action="reset" type="button" class="btn btn-xs btn-danger"><i class="fa fa-undo"/> Reset</button>
<button data-action="format" type="button" class="btn btn-xs btn-link">Format</button>
</div>
</div>
addons/web_editor/static/src/xml/editor.xml
+4 -4
View File
@@ -9,8 +9,8 @@
<div id="web_editor-top-edit">
<div id="web_editor-toolbars"/>
<form class="navbar-form text-muted">
<button type="button" class="btn btn-sm btn-default fa fa-times" data-action="cancel">Discard</button>
<button type="button" class="btn btn-sm btn-primary fa fa-floppy-o" data-action="save">Save</button>
<button type="button" class="btn btn-sm btn-default" data-action="cancel"><i class="fa fa-times"/> Discard</button>
<button type="button" class="btn btn-sm btn-primary" data-action="save"><i class="fa fa-floppy-o"/> Save</button>
</form>
</div>
</t>
@@ -54,10 +54,10 @@
<li class="search pull-right">
<ul class="pager mb0 mt0">
<li class="previous">
<a role="button" class="btn btn-default disabled" href="#"><span class="fa fa-angle-left">&#32;Previous</span></a>
<a role="button" class="btn btn-default disabled" href="#"><i class="fa fa-angle-left"/>&#32;Previous</a>
</li>
<li class="next">
<a role="button" class="btn btn-default disabled" href="#"><span class="fa fa-suffix-angle-right">Next&#32;</span></a>
<a role="button" class="btn btn-default disabled" href="#">Next&#32;<i class="fa fa-angle-right"/></a>
</li>
</ul>
</li>
addons/web_editor/static/src/xml/snippets.xml
+1 -1
View File
@@ -40,7 +40,7 @@
<!-- t-field options -->
<t t-name="web_editor.many2one.button">
<div class="btn-group">
<a role="button" href="#" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" title="Search Contact" aria-label="Search Contact">><i class="fa fa-search"></i></a>
<a role="button" href="#" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" title="Search Contact" aria-label="Search Contact"><i class="fa fa-search"></i></a>
<ul class="dropdown-menu contact_menu" role="menu">
<li><a role="menuitem"><input href="#" type="email" placeholder="Search"/></a></li>
</ul>
addons/web_editor/views/snippets.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<div id="o_scroll">
<div id="snippet_structure" class="o_panel">
<div class="o_panel_header">
<span class="fa fa-th-large"> First Panel</span>
<i class="fa fa-th-large"/> First Panel
</div>
<div class="o_panel_body"/>
</div>
addons/web_settings_dashboard/static/src/xml/dashboard.xml
+2 -2
View File
@@ -40,8 +40,8 @@
<a class="btn btn-primary btn-block o_browse_apps" role="button"><strong>Browse Apps</strong></a>
</div>
<div class="o_web_settings_dashboard_pills">
<a href="https://www.odoo.com/apps/modules" target="_blank" class="pull-left"><span class="fa fa-rocket fa-2x text-muted"> App store</span></a>
<a href="https://www.odoo.com/apps/themes" target="_blank" class="pull-right"><span class="fa fa-picture-o fa-2x text-muted"> Theme store</span></a>
<a href="https://www.odoo.com/apps/modules" target="_blank" class="pull-left"><i class="fa fa-rocket fa-2x text-muted"/> App store</a>
<a href="https://www.odoo.com/apps/themes" target="_blank" class="pull-right"><i class="fa fa-picture-o fa-2x text-muted"/> Theme store</a>
</div>
<div class="clearfix"/>
</div>
addons/website/data/website_demo.xml
+2 -2
View File
@@ -97,8 +97,8 @@ response = request.website.render("website.template_partner_post", {'partner': p
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary" aria-label="Send">
<span class="fa fa-suffix-long-arrow-right">Send </span>
<button type="submit" class="btn btn-primary">
Send <span class="fa fa-long-arrow-right"/>
</button>
</div>
</div>
addons/website/static/src/js/tours/rte.js
+1 -1
View File
@@ -9,7 +9,7 @@ tour.register('rte_translator', {
wait_for: base.ready(),
}, [{
content: "click on Add a language",
trigger: '.js_language_selector a:has(span.fa)',
trigger: '.js_language_selector a:has(i.fa)',
}, {
content: "select french",
trigger: 'select[name="lang"]',
addons/website/static/src/xml/website.contentMenu.xml
+1 -1
View File
@@ -46,7 +46,7 @@
Drag a menu to the right to create a sub-menu
</small>
<a href="#" class="js_add_menu">
<span class="fa fa-plus-circle"> Add Menu Entry</span>
<i class="fa fa-plus-circle"/> Add Menu Entry
</a>
</div>
</div>
addons/website/views/snippets.xml
+26 -26
View File
@@ -287,7 +287,7 @@
<div class="o_facebook_page">
<div class="o_facebook_alert alert alert-info" role="status">
<span class="o_add_facebook_page">
<span class="fa fa-plus-circle"> Add Facebook Page</span>
<i class="fa fa-plus-circle"/> Add Facebook Page
</span>
</div>
</div>
@@ -296,7 +296,7 @@
<template id="s_image_gallery" name="Image Gallery">
<section class="o_gallery o_spc-medium o_slideshow s_image_gallery" data-columns="3" style="height: 500px; overflow: hidden;">
<div class="container">
<div class="alert alert-info css_editable_mode_display text-center" role="status"><span class="o_add_images" style="cursor: pointer;"><span class="fa fa-plus-circle"> Add Images</span></span></div>
<div class="alert alert-info css_editable_mode_display text-center" role="status"><span class="o_add_images" style="cursor: pointer;"><i class="fa fa-plus-circle"/> Add Images</span></div>
</div>
</section>
</template>
@@ -688,7 +688,7 @@
<div id="o_scroll">
<div id="snippet_structure" class="o_panel">
<div class="o_panel_header">
<span class="fa fa-th-large"> Structure</span>
<i class="fa fa-th-large"/> Structure
</div>
<div class="o_panel_body">
<t t-snippet="website.s_title" t-thumbnail="/website/static/src/img/blocks/block_title.png"/>
@@ -706,7 +706,7 @@
<div id="snippet_feature" class="o_panel">
<div class="o_panel_header">
<span class="fa fa-diamond"> Feature</span>
<i class="fa fa-diamond"/> Feature
</div>
<div class="o_panel_body">
<t t-snippet="website.s_image_gallery" t-thumbnail="/website/static/src/img/blocks/block_image_gallery.png"/>
@@ -721,7 +721,7 @@
<div id="snippet_effect" class="o_panel">
<div class="o_panel_header">
<span class="fa fa-magic icon-fix"> Effect</span>
<i class="fa fa-magic icon-fix"/> Effect
</div>
<div class="o_panel_body">
<t t-snippet="website.s_parallax" t-thumbnail="/website/static/src/img/blocks/block_parallax.png"/>
@@ -731,7 +731,7 @@
<div id="snippet_content" class="o_panel">
<div class="o_panel_header">
<span class="fa fa-indent"> Inner content</span>
<i class="fa fa-indent"/> Inner content
</div>
<div class="o_panel_body">
<t t-snippet="website.s_well" t-thumbnail="/website/static/src/img/blocks/block_well.png"/>
@@ -764,11 +764,11 @@
<t t-call="web_editor.snippet_options"/>
<div data-js='gallery' data-selector=".o_gallery">
<li data-add-images="true" data-no-preview="true"><a href="#"><span class="fa fa-plus-circle">Add images</span></a></li>
<li data-remove-all-images="true" data-no-preview="true"><a href="#"><span class="fa fa-trash">Remove all images</span></a></li>
<li data-add-images="true" data-no-preview="true"><a href="#"><i class="fa fa-plus-circle"/>Add images</a></li>
<li data-remove-all-images="true" data-no-preview="true"><a href="#"><i class="fa fa-trash"/>Remove all images</a></li>
<li class="separator"/>
<li class="dropdown-submenu">
<a tabindex="-2" href="#"><span class="fa fa-magic">Mode</span></a>
<a tabindex="-2" href="#"><i class="fa fa-magic"/>Mode</a>
<ul class="dropdown-menu" role="menu">
<li data-mode="nomode"><a role="menuitem" href="#">Float</a></li>
<li data-mode="masonry"><a role="menuitem" href="#">Masonry</a></li>
@@ -777,7 +777,7 @@
</ul>
</li>
<li class="dropdown-submenu">
<a tabindex="-2" href="#"><span class="fa fa-clock-o">Slideshow speed</span></a>
<a tabindex="-2" href="#"><i class="fa fa-clock-o"/>Slideshow speed</a>
<ul class="dropdown-menu" role="menu">
<li data-interval="1000"><a role="menuitem" href="#">1s</a></li>
<li data-interval="2000"><a role="menuitem" href="#">2s</a></li>
@@ -788,7 +788,7 @@
</ul>
</li>
<li class="dropdown-submenu">
<a tabindex="-2" href="#"><span class="fa fa-th">Columns</span></a>
<a tabindex="-2" href="#"><i class="fa fa-th"/>Columns</a>
<ul class="dropdown-menu" role="menu">
<li data-columns="1"><a role="menuitem" href="#">1</a></li>
<li data-columns="2"><a role="menuitem" href="#">2</a></li>
@@ -799,7 +799,7 @@
</ul>
</li>
<li class="dropdown-submenu">
<a tabindex="-2" href="#"><span class="fa fa-arrows-h">Images spacing</span></a>
<a tabindex="-2" href="#"><i class="fa fa-arrows-h"/>Images spacing</a>
<ul class="dropdown-menu" role="menu">
<li data-select-class="o_spc-none"><a role="menuitem" href="#">None</a></li>
@@ -809,7 +809,7 @@
</ul>
</li>
<li class="dropdown-submenu">
<a tabindex="-2" href="#"><span class="fa fa-paint-brush">Styling</span></a>
<a tabindex="-2" href="#"><i class="fa fa-paint-brush"/>Styling</a>
<ul class="dropdown-menu" role="menu">
<li data-styling=""><a role="menuitem" href="#">Square</a></li>
<li data-styling="img-rounded"><a role="menuitem" href="#">Rounded corners</a></li>
@@ -824,14 +824,14 @@
<div data-js="background"
data-selector="section, :not(.o_gallery > .container) > .carousel, .parallax, .s_banner .carousel-content">
<li data-choose-image="true" data-no-preview="true">
<a tabindex="-1" href="#"><span class="fa fa-picture-o">Choose Background Image</span></a>
<a tabindex="-1" href="#"><i class="fa fa-picture-o"/>Choose Background Image</a>
</li>
</div>
<div data-js="background_position"
data-selector="section, :not(.o_gallery > .container) > .carousel, .s_banner .carousel-content">
<li class="background_position_li" data-background-position="true" data-no-preview="true">
<a tabindex="-1" href="#"><span class="fa fa-arrows">Background Image Sizing</span></a>
<a tabindex="-1" href="#"><i class="fa fa-arrows"/>Background Image Sizing</a>
</li>
</div>
@@ -839,7 +839,7 @@
data-selector="section, :not(.o_gallery > .container) > .carousel"
data-exclude=".parallax">
<li class="dropdown-submenu">
<a tabindex="-1" href="#"><span class="fa fa-eyedropper">Background Color</span></a>
<a tabindex="-1" href="#"><i class="fa fa-eyedropper"/>Background Color</a>
<ul class="dropdown-menu" role="menu">
<li></li>
</ul>
@@ -851,7 +851,7 @@
data-palette-default="transparent_grayscale"
data-palette-title="Overlay Color">
<li class="dropdown-submenu">
<a tabindex="-1" href="#"><span class="fa fa-eyedropper">Overlay color</span></a>
<a tabindex="-1" href="#"><i class="fa fa-eyedropper"/>Overlay color</a>
<ul class="dropdown-menu" role="menu">
<li></li>
</ul>
@@ -860,7 +860,7 @@
<div data-js='gallery_img' data-selector=".o_gallery img">
<li class="dropdown-submenu">
<a tabindex="-2" href="#"><span class="fa fa-refresh">Re-order</span></a>
<a tabindex="-2" href="#"><i class="fa fa-refresh"/>Re-order</a>
<ul class="dropdown-menu" role="menu" data-no-preview="true">
<li data-position="first"><a role="menuitem" href="#">Move to first</a></li>
<li data-position="prev"><a role="menuitem" href="#">Move to previous</a></li>
@@ -874,7 +874,7 @@
data-selector=":not(.o_gallery > .container) > .carousel">
<li class="divider"></li>
<li class="dropdown-submenu">
<a tabindex="-2" href="#"><span class="fa fa-clock-o">Slideshow speed</span></a>
<a tabindex="-2" href="#"><i class="fa fa-clock-o"/>Slideshow speed</a>
<ul class="dropdown-menu" role="menu">
<li data-interval="1000"><a role="menuitem" href="#">1s</a></li>
<li data-interval="2000"><a role="menuitem" href="#">2s</a></li>
@@ -884,8 +884,8 @@
<li data-interval="0"><a role="menuitem" href="#">Disable autoplay</a></li>
</ul>
</li>
<li data-add-slide="true" data-no-preview="true"><a href="#"><span class="fa fa-plus-circle">Add Slide</span></a></li>
<li data-remove-slide="true" data-no-preview="true"><a href="#" ><span class="fa fa-trash-o">Remove Slide</span></a></li>
<li data-add-slide="true" data-no-preview="true"><a href="#"><i class="fa fa-plus-circle"/>Add Slide</a></li>
<li data-remove-slide="true" data-no-preview="true"><a href="#" ><i class="fa fa-trash-o"/>Remove Slide</a></li>
</div>
<div data-selector="section, :not(.o_gallery > .container) > .carousel, .parallax"
@@ -900,7 +900,7 @@
data-target="> * > .row"
data-exclude=".s_text_block_image_fw, .s_company_team, .s_big_picture">
<li class="dropdown-submenu">
<a tabindex="-2" href="#"><span class="fa fa-columns">Number of columns</span></a>
<a tabindex="-2" href="#"><i class="fa fa-columns"/>Number of columns</a>
<ul class="dropdown-menu" role="menu" data-no-preview="true">
<li data-select-count="1"><a role="menuitem" href="#">1</a></li>
<li data-select-count="2"><a role="menuitem" href="#">2</a></li>
@@ -930,7 +930,7 @@
<div data-selector=".o_image_floating">
<li class="dropdown-submenu">
<a tabindex="-2" href="#"><span class="fa fa-expand">Margin</span></a>
<a tabindex="-2" href="#"><i class="fa fa-expand"/>Margin</a>
<ul class="dropdown-menu" role="menu">
<li data-select-class="o_margin_xl"><a role="menuitem" href="#">Extra-Large</a></li>
<li data-select-class="o_margin_l"><a role="menuitem" href="#">Large</a></li>
@@ -943,7 +943,7 @@
<div data-selector=".o_image_floating">
<li class="dropdown-submenu">
<a tabindex="-2" href="#"><span class="fa fa-magnet">Float</span></a>
<a tabindex="-2" href="#"><i class="fa fa-magnet"/>Float</a>
<ul class="dropdown-menu" role="menu" data-no-preview="true">
<li data-select-class="pull-left"><a role="menuitem" href="#">Left</a></li>
<li data-select-class="pull-right"><a role="menuitem" href="#">Right</a></li>
@@ -953,7 +953,7 @@
<div data-js="parallax" data-selector=".parallax">
<li class="dropdown-submenu">
<a tabindex="-1" href="#"><span class="fa fa-clock-o">Scroll Speed</span></a>
<a tabindex="-1" href="#"><i class="fa fa-clock-o"/>Scroll Speed</a>
<ul class="dropdown-menu" role="menu" name="parallax-scroll">
<li data-scroll="0"><a role="menuitem" href="#">No-scroll</a></li>
<li class="separator" role="separator"/>
@@ -974,7 +974,7 @@
<div data-js="facebookPage" data-selector=".o_facebook_page">
<li data-fb-page-options="true" data-no-preview="true">
<a href="#"><span class="fa fa-facebook">Options</span></a>
<a href="#"><i class="fa fa-facebook"/>Options</a>
</li>
</div>
addons/website/views/website_navbar_templates.xml
+3 -3
View File
@@ -10,7 +10,7 @@
<ul id="oe_applications">
<li class="dropdown active">
<a class="dropdown full" data-toggle="dropdown" href="#">
<span class="fa fa-th-large"> WEBSITE </span><b class="caret"/>
<i class="fa fa-th-large"/> WEBSITE <b class="caret"/>
</a>
<ul class="dropdown-menu" role="menu">
<li t-as="menu" t-foreach="menu_data['children']">
@@ -75,7 +75,7 @@
</li>
<!-- Page Edition -->
<li class="o_new_content_menu" id="new-content-menu">
<a href="#"><span class="fa fa-plus">New</span></a>
<a href="#"><span class="fa fa-plus"/>New</a>
<div id="o_new_content_menu_choices" class="o_hidden">
<ul>
<li groups="website.group_website_designer"><a href="#" data-action="new_page" aria-label="New page" title="New page"><i class="fa fa-file-o"/><p>New Page</p></a></li>
@@ -83,7 +83,7 @@
</div>
</li>
<li t-if="not translatable" id="edit-page-menu">
<a data-action="edit" href="#"><span class="fa fa-pencil">Edit</span></a>
<a data-action="edit" href="#"><span class="fa fa-pencil"/>Edit</a>
</li>
<li t-if="'website_published' in main_object.fields_get() and main_object._name != 'website.page'">
<a role="button" class="btn btn-primary btn-xs dropdown-toggle css_edit_dynamic" data-toggle="dropdown">
addons/website/views/website_templates.xml
+2 -2
View File
@@ -336,8 +336,8 @@
<li groups="website.group_website_publisher">
<t t-set="url_return" t-value="url_for('', '[lang]') + '?' + keep_query()"/>
<a t-attf-href="/web#action=base.action_view_base_language_install&amp;website_id=#{website.id if website else ''}&amp;url_return=#{url_return}">
<span class="fa fa-plus-circle">
Add a language...</span>
<i class="fa fa-plus-circle"/>
Add a language...
</a>
</li>
</ul>
addons/website_blog/views/website_blog_templates.xml
+2 -2
View File
@@ -324,7 +324,7 @@
"fields": ["name"]
}'/>
</div>
<p class="mt32 fa fa-suffix-long-arrow-right">Read Next </p>
<p class="mt32">Read Next <span class="fa fa-long-arrow-right"/></p>
</div>
</t>
</t>
@@ -552,7 +552,7 @@
<!-- User Navbar -->
<template id="content_new_blogpost" inherit_id="website.user_navbar">
<xpath expr="//div[@id='o_new_content_menu_choices']//ul" position="inside">
<li groups="website.group_website_designer"><a href="#" data-action="new_blog_post"><p class="fa fa-rss">New Blog Post</p></a></li>
<li groups="website.group_website_designer"><a href="#" data-action="new_blog_post"><i class="fa fa-rss"/><p>New Blog Post</p></a></li>
</xpath>
</template>
addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
+3 -3
View File
@@ -421,9 +421,9 @@
</div>
</div>
<div>
<a role="button" class="btn btn-primary btn" data-toggle="modal" data-target=".modal_partner_assign_interested"><span class="fa fa-file-text-o"> I'm interested</span></a>
<a role="button" class="btn btn-primary btn" data-toggle="modal" data-target=".modal_partner_assign_desinterested"><span class="fa fa-fw fa-times"> I'm not interested</span></a>
<div role="dialog" class="modal fade modal_partner_assign_interested">
<a role="button" class="btn btn-primary btn" data-toggle="modal" data-target=".modal_partner_assign_interested"><i class="fa fa-file-text-o"/> I'm interested</a>
<a role="button" class="btn btn-primary btn" data-toggle="modal" data-target=".modal_partner_assign_desinterested"><i class="fa fa-fw fa-times"/> I'm not interested</a>
<div class="modal fade modal_partner_assign_interested" role="form">
<div class="modal-dialog">
<form method="POST" class="js_accept_json modal-content js_website_submit_form interested_partner_assign_form">
<input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
addons/website_customer/views/website_customer_templates.xml
+1 -1
View File
@@ -130,7 +130,7 @@
<h3 t-if="len(tags)">References by Tag</h3>
<ul class="nav nav-pills nav-stacked mt16 mb32" t-if="len(tags)">
<a class="mr8" t-attf-href="/customers/#{ current_industry_id and 'industry/%s/' % slug(current_industry) or '' }#{ current_country_id and 'country/%s' % slug(current_country) or '' }">
<span class="fa fa-1x fa-tags"> All </span></a>
<span class="fa fa-1x fa-tags"/> All </a>
<t t-foreach="tags" t-as="o_tag">
<a t-attf-class="label label-#{o_tag.classname}" t-esc="o_tag.name" t-att-style="tag and tag.id==o_tag.id and 'text-decoration: underline'"
t-attf-href="/customers/#{ current_industry_id and 'industry/%s/' % slug(current_industry) or '' }#{ current_country_id and 'country/%s' % slug(current_country) or '' }?tag_id=#{slug(o_tag)}"/>
addons/website_event/views/event_templates.xml
+10 -8
View File
@@ -130,7 +130,9 @@
<div class="col-md-12 mb16 mt16 country_events">
<div class="country_events_list">
<div class="text-muted text-center">
<h1 class="fa fa-flag fa-5x">Events from Your Country</h1>
<h1>
<i class="fa fa-flag fa-5x"/>
Events from Your Country</h1>
</div>
</div>
</div>
@@ -353,8 +355,8 @@
<h4>When</h4>
</div>
<div class="panel-body">
<span class="fa fa-clock-o"> From</span> <span t-field="event.with_context(tz=event.date_tz).date_begin" t-options='{"hide_seconds":"True"}'> </span><br/>
<span class="fa fa-clock-o"> To</span> <span t-field="event.with_context(tz=event.date_tz).date_end" t-options='{"hide_seconds":"True"}'> </span>
<i class="fa fa-clock-o"></i> From <span t-field="event.with_context(tz=event.date_tz).date_begin" t-options='{"hide_seconds":"True"}'> </span><br/>
<i class="fa fa-clock-o"></i> To <span t-field="event.with_context(tz=event.date_tz).date_end" t-options='{"hide_seconds":"True"}'> </span>
</div>
</div>
@@ -472,8 +474,8 @@
</t>
<t t-if="request.env.user.has_group('event.group_event_manager')">
<a t-attf-href="/web#id=#{event.id}&amp;view_type=form&amp;model=event.event">
<span class="fa fa-plus-circle">
<em>Configure and Launch Event Registration</em></span>
<em><i class="fa fa-plus-circle" role="img" aria-label="Create" title="Create"></i>
Configure and Launch Event Registration</em>
</a>
</t>
</div>
@@ -586,10 +588,10 @@
<i class="fa fa-clock-o" role="img" aria-label="Start date" title="Start date"></i> <span itemprop="startDate" t-esc="event.date_begin_located"> </span> <i>to</i> <span itemprop="endDate" t-esc="event.date_end_located"> </span>
<div id="add_to_calendar" class="mt4">
<a role="button" class="btn btn-primary mr8" t-att-href="iCal_url">
<span class="fa fa-fw fa-arrow-right">Add to iCal/Outlook</span>
<i class="fa fa-fw fa-arrow-right"/>Add to iCal/Outlook
</a>
<a role="button" class="btn btn-primary" t-att-href="google_url" target='_blank'>
<span class="fa fa-fw fa-arrow-right">Add to Google Calendar</span>
<i class="fa fa-fw fa-arrow-right"/>Add to Google Calendar
</a>
</div>
<div itemprop="location" class="mt16 mb8" t-field="event.address_id" t-options='{
@@ -716,7 +718,7 @@
<!-- User Navbar -->
<template id="content_new_event" inherit_id="website.user_navbar">
<xpath expr="//div[@id='o_new_content_menu_choices']//ul" position="inside">
<li groups="event.group_event_manager"><a href="#" data-action="new_event"><p class="fa fa-glass">New Event</p></a></li>
<li groups="event.group_event_manager"><a href="#" data-action="new_event"><i class="fa fa-glass"/><p>New Event</p></a></li>
</xpath>
</template>
</odoo>
addons/website_forum/views/website_forum.xml
+3 -3
View File
@@ -765,8 +765,8 @@
<t t-call="website_forum.header">
<div class="alert alert-info text-center" role="status" t-if="forum and question.state == 'pending' and user.karma>=forum.karma_moderate and question.active">
<p class='text-muted mb16'>This post is currently awaiting moderation and not yet published... Do you want <i>Accept</i> or <i>Reject</i> this post ?</p>
<a role="button" t-attf-href="/forum/#{slug(forum)}/post/#{slug(question)}/validate" type="button" class="btn btn-success"><span class="fa fa-suffix-check">Accept </span></a>
<a role="button" t-attf-href="/forum/#{slug(forum)}/post/#{slug(question)}/refuse" type="button" class="btn btn-danger"><span class="fa fa-suffix-times">Reject </span></a>
<a role="button" t-attf-href="/forum/#{slug(forum)}/post/#{slug(question)}/validate" type="button" class="btn btn-success">Accept <i class="fa fa-check"/></a>
<a role="button" t-attf-href="/forum/#{slug(forum)}/post/#{slug(question)}/refuse" type="button" class="btn btn-danger">Reject <i class="fa fa-times"/></a>
</div>
<div class="alert alert-info text-center" role="status" t-if="question.state == 'pending' and user.karma &lt; forum.karma_moderate">
Waiting for validation
@@ -1572,7 +1572,7 @@
<!-- User Navbar -->
<template id="content_new_forum" inherit_id="website.user_navbar">
<xpath expr="//div[@id='o_new_content_menu_choices']//ul" position="inside">
<li groups="website.group_website_designer"><a href="#" data-action="new_forum"><p class="fa fa-comment">New Forum</p></a></li>
<li groups="website.group_website_designer"><a href="#" data-action="new_forum"><i class="fa fa-comment"/><p>New Forum</p></a></li>
</xpath>
</template>
addons/website_gengo/static/src/xml/website.gengo.xml
+7 -7
View File
@@ -2,8 +2,8 @@
<templates id="template" xml:space="preserve">
<t t-name="website.ButtonGengoTranslator">
<a role="button" class="btn btn-danger gengo_post" data-action="translation_gengo_post" href="#">Auto Translate</a>
<a role="button" class="btn btn-danger hidden gengo_wait disabled" href="#"><span class="fa fa-spinner fa-spin"> Wait</span></a>
<a role="button" class="btn btn-danger hidden gengo_inprogress disabled" href="#"> <span class="fa fa-clock-o"> Translation in Progress</span></a>
<a role="button" class="btn btn-danger hidden gengo_wait disabled" href="#"><i class="fa fa-spinner fa-spin"></i> Wait</a>
<a role="button" class="btn btn-danger hidden gengo_inprogress disabled" href="#"> <i class="fa fa-clock-o"></i> Translation in Progress</a>
<a role="button" class="btn btn-link gengo_info" data-action="translation_gengo_info">Count Words</a>
</t>
<t t-name="web_editor.TranslatorInfoDialog">
@@ -90,12 +90,12 @@
</header>
<main class="modal-body">
<b>
<div class="text-muted mb16"> <span class="fa fa-search-plus"> <t t-esc="widget.new_words"></t> new words found on this page.</span></div>
<h4><span class="fa fa-tachometer"> Gengo Statistics</span> <a href="https://gengo.com/c/dashboard" class="pull-right" target="new">Gengo Dashboard</a></h4>
<div class="text-muted mb16"> <i class="fa fa-search-plus"></i> <t t-esc="widget.new_words"></t> new words found on this page.</div>
<h4><i class="fa fa-tachometer"></i> Gengo Statistics <a href="https://gengo.com/c/dashboard" class="pull-right" target="new">Gengo Dashboard</a></h4>
<hr class="mt8"/>
<div class="text-info mb8"> <span class="fa fa-align-left"> Words posted for translate <t t-esc="widget.total"></t></span></div>
<div class="text-warning mb8"> <span class="fa fa-cogs"> Words in progress <t t-esc="widget.inprogess"></t></span></div>
<div class="text-success mb8"> <span class="fa fa-check"> Translated words <t t-esc="widget.done"></t></span></div>
<div class="text-info mb8"> <i class="fa fa-align-left"></i> Words posted for translate <t t-esc="widget.total"></t></div>
<div class="text-warning mb8"> <i class="fa fa-cogs"></i> Words in progress <t t-esc="widget.inprogess"></t></div>
<div class="text-success mb8"> <i class="fa fa-check"></i> Translated words <t t-esc="widget.done"></t></div>
</b>
</main>
<footer class="modal-footer">
addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
+17 -9
View File
@@ -306,36 +306,44 @@
<div class="container">
<div class="row">
<div class="text-center col-md-3 mt16 mb16">
<h4 class="mb0 mt8 fa fa-2x fa-heart">Benefits</h4>
<h4 class="mb0 mt8"><span class="fa fa-2x fa-heart"/>
Benefits</h4>
<p>Healthcare, dental, vision, life insurance, Flexible Spending Account (FSA), Health Savings Account (HSA)</p>
</div>
<div class="text-center col-md-3 mt16 mb16">
<h4 class="mt8 mb0 fa fa-2x fa-sun-o">PTOs</h4>
<h4 class="mt8 mb0"><span class="fa fa-2x fa-sun-o"/>
PTOs</h4>
<p>Vacation, Sick, and paid leaves</p>
</div>
<div class="text-center col-md-3 mt16 mb16">
<h4 class="mt8 mb0 fa fa-2x fa-car">Save on commute</h4>
<h4 class="mt8 mb0"><span class="fa fa-2x fa-car"/>
Save on commute</h4>
<p>Pre-tax commuter benefitsbr <br/>(parking and transit) </p>
</div>
<div class="text-center col-md-3 mt16 mb16">
<h4 class="mb0 mt8 fa fa-2x fa-check-circle">Discount Programs</h4>
<h4 class="mb0 mt8"><span class="fa fa-2x fa-check-circle"/>
Discount Programs</h4>
<p>Brand-name product and services in categories like travel, electronics, health, fitness, cellular, and more</p>
</div>
</div><div class="row">
<div class="text-center col-md-3 mt16 mb16">
<h4 class="mb0 mt8 fa fa-2x fa-map-marker">Prime location</h4>
<h4 class="mb0 mt8"><span class="fa fa-2x fa-map-marker"/>
Prime location</h4>
<p>Only a couple blocs from BART, Caltrain, Highway 101, carpool pickup, and Bay Bridge.</p>
</div>
<div class="text-center col-md-3 mt16 mb16">
<h4 class="mt8 mb0 fa fa-2x fa-calendar">Sponsored Events</h4>
<h4 class="mt8 mb0"><span class="fa fa-2x fa-calendar"/>
Sponsored Events</h4>
<p>Tuesday Dinners, Monthly Lunch Mixers, Monthly Happy Hour, Annual day event</p>
</div>
<div class="text-center col-md-3 mt16 mb16">
<h4 class="mt8 mb0 fa fa-2x fa-futbol-o">Sport Activity</h4>
<h4 class="mt8 mb0"><span class="fa fa-2x fa-futbol-o"/>
Sport Activity</h4>
<p>Play any sport with colleagues and the bill is covered</p>
</div>
<div class="text-center col-md-3 mt16 mb16">
<h4 class="mb0 mt8 fa fa-2x fa-coffee">Eat &amp; Drink</h4>
<h4 class="mb0 mt8"><span class="fa fa-2x fa-coffee"/>
Eat &amp; Drink</h4>
<p>Peet's and Philz coffee provided all day to order and pantry snacks</p>
</div>
</div>
@@ -498,7 +506,7 @@
<!-- User Navbar -->
<template id="content_new_job_offer" inherit_id="website.user_navbar">
<xpath expr="//div[@id='o_new_content_menu_choices']//ul" position="inside">
<li groups="hr_recruitment.group_hr_recruitment_manager"><a href="/jobs/add" class="js_link2post"><p class="fa fa-briefcase">New Job Offer</p></a></li>
<li groups="hr_recruitment.group_hr_recruitment_manager"><a href="/jobs/add" class="js_link2post"><i class="fa fa-briefcase"/><p>New Job Offer</p></a></li>
</xpath>
</template>
addons/website_hr_recruitment/views/website_hr_recuitment_snippets.xml
+4 -4
View File
@@ -35,10 +35,10 @@
<li class="dropdown-submenu">
<a tabindex="-1" href="#">Rating type</a>
<ul class="dropdown-menu" role="menu">
<li data-select_class="s_hr_rating_stars"><a role="menuitem" href="#" class="fa fa-star"> Stars</a></li>
<li data-select_class="s_hr_rating_bolts"><a role="menuitem" href="#" class="fa fa-bolt"> Bolts</a></li>
<li data-select_class="s_hr_rating_hearts"><a role="menuitem" href="#" class="fa fa-heart"> Hearts</a></li>
<li data-select_class="s_hr_rating_bar"><a role="menuitem" href="#" class="fa fa-tasks"> Bar</a></li>
<li data-select_class="s_hr_rating_stars"><a role="menuitem" href="#"><i class="fa fa-star"/> Stars</a></li>
<li data-select_class="s_hr_rating_bolts"><a role="menuitem" href="#"><i class="fa fa-bolt"/> Bolts</a></li>
<li data-select_class="s_hr_rating_hearts"><a role="menuitem" href="#"><i class="fa fa-heart"/> Hearts</a></li>
<li data-select_class="s_hr_rating_bar"><a role="menuitem" href="#"><i class="fa fa-tasks"/> Bar</a></li>
</ul>
</li>
</div>
addons/website_mail_channel/views/snippets.xml
+3 -3
View File
@@ -28,9 +28,9 @@
</span>
</div>
<p class="js_mg_details hidden well well-sm">
<span class="js_mg_email hidden"><a href="#" class="js_mg_email fa fa-envelope-o"> send mail</a> - </span>
<a href="#" class="js_mg_link fa fa-file-o"> archives</a> -
<a role="button" href="#" class="js_unfollow_btn fa fa-times"> unsubscribe</a>
<span class="js_mg_email hidden"><a href="#" class="js_mg_email"><i class="fa fa-envelope-o"/> send mail</a> - </span>
<a href="#" class="js_mg_link"><i class="fa fa-file-o"/> archives</a> -
<a role="button" href="#" class="js_unfollow_btn"><i class="fa fa-times"/> unsubscribe</a>
</p>
<p class="js_mg_confirmation hidden well well-sm">
a confirmation email has been sent.
addons/website_mail_channel/views/website_mail_channel_templates.xml
+5 -5
View File
@@ -44,8 +44,8 @@
<div t-esc="group.description" class="text-muted"/>
</div>
<div class="col-md-2">
<t class='fa fa-fw fa-user' t-esc="group_data[group.id]['members_count']"/> members<br />
<t class='fa fa-fw fa-envelope-o' t-raw="group_data[group.id]['monthly_message_nbr']"/> messages / month
<i class='fa fa-fw fa-user' role="img" aria-label="Recipients" title="Recipients"/> <t t-esc="group_data[group.id]['members_count']"/> members<br />
<i class='fa fa-fw fa-envelope-o' role="img" aria-label="Traffic" title="Traffic"/> <t t-raw="group_data[group.id]['monthly_message_nbr']"/> messages / month
</div>
<div class="col-md-3">
<!--<t t-call="website_mail.follow"><t t-set="object" t-value="group"/></t>-->
@@ -68,9 +68,9 @@
</span>
</div>
<p class="js_mg_details hidden well well-sm">
<span class="js_mg_email hidden"><a href="#" class="js_mg_email fa fa-envelope-o"> send mail</a> - </span>
<a href="#" class="js_mg_link fa fa-file-o"> archives</a> -
<a role="button" href="#" class="js_unfollow_btn fa fa-times"> unsubscribe</a>
<span class="js_mg_email hidden"><a href="#" class="js_mg_email"><i class="fa fa-envelope-o"/> send mail</a> - </span>
<a href="#" class="js_mg_link"><i class="fa fa-file-o"/> archives</a> -
<a role="button" href="#" class="js_unfollow_btn"><i class="fa fa-times"/> unsubscribe</a>
</p>
</div>
addons/website_quote/data/website_quote_demo.xml
+12 -12
View File
@@ -68,28 +68,28 @@
<div class="container text-center" style="background-color:#eeeeee">
<div class="row mt16 mb16">
<div class="col-md-4">
<p class="fa fa-mortar-board fa-5x">
<span class="text-muted">Is fully trained on Odoo</span></p>
<span class="fa fa-mortar-board fa-5x" aria-label="Training" title="Training" role="img"></span>
<p class="text-muted">Is fully trained on Odoo</p>
</div>
<div class="col-md-4">
<p class="fa fa-github fa-5x">
<span class="text-muted">Has access to Odoo Enterprise source code on Github and latest bug fixes</span></p>
<span class="fa fa-github fa-5x" role="img" aria-label="GitHub" title="GitHub"></span>
<p class="text-muted">Has access to Odoo Enterprise source code on Github and latest bug fixes</p>
</div>
<div class="col-md-4">
<p class="fa fa-bug fa-5x">
<span class="text-muted">Has a direct relationship with Odoo SA to escalate issues</span></p>
<span class="fa fa-bug fa-5x" role="img" title="Direct Sale" aria-label="Direct Sale"></span>
<p class="text-muted">Has a direct relationship with Odoo SA to escalate issues</p>
</div>
<div class="col-md-4">
<p class="fa fa-file-text-o fa-5x">
<span class="text-muted">Publishes references directly on Odoo.com</span></p>
<span class="fa fa-file-text-o fa-5x" role="img" aria-label="Reference" title="Reference"></span>
<p class="text-muted">Publishes references directly on Odoo.com</p>
</div>
<div class="col-md-4">
<p class="fa fa-certificate fa-5x">
<span class="text-muted">Follows a transparent ranking system. Ready - Silver - Gold</span></p>
<span class="fa fa-certificate fa-5x" role="img" aria-label="Ranking" title="Ranking"></span>
<p class="text-muted">Follows a transparent ranking system. Ready - Silver - Gold</p>
</div>
<div class="col-md-4">
<p class="fa fa-refresh fa-5x">
<span class="text-muted">Gets access to training sessions (updated weekly)</span></p>
<span class="fa fa-refresh fa-5x" role="img" aria-label="Training" title="Training"></span>
<p class="text-muted">Gets access to training sessions (updated weekly)</p>
</div>
</div>
</div>
addons/website_quote/views/website_quote_templates.xml
+6 -6
View File
@@ -234,7 +234,7 @@
</div>
<div class="text-center" t-if="need_payment or (quotation.state in ('sale') and quotation.has_to_be_paid() and tx_state != 'done')" style="padding: 10px">
<a role="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#modalaccept">
<span class="fa fa-check"> Pay Now</span>
<i class="fa fa-check"></i> Pay Now
</a>
</div>
<hr class="mt0 mb0"/>
@@ -401,18 +401,18 @@
<div class="text-center hidden-print mt16 mb16" id="quotation_toolbar" t-if="quotation.state in ('draft', 'sent', 'waiting_date')">
<a role="button" class="btn btn-success" data-toggle="modal" data-target="#modalaccept" t-if="order_valid and not quotation.has_to_be_paid()">
<span class="fa fa-check"> Accept</span>
<i class="fa fa-check"></i> Accept
</a>
<a role="button" class="btn btn-success" data-toggle="modal" data-target="#modalaccept" t-if="order_valid and quotation.has_to_be_paid()">
<span class="fa fa-check"> Accept &amp; Pay</span>
<i class="fa fa-check"></i> Accept &amp; Pay
</a>
<a role="button" class="btn btn-danger" data-toggle="modal" data-target="#modaldecline">
<span class="fa fa-times"> Reject</span>
<i class="fa fa-times"></i> Reject
</a>
</div>
<div class="text-center" t-if="need_payment or (quotation.state in ('sale') and quotation.has_to_be_paid() and tx_state != 'done')" style="padding: 10px">
<a role="button" class="btn btn-primary" data-toggle="modal" data-target="#modalaccept">
<span class="fa fa-check"> Pay Now</span>
<i class="fa fa-check"></i> Pay Now
</a>
</div>
@@ -438,7 +438,7 @@
</xpath>
<xpath expr="//div[@id='quotation_toolbar']/a[@data-target='#modaldecline']" position="before">
<a role="button" class="btn btn-info" type="submit" href="#discussion">
<span class="fa fa-comment"> Feedback</span>
<i class="fa fa-comment"></i> Feedback
</a>
</xpath>
</template>
addons/website_sale/views/templates.xml
+23 -21
View File
@@ -43,9 +43,8 @@
<li class="divider hidden"/> <!-- Make sure the cart and related menus are not folded (see autohideMenu) -->
<li id="my_cart" t-att-class="'' if website_sale_order and website_sale_order.cart_quantity else 'hidden'">
<a href="/shop/cart">
<span class="fa fa-shopping-cart">
My Cart <sup t-attf-class="my_cart_quantity label label-primary" t-esc="website_sale_order and website_sale_order.cart_quantity or ''" />
</span>
<i class="fa fa-shopping-cart"></i>
My Cart <sup t-attf-class="my_cart_quantity label label-primary" t-esc="website_sale_order and website_sale_order.cart_quantity or ''" />
</a>
</li>
</xpath>
@@ -779,8 +778,8 @@
<div class="col-md-3 col-sm-4">
</div>
<div class="col-md-9 col-sm-8">
<a role="button" href="/shop/checkout" class="btn btn-default mb32 pull-left"><span class="fa fa-chevron-left" > Previous</span></a>
<a role="button" class="fa fa-chevron-suffix-right btn btn-primary pull-right mb32 o_website_form_send" href="/shop/confirm_order">Next</a>
<a role="button" href="/shop/checkout" class="btn btn-default mb32 pull-left"><span class="fa fa-chevron-left" /> Previous</a>
<a role="button" class="btn btn-primary pull-right mb32 o_website_form_send" href="/shop/confirm_order">Next <span class="fa fa-chevron-right" /></a>
</div>
</div>
</form>
@@ -901,10 +900,12 @@
<t t-call="website_sale.cart_lines" />
<div class="clearfix" />
<a role="button" href="/shop" class="btn btn-default mb32 hidden-xs hidden-sm hidden-md">
<span class="fa fa-chevron-left">Continue Shopping</span>
<span class="fa fa-chevron-left" />
<span class="">Continue Shopping</span>
</a>
<a role="button" t-if="website_sale_order and website_sale_order.website_order_line" class="btn btn-primary pull-right mb32 mr8 hidden visible-lg" href="/shop/checkout?express=1">
<span class="fa fa-chevron-suffix-right">Process Checkout</span>
<span class="">Process Checkout</span>
<span class="fa fa-chevron-right" />
</a>
<div class="oe_structure" />
</div>
@@ -914,11 +915,12 @@
<t t-call='website_sale.short_cart_summary'/>
<div class='hidden-lg'>
<a role="button" href="/shop" class="btn btn-default mb32">
<span class="fa fa-chevron-left">
Continue<span class="hidden-xs"> Shopping</span></span>
<span class="fa fa-chevron-left" />
Continue<span class="hidden-xs"> Shopping</span>
</a>
<a role="button" t-if="website_sale_order and website_sale_order.website_order_line" class="btn btn-primary pull-right mb32 mr8" href="/shop/checkout?express=1">
<span class="fa fa-suffix-chevron-right">Process Checkout</span>
<span class="">Process Checkout</span>
<span class="fa fa-chevron-right" />
</a>
</div>
</div>
@@ -1056,7 +1058,7 @@
<form action="/shop/address" method="post" class=''>
<input type="hidden" name="csrf_token" t-att-value="request.csrf_token()" />
<a role="button" class='a-submit btn btn-default mb16 btn-block'>
<span class="fa fa-plus-square"> Add an address</span>
<i class="fa fa-plus-square"></i> Add an address
</a>
</form>
</div>
@@ -1078,8 +1080,8 @@
<div class="clearfix" />
<div>
<a role="button" href="/shop/cart" class="btn btn-default mb32">
<span class="fa fa-chevron-left" > Return to Cart</span></a>
<a role="button" class="btn btn-primary pull-right mb32 " href="/shop/confirm_order"><span class="fa fa-suffix-chevron-right">Confirm</span></a>
<span class="fa fa-chevron-left" /> Return to Cart</a>
<a role="button" class="btn btn-primary pull-right mb32 " href="/shop/confirm_order">Confirm <span class="fa fa-chevron-right" /></a>
</div>
</div>
</div>
@@ -1105,7 +1107,7 @@
<div class='panel-footer' t-if='not readonly'>
<span class='btn-ship' t-att-style="'' if selected else 'display:none;'">
<a role="button" class="btn btn-block btn-primary">
<span class='fa fa-check'> Ship to this address</span>
<i class='fa fa-check'></i> Ship to this address
</a>
</span>
<span class='btn-ship' t-att-style="'' if not selected else 'display:none;'">
@@ -1250,10 +1252,10 @@
<div class="clearfix"/>
<div style='padding: 0 15px'>
<a role="button" t-att-href="mode == ('new', 'billing') and '/shop/cart' or '/shop/checkout'" class="btn btn-default mb32">
<span class="fa fa-chevron-left">Back </span>
<span class="fa fa-chevron-left" /> Back
</a>
<a role="button" class="btn btn-primary pull-right mb32 a-submit a-submit-disable a-submit-loading">
<span class="fa fa-suffix-chevron-right">Next </span>
<span>Next </span><span class="fa fa-chevron-right" />
</a>
</div>
</form>
@@ -1332,7 +1334,7 @@
<a role="button" class="btn-link"
groups="base.group_system"
t-attf-href="/web#return_label=Website&amp;action=#{payment_action_id}">
<span class="fa fa-arrow-right"> Add payment acquirers</span>
<i class="fa fa-arrow-right"></i> Add payment acquirers
</a>
</div>
<div class="js_payment mb64 row" t-if="not website_sale_order.amount_total" id="payment_method">
@@ -1340,8 +1342,8 @@
<form target="_self" action="/shop/payment/validate" method="post" class="pull-right">
<input type="hidden" name="csrf_token" t-att-value="request.csrf_token()" />
<a role="button" class="btn btn-primary a-submit">
<span class="fa fa-suffix-chevron-right" t-if="order.amount_total &gt; 0">Pay Now </span>
<span class="fa fa-suffix-chevron-right" t-if="order.amount_total == 0">Confirm Order </span>
<span t-if="order.amount_total &gt; 0">Pay Now <span class="fa fa-chevron-right"></span></span>
<span t-if="order.amount_total == 0">Confirm Order <span class="fa fa-chevron-right"></span></span>
</a>
</form>
</div>
@@ -1603,8 +1605,8 @@
<xpath expr="//div[@id='o_new_content_menu_choices']//ul" position="inside">
<li groups="sales_team.group_sale_manager">
<a id="create-new-product" href="#" data-action="new_product">
<p class="fa fa-shopping-cart">
New Product</p>
<i class="fa fa-shopping-cart" />
<p>New Product</p>
</a>
</li>
</xpath>
addons/website_sale_comparison/views/website_sale_comparison_template.xml
+2 -2
View File
@@ -58,7 +58,7 @@
<template id='recommended_product' inherit_id="website_sale.recommended_products" name="Alternative Products">
<xpath expr="//h3" position="replace">
<t t-set="ids" t-value="str(product.product_variant_id.id) + ','+ ','.join([str(a) for a in product.alternative_product_ids.mapped('product_variant_id.id')])"/>
<div><span class='h3'>Suggested alternatives: </span><a role="button" class="btn btn-primary fa fa-exchange" t-attf-href="/shop/compare/?products=#{ids}"> Compare</a></div>
<div><span class='h3'>Suggested alternatives: </span><a role="button" class="btn btn-primary" t-attf-href="/shop/compare/?products=#{ids}"><i class="fa fa-exchange"></i> Compare</a></div>
</xpath>
</template>
@@ -95,7 +95,7 @@
<form action="/shop/cart/update" method="post" class="text-center">
<input name="product_id" t-att-value="product.id" type="hidden"/>
<a role="button" class="btn btn-primary btn-block a-submit fa fa-shopping-cart">&amp;nbsp;Add to Cart</a>
<a role="button" class="btn btn-primary btn-block a-submit"><i class="fa fa-shopping-cart"></i>&amp;nbsp;Add to Cart</a>
</form>
</div>
</td>
addons/website_sale_wishlist/views/website_sale_wishlist_template.xml
+1 -1
View File
@@ -63,7 +63,7 @@
<td class='text-left'>
<strong><a t-att-href="'/shop/product/%s' % slug(wish.product_id.product_tmpl_id)"><t t-esc="wish.product_id.display_name" /></a></strong>
<small class='hidden-xs'><p t-field="wish.product_id.description_sale" class="text-muted"/></small>
<a class="o_wish_rm no-decoration"><small><span class='fa fa-trash-o'> Remove</span></small></a>
<a class="o_wish_rm no-decoration"><small><i class='fa fa-trash-o'></i> Remove</small></a>
</td>
<td style='width:80px'>
<t t-if='wish.price_new != wish.price'>
addons/website_slides/static/src/xml/website_slides.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<h3 class="modal-title">Upload Presentation</h3>
</header>
<div class="oe_slides_upload_loading text-center" style="display:none" aria-hidden="true" role="status">
<h4><span class='fa fa-spinner fa-spin'> Uploading presentation... </span></h4>
<h4><i class='fa fa-spinner fa-spin'></i> Uploading presentation... </h4>
</div>
<main class="modal-body">
<form class="clearfix form-horizontal">
addons/website_slides/views/res_config_settings_views.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<field name="website_slide_google_app_key" class="oe_inline"/>
</div>
<div class="oe_link">
<a class="fa fa-arrow-right" href="https://console.developers.google.com/flows/enableapi?apiid=drive,youtube">
<a href="https://console.developers.google.com/flows/enableapi?apiid=drive,youtube"><span class="fa fa-arrow-right"/>
Create a Google Project and Get a Key
</a>
</div>
addons/website_slides/views/website_slides.xml
+17 -17
View File
@@ -479,27 +479,27 @@
<ul class="nav nav-tabs" role="tablist">
<li t-att-class="not comments and 'active' or None">
<a aria-controls="about" href="#about" role="tab" data-toggle="tab">
<span class="fa fa-home"> About</span>
<i class="fa fa-home"></i> About
</a>
</li>
<li>
<a aria-controls="share" href="#share" role="tab" data-toggle="tab">
<span class="fa fa-share-alt"> Share</span>
<i class="fa fa-share-alt"></i> Share
</a>
</li>
<li t-att-class="comments and 'active' or None">
<a aria-controls="discuss" href="#discuss" role="tab" data-toggle="tab">
<span class="fa fa-comments-o"> Comments</span>
<i class="fa fa-comments-o"></i> Comments
</a>
</li>
<li>
<a aria-controls="transcript" href="#transcript" role="tab" data-toggle="tab">
<span class="fa fa-align-justify"> Transcript</span>
<i class="fa fa-align-justify"></i> Transcript
</a>
</li>
<li>
<a aria-controls="statistic" href="#statistic" role="tab" data-toggle="tab">
<span class="fa fa-bar-chart"> Statistics</span>
<i class="fa fa-bar-chart"></i> Statistics
</a>
</li>
</ul>
@@ -521,7 +521,7 @@
</t>
</div>
<div role="tabpanel" class="tab-pane fade" t-if="not slide.website_published" id="share">
<h4 class="fa fa-info-circle">
<h4><i class="fa fa-info-circle"></i>
The social sharing module will be unlocked when a moderator will allow your publication.
</h4>
</div>
@@ -544,15 +544,15 @@
<ul class="list-group">
<li class="list-group-item">
<span class="badge"><t t-esc="slide.total_views"/></span>
<span class="fa fa-play"> Total Views</span>
<i class="fa fa-play"></i> Total Views
</li>
<li class="list-group-item">
<span class="badge"><t t-esc="slide.slide_views"/></span>
<span class="fa fa-circle-o"> Website Views</span>
<i class="fa fa-circle-o"></i> Website Views
</li>
<li class="list-group-item" t-if="not slide.document_id">
<span class="badge"><t t-esc="slide.embed_views"/></span>
<span class="fa fa-code"> Embedded Views</span>
<i class="fa fa-code"></i> Embedded Views
</li>
</ul>
</div>
@@ -562,19 +562,19 @@
<ul class="list-group">
<li class="list-group-item">
<span class="badge" id="total-share">0</span>
<span class="fa fa-share-alt"> Social Shares</span>
<i class="fa fa-share-alt"></i> Social Shares
</li>
<li class="list-group-item">
<span class="badge"><t t-esc="slide.likes"/></span>
<span class="fa fa-thumbs-up"> Likes</span>
<i class="fa fa-thumbs-up"></i> Likes
</li>
<li class="list-group-item">
<span class="badge"><t t-esc="slide.dislikes"/></span>
<span class="fa fa-thumbs-down"> Dislikes</span>
<i class="fa fa-thumbs-down"></i> Dislikes
</li>
<li class="list-group-item">
<span class="badge"><t t-esc="len(slide.website_message_ids)"/></span>
<span class="fa fa-comments-o"> Comments</span>
<i class="fa fa-comments-o"></i> Comments
</li>
</ul>
</div>
@@ -584,19 +584,19 @@
<ul class="list-group">
<li class="list-group-item">
<span class="badge" id="facebook-badge">0</span>
<span class="fa fa-facebook-square"> Facebook</span>
<i class="fa fa-facebook-square"></i> Facebook
</li>
<li class="list-group-item">
<span class="badge" id="twitter-badge">0</span>
<span class="fa fa-twitter-square"> Twitter</span>
<i class="fa fa-twitter-square"></i> Twitter
</li>
<li class="list-group-item">
<span class="badge" id="linkedin-badge">0</span>
<span class="fa fa-linkedin-square"> LinkedIn</span>
<i class="fa fa-linkedin-square"></i> LinkedIn
</li>
<li class="list-group-item">
<span class="badge" id="google-badge">0</span>
<span class="fa fa-google-plus-square"> Google+</span>
<i class="fa fa-google-plus-square"></i> Google+
</li>
</ul>
</div>
addons/website_slides/views/website_slides_embed.xml
+4 -4
View File
@@ -45,13 +45,13 @@
</div>
</div>
<div class="col-lg-1 col-md-1 col-sm-2 col-xs-2 text-right">
<b class="oe_slide_js_embed_option_link" data-slide-option-id="#slide_share"><span class="fa fa-share-alt"> Share</span></b>
<b class="oe_slide_js_embed_option_link" data-slide-option-id="#slide_share"><i class="fa fa-share-alt"></i> Share</b>
</div>
<div class="col-lg-1 col-md-1 col-sm-2 col-xs-2 text-right">
<b class="oe_slide_js_embed_option_link" data-slide-option-id="#slide_email"><span class="fa fa-envelope"> Email</span></b>
<b class="oe_slide_js_embed_option_link" data-slide-option-id="#slide_email"><i class="fa fa-envelope"></i> Email</b>
</div>
<div class="col-lg-1 col-md-1 col-sm-2 col-xs-2 text-right">
<b class="oe_slide_js_embed_option_link" data-slide-option-id="#slide_embed"><span class="fa fa-code"> Embed</span></b>
<b class="oe_slide_js_embed_option_link" data-slide-option-id="#slide_embed"><i class="fa fa-code"></i> Embed</b>
</div>
</div>
</div>
@@ -92,7 +92,7 @@
<div id="PDFViewerLoader" class="oe_slides_loader">
<img class="img-responsive" t-attf-src="/web/image/slide.slide/#{slide.id}/image_medium" style="margin:auto;height:100%" alt="suggest_slide.name"/>
<h4 class="text-center">
<span class="fa fa-spinner fa-spin"> Loading ...</span>
<i class="fa fa-spinner fa-spin"></i> Loading ...
</h4>
</div>
<canvas id="PDFViewerCanvas" class="img-responsive" style="margin:auto;height:100%;display:none;"></canvas>
addons/website_twitter/static/src/xml/website.twitter.xml
+1 -1
View File
@@ -37,7 +37,7 @@
<div class="alert alert-warning" role="alert">
<t t-esc="data.error"/>
<t t-if='!data.nodata'>
<a class="lnk_configure fa fa-plus-circle" href="/web#action=website.action_website_configuration"> Twitter Configuration</a>
<a class="lnk_configure" href="/web#action=website.action_website_configuration"><i class="fa fa-plus-circle"/> Twitter Configuration</a>
</t>
</div>
</div>
odoo/addons/base/tests/test_view_validation.py
+3
View File
@@ -71,12 +71,15 @@ valid_form = etree.parse(io.BytesIO(b'''\
<span class="fa fa-success" aria-label="Test span" title="Test span"/>
<a class="fa fa-success"><span aria-label="test" title="test"/></a>
<a class="btn" role="button"/>
<i class="fa fa-check"/> Test icon
<i class="fa fa-check"/>
</group>
</page>
</notebook>
<div role="dialog" class="modal">
<header class="modal-header"/>
<main class="modal-body"/>
<i class="fa fa-check"/> <span>Test</span>
<footer class="modal-footer"/>
</div>
<div class="tab-pane" role="tabpanel"/>
odoo/tools/view_validation.py
+12
View File
@@ -155,6 +155,12 @@ def valid_alternative_icon_text(arch):
xpath += '[not(descendant-or-self::field)]'
# And finally, if there is some text, it's good too
xpath += '[not(descendant-or-self::*[text()])]'
# Following or preceding text
xpath += '[not(preceding-sibling::text()[normalize-space()])]'
xpath += '[not(following-sibling::text()[normalize-space()])]'
# Following or preceding text in span
xpath += '[not(preceding-sibling::span[text()])]'
xpath += '[not(following-sibling::span[text()])]'
if arch.xpath(xpath):
return "Warning"
@@ -188,6 +194,12 @@ def valid_title_icon(arch):
xpath += '[not(descendant-or-self::field)]'
# And finally, if there is some text, it's good too
xpath += '[not(descendant-or-self::*[text()])]'
# Following or preceding text
xpath += '[not(preceding-sibling::text()[normalize-space()])]'
xpath += '[not(following-sibling::text()[normalize-space()])]'
# Following or preceding text in span
xpath += '[not(preceding-sibling::span[text()])]'
xpath += '[not(following-sibling::span[text()])]'
if arch.xpath(xpath):
return "Warning"