odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-portal_anonymous_fixes-vta 

bzr revid: vta@openerp.com-20121217112055-ga4mw00z08owxo0l
This commit is contained in:
vta vta@openerp.com 2012-12-17 12:20:55 +01:00
parent 356fd3466e 3e8d5d9bad
commit 8f57edf1ed
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/portal/portal_data.xml
View File

@ -32,6 +32,7 @@
'default_model': 'mail.group',
'default_res_id': ref('company_news_feed'),
},
'readonly': True,
'show_link': False,
'res_model': 'mail.message',
'thread_level': 1,
@ -64,6 +65,7 @@
'default_model': 'mail.group',
'default_res_id': ref('company_jobs'),
},
'readonly': True,
'show_link': False,
'res_model': 'mail.message',
'thread_level': 1,

11
addons/portal_anonymous/static/src/js/portal_anonymous.js
View File

@ -26,7 +26,7 @@ openerp.portal_anonymous = function(instance) {
start: function() {
var self = this;
this._super.apply(this, arguments);
this.$el.find('.oe_topbar_anonymous_login').click(function() {
this.$el.find('a.login').click(function() {
var p = self.getParent();
var am = p.action_manager;
p.$el.find('.oe_leftbar').hide();
@ -44,4 +44,13 @@ openerp.portal_anonymous = function(instance) {
}
});
instance.web.WebClient.include({
check_timezone: function() {
if (this.session.username !== 'anonymous') {
return this._super.apply(this, arguments);
}
return false;
},
});
};

4
addons/portal_anonymous/static/src/xml/portal_anonymous.xml
View File

@ -4,8 +4,8 @@
<templates id="template" xml:space="preserve">
<t t-name="UserMenu.portal_anonymous">
<div>
<a href="#" class="oe_user_menu oe_topbar_item oe_topbar_anonymous_login">
<div class="oe_user_menu oe_topbar_anonymous_login">
<a href="#" class="login">
Login
</a>
</div>

8
addons/portal_crm/contact_view.xml
View File

@ -43,15 +43,15 @@
</kanban>
</field>
<div class="oe_portal_crm_team">
</div>
</div>
<div style="margin-right: 320px; max-width: 900px;">
<group>
<group>
<field name="partner_name" string="Name" placeholder="Your name..."/>
<field name="email_from" placeholder="Your email..."/>
<field name="phone" placeholder="Your phone number..."/>
<field name="partner_name" string="Name" placeholder="Your name..." required="True"/>
<field name="email_from" placeholder="Your email..." required="True"/>
<field name="phone" placeholder="Your phone number..."/>
</group>
<field name="name" placeholder="Subject..." nolabel="1" colspan="2"/>
<field name="description" String="Content" placeholder="Content..." nolabel="1" colspan="2"/>