diff options
| author | Pankaj Joshi <pji@openerp.com> | 2015-04-13 14:52:44 +0530 |
|---|---|---|
| committer | Richard Mathot <rim@odoo.com> | 2015-06-08 12:52:29 +0200 |
| commit | 98d0e3cc4b296abfcd96020e66f67677fbaacf5c (patch) | |
| tree | 2ff46552109bccd54edb65a4ab6af14baaa90997 | |
| parent | 1395a9d5fe193429f58819ae2e937793b6c38e2b (diff) | |
[IMP] updated icon classes which are renamed in font-awesome v4.2 and removed useless icon-* classes of old font-awesome
28 files changed, 41 insertions, 41 deletions
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index 76a01259977..6085d56f105 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -6,7 +6,7 @@ <menuitem name="Members" id="base.menu_association" groups="base.group_sale_salesman" - icon="fa-group" + icon="fa-users" sequence="15"/> <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="100" groups="base.group_configuration"/> <menuitem name="Reports" id="base.menu_report_association" parent="base.menu_association" sequence="99"/> diff --git a/addons/calendar/static/src/xml/base_calendar.xml b/addons/calendar/static/src/xml/base_calendar.xml index a211ef41b90..311765aa6f7 100644 --- a/addons/calendar/static/src/xml/base_calendar.xml +++ b/addons/calendar/static/src/xml/base_calendar.xml @@ -77,7 +77,7 @@ <t t-extend="CalendarView.sidebar.responsible"> <t t-jquery="span[t-attf-class*='color_filter']" t-operation="after"> <t t-if="(filters_value.value != -1) && (filters_value.is_remove != false)"> - <i class="oe_remove_follower fa fa-close hidden" title="Remove this favorite from the list" t-att-data-id="filters_value.value"/> + <i class="oe_remove_follower fa fa-times hidden" title="Remove this favorite from the list" t-att-data-id="filters_value.value"/> </t> </t> </t> diff --git a/addons/gamification/views/goal.xml b/addons/gamification/views/goal.xml index 842fc692e02..2ecebda16a2 100644 --- a/addons/gamification/views/goal.xml +++ b/addons/gamification/views/goal.xml @@ -162,7 +162,7 @@ <div class="oe_goal_state"> <t t-if="record.state.raw_value=='reached'"><i class="oe_green fa fa-check" title="Goal Reached"/></t> <t t-if="record.state.raw_value=='inprogress'"><i class="fa fa-clock-o" title="Goal in Progress"/></t> - <t t-if="record.state.raw_value=='failed'"><i class="oe_red fa fa-remove" title="Goal Failed"/></t> + <t t-if="record.state.raw_value=='failed'"><i class="oe_red fa fa-times" title="Goal Failed"/></t> </div> </t> <t t-if="record.definition_display.raw_value == 'progress'"> diff --git a/addons/hr/static/src/xml/suggestions.xml b/addons/hr/static/src/xml/suggestions.xml index 28ac32b334c..8856e7ab3a4 100644 --- a/addons/hr/static/src/xml/suggestions.xml +++ b/addons/hr/static/src/xml/suggestions.xml @@ -11,7 +11,7 @@ <!-- Suggested employees --> <div t-name="hr.suggestions.employees" class="oe_sidebar_suggestion oe_suggestion_employee"> <div class="oe_suggest_title"> - <i class="oe_suggestion_remove oe_suggestion_employee fa fa-remove"/> + <i class="oe_suggestion_remove oe_suggestion_employee fa fa-times"/> <h2>Suggested Employees</h2> </div> <div class="oe_suggest_items"> @@ -24,7 +24,7 @@ </div> <div class="oe_suggested_item_content"> <a class="oe_suggestion_item_name" t-attf-href="#model=hr.employee&id=#{result.id}"><t t-esc="result.name"/></a> - <i class="oe_suggestion_remove_item oe_suggestion_employee fa fa-remove" t-att-id="result.id"/> + <i class="oe_suggestion_remove_item oe_suggestion_employee fa fa-times" t-att-id="result.id"/> <br/> <button class="oe_suggestion_follow" t-att-id="result.id">Follow</button> </div> diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml index 2104e96a891..1b206e930fd 100644 --- a/addons/mail/static/src/xml/suggestions.xml +++ b/addons/mail/static/src/xml/suggestions.xml @@ -11,7 +11,7 @@ <!-- Suggested groups --> <div t-name="TimelineSuggestionGroups" class="oe_sidebar_suggestion oe_suggestion_group"> <div class="oe_suggest_title"> - <i class="oe_suggestion_remove oe_suggestion_group fa fa-remove"/> + <i class="oe_suggestion_remove oe_suggestion_group fa fa-times"/> <span>Suggested Groups</span> </div> <div class="oe_suggest_items"> @@ -24,7 +24,7 @@ </div> <div class="oe_suggested_item_content"> <a class="oe_suggestion_item_name" t-attf-href="#model=mail.group&id=#{result.id}"><t t-esc="result.name"/></a> - <i class="oe_suggestion_remove_item oe_suggestion_group fa fa-remove" t-att-id="result.id"/> + <i class="oe_suggestion_remove_item oe_suggestion_group fa fa-times" t-att-id="result.id"/> <br/> <div class="btn-group btn-group-sm"> <button type="button" class="btn btn-default oe_suggestion_join" t-att-id="result.id">Join Group</button> @@ -35,4 +35,4 @@ </div> </div> -</template>
\ No newline at end of file +</template> diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml index 05aab7bdb54..2cc0d0e4da1 100644 --- a/addons/portal/portal_view.xml +++ b/addons/portal/portal_view.xml @@ -6,7 +6,7 @@ <menuitem name="Portal" id="portal_menu" groups="base.group_portal" - icon="icon-circle-blank" + icon="fa-circle-o" sequence="15"/> <menuitem name="Messaging" id="portal_messages" parent="portal_menu" sequence="10" groups="base.group_portal"/> @@ -70,4 +70,4 @@ </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/pos_restaurant/static/src/xml/floors.xml b/addons/pos_restaurant/static/src/xml/floors.xml index bad29900219..e96173d42dd 100644 --- a/addons/pos_restaurant/static/src/xml/floors.xml +++ b/addons/pos_restaurant/static/src/xml/floors.xml @@ -97,7 +97,7 @@ <i class='fa fa-plus'></i> </span> <span class='edit-button dup-table needs-selection'> - <i class='fa fa-copy'></i> + <i class='fa fa-files-o'></i> </span> <span class='edit-button rename needs-selection'> <i class='fa fa-font'></i> diff --git a/addons/pos_restaurant/static/src/xml/splitbill.xml b/addons/pos_restaurant/static/src/xml/splitbill.xml index 28d72de5e9a..328fbb07dea 100644 --- a/addons/pos_restaurant/static/src/xml/splitbill.xml +++ b/addons/pos_restaurant/static/src/xml/splitbill.xml @@ -3,7 +3,7 @@ <t t-name="SplitbillButton"> <span class="control-button order-split"> - <i class="fa fa-copy"></i> + <i class="fa fa-files-o"></i> Split </span> </t> diff --git a/addons/stock/static/src/xml/picking.xml b/addons/stock/static/src/xml/picking.xml index e95cfeb8a9a..0c92f591575 100644 --- a/addons/stock/static/src/xml/picking.xml +++ b/addons/stock/static/src/xml/picking.xml @@ -108,7 +108,7 @@ <div class="col-md-6 col-sm-4 col-xs-12 text-right"> <h3> <button type="button" class='btn btn-default js_pick_pack js_putinpack'> Put in Pack </button> - <button type="button" class='btn btn-danger js_drop_down fa fa-download'> Put in Cart </button> + <button type="button" class='btn btn-danger js_drop_down fa fa-arrow-circle-o-down'> Put in Cart </button> </h3> </div> </div> diff --git a/addons/survey/views/survey_result.xml b/addons/survey/views/survey_result.xml index deea5d19b47..11ce73eca33 100644 --- a/addons/survey/views/survey_result.xml +++ b/addons/survey/views/survey_result.xml @@ -211,7 +211,7 @@ <ul class="nav nav-tabs hidden-print"> <li class="active"> <a t-att-href="'#graph_question_%d' % question.id" data-toggle="tab"> - <i class="fa fa-bar-chart-o"></i> + <i class="fa fa-bar-char"></i> Graph </a> </li> diff --git a/addons/website/static/src/js/summernote.js b/addons/website/static/src/js/summernote.js index 464613581c4..5303837b26a 100644 --- a/addons/website/static/src/js/summernote.js +++ b/addons/website/static/src/js/summernote.js @@ -888,7 +888,7 @@ range.WrappedRange.prototype.isContentEditable = function () { renderer.tplButtonInfo.fontsize = function (lang, options) { var items = options.fontSizes.reduce(function (memo, v) { return memo + '<li><a data-event="fontSize" href="#" data-value="' + v + '">' + - '<i class="fa fa-check icon-ok"></i> ' + v + + '<i class="fa fa-check"></i> ' + v + '</a></li>'; }, ''); diff --git a/addons/website/static/src/xml/website.contentMenu.xml b/addons/website/static/src/xml/website.contentMenu.xml index 63d6a1a1437..2256f4bbf33 100644 --- a/addons/website/static/src/xml/website.contentMenu.xml +++ b/addons/website/static/src/xml/website.contentMenu.xml @@ -10,7 +10,7 @@ <i class="pull-right fa fa-home" style="margin-top: 3px"/> </span> <span class="input-group-btn"> - <button type="button" class="btn btn-primary js_edit_menu fa fa-edit"/> + <button type="button" class="btn btn-primary js_edit_menu fa fa-pencil-square-o"/> <button type="button" class="btn btn-danger js_delete_menu fa fa-trash-o"/> </span> </div> diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index bef9c4d97da..198336650a4 100644 --- a/addons/website/static/src/xml/website.editor.xml +++ b/addons/website/static/src/xml/website.editor.xml @@ -462,10 +462,10 @@ <a href="http://www.google.com" target="_blank">www.google.com</a> <div class="note-insert btn-group"> <button type="button" class="btn btn-default btn-sm btn-small" t-attf-title="#{lang.link.edit}" data-event="showLinkDialog" tabindex="-1"> - <i class="fa fa-edit icon-edit"></i> + <i class="fa fa-pencil-square-o"></i> </button> <button type="button" class="btn btn-default btn-sm btn-small" t-attf-title="#{lang.link.unlink}" data-event="unlink" tabindex="-1"> - <i class="fa fa-unlink icon-unlink"></i> + <i class="fa fa-chain-broken"></i> </button> </div> </div> @@ -478,7 +478,7 @@ <a href="http://www.google.com" target="_blank">www.google.com</a> <div class="note-insert btn-group"> <button type="button" class="btn btn-default btn-sm btn-small" t-attf-title="#{lang.image.image}" data-event="showImageDialog" tabindex="-1"> - <i class="fa fa-picture-o icon-picture"></i> + <i class="fa fa-picture-o"></i> </button> </div> </div> @@ -502,18 +502,18 @@ </div> <div class="note-insert btn-group"> <button type="button" class="btn btn-default btn-sm btn-small" t-attf-title="#{lang.image.floatLeft}" data-event="floatMe" data-value="left" tabindex="-1"> - <i class="fa fa-align-left icon-align-left"></i> + <i class="fa fa-align-left"></i> </button> <button type="button" class="btn btn-default btn-sm btn-small" t-attf-title="#{lang.image.floatRight}" data-event="floatMe" data-value="right" tabindex="-1"> - <i class="fa fa-align-right icon-align-right"></i> + <i class="fa fa-align-right"></i> </button> <button type="button" class="btn btn-default btn-sm btn-small" t-attf-title="#{lang.image.floatNone}" data-event="floatMe" data-value="none" tabindex="-1"> - <i class="fa fa-align-justify icon-align-justify"></i> + <i class="fa fa-align-justify"></i> </button> </div> <div class="note-insert btn-group"> <button type="button" class="btn btn-default btn-sm btn-small" t-attf-title="#{lang.image.remove}" data-event="removeMedia" data-value="none" tabindex="-1"> - <i class="fa fa-trash-o icon-trash"></i> + <i class="fa fa-trash-o "></i> </button> </div> </div> diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml index 7efe5dfb0cf..a2b13f31d92 100644 --- a/addons/website_blog/views/website_blog_templates.xml +++ b/addons/website_blog/views/website_blog_templates.xml @@ -62,7 +62,7 @@ <a t-attf-href="#{blog_url('', ['blog', 'post'], blog=post.blog_id, post=post)}" t-field="post.name"></a> <span t-if="not post.website_published" class="text-warning"> &nbsp; - <span class="fa fa-warning" title="Not published"/> + <span class="fa fa-exclamation-triangle" title="Not published"/> </span> </h4> <div class="text-muted"> diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml index 3421be65390..14ce20566e7 100644 --- a/addons/website_forum/views/website_forum.xml +++ b/addons/website_forum/views/website_forum.xml @@ -731,7 +731,7 @@ <t t-call="website_forum.link_button"> <t t-set="url" t-value="'/forum/' + slug(forum) +'/post/' + slug(question) + '/edit'"/> <t t-set="label" t-value="'Edit'"/> - <t t-set="classes" t-value="'fa-edit'"/> + <t t-set="classes" t-value="'fa-pencil-square-o'"/> <t t-set="karma" t-value="not question.can_edit and question.karma_edit or 0"/> </t> </li> @@ -833,7 +833,7 @@ <t t-call="website_forum.link_button"> <t t-set="url" t-value="'/forum/' + slug(forum) + '/post/' + slug(answer) + '/edit'"/> <t t-set="label" t-value="'Edit'"/> - <t t-set="classes" t-value="'fa fa-edit'"/> + <t t-set="classes" t-value="'fa fa-pencil-square-o'"/> <t t-set="karma" t-value="not answer.can_edit and answer.karma_edit or 0"/> </t> </li> diff --git a/addons/website_gengo/static/src/xml/website.gengo.xml b/addons/website_gengo/static/src/xml/website.gengo.xml index 294318cf24f..a867f6eb478 100644 --- a/addons/website_gengo/static/src/xml/website.gengo.xml +++ b/addons/website_gengo/static/src/xml/website.gengo.xml @@ -93,7 +93,7 @@ <div class="modal-body"> <b> <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-dashboard"></i> Gengo Statistics <a href="https://gengo.com/c/dashboard" class="pull-right" target="new">Gengo Dashboard</a></h4> + <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"> <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> diff --git a/addons/website_links/views/website_links.xml b/addons/website_links/views/website_links.xml index bbe875d8c89..8ee1b694b11 100644 --- a/addons/website_links/views/website_links.xml +++ b/addons/website_links/views/website_links.xml @@ -31,7 +31,7 @@ <button type="object" icon="fa-sign-out" name="action_visit_page" string="Visit Page" class="oe_stat_button"/> - <button type="object" class="oe_stat_button" name="action_view_statistics" icon="fa-bar-chart"> + <button type="object" class="oe_stat_button" name="action_view_statistics" icon="fa-bar-chart-o"> <field name="count" string="Clicks" widget="statinfo"/> </button> diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml index 1c75f87243d..e7606deb076 100644 --- a/addons/website_mail/views/snippets.xml +++ b/addons/website_mail/views/snippets.xml @@ -325,7 +325,7 @@ </td> <td style="vertical-align:top; padding: 30px 15px; width:33%;text-align:center;background-color:#fff;color:#777777;font-size:14px" class="col_mv bg-color"> &nbsp; - <span class="fa fa-dollar fa-3x"></span> + <span class="fa fa-usd fa-3x"></span> &nbsp; <p style="margin:0;font-size:24px;font-weight:bold">Step 3</p> <p style="margin:0"> diff --git a/addons/website_mail/views/theme/airmail_snippets.xml b/addons/website_mail/views/theme/airmail_snippets.xml index eb8da5183f7..22d31a416bd 100644 --- a/addons/website_mail/views/theme/airmail_snippets.xml +++ b/addons/website_mail/views/theme/airmail_snippets.xml @@ -430,7 +430,7 @@ <tr> <td style="width:45%;text-align:center;vertical-align:middle" class="col_mv bg-color"> &nbsp; - <span class="fa fa-photo fa-10x"></span> + <span class="fa fa-picture-o fa-10x"></span> &nbsp; </td> <td style="vertical-align:middle; padding: 30px 30px 10px 30px; width:45%;text-align:justify;font-size:14px;color:#464646" class="col_mv bg-color"> @@ -555,7 +555,7 @@ <tr> <td rowspan="2" style="padding-left:10px"> &nbsp; - <span class="fa fa-dollar fa-3x"></span> + <span class="fa fa-usd fa-3x"></span> &nbsp; </td> <td style="padding-left:10px;color:#808080;font-size:14px"> diff --git a/addons/website_mail/views/theme/cleave_snippets.xml b/addons/website_mail/views/theme/cleave_snippets.xml index 18e92bbc805..94ec7dd08fd 100644 --- a/addons/website_mail/views/theme/cleave_snippets.xml +++ b/addons/website_mail/views/theme/cleave_snippets.xml @@ -426,7 +426,7 @@ <tr> <td style="text-align:center;padding:20px 0" > &nbsp; - <span class="fa fa-photo fa-10x"></span> + <span class="fa fa-picture-o fa-10x"></span> &nbsp; </td> </tr> @@ -539,7 +539,7 @@ <tr> <td rowspan="2" style="padding-left:10px"> &nbsp; - <span class="fa fa-dollar fa-3x"></span> + <span class="fa fa-usd fa-3x"></span> &nbsp; </td> <td style="padding-left:10px;color:#808080;font-size:14px"> diff --git a/addons/website_mail/views/theme/go_snippets.xml b/addons/website_mail/views/theme/go_snippets.xml index 7ae20bd258e..125ecf8badd 100644 --- a/addons/website_mail/views/theme/go_snippets.xml +++ b/addons/website_mail/views/theme/go_snippets.xml @@ -584,7 +584,7 @@ <tr> <td rowspan="2" style="padding-left:10px"> &nbsp; - <span class="fa fa-dollar fa-3x"></span> + <span class="fa fa-usd fa-3x"></span> &nbsp; </td> <td style="padding-left:10px;color:#808080;font-size:14px"> diff --git a/addons/website_mail/views/theme/narrative_snippets.xml b/addons/website_mail/views/theme/narrative_snippets.xml index 987b09c5fb6..7acc4e825a4 100644 --- a/addons/website_mail/views/theme/narrative_snippets.xml +++ b/addons/website_mail/views/theme/narrative_snippets.xml @@ -556,7 +556,7 @@ <tr> <td rowspan="2" style="padding-left:10px"> &nbsp; - <span class="fa fa-dollar fa-3x"></span> + <span class="fa fa-usd fa-3x"></span> &nbsp; </td> <td style="padding-left:10px;color:#808080;font-size:14px"> diff --git a/addons/website_mail/views/theme/neopolitan_snippets.xml b/addons/website_mail/views/theme/neopolitan_snippets.xml index 98c4c557851..1d97bb72b66 100644 --- a/addons/website_mail/views/theme/neopolitan_snippets.xml +++ b/addons/website_mail/views/theme/neopolitan_snippets.xml @@ -523,7 +523,7 @@ <tr> <td rowspan="2" style="padding-left:10px"> &nbsp; - <span class="fa fa-dollar fa-3x"></span> + <span class="fa fa-usd fa-3x"></span> &nbsp; </td> <td style="padding-left:10px;color:#808080;font-size:14px"> diff --git a/addons/website_mail/views/theme/skyline_snippets.xml b/addons/website_mail/views/theme/skyline_snippets.xml index 126b57e18dd..99d4eaa04c1 100644 --- a/addons/website_mail/views/theme/skyline_snippets.xml +++ b/addons/website_mail/views/theme/skyline_snippets.xml @@ -538,7 +538,7 @@ <tr> <td rowspan="2" style="padding-left:10px"> &nbsp; - <span class="fa fa-dollar fa-3x"></span> + <span class="fa fa-usd fa-3x"></span> &nbsp; </td> <td style="padding-left:10px;color:#808080;font-size:14px"> diff --git a/addons/website_mail/views/theme/sunday_snippets.xml b/addons/website_mail/views/theme/sunday_snippets.xml index aa678507e9d..ebe4f0727cc 100644 --- a/addons/website_mail/views/theme/sunday_snippets.xml +++ b/addons/website_mail/views/theme/sunday_snippets.xml @@ -539,7 +539,7 @@ <tr> <td rowspan="2" style="padding-left:10px"> &nbsp; - <span class="fa fa-dollar fa-3x"></span> + <span class="fa fa-usd fa-3x"></span> &nbsp; </td> <td style="padding-left:10px;color:#808080;font-size:14px"> diff --git a/addons/website_mail/views/theme/zenflat_snippets.xml b/addons/website_mail/views/theme/zenflat_snippets.xml index 75574bf2ff3..33b1343a892 100644 --- a/addons/website_mail/views/theme/zenflat_snippets.xml +++ b/addons/website_mail/views/theme/zenflat_snippets.xml @@ -559,7 +559,7 @@ <tr> <td rowspan="2" style="padding-left:10px"> &nbsp; - <span class="fa fa-dollar fa-3x"></span> + <span class="fa fa-usd fa-3x"></span> &nbsp; </td> <td style="padding-left:10px;color:#808080;font-size:14px"> diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml index f4d38f72cf0..b0bcf71736d 100644 --- a/openerp/addons/base/base_menu.xml +++ b/openerp/addons/base/base_menu.xml @@ -8,7 +8,7 @@ <!-- Top menu item --> <menuitem name="Settings" id="menu_administration" - icon="fa-gear" + icon="fa-cog" sequence="500"/> <menuitem id="menu_management" name="Modules" sequence="310"/> <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/> diff --git a/openerp/addons/base/ir/ir_qweb.xml b/openerp/addons/base/ir/ir_qweb.xml index c512c336181..2af6233abad 100644 --- a/openerp/addons/base/ir/ir_qweb.xml +++ b/openerp/addons/base/ir/ir_qweb.xml @@ -21,7 +21,7 @@ <span itemprop="addressCountry" t-raw="country_id"/> </div> <div t-if="phone and 'phone' in fields"><i t-if="not options.get('no_marker')" class='fa fa-phone'/> <span itemprop="telephone" t-esc="phone"/></div> - <div t-if="mobile and 'mobile' in fields"><i t-if="not options.get('no_marker')" class='fa fa-mobile-phone'/> <span itemprop="telephone" t-esc="mobile"/></div> + <div t-if="mobile and 'mobile' in fields"><i t-if="not options.get('no_marker')" class='fa fa-mobile'/> <span itemprop="telephone" t-esc="mobile"/></div> <div t-if="fax and 'fax' in fields"><i t-if="not options.get('no_marker')" class='fa fa-file-text-o'/> <span itemprop="faxNumber" t-esc="fax"/></div> <div t-if="website and 'website' in fields"> <i t-if="not options.get('no_marker')" class='fa fa-globe'/> |
