Anto has proposed merging
lp:~openerp-dev/openerp-web/trunk-formatting-modules-rst2html-pso into
lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-formatting-modules-rst2html-pso/+merge/120780
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-formatting-modules-rst2html-pso/+merge/120780
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-formatting-modules-rst2html-pso.
=== modified file 'addons/web/__openerp__.py'
--- addons/web/__openerp__.py 2012-08-01 11:19:29 +0000
+++ addons/web/__openerp__.py 2012-08-22 13:51:23 +0000
@@ -1,71 +1,71 @@
{
- "name" : "Web",
- "category": "Hidden",
- "description":
+ 'name': 'Web',
+ 'category': 'Hidden',
+ 'description':
"""
OpenERP Web core module.
========================
This module provides the core of the OpenERP Web Client.
""",
- "depends" : [],
+ 'depends': [],
'auto_install': True,
- 'post_load' : 'wsgi_postload',
+ 'post_load': 'wsgi_postload',
'js' : [
- "static/lib/datejs/globalization/en-US.js",
- "static/lib/datejs/core.js",
- "static/lib/datejs/parser.js",
- "static/lib/datejs/sugarpak.js",
- "static/lib/datejs/extras.js",
- "static/lib/jquery/jquery-1.7.2.js",
- "static/lib/jquery.MD5/jquery.md5.js",
- "static/lib/jquery.form/jquery.form.js",
- "static/lib/jquery.validate/jquery.validate.js",
- "static/lib/jquery.ba-bbq/jquery.ba-bbq.js",
- "static/lib/spinjs/spin.js",
- "static/lib/jquery.blockUI/jquery.blockUI.js",
- "static/lib/jquery.ui/js/jquery-ui-1.8.17.custom.min.js",
- "static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js",
- "static/lib/jquery.ui.notify/js/jquery.notify.js",
- "static/lib/jquery.deferred-queue/jquery.deferred-queue.js",
- "static/lib/jquery.scrollTo/jquery.scrollTo-min.js",
- "static/lib/jquery.tipsy/jquery.tipsy.js",
- "static/lib/jquery.textext/jquery.textext.js",
- "static/lib/jquery.timeago/jquery.timeago.js",
- "static/lib/qweb/qweb2.js",
- "static/lib/underscore/underscore.js",
- "static/lib/underscore/underscore.string.js",
- "static/lib/backbone/backbone.js",
- "static/lib/cleditor/jquery.cleditor.js",
- "static/lib/py.js/lib/py.js",
- "static/src/js/boot.js",
- "static/src/js/corelib.js",
- "static/src/js/coresetup.js",
- "static/src/js/dates.js",
- "static/src/js/formats.js",
- "static/src/js/chrome.js",
- "static/src/js/views.js",
- "static/src/js/data.js",
- "static/src/js/data_export.js",
- "static/src/js/data_import.js",
- "static/src/js/search.js",
- "static/src/js/view_form.js",
- "static/src/js/view_list.js",
- "static/src/js/view_list_editable.js",
- "static/src/js/view_tree.js",
- ],
- 'css' : [
- "static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.8.16.custom.css",
- "static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css",
- "static/lib/jquery.ui.notify/css/ui.notify.css",
- "static/lib/jquery.tipsy/tipsy.css",
- "static/lib/jquery.textext/jquery.textext.css",
- "static/src/css/base.css",
- "static/src/css/data_export.css",
- "static/src/css/data_import.css",
- "static/lib/cleditor/jquery.cleditor.css",
- ],
- 'qweb' : [
- "static/src/xml/*.xml",
+ 'static/lib/datejs/globalization/en-US.js',
+ 'static/lib/datejs/core.js',
+ 'static/lib/datejs/parser.js',
+ 'static/lib/datejs/sugarpak.js',
+ 'static/lib/datejs/extras.js',
+ 'static/lib/jquery/jquery-1.7.2.js',
+ 'static/lib/jquery.MD5/jquery.md5.js',
+ 'static/lib/jquery.form/jquery.form.js',
+ 'static/lib/jquery.validate/jquery.validate.js',
+ 'static/lib/jquery.ba-bbq/jquery.ba-bbq.js',
+ 'static/lib/spinjs/spin.js',
+ 'static/lib/jquery.blockUI/jquery.blockUI.js',
+ 'static/lib/jquery.ui/js/jquery-ui-1.8.17.custom.min.js',
+ 'static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js',
+ 'static/lib/jquery.ui.notify/js/jquery.notify.js',
+ 'static/lib/jquery.deferred-queue/jquery.deferred-queue.js',
+ 'static/lib/jquery.scrollTo/jquery.scrollTo-min.js',
+ 'static/lib/jquery.tipsy/jquery.tipsy.js',
+ 'static/lib/jquery.textext/jquery.textext.js',
+ 'static/lib/jquery.timeago/jquery.timeago.js',
+ 'static/lib/qweb/qweb2.js',
+ 'static/lib/underscore/underscore.js',
+ 'static/lib/underscore/underscore.string.js',
+ 'static/lib/backbone/backbone.js',
+ 'static/lib/cleditor/jquery.cleditor.js',
+ 'static/lib/py.js/lib/py.js',
+ 'static/src/js/boot.js',
+ 'static/src/js/corelib.js',
+ 'static/src/js/coresetup.js',
+ 'static/src/js/dates.js',
+ 'static/src/js/formats.js',
+ 'static/src/js/chrome.js',
+ 'static/src/js/views.js',
+ 'static/src/js/data.js',
+ 'static/src/js/data_export.js',
+ 'static/src/js/data_import.js',
+ 'static/src/js/search.js',
+ 'static/src/js/view_form.js',
+ 'static/src/js/view_list.js',
+ 'static/src/js/view_list_editable.js',
+ 'static/src/js/view_tree.js',
+ ],
+ 'css': [
+ 'static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.8.16.custom.css',
+ 'static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css',
+ 'static/lib/jquery.ui.notify/css/ui.notify.css',
+ 'static/lib/jquery.tipsy/tipsy.css',
+ 'static/lib/jquery.textext/jquery.textext.css',
+ 'static/src/css/base.css',
+ 'static/src/css/data_export.css',
+ 'static/src/css/data_import.css',
+ 'static/lib/cleditor/jquery.cleditor.css',
+ ],
+ 'qweb': [
+ 'static/src/xml/*.xml',
],
}
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css 2012-08-21 16:46:05 +0000
+++ addons/web/static/src/css/base.css 2012-08-22 13:51:23 +0000
@@ -148,6 +148,15 @@
.openerp li {
list-style-type: none;
}
+
+.openerp .oe_form_field_html li {
+ list-style-type: disc;
+}
+
+ .openerp .oe_form_field_html h1,h2 {
+ line-height:26px;
+}
+
.openerp input, .openerp textarea, .openerp select {
padding: 2px 4px;
border: 1px solid #cccccc;
=== modified file 'addons/web_api/__openerp__.py'
--- addons/web_api/__openerp__.py 2012-08-19 01:06:46 +0000
+++ addons/web_api/__openerp__.py 2012-08-22 13:51:23 +0000
@@ -1,10 +1,14 @@
{
- "name" : "OpenERP Web API",
- "category" : "Hidden",
- "description":"""Openerp Web API.""",
- "version" : "2.0",
- "depends" : ['web'],
- "installable" : True,
+ 'name': 'OpenERP Web API',
+ 'category': 'Hidden',
+ 'description': """
+Openerp Web API.
+================
+
+""",
+ 'version': '2.0',
+ 'depends': ['web'],
+ 'installable': True,
'auto_install': False,
'js' : [
],
=== modified file 'addons/web_calendar/__openerp__.py'
--- addons/web_calendar/__openerp__.py 2012-07-16 09:59:19 +0000
+++ addons/web_calendar/__openerp__.py 2012-08-22 13:51:23 +0000
@@ -1,20 +1,24 @@
{
- "name": "Web Calendar",
- "category": "Hidden",
- "description":"""OpenERP Web Calendar view.""",
- "version": "2.0",
- "depends": ['web'],
- "js": [
+ 'name': 'Web Calendar',
+ 'category': 'Hidden',
+ 'description':"""
+OpenERP Web Calendar view.
+==========================
+
+""",
+ 'version': '2.0',
+ 'depends': ['web'],
+ 'js': [
'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js',
'static/lib/dhtmlxScheduler/sources/ext/ext_minical.js',
'static/src/js/calendar.js'
],
- "css": [
- 'static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_ext.css',
- 'static/src/css/web_calendar.css'
- ],
+ 'css': [
+ 'static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_ext.css',
+ 'static/src/css/web_calendar.css'
+ ],
'qweb' : [
- "static/src/xml/*.xml",
+ 'static/src/xml/*.xml',
],
'auto_install': True
}
=== modified file 'addons/web_diagram/__openerp__.py'
--- addons/web_diagram/__openerp__.py 2012-07-16 09:59:19 +0000
+++ addons/web_diagram/__openerp__.py 2012-08-22 13:51:23 +0000
@@ -1,21 +1,25 @@
{
- "name" : "OpenERP Web Diagram",
- "category" : "Hidden",
- "description":"""Openerp Web Diagram view.""",
- "version" : "2.0",
- "depends" : ["web"],
- "js": [
+ 'name': 'OpenERP Web Diagram',
+ 'category': 'Hidden',
+ 'description': """
+Openerp Web Diagram view.
+=========================
+
+""",
+ 'version': '2.0',
+ 'depends': ['web'],
+ 'js': [
'static/lib/js/raphael.js',
'static/lib/js/jquery.mousewheel.js',
'static/src/js/vec2.js',
'static/src/js/graph.js',
'static/src/js/diagram.js',
],
- 'css' : [
- "static/src/css/base_diagram.css",
+ 'css': [
+ 'static/src/css/base_diagram.css',
],
- 'qweb' : [
- "static/src/xml/*.xml",
+ 'qweb': [
+ 'static/src/xml/*.xml',
],
'auto_install': True,
}
=== modified file 'addons/web_gantt/__openerp__.py'
--- addons/web_gantt/__openerp__.py 2012-07-16 09:59:19 +0000
+++ addons/web_gantt/__openerp__.py 2012-08-22 13:51:23 +0000
@@ -1,17 +1,21 @@
{
- "name": "Web Gantt",
- "category": "Hidden",
- "description":"""OpenERP Web Gantt chart view.""",
- "version": "2.0",
- "depends": ['web'],
- "js": [
+ 'name': 'Web Gantt',
+ 'category': 'Hidden',
+ 'description': """
+OpenERP Web Gantt chart view.
+=============================
+
+""",
+ 'version': '2.0',
+ 'depends': ['web'],
+ 'js': [
'static/lib/dhtmlxGantt/sources/dhtmlxcommon.js',
'static/lib/dhtmlxGantt/sources/dhtmlxgantt.js',
'static/src/js/gantt.js'
],
- "css": ['static/src/css/gantt.css', 'static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css'],
- 'qweb' : [
- "static/src/xml/*.xml",
+ 'css': ['static/src/css/gantt.css', 'static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css'],
+ 'qweb': [
+ 'static/src/xml/*.xml',
],
'auto_install': True
}
=== modified file 'addons/web_graph/__openerp__.py'
--- addons/web_graph/__openerp__.py 2012-07-16 09:59:19 +0000
+++ addons/web_graph/__openerp__.py 2012-08-22 13:51:23 +0000
@@ -1,7 +1,7 @@
{
- "name": "Graph Views",
- "category" : "Hidden",
- "description":"""
+ 'name': 'Graph Views',
+ 'category': 'Hidden',
+ 'description': """
Graph Views for Web Client.
===========================
@@ -12,47 +12,47 @@
* Features: download as PNG or CSV, browse data grid, switch orientation
* Unlimited "Group By" levels (not stacked), two cross level analysis (stacked)
""",
- "version": "3.0",
- "depends": ['web'],
- "js": [
- "static/lib/dropdown.js",
- "static/lib/flotr2/lib/bean.js",
- "static/lib/flotr2/js/Flotr.js",
- "static/lib/flotr2/js/DefaultOptions.js",
- "static/lib/flotr2/js/Color.js",
- "static/lib/flotr2/js/Date.js",
- "static/lib/flotr2/js/DOM.js",
- "static/lib/flotr2/js/EventAdapter.js",
- "static/lib/flotr2/js/Text.js",
- "static/lib/flotr2/js/Graph.js",
- "static/lib/flotr2/js/Axis.js",
- "static/lib/flotr2/js/Series.js",
- "static/lib/flotr2/js/types/lines.js",
- "static/lib/flotr2/js/types/bars.js",
- "static/lib/flotr2/js/types/bubbles.js",
- "static/lib/flotr2/js/types/candles.js",
- "static/lib/flotr2/js/types/gantt.js",
- "static/lib/flotr2/js/types/markers.js",
- "static/lib/flotr2/js/types/pie.js",
- "static/lib/flotr2/js/types/points.js",
- "static/lib/flotr2/js/types/radar.js",
- "static/lib/flotr2/js/types/timeline.js",
- "static/lib/flotr2/js/plugins/crosshair.js",
- "static/lib/flotr2/js/plugins/download.js",
- "static/lib/flotr2/js/plugins/grid.js",
- "static/lib/flotr2/js/plugins/hit.js",
- "static/lib/flotr2/js/plugins/selection.js",
- "static/lib/flotr2/js/plugins/labels.js",
- "static/lib/flotr2/js/plugins/legend.js",
- "static/lib/flotr2/js/plugins/spreadsheet.js",
- "static/lib/flotr2/js/plugins/titles.js",
- "static/src/js/graph.js"
+ 'version': '3.0',
+ 'depends': ['web'],
+ 'js': [
+ 'static/lib/dropdown.js',
+ 'static/lib/flotr2/lib/bean.js',
+ 'static/lib/flotr2/js/Flotr.js',
+ 'static/lib/flotr2/js/DefaultOptions.js',
+ 'static/lib/flotr2/js/Color.js',
+ 'static/lib/flotr2/js/Date.js',
+ 'static/lib/flotr2/js/DOM.js',
+ 'static/lib/flotr2/js/EventAdapter.js',
+ 'static/lib/flotr2/js/Text.js',
+ 'static/lib/flotr2/js/Graph.js',
+ 'static/lib/flotr2/js/Axis.js',
+ 'static/lib/flotr2/js/Series.js',
+ 'static/lib/flotr2/js/types/lines.js',
+ 'static/lib/flotr2/js/types/bars.js',
+ 'static/lib/flotr2/js/types/bubbles.js',
+ 'static/lib/flotr2/js/types/candles.js',
+ 'static/lib/flotr2/js/types/gantt.js',
+ 'static/lib/flotr2/js/types/markers.js',
+ 'static/lib/flotr2/js/types/pie.js',
+ 'static/lib/flotr2/js/types/points.js',
+ 'static/lib/flotr2/js/types/radar.js',
+ 'static/lib/flotr2/js/types/timeline.js',
+ 'static/lib/flotr2/js/plugins/crosshair.js',
+ 'static/lib/flotr2/js/plugins/download.js',
+ 'static/lib/flotr2/js/plugins/grid.js',
+ 'static/lib/flotr2/js/plugins/hit.js',
+ 'static/lib/flotr2/js/plugins/selection.js',
+ 'static/lib/flotr2/js/plugins/labels.js',
+ 'static/lib/flotr2/js/plugins/legend.js',
+ 'static/lib/flotr2/js/plugins/spreadsheet.js',
+ 'static/lib/flotr2/js/plugins/titles.js',
+ 'static/src/js/graph.js'
],
- "css": [
- "static/src/css/*.css",
+ 'css': [
+ 'static/src/css/*.css',
],
'qweb' : [
- "static/src/xml/*.xml",
+ 'static/src/xml/*.xml',
],
- "auto_install": True
+ 'auto_install': True
}
=== modified file 'addons/web_hello/__openerp__.py'
--- addons/web_hello/__openerp__.py 2012-07-16 09:59:19 +0000
+++ addons/web_hello/__openerp__.py 2012-08-22 13:51:23 +0000
@@ -1,11 +1,15 @@
{
- "name": "Hello",
- "category": "Hidden",
- "description":"""OpenERP Web example module.""",
- "version": "2.0",
- "depends": [],
- "js": ["static/*/*.js", "static/*/js/*.js"],
- "css": [],
+ 'name': 'Hello',
+ 'category': 'Hidden',
+ 'description':"""
+OpenERP Web example module.
+===========================
+
+""",
+ 'version': '2.0',
+ 'depends': [],
+ 'js': ['static/*/*.js', 'static/*/js/*.js'],
+ 'css': [],
'auto_install': False,
'web_preload': False,
}
=== modified file 'addons/web_kanban/__openerp__.py'
--- addons/web_kanban/__openerp__.py 2012-07-16 09:59:19 +0000
+++ addons/web_kanban/__openerp__.py 2012-08-22 13:51:23 +0000
@@ -1,17 +1,21 @@
{
- "name" : "Base Kanban",
- "category": "Hidden",
- "description":"""OpenERP Web kanban view.""",
- "version" : "2.0",
- "depends" : ["web"],
- "js": [
- "static/src/js/kanban.js"
+ 'name': 'Base Kanban',
+ 'category': 'Hidden',
+ 'description': """
+OpenERP Web kanban view.
+========================
+
+""",
+ 'version': '2.0',
+ 'depends': ['web'],
+ 'js': [
+ 'static/src/js/kanban.js'
],
- "css": [
- "static/src/css/kanban.css"
+ 'css': [
+ 'static/src/css/kanban.css'
],
'qweb' : [
- "static/src/xml/*.xml",
+ 'static/src/xml/*.xml',
],
'auto_install': True
}
=== modified file 'addons/web_mobile/__openerp__.py'
--- addons/web_mobile/__openerp__.py 2012-07-16 09:59:19 +0000
+++ addons/web_mobile/__openerp__.py 2012-08-22 13:51:23 +0000
@@ -1,8 +1,12 @@
{
- "name" : "OpenERP Web Mobile",
- "category": "Hidden",
- "description":"""OpenERP Web Mobile.""",
- "version" : "2.0",
- "depends" : [],
+ 'name': 'OpenERP Web Mobile',
+ 'category': 'Hidden',
+ 'description': """
+OpenERP Web Mobile.
+===================
+
+""",
+ 'version': '2.0',
+ 'depends': [],
'auto_install': True,
}
=== modified file 'addons/web_process/__openerp__.py'
--- addons/web_process/__openerp__.py 2012-07-16 09:59:19 +0000
+++ addons/web_process/__openerp__.py 2012-08-22 13:51:23 +0000
@@ -1,17 +1,21 @@
{
- "name" : "Process",
- "version": "2.0",
- "description":"""OpenERP Web process view.""",
- "depends" : ["web_diagram"],
- "js": [
+ 'name': 'Process',
+ 'version': '2.0',
+ 'description': """
+OpenERP Web process view.
+=========================
+
+""",
+ 'depends': ['web_diagram'],
+ 'js': [
'static/lib/dracula/*.js',
- "static/src/js/process.js"
+ 'static/src/js/process.js'
],
- "css": [
- "static/src/css/process.css"
+ 'css': [
+ 'static/src/css/process.css'
],
'qweb': [
- "static/src/xml/*.xml"
+ 'static/src/xml/*.xml'
],
'auto_install': True
}
=== modified file 'addons/web_tests/__openerp__.py'
--- addons/web_tests/__openerp__.py 2012-07-16 09:59:19 +0000
+++ addons/web_tests/__openerp__.py 2012-08-22 13:51:23 +0000
@@ -1,10 +1,14 @@
{
- "name": "Tests",
- "category": "Hidden",
- "description":"""OpenERP Web test suite.""",
- "version": "2.0",
- "depends": [],
- "js": ["static/src/js/*.js"],
- "css": ['static/src/css/*.css'],
+ 'name': 'Tests',
+ 'category': 'Hidden',
+ 'description': """
+OpenERP Web test suite.
+=======================
+
+""",
+ 'version': '2.0',
+ 'depends': [],
+ 'js': ['static/src/js/*.js'],
+ 'css': ['static/src/css/*.css'],
'auto_install': True,
}
=== modified file 'addons/web_view_editor/__openerp__.py'
--- addons/web_view_editor/__openerp__.py 2012-07-30 09:18:15 +0000
+++ addons/web_view_editor/__openerp__.py 2012-08-22 13:51:23 +0000
@@ -1,14 +1,15 @@
{
- "name": "View Editor",
- "category": "Hidden",
- "description":
- """
- OpenERP Web to edit views.
+ 'name': 'View Editor',
+ 'category': 'Hidden',
+ 'description': """
+OpenERP Web to edit views.
+==========================
+
""",
- "version": "2.0",
- "depends":['web'],
- "js": ["static/src/js/view_editor.js"],
- "css": ['static/src/css/view_editor.css'],
- "qweb": ['static/src/xml/view_editor.xml'],
+ 'version': '2.0',
+ 'depends':['web'],
+ 'js': ['static/src/js/view_editor.js'],
+ 'css': ['static/src/css/view_editor.css'],
+ 'qweb': ['static/src/xml/view_editor.xml'],
'auto_install': True,
}
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
