[IMP] replace ad-hoc patch display by patchqueue

bzr revid: xmo@openerp.com-20130211075200-lwd79pktewqf0wkk

30 files changed, 208 insertions, 163 deletions

diff --git a/addons/web/doc/module/0 b/addons/web/doc/module/0
new file mode 100644
index 00000000000..16762e1afd0
--- /dev/null
+++ b/addons/web/doc/module/0
@@ -0,0 +1,17 @@
+# HG changeset patch
+# Parent 0000000000000000000000000000000000000000
+
+diff --git a/__init__.py b/__init__.py
+new file mode 100644
+diff --git a/__openerp__.py b/__openerp__.py
+new file mode 100644
+--- /dev/null
++++ b/__openerp__.py
+@@ -0,0 +1,7 @@
++# __openerp__.py
++{
++    'name': "Web Example",
++    'description': "Basic example of a (future) web module",
++    'category': 'Hidden',
++    'depends': ['base'],
++}
diff --git a/addons/web/doc/module/10 b/addons/web/doc/module/10
new file mode 100644
index 00000000000..dc3b670c5a0
--- /dev/null
+++ b/addons/web/doc/module/10
@@ -0,0 +1,13 @@
+# HG changeset patch
+# Parent 72d9d59a93fcee06ba28cf0b98a1075331dcc8f4
+diff --git a/static/src/css/web_example.css b/static/src/css/web_example.css
+new file mode 100644
+--- /dev/null
++++ b/static/src/css/web_example.css
+@@ -0,0 +1,6 @@
++.openerp .oe_web_example {
++    color: white;
++    background-color: black;
++    height: 100%;
++    font-size: 400%;
++}
diff --git a/addons/web/doc/module/11 b/addons/web/doc/module/11
new file mode 100644
index 00000000000..fc4225afaa6
--- /dev/null
+++ b/addons/web/doc/module/11
@@ -0,0 +1,11 @@
+# HG changeset patch
+# Parent 3ed382d9a8fe64fbb8e2bf4045e3fcd5c74c92bc
+diff --git a/__openerp__.py b/__openerp__.py
+--- a/__openerp__.py
++++ b/__openerp__.py
+@@ -6,4 +6,5 @@
+     'depends': ['web'],
+     'data': ['web_example.xml'],
+     'js': ['static/src/js/first_module.js'],
++    'css': ['static/src/css/web_example.css'],
+ }
diff --git a/addons/web/doc/module/12 b/addons/web/doc/module/12
new file mode 100644
index 00000000000..9a2982e7d20
--- /dev/null
+++ b/addons/web/doc/module/12
@@ -0,0 +1,28 @@
+# HG changeset patch
+# Parent 43f21611dacb7c2b2f3810baeeef359ad7c329f0
+
+diff --git a/__openerp__.py b/__openerp__.py
+--- a/__openerp__.py
++++ b/__openerp__.py
+@@ -7,4 +7,5 @@
+     'data': ['web_example.xml'],
+     'js': ['static/src/js/first_module.js'],
+     'css': ['static/src/css/web_example.css'],
++    'qweb': ['static/src/xml/web_example.xml'],
+ }
+diff --git a/static/src/xml/web_example.xml b/static/src/xml/web_example.xml
+new file mode 100644
+--- /dev/null
++++ b/static/src/xml/web_example.xml
+@@ -0,0 +1,11 @@
++<templates>
++<div t-name="web_example.action" class="oe_web_example oe_web_example_stopped">
++    <h4 class="oe_web_example_timer">00:00:00</h4>
++    <p class="oe_web_example_start">
++        <button type="button">Start</button>
++    </p>
++    <p class="oe_web_example_stop">
++        <button type="button">Stop</button>
++    </p>
++</div>
++</templates>
diff --git a/addons/web/doc/module/static/src/js/first_module.js.4.diff b/addons/web/doc/module/14
index 78a192147e6..a908cbc61e2 100644
--- a/addons/web/doc/module/static/src/js/first_module.js.4.diff
+++ b/addons/web/doc/module/14
@@ -1,15 +1,17 @@
---- web_example/static/src/js/first_module.js
-+++ web_example/static/src/js/first_module.js
-@@ -1,11 +1,7 @@
- // static/src/js/first_module.js
+# HG changeset patch
+# Parent ae3b427c96b532794a65357b3f075129cc991276
+diff --git a/static/src/js/first_module.js b/static/src/js/first_module.js
+--- a/static/src/js/first_module.js
++++ b/static/src/js/first_module.js
+@@ -2,10 +2,6 @@
  openerp.web_example = function (instance) {
      instance.web.client_actions.add('example.action', 'instance.web_example.Action');
      instance.web_example.Action = instance.web.Widget.extend({
-+        template: 'web_example.action'
 -        className: 'oe_web_example',
 -        start: function () {
 -            this.$el.text("Hello, world!");
 -            return this._super();
 -        }
++        template: 'web_example.action'
      });
  };
diff --git a/addons/web/doc/module/static/src/css/web_example.css.1.diff b/addons/web/doc/module/15
index 442211a252b..d82abee3284 100644
--- a/addons/web/doc/module/static/src/css/web_example.css.1.diff
+++ b/addons/web/doc/module/15
@@ -1,7 +1,9 @@
---- web_example/static/src/css/web_example.css
-+++ web_example/static/src/css/web_example.css
-@@ -1,6 +1,13 @@
- .openerp .oe_web_example {
+# HG changeset patch
+# Parent e2d2e1a4cc2d2496aebeb05d94768384427c9e8b
+diff --git a/static/src/css/web_example.css b/static/src/css/web_example.css
+--- a/static/src/css/web_example.css
++++ b/static/src/css/web_example.css
+@@ -2,5 +2,12 @@
      color: white;
      background-color: black;
      height: 100%;
diff --git a/addons/web/doc/module/static/src/js/first_module.js.5.diff b/addons/web/doc/module/16
index f345ea319ef..816c23aa0b0 100644
--- a/addons/web/doc/module/static/src/js/first_module.js.5.diff
+++ b/addons/web/doc/module/16
@@ -1,7 +1,9 @@
---- web_example/static/src/js/first_module.js
-+++ web_example/static/src/js/first_module.js
-@@ -1,7 +1,19 @@
- // static/src/js/first_module.js
+# HG changeset patch
+# Parent 2645d7a09dcba7f6d6074a33252c16c03c56fdf3
+diff --git a/static/src/js/first_module.js b/static/src/js/first_module.js
+--- a/static/src/js/first_module.js
++++ b/static/src/js/first_module.js
+@@ -2,6 +2,18 @@
  openerp.web_example = function (instance) {
      instance.web.client_actions.add('example.action', 'instance.web_example.Action');
      instance.web_example.Action = instance.web.Widget.extend({
diff --git a/addons/web/doc/module/static/src/js/first_module.js.6.diff b/addons/web/doc/module/17
index 7dd17af0e18..d6d6ecc71e3 100644
--- a/addons/web/doc/module/static/src/js/first_module.js.6.diff
+++ b/addons/web/doc/module/17
@@ -1,12 +1,9 @@
---- web_example/static/src/js/first_module.js
-+++ web_example/static/src/js/first_module.js
-@@ -1,19 +1,52 @@
- // static/src/js/first_module.js
- openerp.web_example = function (instance) {
-     instance.web.client_actions.add('example.action', 'instance.web_example.Action');
-     instance.web_example.Action = instance.web.Widget.extend({
-         template: 'web_example.action',
-         events: {
+# HG changeset patch
+# Parent 2921a545adc3406d3139be7951f3225e94493466
+diff --git a/static/src/js/first_module.js b/static/src/js/first_module.js
+--- a/static/src/js/first_module.js
++++ b/static/src/js/first_module.js
+@@ -7,13 +7,46 @@ openerp.web_example = function (instance
              'click .oe_web_example_start button': 'watch_start',
              'click .oe_web_example_stop button': 'watch_stop'
          },
diff --git a/addons/web/doc/module/__init__.py.1.diff b/addons/web/doc/module/18
index 6f16f0e9a08..6781c985239 100644
--- a/addons/web/doc/module/__init__.py.1.diff
+++ b/addons/web/doc/module/18
@@ -1,6 +1,9 @@
---- web_example/__init__.py
-+++ web_example/__init__.py
-@@ -1,1 +1,14 @@
+# HG changeset patch
+# Parent e0cc13c2b2ec4d6f6bfdb033b189a32e44106f2e
+diff --git a/__init__.py b/__init__.py
+--- a/__init__.py
++++ b/__init__.py
+@@ -0,0 +1,13 @@
 +# __init__.py
 +from openerp.osv import orm, fields
 +
diff --git a/addons/web/doc/module/static/src/js/first_module.js.7.diff b/addons/web/doc/module/19
index 1d3430656fc..d95a89a3441 100644
--- a/addons/web/doc/module/static/src/js/first_module.js.7.diff
+++ b/addons/web/doc/module/19
@@ -1,25 +1,17 @@
---- web_example/static/src/js/first_module.js
-+++ web_example/static/src/js/first_module.js
-@@ -1,52 +1,60 @@
- // static/src/js/first_module.js
- openerp.web_example = function (instance) {
-     instance.web.client_actions.add('example.action', 'instance.web_example.Action');
-     instance.web_example.Action = instance.web.Widget.extend({
-         template: 'web_example.action',
-         events: {
-             'click .oe_web_example_start button': 'watch_start',
-             'click .oe_web_example_stop button': 'watch_stop'
-         },
-         init: function () {
-             this._super.apply(this, arguments);
+# HG changeset patch
+# Parent 05797cc75b49634e640f44b24347f2905b464022
+diff --git a/static/src/js/first_module.js b/static/src/js/first_module.js
+--- a/static/src/js/first_module.js
++++ b/static/src/js/first_module.js
+@@ -12,11 +12,13 @@ openerp.web_example = function (instance
              this._start = null;
              this._watch = null;
          },
+-        update_counter: function () {
 +        current: function () {
 +            // Subtracting javascript dates returns the difference in milliseconds
 +            return new Date() - this._start;
 +        },
--        update_counter: function () {
 +        update_counter: function (time) {
              var h, m, s;
 -            // Subtracting javascript dates returns the difference in milliseconds
@@ -29,12 +21,7 @@
              m = Math.floor(s / 60);
              s -= 60*m;
              h = Math.floor(m / 60);
-             m -= 60*h;
-             this.$('.oe_web_example_timer').text(
-                 _.str.sprintf("%02d:%02d:%02d", h, m, s));
-         },
-         watch_start: function () {
-             this.$el.addClass('oe_web_example_started')
+@@ -29,18 +31,24 @@ openerp.web_example = function (instance
                      .removeClass('oe_web_example_stopped');
              this._start = new Date();
              // Update the UI to the current time
@@ -50,8 +37,8 @@
          },
          watch_stop: function () {
              clearInterval(this._watch);
-+            var time = this.current();
 -            this.update_counter();
++            var time = this.current();
 +            this.update_counter(time);
              this._start = this._watch = null;
              this.$el.removeClass('oe_web_example_started')
@@ -63,9 +50,3 @@
          },
          destroy: function () {
              if (this._watch) {
-                 clearInterval(this._watch);
-             }
-             this._super();
-         }
-     });
- };
diff --git a/addons/web/doc/module/2 b/addons/web/doc/module/2
new file mode 100644
index 00000000000..08becf41602
--- /dev/null
+++ b/addons/web/doc/module/2
@@ -0,0 +1,12 @@
+# HG changeset patch
+# Parent 8a986919a3e22cd7cca51210820c09d4545dc60d
+diff --git a/__openerp__.py b/__openerp__.py
+--- a/__openerp__.py
++++ b/__openerp__.py
+@@ -3,5 +3,5 @@
+     'name': "Web Example",
+     'description': "Basic example of a (future) web module",
+     'category': 'Hidden',
+-    'depends': ['base'],
++    'depends': ['web'],
+ }
diff --git a/addons/web/doc/module/3 b/addons/web/doc/module/3
new file mode 100644
index 00000000000..c09925f93d4
--- /dev/null
+++ b/addons/web/doc/module/3
@@ -0,0 +1,9 @@
+# HG changeset patch
+# Parent dcf661a5eef8f82503831bdb8e6c9d2f9beb285e
+diff --git a/static/src/js/first_module.js b/static/src/js/first_module.js
+new file mode 100644
+--- /dev/null
++++ b/static/src/js/first_module.js
+@@ -0,0 +1,2 @@
++// static/src/js/first_module.js
++console.log("Debug statement: file loaded");
diff --git a/addons/web/doc/module/4 b/addons/web/doc/module/4
new file mode 100644
index 00000000000..55535fe57da
--- /dev/null
+++ b/addons/web/doc/module/4
@@ -0,0 +1,11 @@
+# HG changeset patch
+# Parent 139dae60de67efa0017f5032f71ab774685c5507
+diff --git a/__openerp__.py b/__openerp__.py
+--- a/__openerp__.py
++++ b/__openerp__.py
+@@ -4,4 +4,5 @@
+     'description': "Basic example of a (future) web module",
+     'category': 'Hidden',
+     'depends': ['web'],
++    'js': ['static/src/js/first_module.js'],
+ }
diff --git a/addons/web/doc/module/5 b/addons/web/doc/module/5
new file mode 100644
index 00000000000..49acad9cd52
--- /dev/null
+++ b/addons/web/doc/module/5
@@ -0,0 +1,11 @@
+# HG changeset patch
+# Parent c8ae7646cce3f271698c844eb2d67f9a8719650d
+diff --git a/static/src/js/first_module.js b/static/src/js/first_module.js
+--- a/static/src/js/first_module.js
++++ b/static/src/js/first_module.js
+@@ -1,2 +1,4 @@
+ // static/src/js/first_module.js
+-console.log("Debug statement: file loaded");
++openerp.web_example = function (instance) {
++    console.log("Module loaded");
++};
diff --git a/addons/web/doc/module/6 b/addons/web/doc/module/6
new file mode 100644
index 00000000000..f2c6a8762e7
--- /dev/null
+++ b/addons/web/doc/module/6
@@ -0,0 +1,29 @@
+# HG changeset patch
+# Parent 0026cb80097a724db8d36371bc00da993a51a06f
+
+diff --git a/__openerp__.py b/__openerp__.py
+--- a/__openerp__.py
++++ b/__openerp__.py
+@@ -4,5 +4,6 @@
+     'description': "Basic example of a (future) web module",
+     'category': 'Hidden',
+     'depends': ['web'],
++    'data': ['web_example.xml'],
+     'js': ['static/src/js/first_module.js'],
+ }
+diff --git a/web_example.xml b/web_example.xml
+new file mode 100644
+--- /dev/null
++++ b/web_example.xml
+@@ -0,0 +1,11 @@
++<!-- web_example/web_example.xml -->
++<openerp>
++    <data>
++        <record model="ir.actions.client" id="action_client_example">
++            <field name="name">Example Client Action</field>
++            <field name="tag">example.action</field>
++        </record>
++        <menuitem action="action_client_example"
++                  id="menu_client_example"/>
++    </data>
++</openerp>
diff --git a/addons/web/doc/module/static/src/js/first_module.js.2.diff b/addons/web/doc/module/8
index 88a80f50fff..83e6c371bb3 100644
--- a/addons/web/doc/module/static/src/js/first_module.js.2.diff
+++ b/addons/web/doc/module/8
@@ -1,5 +1,8 @@
---- web_example/static/src/js/first_module.js
-+++ web_example/static/src/js/first_module.js
+# HG changeset patch
+# Parent d987c9edd884de1de30f2ceb70d2e554474b8dd1
+diff --git a/static/src/js/first_module.js b/static/src/js/first_module.js
+--- a/static/src/js/first_module.js
++++ b/static/src/js/first_module.js
 @@ -1,4 +1,7 @@
  // static/src/js/first_module.js
  openerp.web_example = function (instance) {
diff --git a/addons/web/doc/module/static/src/js/first_module.js.3.diff b/addons/web/doc/module/9
index 295e90b6840..9113f914e7c 100644
--- a/addons/web/doc/module/static/src/js/first_module.js.3.diff
+++ b/addons/web/doc/module/9
@@ -1,5 +1,8 @@
---- web_example/static/src/js/first_module.js
-+++ web_example/static/src/js/first_module.js
+# HG changeset patch
+# Parent 6a1a7240ea0e63182f60abb1eb5c631089d56dbe
+diff --git a/static/src/js/first_module.js b/static/src/js/first_module.js
+--- a/static/src/js/first_module.js
++++ b/static/src/js/first_module.js
 @@ -1,7 +1,11 @@
  // static/src/js/first_module.js
  openerp.web_example = function (instance) {
diff --git a/addons/web/doc/module/__init__.py b/addons/web/doc/module/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/addons/web/doc/module/__init__.py
+++ /dev/null
diff --git a/addons/web/doc/module/__openerp__.py b/addons/web/doc/module/__openerp__.py
deleted file mode 100644
index d8c23c34f10..00000000000
--- a/addons/web/doc/module/__openerp__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# __openerp__.py
-{
-    'name': "Web Example",
-    'description': "Basic example of a (future) web module",
-    'category': 'Hidden',
-    'depends': ['base'],
-}
diff --git a/addons/web/doc/module/__openerp__.py.1.diff b/addons/web/doc/module/__openerp__.py.1.diff
deleted file mode 100644
index dbab2e65437..00000000000
--- a/addons/web/doc/module/__openerp__.py.1.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- web_example/__openerp__.py
-+++ web_example/__openerp__.py
-@@ -1,7 +1,7 @@
- # __openerp__.py
- {
-     'name': "Web Example",
-     'description': "Basic example of a (future) web module",
-     'category': 'Hidden',
--    'depends': ['base'],
-+    'depends': ['web'],
- }
diff --git a/addons/web/doc/module/__openerp__.py.2.diff b/addons/web/doc/module/__openerp__.py.2.diff
deleted file mode 100644
index 77025f11512..00000000000
--- a/addons/web/doc/module/__openerp__.py.2.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- web_example/__openerp__.py
-+++ web_example/__openerp__.py
-@@ -1,7 +1,8 @@
- # __openerp__.py
- {
-     'name': "Web Example",
-     'description': "Basic example of a (future) web module",
-     'category': 'Hidden',
-     'depends': ['web'],
-+    'js': ['static/src/js/first_module.js'],
- }
diff --git a/addons/web/doc/module/__openerp__.py.3.diff b/addons/web/doc/module/__openerp__.py.3.diff
deleted file mode 100644
index e100098bce9..00000000000
--- a/addons/web/doc/module/__openerp__.py.3.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- web_example/__openerp__.py
-+++ web_example/__openerp__.py
-@@ -1,8 +1,9 @@
- # __openerp__.py
- {
-     'name': "Web Example",
-     'description': "Basic example of a (future) web module",
-     'category': 'Hidden',
-     'depends': ['web'],
-+    'data': ['web_example.xml'],
-     'js': ['static/src/js/first_module.js'],
- }
diff --git a/addons/web/doc/module/__openerp__.py.4.diff b/addons/web/doc/module/__openerp__.py.4.diff
deleted file mode 100644
index 78fc90c4b1c..00000000000
--- a/addons/web/doc/module/__openerp__.py.4.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- web_example/__openerp__.py
-+++ web_example/__openerp__.py
-@@ -1,9 +1,10 @@
- # __openerp__.py
- {
-     'name': "Web Example",
-     'description': "Basic example of a (future) web module",
-     'category': 'Hidden',
-     'depends': ['web'],
-     'data': ['web_example.xml'],
-     'js': ['static/src/js/first_module.js'],
-+    'css': ['static/src/css/web_example.css'],
- }
diff --git a/addons/web/doc/module/__openerp__.py.5.diff b/addons/web/doc/module/__openerp__.py.5.diff
deleted file mode 100644
index c9492420ee8..00000000000
--- a/addons/web/doc/module/__openerp__.py.5.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- web_example/__openerp__.py
-+++ web_example/__openerp__.py
-@@ -1,10 +1,11 @@
- # __openerp__.py
- {
-     'name': "Web Example",
-     'description': "Basic example of a (future) web module",
-     'category': 'Hidden',
-     'depends': ['web'],
-     'data': ['web_example.xml'],
-     'js': ['static/src/js/first_module.js'],
-     'css': ['static/src/css/web_example.css'],
-+    'qweb': ['static/src/xml/web_example.xml'],
- }
diff --git a/addons/web/doc/module/series b/addons/web/doc/module/series
new file mode 100644
index 00000000000..119e58801de
--- /dev/null
+++ b/addons/web/doc/module/series
@@ -0,0 +1,17 @@
+0
+2
+3
+4
+5
+6
+8
+9
+10
+11
+12
+14
+15
+16
+17
+18
+19
diff --git a/addons/web/doc/module/static/src/css/web_example.css b/addons/web/doc/module/static/src/css/web_example.css
deleted file mode 100644
index b861af8d517..00000000000
--- a/addons/web/doc/module/static/src/css/web_example.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.openerp .oe_web_example {
-    color: white;
-    background-color: black;
-    height: 100%;
-    font-size: 400%;
-}
diff --git a/addons/web/doc/module/static/src/js/first_module.js b/addons/web/doc/module/static/src/js/first_module.js
deleted file mode 100644
index 74580d1c0ca..00000000000
--- a/addons/web/doc/module/static/src/js/first_module.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// static/src/js/first_module.js
-console.log("Debug statement: file loaded");
diff --git a/addons/web/doc/module/static/src/js/first_module.js.1.diff b/addons/web/doc/module/static/src/js/first_module.js.1.diff
deleted file mode 100644
index 53c153e1971..00000000000
--- a/addons/web/doc/module/static/src/js/first_module.js.1.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- web_example/static/src/js/first_module.js
-+++ web_example/static/src/js/first_module.js
-@@ -1,2 +1,4 @@
- // static/src/js/first_module.js
--console.log("Debug statement: file loaded");
-+openerp.web_example = function (instance) {
-+    console.log("Module loaded");
-+};
diff --git a/addons/web/doc/module/static/src/xml/web_example.xml b/addons/web/doc/module/static/src/xml/web_example.xml
deleted file mode 100644
index b5a9918f2f0..00000000000
--- a/addons/web/doc/module/static/src/xml/web_example.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<templates>
-<div t-name="web_example.action" class="oe_web_example oe_web_example_stopped">
-    <h4 class="oe_web_example_timer">00:00:00</h4>
-    <p class="oe_web_example_start">
-        <button type="button">Start</button>
-    </p>
-    <p class="oe_web_example_stop">
-        <button type="button">Stop</button>
-    </p>
-</div>
-</templates>
diff --git a/addons/web/doc/module/web_example.xml b/addons/web/doc/module/web_example.xml
deleted file mode 100644
index dfcc1614df4..00000000000
--- a/addons/web/doc/module/web_example.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- web_example/web_example.xml -->
-<openerp>
-    <data>
-        <record model="ir.actions.client" id="action_client_example">
-            <field name="name">Example Client Action</field>
-            <field name="tag">example.action</field>
-        </record>
-        <menuitem action="action_client_example"
-                  id="menu_client_example"/>
-    </data>
-</openerp>