diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py index f1ceb9a0915..ab9231b129c 100644 --- a/openerp/addons/base/__openerp__.py +++ b/openerp/addons/base/__openerp__.py @@ -99,5 +99,6 @@ 'installable': True, 'active': True, 'certificate': '0076807797149', + "css": [ 'static/src/css/modules.css' ], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/base.sql b/openerp/addons/base/base.sql index 6f3a8ed1ee8..c0884895d67 100644 --- a/openerp/addons/base/base.sql +++ b/openerp/addons/base/base.sql @@ -295,7 +295,7 @@ CREATE TABLE ir_module_module ( category_id integer REFERENCES ir_module_category ON DELETE SET NULL, certificate character varying(64), description text, - core boolean default False, + application boolean default False, demo boolean default False, web boolean DEFAULT FALSE, license character varying(32), diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index 47000e9a358..f05b55b3344 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -215,7 +215,7 @@ class module(osv.osv): 'views_by_module': fields.function(_get_views, method=True, string='Views', type='text', multi="meta", store=True), 'certificate' : fields.char('Quality Certificate', size=64, readonly=True), 'web': fields.boolean('Has a web component', readonly=True), - 'core': fields.boolean('Is a Core Application', readonly=True), + 'application': fields.boolean('Application', readonly=True), 'icon': fields.char('Icon URL', size=128), 'complexity': fields.selection([('easy','Easy'), ('normal','Normal'), ('expert','Expert')], string='Complexity', readonly=True, diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index ff4dee3b3c0..76aec91b98e 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -39,8 +39,8 @@ - - + + @@ -62,34 +62,37 @@ ir.module.module kanban - - - - - - - - - - - - -
- - -
-
-
- -
-
-
-
+ + + + + + + + + + + +
+

+

+
+ Complex +

+ Install + +
+ +
+
+
+
- - Modules ir.module.module @@ -121,7 +124,7 @@ - +
@@ -194,7 +197,7 @@ Modules ir.module.module form - tree,form,kanban + kanban,tree,form 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". diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng index 5556d131fee..a95abd9ac4f 100644 --- a/openerp/addons/base/rng/view.rng +++ b/openerp/addons/base/rng/view.rng @@ -63,6 +63,9 @@ + + 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..3b525679be1 --- /dev/null +++ b/openerp/addons/base/static/src/css/modules.css @@ -0,0 +1,39 @@ +.oe_module_icon, .oe_module_desc { + display: inline-block; + vertical-align: top; +} + +.oe_module_icon { + width: 80px; + height: 80px; + padding: 4px; +} + +.oe_module_desc { + width: 220px; + font-size: 13px; + padding: 2px 4px 8px; + color: #4c4c4c; +} + +.oe_module_desc h4 { + margin: 0; + font-size: 13px; +} + +.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: 100px; +} diff --git a/openerp/modules/db.py b/openerp/modules/db.py index 4f8032716a9..31d6ddb60eb 100644 --- a/openerp/modules/db.py +++ b/openerp/modules/db.py @@ -75,14 +75,14 @@ def initialize(cr): cr.execute('INSERT INTO ir_module_module \ (author, website, name, shortdesc, description, \ - category_id, state, certificate, web, license, complexity, core, icon) \ + category_id, state, certificate, web, license, complexity, application, icon) \ VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', ( info['author'], info['website'], i, info['name'], info['description'], category_id, state, info['certificate'], info['web'], info['license'], - info['complexity'], info['core'], info['icon'])) + info['complexity'], info['application'], info['icon'])) id = cr.fetchone()[0] cr.execute('INSERT INTO ir_model_data \ (name,model,module, res_id, noupdate) VALUES (%s,%s,%s,%s,%s)', ( diff --git a/openerp/modules/module.py b/openerp/modules/module.py index 09fcb2e9a0a..78f1f831920 100644 --- a/openerp/modules/module.py +++ b/openerp/modules/module.py @@ -250,8 +250,8 @@ def load_information_from_description_file(module): info.setdefault('name', False) info.setdefault('description', '') info.setdefault('complexity', 'normal') - info.setdefault('core', False) - info.setdefault('icon', '') + info.setdefault('application', False) + 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'