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

[IMP]: Add accept/decline button instead of link and improve css of status button in m2m tag

Browse Source 
bzr revid: aja@tinyerp.com-20130808091346-c34npeouncn0i5rm
This commit is contained in:
ajay javiya (OpenERP)
2013-08-08 14:43:46 +05:30
parent 2c6221092e
commit e87080e128
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_calendar/__openerp__.py
+1 -1
View File
@@ -58,7 +58,7 @@ If you need to manage your meetings, you should install the CRM module.
'installable': True,
'application': True,
'auto_install': False,
'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',],
'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg'],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/base_calendar/crm_meeting_data.xml
+8 -8
View File
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="1">
<data>
<!-- CASE CATEGORY(categ_id) -->
@@ -78,9 +78,9 @@
<div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 14px" >
${object.location or ''}
% if object.location :
<span style= "color:#A9A9A9; ">
<span style= "color:#A9A9A9; ">
(<a href="http://maps.google.com/maps?oi=map&q=${object.location}">View Map</a>)
</span>
</span>
% endif
</div>
</td>
@@ -90,7 +90,7 @@
<div style = "height: 25px; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 14px;"><b>What :</b>
</div>
</td>
<td colspan="3">
<td colspan="3">
<div style = " font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 14px" >
${object.description or ''}
</div>
@@ -113,19 +113,19 @@
</table>
</td>
</tr>
<tr >
<tr>
<td>
<div style = " font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 10px" >
<span style= "margin-top: 50px; margin-left: 200px;" >
<a href="${ctx['base_url']}/meeting/meeting_invitation?db=${ctx['dbname']}&token=${ctx['att_obj'].id}&action=${ctx['action_id']}&id=${object.id}&view_type=form&status=accepted">Accept</a> |
<a href="${ctx['base_url']}/meeting/meeting_invitation?db=${ctx['dbname']}&token=${ctx['att_obj'].id}&action=${ctx['action_id']}&id=${object.id}&view_type=form&status=declined">Declined</a>
<a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background: url(${ctx['base_url']}/web/static/src/img/icons/kanban-apply.png) no-repeat center left 4px,-moz-linear-gradient(top, #ffffff, #f6f6f6);background: url(${ctx['base_url']}/web/static/src/img/icons/kanban-apply.png) no-repeat center left 4px,-webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#f6f6f6));margin : 0 15px 0 0;text-decoration: none;" href="${ctx['base_url']}/meeting/meeting_invitation?db=${ctx['dbname']}&token=${ctx['att_obj'].id}&action=${ctx['action_id']}&id=${object.id}&view_type=form&status=accepted">Accept</a>
<a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background: url(${ctx['base_url']}/web/static/src/img/icons/gtk-cancel.png) no-repeat center left 4px,-moz-linear-gradient(top, #ffffff, #f6f6f6);background: url(${ctx['base_url']}/web/static/src/img/icons/gtk-cancel.png) no-repeat center left 4px,-webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#f6f6f6));margin: 0 0 0 15px;text-decoration: none;" href="${ctx['base_url']}/meeting/meeting_invitation?db=${ctx['dbname']}&token=${ctx['att_obj'].id}&action=${ctx['action_id']}&id=${object.id}&view_type=form&status=declined">Decline</a>
</span>
</div>
</td>
</tr>
<tr>
<td>
<div >
<div>
-- </br> Sent by ${object.user_id.name} from ${object.user_id.company_id.name}. View this meeting detail
<a href="${ctx['base_url']}/meeting/meeting_invitation?db=${ctx['dbname']}&token=${ctx['att_obj'].id}&action=${ctx['action_id']}&id=${object.id}&view_type=calendar&status=">directly in OpenERP.</a>
</div>
addons/base_calendar/static/src/css/base_calender.css
+5 -2
View File
@@ -1,15 +1,18 @@
.openerp .oe_invitation , .text-core .text-tag .oe_invitation{
width : 16px;
height : 16px;
width : 13px;
height : 13px;
margin-bottom : -4px;
display : inline-block;
}
.openerp .needs-action , .tentative,.text-core .text-tag .custom-edit, .text-core .text-tag .tentative {
background : url(/web/static/src/img/icons/gtk-normal.png) no-repeat;
background-size : 11px 11px;
}
.openerp .accepted , .text-core .text-tag .accepted {
background : url(/web/static/src/img/icons/gtk-yes.png) no-repeat;
background-size : 11px 11px;
}
.openerp .declined , .text-core .text-tag .declined {
background : url(/web/static/src/img/icons/gtk-no.png) no-repeat;
background-size : 11px 11px;
}