[MERGE]
bzr revid: sgo@tinyerp.com-20120404093445-qeommohxdn87ys8k bzr revid: sgo@tinyerp.com-20120404093820-bt23fuitm0my0z7h bzr revid: sgo@tinyerp.com-20120404094415-cax7ycp1l4bn38l0
This commit is contained in:
@@ -71,7 +71,7 @@ Dashboard for project members that includes:
|
||||
'auto_install': False,
|
||||
'application': True,
|
||||
'css': ['static/src/css/project.css'],
|
||||
'js': ['static/src/js/dropdown.js'],
|
||||
'js': ['static/src/js/dropdown.js','static/src/js/project.js'],
|
||||
'certificate': '0075116868317',
|
||||
}
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -176,15 +176,9 @@
|
||||
<field name="open_task"/>
|
||||
<templates>
|
||||
<t t-name="kanban-box">
|
||||
<script type="text/javascript">
|
||||
function showElement(){
|
||||
$('.dropdown-toggle').dropdown();
|
||||
|
||||
}
|
||||
</script>
|
||||
<div class="project_vignettes">
|
||||
<li class="oe_project_kanban_vignette">
|
||||
<a href="#" class="oe_project_kanban_action dropdown-toggle" onclick="javascript:showElement()"><span class="i">B</span></a>
|
||||
<a href="#" class="oe_project_kanban_action dropdown-toggle"><span class="i">B</span></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li ><a type="edit" >Edit...</a></li>
|
||||
<li ><a type="delete">Delete</a></li>
|
||||
@@ -222,13 +216,16 @@
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<t t-if="record.members.raw_value.length > 7">
|
||||
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" class="project_avatar"/>
|
||||
<t t-foreach="record.members.raw_value" t-as="member">
|
||||
<img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-title="member" class="project_avatar"/>
|
||||
</t>
|
||||
</t>
|
||||
<t t-if="record.members.raw_value.length <= 7">
|
||||
<br/><br/>
|
||||
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" class="project_avatar"/>
|
||||
<t t-foreach="record.members.raw_value" t-as="member">
|
||||
<img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-title="member" class="project_avatar"/>
|
||||
</t>
|
||||
|
||||
@@ -111,6 +111,7 @@ table {
|
||||
a.oe_project_kanban_action {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
display: none;
|
||||
}
|
||||
a.oe_project_kanban_action:hover {
|
||||
text-decoration: none; }
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
openerp.project = function(openerp) {
|
||||
openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({
|
||||
bind_events: function() {
|
||||
self = this
|
||||
self._super()
|
||||
if(this.view.dataset.model == 'project.project') {
|
||||
$('.oe_project_kanban_vignette').mouseover(function() {
|
||||
return $(this).find('.oe_project_kanban_action').show();
|
||||
}).mouseout(function() {
|
||||
return $(this).find('.oe_project_kanban_action').hide();
|
||||
});
|
||||
$('.dropdown-toggle').dropdown();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user