[MERGE] module kaban padding fixes (manual merge)
bzr revid: al@openerp.com-20111220004135-fafhd3w1l0ovsdie
This commit is contained in:
parent
9c69c1c0c9
commit
c6bddbdd49
|
@ -75,19 +75,21 @@
|
|||
<field name="complexity"/>
|
||||
<templates>
|
||||
<t t-name="kanban-box">
|
||||
<t t-set="installed" t-value="record.state.raw_value == 'installed'"/>
|
||||
<a type="edit">
|
||||
<img t-attf-src="#{record.icon.value}" class="oe_module_icon"/>
|
||||
</a>
|
||||
<div class="oe_module_desc">
|
||||
<h4><a type="edit"><field name="shortdesc"/></a></h4>
|
||||
<p>
|
||||
<field name="category_id"/><br/>
|
||||
<field name="name"/><br/>
|
||||
<span t-if="record.complexity.raw_value == 'Expert'" class="oe_label oe_warning">Complex</span>
|
||||
</p>
|
||||
<button type="object" name="button_immediate_install" states="uninstalled" class="button">Install</button>
|
||||
<button t-if="installed" class="label" disabled="disabled">Installed</button>
|
||||
<div class="oe_module_vignette">
|
||||
<t t-set="installed" t-value="record.state.raw_value == 'installed'"/>
|
||||
<a type="edit">
|
||||
<img t-attf-src="#{record.icon.value}" class="oe_module_icon"/>
|
||||
</a>
|
||||
<div class="oe_module_desc">
|
||||
<h4><a type="edit"><field name="shortdesc"/></a></h4>
|
||||
<p>
|
||||
<field name="category_id"/><br/>
|
||||
<field name="name"/><br/>
|
||||
<span t-if="record.complexity.raw_value == 'Expert'" class="oe_label oe_warning">Complex</span>
|
||||
</p>
|
||||
<button type="object" name="button_immediate_install" states="uninstalled" class="button">Install</button>
|
||||
<button t-if="installed" class="label" disabled="disabled">Installed</button>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
</templates>
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
.oe_module_vignette {
|
||||
padding: 6px;
|
||||
min-height: 100px;
|
||||
}
|
||||
|
||||
.oe_module_icon, .oe_module_desc {
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
|
|
Loading…
Reference in New Issue