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

[ADD] fa-icon for website applications dropdown menu

Browse Source
This commit is contained in:
Pankaj Joshi
2015-03-09 15:19:28 +01:00
committed by Richard Mathot
parent 6a7f17a057
commit 02cc08586b
22 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_menuitem.xml
+1
View File
@@ -6,6 +6,7 @@
<menuitem name="Invoicing"
id="menu_finance"
groups="group_account_user,group_account_manager,group_account_invoice"
icon="fa-usd"
sequence="50"/>
<menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/>
addons/account/account_view.xml
+1 -1
View File
@@ -258,7 +258,7 @@
</p>
</field>
</record>
<menuitem id="account_account_menu" name="Accounts" parent="account.menu_finance_configuration" sequence="2"/>
<menuitem id="account_account_menu" name="Accounts" parent="account.menu_finance_configuration" sequence="2" icon="fa-book"/>
<menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu" sequence="1"/>
<act_window
addons/account_accountant/account_accountant_data.xml
+1
View File
@@ -4,6 +4,7 @@
<!-- Rename root menu "Accounting" -->
<!-- Top menu item -->
<menuitem name="Accounting"
icon="fa-book"
id="account.menu_finance"/>
<menuitem id="account.menu_account_config" name="Accounting" parent="base.menu_config" sequence="3"/>
addons/association/profile_association.xml
+1
View File
@@ -6,6 +6,7 @@
<menuitem name="Association"
id="base.menu_association"
groups="base.group_user"
icon="fa-group"
sequence="45"/>
<menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30"/>
<menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/>
addons/fleet/fleet_view.xml
+1 -1
View File
@@ -175,7 +175,7 @@
</field>
</record>
<menuitem name="Fleet" id="menu_root" sequence="110" groups="group_fleet_user"/>
<menuitem name="Fleet" id="menu_root" sequence="110" groups="group_fleet_user" icon="fa-car"/>
<menuitem name="Configuration" parent="menu_root" id="fleet_configuration" sequence="3" groups="group_fleet_manager"/>
<menuitem action="fleet_vehicle_model_act" parent="fleet_configuration" id="fleet_vehicle_model_menu" groups="base.group_no_one"/>
<menuitem action="fleet_vehicle_model_brand_act" parent="fleet_configuration" id="fleet_vehicle_model_brand_menu" groups="base.group_no_one"/>
addons/hr/hr_view.xml
+1
View File
@@ -6,6 +6,7 @@
<menuitem name="Human Resources"
id="menu_hr_root"
groups="base.group_hr_manager,base.group_hr_user,base.group_user"
icon="fa-user"
sequence="90"/>
<menuitem id="menu_hr_reporting" parent="base.menu_reporting" name="Human Resources" sequence="60" />
<menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
addons/knowledge/knowledge_view.xml
+1
View File
@@ -6,6 +6,7 @@
<menuitem name="Knowledge"
id="knowledge.menu_document"
groups="base.group_system,base.group_document_user"
icon="fa-magic"
sequence="116"/>
<menuitem name="Configuration" id="knowledge.menu_document_configuration"
addons/lunch/lunch_view.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<openerp>
<data>
<!-- Top menu item -->
<menuitem id='menu_lunch' name='Lunch' sequence="100" groups="group_lunch_user"/>
<menuitem id='menu_lunch' name='Lunch' sequence="100" groups="group_lunch_user" icon="fa-cutlery"/>
<menuitem name="Lunch" parent="menu_lunch" id="menu_lunch_title" sequence="50" />
<menuitem name="Administrate Orders" parent="menu_lunch" id="menu_lunch_admin" sequence="51" groups="group_lunch_manager"/>
<menuitem name="Administrate Cash Moves" parent="menu_lunch" id="menu_lunch_cash" sequence="52" groups="group_lunch_manager"/>
addons/mail/mail_thread_view.xml
+1
View File
@@ -132,6 +132,7 @@
<menuitem name="Messaging"
id="mail.mail_feeds_main"
groups="base.group_user"
icon="fa-envelope"
sequence="10"/>
<!-- Left-side menu: Feeds -->
addons/marketing/marketing_view.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<!-- Top menu item -->
<menuitem name="Marketing" id="base.marketing_menu" sequence="85"
groups="base.group_user"/>
groups="base.group_user" icon="fa-check-square-o"/>
<!-- Reporting for Marketing -->
<menuitem name="Marketing" id="base.marketing_reporting_menu" sequence="49"
addons/mrp/mrp_view.xml
+1
View File
@@ -6,6 +6,7 @@
<menuitem name="Manufacturing"
id="base.menu_mrp_root"
groups="group_mrp_user,group_mrp_manager"
icon="fa-wrench"
sequence="80"/>
<menuitem name="Manufacturing"
addons/point_of_sale/point_of_sale_view.xml
+1
View File
@@ -6,6 +6,7 @@
<menuitem name="Point of Sale"
id="menu_point_root"
groups="group_pos_manager,group_pos_user"
icon="fa-suitcase"
sequence="30"/>
<record model="ir.ui.view" id="view_pos_pos_form">
addons/portal/portal_view.xml
+1
View File
@@ -6,6 +6,7 @@
<menuitem name="Portal"
id="portal_menu"
groups="base.group_portal"
icon="icon-circle-blank"
sequence="15"/>
<menuitem name="Messaging" id="portal_messages" parent="portal_menu" sequence="10" groups="base.group_portal"/>
addons/project/project_view.xml
+1
View File
@@ -6,6 +6,7 @@
<menuitem name="Project"
id="base.menu_main_pm"
groups="group_project_manager,group_project_user"
icon="fa-calendar"
sequence="40"/>
<menuitem name="Project"
addons/purchase/purchase_view.xml
+1
View File
@@ -6,6 +6,7 @@
<menuitem name="Purchases"
id="base.menu_purchase_root"
groups="group_purchase_manager,group_purchase_user"
icon="fa-shopping-cart"
sequence="60"/>
<menuitem id="menu_procurement_management" name="Purchase"
addons/sales_team/sales_team.xml
+1
View File
@@ -3,6 +3,7 @@
<data>
<menuitem name="Sales"
id="base.menu_base_partner"
icon="fa-credit-card"
groups="base.group_sale_salesman,base.group_sale_manager"/>
<!-- Case Teams Salesteams kanban view -->
addons/stock/stock_view.xml
+1
View File
@@ -6,6 +6,7 @@
<menuitem name="Warehouse"
id="menu_stock_root"
groups="group_stock_manager,group_stock_user"
icon="fa-archive"
sequence="70"/>
<menuitem id="menu_stock_warehouse_mgmt" name="Operations" parent="menu_stock_root" sequence="1"/>
addons/web/views/webclient_templates.xml
+1
View File
@@ -190,6 +190,7 @@
t-att-data-menu="menu['id']"
t-att-data-action-model="menu['action'] and menu['action'].split(',')[0] or ''"
t-att-data-action-id="menu['action'] and menu['action'].split(',')[1] or ''">
<i t-if="menu.get('icon')" t-attf-class="fa #{menu.get('icon')} fa-lg fa-fw"/>
<span class="oe_menu_text">
<t t-esc="menu['name']"/>
</span>
addons/website/data/data.xml
+1
View File
@@ -85,6 +85,7 @@
<record id="menu_website" model="ir.ui.menu">
<field name="name">Website</field>
<field name="icon">fa-home</field>
<field name="sequence" eval="400"/>
<field name="action" ref="action_website"/>
</record>
openerp/addons/base/base_menu.xml
+2
View File
@@ -4,6 +4,7 @@
<menuitem name="Reporting"
id="menu_reporting"
groups="base.group_user"
icon="fa-signal"
sequence="170"/>
<menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_reporting" sequence="0"/>
<menuitem id="menu_reporting_config" name="Configuration" parent="menu_reporting" sequence="100" groups="base.group_system"/>
@@ -11,6 +12,7 @@
<!-- Top menu item -->
<menuitem name="Settings"
id="menu_administration"
icon="fa-gear"
sequence="500"/>
<menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
<menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
openerp/addons/base/ir/ir_ui_menu.py
+2 -3
View File
@@ -358,7 +358,7 @@ class ir_ui_menu(osv.osv):
@api.cr_uid_context
@tools.ormcache_context(accepted_keys=('lang',))
def load_menus_root(self, cr, uid, context=None):
fields = ['name', 'sequence', 'parent_id', 'action']
fields = ['name', 'sequence', 'parent_id', 'action', 'icon']
menu_root_ids = self.get_user_roots(cr, uid, context=context)
menu_roots = self.read(cr, uid, menu_root_ids, fields, context=context) if menu_root_ids else []
return {
@@ -432,7 +432,7 @@ class ir_ui_menu(osv.osv):
"If this field is empty, Odoo will compute visibility based on the related object's read access."),
'complete_name': fields.function(_get_full_name,
string='Full Path', type='char', size=128),
'icon': fields.selection(tools.icons, 'Icon', size=64),
'icon': fields.char('Icon', size=64),
'icon_pict': fields.function(_get_icon_pict, type='char', size=32),
'web_icon': fields.char('Web Icon File'),
'web_icon_hover': fields.char('Web Icon File (hover)'),
@@ -462,7 +462,6 @@ class ir_ui_menu(osv.osv):
(osv.osv._check_recursion, _rec_message, ['parent_id'])
]
_defaults = {
'icon': 'STOCK_OPEN',
'icon_pict': ('stock', ('STOCK_OPEN', 'ICON_SIZE_MENU')),
'sequence': 10,
}
openerp/tools/convert.py
+10
View File
@@ -560,6 +560,16 @@ form: module.record_id""" % (xml_id,)
groups_value.append((4, group_id))
values['groups_id'] = groups_value
if not values.get('parent_id'):
if rec.get('icon'):
values['icon'] = rec.get('icon')
else:
default_icon = 'fa-cube' # default icon if not specified any for top-level menu
try:
values['icon'] = self.pool.get('ir.ui.menu').read(cr,self.uid,res,['icon'])[0].get('icon')
except:
values['icon'] = default_icon
pid = self.pool['ir.model.data']._update(cr, self.uid, 'ir.ui.menu', self.module, values, rec_id, noupdate=self.isnoupdate(data_node), mode=self.mode, res_id=res and res[0] or False)
if rec_id and pid: