From 229e507a4bce79ae6bfe652330b714c3e94d45ff Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Wed, 7 Dec 2011 19:50:58 +0100
Subject: [PATCH 1/2] [IMP] Relooking of the modules vignette, the Kanban view
 is now the default view for the module screen.

bzr revid: mit@openerp.com-20111207185058-xb5b4z8cz0zd6gla
---
 openerp/addons/base/__openerp__.py            |  2 +
 openerp/addons/base/module/module_view.xml    | 48 +++++++++----------
 .../addons/base/static/src/css/modules.css    | 31 ++++++++++++
 openerp/addons/base/static/src/js/modules.js  |  0
 4 files changed, 55 insertions(+), 26 deletions(-)
 create mode 100644 openerp/addons/base/static/src/css/modules.css
 create mode 100644 openerp/addons/base/static/src/js/modules.js

diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index f1ceb9a0915..2bd66fa5a02 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -99,5 +99,7 @@
     'installable': True,
     'active': True,
     'certificate': '0076807797149',
+    "js": [ 'static/src/js/modules.js' ],
+    "css": [ 'static/src/css/modules.css' ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index ff4dee3b3c0..212a2881cf2 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -62,34 +62,30 @@
             <field name="model">ir.module.module</field>
             <field name="type">kanban</field>
             <field name="arch" type="xml">
-                <kanban>
-                    <field name="name"/>
-                    <field name="icon"/>
-                    <field name="complexity"/>
-                    <field name="category_id"/>
-                    <field name="state"/>
-                    <templates>
-                        <t t-name="kanban-box">
-                            <table border="0">
-                            <tr>
-                                <td>
-                                    <img src="/web/static/src/img/header-preferences.png"/>
-                                </td><td>
-                                    <field name="name"/><br/>
-                                    <field name="category_id"/><br/>
-                                    <field name="complexity"/><br/>
-                                    <field name="state"/>
-                                </td>
-                            </tr>
-                            </table>
-                        </t>
-                    </templates>
-                </kanban>
+
+              <kanban>
+                  <field name="icon"/>
+                  <field name="state"/>
+                  <templates>
+                      <t t-name="kanban-box">
+                        <img t-if="record.icon.value" src="#{record.icon.value}.png" class="module-icon"/>
+                        <img t-if="!record.icon.value" src="/web/static/src/img/header-preferences.png" class="module-icon"/>
+                        <div class="module-desc">
+                          <h4><field name="shortdesc"/></h4>
+                          <p>
+                             <field name="category_id"/><br/>
+                             Complexity: <field name="complexity"/>
+                           </p>
+                          <a type="object" name="button_install" states="uninstalled" class="button">Install</a>
+                          <button t-if="record.state.raw_value == 'installed'" class="label" disabled="disabled">Installed</button>
+                        </div>
+                      </t>
+                  </templates>
+              </kanban>
+
             </field>
         </record>
 
-
-
         <record id="action_module_open_categ" model="ir.actions.act_window">
             <field name="name">Modules</field>
             <field name="res_model">ir.module.module</field>
@@ -194,7 +190,7 @@
             <field name="name">Modules</field>
             <field name="res_model">ir.module.module</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,kanban</field>
+            <field name="view_mode">kanban,tree,form</field>
             <field name="domain"/>
             <field name="search_view_id" ref="view_module_filter"/>
             <field name="help">You can install new modules in order to activate new features, menu, reports or data in your OpenERP instance. To install some modules, click on the button "Install" from the form view and then click on "Start Upgrade".</field>
diff --git a/openerp/addons/base/static/src/css/modules.css b/openerp/addons/base/static/src/css/modules.css
new file mode 100644
index 00000000000..645a332bc46
--- /dev/null
+++ b/openerp/addons/base/static/src/css/modules.css
@@ -0,0 +1,31 @@
+.module-icon, .module-desc {
+  display: inline-block;
+  vertical-align: top;
+}
+
+.module-icon {
+  width: 80px;
+  height: 80px;
+  padding: 0 4px;
+}
+
+.module-desc {
+  width: 220px;
+  font-size: 13px;
+  padding: 2px 4px 8px;
+  color: #4c4c4c;
+}
+
+.module-desc h4 {
+  margin: 3px 0;
+  font-size: 13px;
+}
+
+.module-desc p {
+  margin: 3px 0 5px;
+}
+
+.oe_kanban_record {
+  margin: 5px 0;
+  min-height: 80px;
+}
diff --git a/openerp/addons/base/static/src/js/modules.js b/openerp/addons/base/static/src/js/modules.js
new file mode 100644
index 00000000000..e69de29bb2d

From 3a84d1c8b0d902fd28fb323e24c5cadc9e1832e2 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Thu, 8 Dec 2011 17:11:24 +0100
Subject: [PATCH 2/2] Changed modules icons in the vignette

bzr revid: mit@openerp.com-20111208161124-o325usj9ikheewv8
---
 openerp/addons/base/module/module_view.xml    | 33 +++++++++++--------
 .../addons/base/static/src/css/modules.css    | 24 +++++++++-----
 openerp/modules/module.py                     |  2 +-
 3 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 212a2881cf2..c155b01af76 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -65,21 +65,28 @@
 
               <kanban>
                   <field name="icon"/>
+                  <field name="name"/>
                   <field name="state"/>
+                  <field name="complexity"/>
                   <templates>
-                      <t t-name="kanban-box">
-                        <img t-if="record.icon.value" src="#{record.icon.value}.png" class="module-icon"/>
-                        <img t-if="!record.icon.value" src="/web/static/src/img/header-preferences.png" class="module-icon"/>
-                        <div class="module-desc">
-                          <h4><field name="shortdesc"/></h4>
-                          <p>
-                             <field name="category_id"/><br/>
-                             Complexity: <field name="complexity"/>
-                           </p>
-                          <a type="object" name="button_install" states="uninstalled" class="button">Install</a>
-                          <button t-if="record.state.raw_value == 'installed'" class="label" disabled="disabled">Installed</button>
-                        </div>
-                      </t>
+                    <t t-name="kanban-box">
+                      <a type="edit"> 
+                        <img t-attf-src="/#{record.name.value}/static/images/icon.png" 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/>
+                           <span t-if="record.complexity.raw_value == 'Expert'" class="oe_label oe_warning">Complex</span>
+                         </p>
+                        <a type="object" name="button_install" states="uninstalled" class="button">Install</a>
+                        <button t-if="record.state.raw_value == 'installed'" class="label" disabled="disabled">Installed</button>
+                      </div>
+                      <script>
+                        $('.oe_module_icon').error(function() { $(this).attr('src', "/base/static/src/img/kanban_partner.png"); });
+                        $('a .oe_module_icon').error(function() { $(this).attr('src', "/base/static/src/img/kanban_partner.png"); });
+                      </script>
+                    </t>
                   </templates>
               </kanban>
 
diff --git a/openerp/addons/base/static/src/css/modules.css b/openerp/addons/base/static/src/css/modules.css
index 645a332bc46..3b525679be1 100644
--- a/openerp/addons/base/static/src/css/modules.css
+++ b/openerp/addons/base/static/src/css/modules.css
@@ -1,31 +1,39 @@
-.module-icon, .module-desc {
+.oe_module_icon, .oe_module_desc {
   display: inline-block;
   vertical-align: top;
 }
 
-.module-icon {
+.oe_module_icon {
   width: 80px;
   height: 80px;
-  padding: 0 4px;
+  padding: 4px;
 }
 
-.module-desc {
+.oe_module_desc {
   width: 220px;
   font-size: 13px;
   padding: 2px 4px 8px;
   color: #4c4c4c;
 }
 
-.module-desc h4 {
-  margin: 3px 0;
+.oe_module_desc h4 {
+  margin: 0;
   font-size: 13px;
 }
 
-.module-desc p {
+.oe_module_desc h4 a {
+  color: #4c4c4c;
+}
+
+.oe_module_desc h4 a:hover {
+  text-decoration: underline;
+}
+
+.oe_module_desc p {
   margin: 3px 0 5px;
 }
 
 .oe_kanban_record {
   margin: 5px 0;
-  min-height: 80px;
+  min-height: 100px;
 }
diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index 09fcb2e9a0a..d35ca743bd3 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -251,7 +251,7 @@ def load_information_from_description_file(module):
             info.setdefault('description', '')
             info.setdefault('complexity', 'normal')
             info.setdefault('core', False)
-            info.setdefault('icon', '')
+            info.setdefault('icon', 'images/icon.png')
             info['certificate'] = info.get('certificate') or None
             info['web'] = info.get('web') or False
             info['license'] = info.get('license') or 'AGPL-3'