[MERGE] module kaban padding fixes (manual merge)

bzr revid: al@openerp.com-20111220004135-fafhd3w1l0ovsdie

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index b0392fb..de72e72 100644 (file)
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -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>

diff --git a/openerp/addons/base/static/src/css/modules.css b/openerp/addons/base/static/src/css/modules.css
index a1fd6b9..4ee04e9 100644 (file)
--- a/openerp/addons/base/static/src/css/modules.css
+++ b/openerp/addons/base/static/src/css/modules.css
@@ -1,3 +1,8 @@
+.oe_module_vignette {
+  padding: 6px;
+  min-height: 100px;
+}
+
 .oe_module_icon, .oe_module_desc {
   display: inline-block;
   vertical-align: top;