From 18b74e942bab11798bba63c0e72f3cec829ea921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 25 Mar 2013 18:36:25 +0100
Subject: [PATCH 1/8] [IMP] load description from 'description.html' file in
 module directory

bzr revid: fva@openerp.com-20130325173625-ntb9z3bgcr85ozpl
---
 openerp/addons/base/module/module.py       | 14 ++++++++-
 openerp/addons/base/module/module_view.xml | 36 ++++++++++++----------
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 5dcb1693c67..fe473cb90dd 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -149,6 +149,18 @@ class module(osv.osv):
                           'module %s', name, exc_info=True)
         return info
 
+    def _get_desc_from_file(self, cr, uid, ids, field_name=None, arg=None, context=None):
+        res = dict.fromkeys(ids, '')
+        for module in self.browse(cr, uid, ids, context=context):
+            path = addons.get_module_resource(module.name, 'description.html')
+            if path:
+                desc_file = tools.file_open(path, 'rb')
+                try:
+                    res[module.id] = desc_file.read()
+                finally:
+                    desc_file.close()
+        return res
+
     def _get_desc(self, cr, uid, ids, field_name=None, arg=None, context=None):
         res = dict.fromkeys(ids, '')
         for module in self.browse(cr, uid, ids, context=context):
@@ -247,7 +259,7 @@ class module(osv.osv):
         'shortdesc': fields.char('Module Name', size=64, readonly=True, translate=True),
         'summary': fields.char('Summary', size=64, readonly=True, translate=True),
         'description': fields.text("Description", readonly=True, translate=True),
-        'description_html': fields.function(_get_desc, string='Description HTML', type='html', method=True, readonly=True),
+        'description_html': fields.function(_get_desc_from_file, string='Description HTML', type='html', method=True, readonly=True),
         'author': fields.char("Author", size=128, readonly=True),
         'maintainer': fields.char('Maintainer', size=128, readonly=True),
         'contributors': fields.text('Contributors', readonly=True),
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 3923c9de3bd..9c4ca714c6f 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -70,13 +70,15 @@
             <field name="name">ir.module.module.form</field>
             <field name="model">ir.module.module</field>
             <field name="arch" type="xml">
-                <form create="0" edit="0" string="Module" version="7.0">
+                <form create="0" edit="0" string="Module" version="7.0" class='oe_styling_v8'>
                 <sheet>
                     <field name="icon_image" widget="image" class="oe_avatar oe_left"/>
                     <div class="oe_title">
                         <h1><field name="shortdesc"/></h1>
                         <h2 class="oe_fade"><field name="summary"/></h2>
-                        <button name="button_immediate_install" states="uninstalled" string="Install" type="object" class="oe_highlight"/>
+                    </div>
+                    <div class='oe_right oe_button_box'>
+                        <button name="button_immediate_install" states="uninstalled" string="Install" type="object" class="oe_highlight oe_big_purple"/>
                         <button name="button_immediate_upgrade" states="installed" string="Upgrade" type="object" class="oe_highlight"/>
                         <button name="button_immediate_uninstall" states="installed" string="Uninstall" type="object"
                             confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
@@ -84,21 +86,23 @@
                         <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" type="object"/>
                         <button name="button_install_cancel" states="to install" string="Cancel Install" type="object"/>
                     </div>
-                    <group>
-                        <group>
-                            <field name="author"/>
-                            <field name="website" widget="url" attrs="{'invisible':[('website','=',False)]}"/>
-                            <field name="category_id" widget="selection"/>
-                        </group>
-                        <group>
-                            <field name="name"/>
-                            <field name="license"/>
-                            <field name="installed_version"/>
-                        </group>
-                    </group>
                     <notebook>
                         <page string="Description">
-                            <field name="description_html"/>
+                            <field name="description_html" class='oe_app_description oe_styling_v8'/>
+                        </page>
+                        <page string="Info">
+                            <group>
+                                <group>
+                                    <field name="author"/>
+                                    <field name="website" widget="url" attrs="{'invisible':[('website','=',False)]}"/>
+                                    <field name="category_id" widget="selection"/>
+                                </group>
+                                <group>
+                                    <field name="name"/>
+                                    <field name="license"/>
+                                    <field name="installed_version"/>
+                                </group>
+                            </group>
                         </page>
                         <page string="Technical Data" groups="base.group_no_one">
                             <group col="4">
@@ -116,7 +120,7 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="Features" attrs="{'invisible':[('state','!=','installed')]}">
+                        <page string="Installed Features" attrs="{'invisible':[('state','!=','installed')]}">
                             <label for="menus_by_module" string="Created Menus"/>
                             <field name="menus_by_module"/>
                             <label for="reports_by_module" string="Defined Reports"/>

From fee9494b4bcd64b12612051a98e94518fbe48946 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 7 Apr 2013 14:25:17 +0200
Subject: [PATCH 2/8] [IMP] module view

bzr revid: fp@openerp.com-20130407122517-zkwmkr17bb7q6p3a
---
 openerp/addons/base/module/module_view.xml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 9c4ca714c6f..e74e4d75020 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -71,11 +71,13 @@
             <field name="model">ir.module.module</field>
             <field name="arch" type="xml">
                 <form create="0" edit="0" string="Module" version="7.0" class='oe_styling_v8'>
-                <sheet>
+                    <sheet>
                     <field name="icon_image" widget="image" class="oe_avatar oe_left"/>
                     <div class="oe_title">
                         <h1><field name="shortdesc"/></h1>
-                        <h2 class="oe_fade"><field name="summary"/></h2>
+                        <h3 class="oe_fade">
+                            By <field name="author" class="oe_inline"/>
+                        </h3>
                     </div>
                     <div class='oe_right oe_button_box'>
                         <button name="button_immediate_install" states="uninstalled" string="Install" type="object" class="oe_highlight oe_big_purple"/>
@@ -86,16 +88,14 @@
                         <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" type="object"/>
                         <button name="button_install_cancel" states="to install" string="Cancel Install" type="object"/>
                     </div>
-                    <notebook>
-                        <page string="Description">
-                            <field name="description_html" class='oe_app_description oe_styling_v8'/>
-                        </page>
-                        <page string="Info">
+                    <div class="oe_clear"/>
+                    <notebook groups="base.group_no_one">
+                        <page string="Information">
                             <group>
                                 <group>
-                                    <field name="author"/>
                                     <field name="website" widget="url" attrs="{'invisible':[('website','=',False)]}"/>
                                     <field name="category_id" widget="selection"/>
+                                    <field name="summary"/>
                                 </group>
                                 <group>
                                     <field name="name"/>
@@ -104,7 +104,7 @@
                                 </group>
                             </group>
                         </page>
-                        <page string="Technical Data" groups="base.group_no_one">
+                        <page string="Technical Data">
                             <group col="4">
                                 <field name="demo"/>
                                 <field name="application"/>
@@ -128,6 +128,7 @@
                         </page>
                     </notebook>
                     </sheet>
+                    <field name="description_html" class='oe_app_description oe_styling_v8'/>
                 </form>
             </field>
         </record>

From 4bf6a7ea4c1703a02aa547db477ad7162ac1378c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 30 May 2013 15:51:47 +0200
Subject: [PATCH 3/8] [IMP] parse description html to change image src to
 [module]/static/description/image_url

bzr revid: chm@openerp.com-20130530135147-oij26myykrngrig1
---
 openerp/addons/base/module/module.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 30b3d203930..74daf56c628 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -32,6 +32,7 @@ import urllib
 import urllib2
 import zipfile
 import zipimport
+import lxml.html
 
 try:
     from cStringIO import StringIO
@@ -156,7 +157,12 @@ class module(osv.osv):
             if path:
                 desc_file = tools.file_open(path, 'rb')
                 try:
-                    res[module.id] = desc_file.read()
+                    doc = desc_file.read()
+                    html = lxml.html.document_fromstring(doc)
+                    for element in html.iterlinks():
+                        if element.get('src'):
+                            element.set('src', "%s/static/description/%s" % (module.name, element.get('src')))
+                    res[module.id] = lxml.html.tostring(html)
                 finally:
                     desc_file.close()
             else:

From 33a40f131a3773077c49f7d5dd62ba1fae971ac0 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 30 May 2013 16:29:02 +0200
Subject: [PATCH 4/8] [IMP] parse description html to change image src to
 [module]/static/description/image_url

bzr revid: chm@openerp.com-20130530142902-bv4ol10s4n119c8i
---
 openerp/addons/base/module/module.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index b84a35d7e4d..6fffac97da7 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -159,7 +159,7 @@ class module(osv.osv):
                 try:
                     doc = desc_file.read()
                     html = lxml.html.document_fromstring(doc)
-                    for element in html.iterlinks():
+                    for element, attribute, link, pos in html.iterlinks():
                         if element.get('src'):
                             element.set('src', "%s/static/description/%s" % (module.name, element.get('src')))
                     res[module.id] = lxml.html.tostring(html)
@@ -486,7 +486,6 @@ class module(osv.osv):
         function(cr, uid, ids, context=context)
 
         cr.commit()
-        openerp.modules.registry.RegistryManager.signal_registry_change(cr.dbname)
         registry = openerp.modules.registry.RegistryManager.new(cr.dbname, update_module=True)
 
         config = registry['res.config'].next(cr, uid, [], context=context) or {}

From 2d6806308063edb3ab9ba1e60c14c31fd42e12e8 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 30 May 2013 17:27:41 +0200
Subject: [PATCH 5/8] [IMP] css

bzr revid: chm@openerp.com-20130530152741-mdzjtuvalkmvmanh
---
 openerp/addons/base/module/module.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 6fffac97da7..1f88b5b0c7a 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -153,14 +153,15 @@ class module(osv.osv):
     def _get_desc(self, cr, uid, ids, field_name=None, arg=None, context=None):
         res = dict.fromkeys(ids, '')
         for module in self.browse(cr, uid, ids, context=context):
-            path = addons.get_module_resource(module.name, 'description.html')
+            path = addons.get_module_resource(module.name, 'static/description/description.html')
             if path:
+                print path
                 desc_file = tools.file_open(path, 'rb')
                 try:
                     doc = desc_file.read()
                     html = lxml.html.document_fromstring(doc)
                     for element, attribute, link, pos in html.iterlinks():
-                        if element.get('src'):
+                        if element.get('src') and not '//' in element.get('src') and not 'static/' in element.get('src'):
                             element.set('src', "%s/static/description/%s" % (module.name, element.get('src')))
                     res[module.id] = lxml.html.tostring(html)
                 finally:

From f14a86b7ae79ff1bf0de2ea4c781b84b6ead86d8 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 30 May 2013 18:52:19 +0200
Subject: [PATCH 6/8] [IMP] module view

bzr revid: chm@openerp.com-20130530165219-fm04kpau7xvxz1zh
---
 openerp/addons/base/module/module_view.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index e74e4d75020..322f8886f91 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -78,15 +78,15 @@
                         <h3 class="oe_fade">
                             By <field name="author" class="oe_inline"/>
                         </h3>
-                    </div>
-                    <div class='oe_right oe_button_box'>
-                        <button name="button_immediate_install" states="uninstalled" string="Install" type="object" class="oe_highlight oe_big_purple"/>
-                        <button name="button_immediate_upgrade" states="installed" string="Upgrade" type="object" class="oe_highlight"/>
-                        <button name="button_immediate_uninstall" states="installed" string="Uninstall" type="object"
-                            confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
-                        <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" type="object"/>
-                        <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" type="object"/>
-                        <button name="button_install_cancel" states="to install" string="Cancel Install" type="object"/>
+                        <div>
+                            <button name="button_immediate_install" states="uninstalled" string="Install" type="object" class="oe_highlight oe_big_purple"/>
+                            <button name="button_immediate_upgrade" states="installed" string="Upgrade" type="object" class="oe_highlight"/>
+                            <button name="button_immediate_uninstall" states="installed" string="Uninstall" type="object"
+                                confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
+                            <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" type="object"/>
+                            <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" type="object"/>
+                            <button name="button_install_cancel" states="to install" string="Cancel Install" type="object"/>
+                        </div>
                     </div>
                     <div class="oe_clear"/>
                     <notebook groups="base.group_no_one">

From 71d93466e7b09c300e0524af4c762fbd5aa8ff8d Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 31 May 2013 11:39:01 +0200
Subject: [PATCH 7/8] [IMP] css app description relative href

bzr revid: chm@openerp.com-20130531093901-41uqp52xeef8yu37
---
 openerp/addons/base/module/module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 1f88b5b0c7a..4dba60398b7 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -162,7 +162,7 @@ class module(osv.osv):
                     html = lxml.html.document_fromstring(doc)
                     for element, attribute, link, pos in html.iterlinks():
                         if element.get('src') and not '//' in element.get('src') and not 'static/' in element.get('src'):
-                            element.set('src', "%s/static/description/%s" % (module.name, element.get('src')))
+                            element.set('src', "/%s/static/description/%s" % (module.name, element.get('src')))
                     res[module.id] = lxml.html.tostring(html)
                 finally:
                     desc_file.close()

From 68080eb17f8f23a34670d01f305316a01cea4d3b Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 3 Jun 2013 16:22:01 +0200
Subject: [PATCH 8/8] [IMP] description.html to index.html

bzr revid: chm@openerp.com-20130603142201-l3pdz4s5ggxjdf8w
---
 openerp/addons/base/module/module.py       | 2 +-
 openerp/addons/base/module/module_view.xml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 4dba60398b7..5cf6f8d97c1 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -153,7 +153,7 @@ class module(osv.osv):
     def _get_desc(self, cr, uid, ids, field_name=None, arg=None, context=None):
         res = dict.fromkeys(ids, '')
         for module in self.browse(cr, uid, ids, context=context):
-            path = addons.get_module_resource(module.name, 'static/description/description.html')
+            path = addons.get_module_resource(module.name, 'static/description/index.html')
             if path:
                 print path
                 desc_file = tools.file_open(path, 'rb')
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 322f8886f91..92cff25cb7d 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -79,7 +79,7 @@
                             By <field name="author" class="oe_inline"/>
                         </h3>
                         <div>
-                            <button name="button_immediate_install" states="uninstalled" string="Install" type="object" class="oe_highlight oe_big_purple"/>
+                            <button name="button_immediate_install" states="uninstalled" string="Install" type="object" class="oe_highlight"/>
                             <button name="button_immediate_upgrade" states="installed" string="Upgrade" type="object" class="oe_highlight"/>
                             <button name="button_immediate_uninstall" states="installed" string="Uninstall" type="object"
                                 confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
@@ -129,6 +129,7 @@
                     </notebook>
                     </sheet>
                     <field name="description_html" class='oe_app_description oe_styling_v8'/>
+                    <button name="button_immediate_install" states="uninstalled" string="Install" type="object" class="oe_highlight oe_center"/>
                 </form>
             </field>
         </record>