From fbd835894f666db781f4f29392df82a519b2963c Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Mon, 12 Sep 2011 16:34:28 +0530
Subject: [IMP] Dynamically Set Header & Footer, Change page on click of
 header-footer.

bzr revid: bth@tinyerp.com-20110912110428-xyxc70zql0r01mty
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 93 ++++++++++++++++--------
 addons/web_mobile/static/src/js/list_mobile.js   | 45 ++++++------
 addons/web_mobile/static/src/xml/web_mobile.xml  | 56 ++++----------
 3 files changed, 102 insertions(+), 92 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 2b9d8600fef..9bdc004a7ca 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -90,8 +90,7 @@ openerp.web_mobile.Header =  openerp.web.Widget.extend({
         this._super(session, element_id);
     },
     start: function() {
-        var self = this;
-        self.$element.html(QWeb.render("Header", this));
+        this.$element.html(QWeb.render("Header", this));
     }
 });
 
@@ -100,8 +99,7 @@ openerp.web_mobile.Footer =  openerp.web.Widget.extend({
         this._super(session, element_id);
     },
     start: function() {
-        var self = this;
-        self.$element.html(QWeb.render("Footer", this));
+        this.$element.html(QWeb.render("Footer", this));
     }
 });
 
@@ -113,14 +111,19 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
         var self = this;
         this.rpc('/web/session/sc_list',{} ,function(res){
             self.$element.html(QWeb.render("Shortcuts", {'sc' : res}))
+
+            self.$element.find("[data-role=header]").find('h1').html('Favourite');
+            self.$element.find("[data-role=header]").find('#home').click(function(){
+                $.mobile.changePage($("#oe_menu"), "slide", true, true);
+            });
             self.$element.find('#content').find("a").click(self.on_clicked);
-            self.$element.find("#footer").find('#preference').click(function(){
+            self.$element.find("[data-role=footer]").find('#preference').click(function(){
                 if(!$('#oe_options').html().length){
                     this.options = new openerp.web_mobile.Options(self, "oe_options");
                     this.options.start();
                 }
                 else{
-                    self.$element.find("#footer").find('#preference').attr('href','#oe_options');
+                    $.mobile.changePage($("#oe_options"), "slide", true, true);
                 }
             });
             $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
@@ -130,9 +133,7 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
         $shortcut = $(ev.currentTarget);
         id = $shortcut.data('menu');
         res_id = $shortcut.data('res');
-//        this.header = new openerp.web_mobile.Header(this, "oe_header");
         this.listview = new openerp.web_mobile.ListView(this, "oe_list", res_id);
-//        this.header.start();
         this.listview.start();
         jQuery("#oe_header").find("h1").html($shortcut.data('name'));
     }
@@ -151,24 +152,30 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
     on_loaded: function(data) {
         var self = this;
         this.data = data;
-        this.$element.html(QWeb.render("Menu", this.data));
 
-        this.$element.find("#footer").find('#shrotcuts').click(function(){
+        this.header = new openerp.web_mobile.Header(this, "oe_header");
+        this.header.start();
+        this.footer = new openerp.web_mobile.Footer(this, "oe_footer");
+        this.footer.start();
+
+        this.$element.html(QWeb.render("Menu", this.data));
+        this.$element.find("[data-role=header]").find('h1').html('Application');
+        this.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
             if(!$('#oe_shortcuts').html().length){
                 this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
                 this.shortcuts.start();
             }
             else{
-                self.$element.find("#footer").find('#shrotcuts').attr('href','#oe_shortcuts');
+                $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
             }
         });
-        this.$element.find("#footer").find('#preference').click(function(){
+        this.$element.find("[data-role=footer]").find('#preference').click(function(){
             if(!$('#oe_options').html().length){
                 this.options = new openerp.web_mobile.Options(self, "oe_options");
                 this.options.start();
             }
             else{
-                self.$element.find("#footer").find('#preference').attr('href','#oe_options');
+                $.mobile.changePage($("#oe_options"), "slide", true, true);
             }
         });
         this.$element.add(this.$secondary_menu).find("#content").find('a').click(this.on_menu_click);
@@ -186,20 +193,37 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
             .removeClass("login_valid")
             .addClass("secondary_menu");
             //.hide();
-    if(!$('#oe_sec_menu').html().length){
+    /*if(!$('#oe_sec_menu').html().length){
             this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu", this.children);
                    this.secondary.start();
          }else{
-            this.$element.find("#content").find('a').attr('href','#oe_sec_menu');
-         }
-        /*if(!$('#oe_sec_menu').html().length){
+            //console.log('heree>>>>>>>>>>>>>>>>>>',$('#'+$('.ui-page-active').attr('id')));
+            var id=$('.ui-page-active').attr('id');
+            //console.log('heree>>>>>>>>>>>>>>>>>>',$('#'+id).removeClass('ui-page-active'));
+
             this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu", this.children);
             this.secondary.start();
-        }else{
-          //  self.$element.find("#content").find('a').attr('href','#oe_sec_menu');
-            this.$element.add(this.$secondary_menu).find("#content").find('a').attr('href','#oe_sec_menu');
-        }*/
+            $('#'+id).removeClass('ui-page-active');
+            $('#oe_sec_menu').addClass('ui-page-active');
+            //console.log();
+            $.mobile.changePage($("#oe_menu"), "slide", true, true);
+
+            //if($('.ui-page-active').attr('id').live())
+            //$.mobile.changePage($("#oe_sec_menu"), "slide", true, true);
+           // this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu", this.children);
+                  // this.secondary.start();
+
 
+                   //$.mobile.loadPage();
+                   //$.mobile.changePage($("#oe_sec_menu"), "slide", true, true);
+            //this.$element.find("#content").find('a').attr('href','#oe_sec_menu');
+         }*/
+        if(!$('#oe_sec_menu').html().length){
+            this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu", this.children);
+            this.secondary.start();
+        }else{
+            $.mobile.changePage($("#oe_sec_menu"), "slide", true, true);
+        }
     }
 });
 openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
@@ -209,7 +233,6 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
     },
     start: function(ev, id) {
         var self = this;
-       // console.log(this.data,this.$element.html().length);
 
      /*   if(this.$element.html().length){
                 self.$element.find('[data-role="listview"]').remove();
@@ -225,27 +248,33 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
             }else{*/
 
         var v = { menu : this.data };
+
         this.$element.html(QWeb.render("Menu.secondary", v));
-        this.$element.find("#header").find("h1").html(this.data.name);
+
+        this.$element.find("[data-role=header]").find("h1").html(this.data.name);
         this.$element.add(this.$secondary_menu).find('#content').find("a").click(this.on_menu_click);
-        this.$element.find("#footer").find('#shrotcuts').click(function(){
+        this.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
             if(!$('#oe_shortcuts').html().length){
                 this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
                 this.shortcuts.start();
             }
             else{
-                self.$element.find("#footer").find('#shrotcuts').attr('href','#oe_shortcuts');
+                $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
             }
         });
-        this.$element.find("#footer").find('#preference').click(function(){
+        this.$element.find("[data-role=footer]").find('#preference').click(function(){
             if(!$('#oe_options').html().length){
                 this.options = new openerp.web_mobile.Options(self, "oe_options");
                 this.options.start();
             }
             else{
-                self.$element.find("#footer").find('#preference').attr('href','#oe_options');
+                $.mobile.changePage($("#oe_options"), "slide", true, true);
             }
         });
+        this.$element.find("[data-role=header]").find('#home').click(function(){
+            $.mobile.changePage($("#oe_menu"), "slide", true, true);
+        });
+
         $.mobile.changePage($("#oe_sec_menu"), "slide", true, true);
     },
     on_menu_click: function(ev, id) {
@@ -262,16 +291,22 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
 openerp.web_mobile.Options =  openerp.web.Widget.extend({
     start: function() {
         var self = this;
+
         this.$element.html(QWeb.render("Options", this));
-        this.$element.find("#footer").find('#shrotcuts').click(function(){
+        this.$element.find("[data-role=header]").find('h1').html('Preference');
+        this.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
             if(!$('#oe_shortcuts').html().length){
                 this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
                 this.shortcuts.start();
             }
             else{
-                self.$element.find("#footer").find('#shrotcuts').attr('href','#oe_shortcuts');
+                $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                //self.$element.find("#footer").find('#shrotcuts').attr('href','#oe_shortcuts');
             }
         });
+        this.$element.find("[data-role=header]").find('#home').click(function(){
+            $.mobile.changePage($("#oe_menu"), "slide", true, true);
+        });
         $.mobile.changePage($("#oe_options"), "slide", true, true);
     }
 });
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index 1d4e0d72ca2..8d276a6bc65 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -32,26 +32,29 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
                 }
                 self.$element.find('[data-role="listview"]').listview('refresh');
             }else{
-            self.$element.html(QWeb.render("ListView", {'records' : result}));
-            self.$element.find("#header").find('h1').html(self.action.name);
-            self.$element.find("#footer").find('#shortcuts').click(function(){
-                if(!$('#oe_shortcuts').html().length){
-                    this.shortcut = new openerp.web_mobile.Options(self, "oe_shortcuts");
-                    this.options.start();
-                }
-                else{
-                    self.$element.find("#footer").find('#shrotcuts').attr('href','#oe_shortcuts');
-                }
-            });
-            self.$element.find("#footer").find('#preference').click(function(){
-                if(!$('#oe_options').html().length){
-                    this.options = new openerp.web_mobile.Options(self, "oe_options");
-                    this.options.start();
-                }
-                else{
-                    self.$element.find("#footer").find('#preference').attr('href','#oe_options');
-                }
-            });
+                self.$element.html(QWeb.render("ListView", {'records' : result}));
+                self.$element.find("[data-role=header]").find('h1').html(self.action.name);
+                self.$element.find("[data-role=header]").find('#home').click(function(){
+                    $.mobile.changePage($("#oe_menu"), "slide", true, true);
+                });
+                self.$element.find("[data-role=footer]").find('#shortcuts').click(function(){
+                    if(!$('#oe_shortcuts').html().length){
+                        this.shortcut = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
+                        this.shortcut.start();
+                    }
+                    else{
+                        $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                    }
+                });
+                self.$element.find("[data-role=footer]").find('#preference').click(function(){
+                    if(!$('#oe_options').html().length){
+                        this.options = new openerp.web_mobile.Options(self, "oe_options");
+                        this.options.start();
+                    }
+                    else{
+                        $.mobile.changePage($("#oe_options"), "slide", true, true);
+                    }
+                });
             }
             self.$element.find("a#list-id").click(self.on_list_click);
             $.mobile.changePage($("#oe_list"), "slide", true, true);
@@ -61,9 +64,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
         var $record = $(ev.currentTarget);
         var self = this;
         id = $record.data('id');
-//        this.header = new openerp.web_mobile.Header(this, "oe_header");
         this.formview = new openerp.web_mobile.FormView(this, "oe_form", id, this.action);
-//        this.header.start();
         this.formview.start();
     }
  });
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index 75d30af55b1..29a325a61ce 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -5,6 +5,8 @@
 
 <t t-name="WebClient">
     <div data-role="page" id="oe_login"></div>
+    <div id="oe_header" />
+    <div id="oe_footer" />
     <div data-role="page" id="oe_sec_menu"></div>
     <div data-role="page" id="oe_sec_menu_new"></div>
     <div data-role="page" id="oe_list"></div>
@@ -44,22 +46,20 @@
 
 <t t-name="Header">
     <div data-role="header" data-theme="b" data-position="fixed">
-        <h1>OpenERP</h1>
+        <h1></h1>
         <a id="home" class="ui-btn-right" data-iconpos="notext" data-icon="home" href="#" title="Home" data-theme="b"></a>
     </div>
 </t>
 
 <t t-name="Footer">
     <div data-role="footer" data-theme="b" data-position="fixed">
-        <h1></h1>
+        <a id="shrotcuts" href="#" title="Favourite" data-theme="b">Favourite</a>
+        <a id="preference" href="#" title="Preference" data-theme="b">Preference</a>
     </div>
 </t>
 
 <t t-name="Shortcuts">
-    <div id="header" data-role="header" data-theme="b" data-position="fixed">
-        <h1>Favourite</h1>
-        <a id="application" class="ui-btn-right" data-iconpos="notext" data-icon="home" href="#oe_menu" title="Home" data-theme="b"></a>
-    </div>
+    <t t-call="Header" />
     <div id="content" data-role="content">
         <ul data-role="listview" data-inset="true">
             <li data-theme="c" t-foreach="sc" t-as="opt">
@@ -69,15 +69,10 @@
             </li>
        </ul>
    </div>
-   <div id="footer" data-role="footer" data-theme="b" data-position="fixed">
-        <a id="shrotcuts" href="#" title="Favourite" data-theme="b">Favourite</a>
-        <a id="preference" class="ui-btn-right" href="#" title="Preference" data-theme="b">Preference</a>
-    </div>
+   <t t-call="Footer" />
 </t>
 <t t-name="Menu">
-     <div data-role="header" data-theme="b" data-position="fixed">
-        <h1>Applications</h1>
-    </div>
+    <t t-call="Header" />
     <div id="content" data-role="content">
         <ul data-role="listview" data-inset="true">
             <li data-theme="c" t-foreach="data.children" t-as="menu">
@@ -87,17 +82,11 @@
             </li>
         </ul>
     </div>
-    <div id="footer" data-role="footer" data-theme="b" data-position="fixed">
-        <a id="shrotcuts" href="#" title="Favourite" data-theme="b">Favourite</a>
-        <a id="preference" href="#" title="Preference" data-theme="b">Preference</a>
-    </div>
+    <t t-call="Footer" />
 </t>
 
 <t t-name="Menu.secondary">
-    <div id="header" data-role="header" data-theme="b" data-position="fixed">
-        <h1></h1>
-        <a id="application" class="ui-btn-right" data-iconpos="notext" data-icon="home" href="#oe_menu" title="Home" data-theme="b"></a>
-    </div>
+    <t t-call="Header" />
     <div id="content" data-role="content">
         <t t-foreach="menu.children" t-as="menu1" >
             <ul data-dividertheme="b" data-theme="c" data-inset="true" data-role="listview">
@@ -114,16 +103,10 @@
             </ul>
         </t>
     </div>
-     <div id="footer" data-role="footer" data-theme="b" data-position="fixed">
-        <a id="shrotcuts" href="#" title="Favourite" data-theme="b">Favourite</a>
-        <a id="preference" href="#" title="Preference" data-theme="b">Preference</a>
-    </div>
+     <t t-call="Footer" />
 </t>
 <t t-name="Options">
-    <div id="header" data-role="header" data-theme="b" data-position="fixed">
-        <h1>Options</h1>
-        <a id="application" class="ui-btn-right" data-iconpos="notext" data-icon="home" href="#oe_menu" title="Home" data-theme="b"></a>
-    </div>
+    <t t-call="Header" />
     <div data-role="content">
         <ul data-dividertheme="b" data-theme="c" data-inset="true" data-role="listview">
             <li data-theme="c">
@@ -131,17 +114,11 @@
             </li>
         </ul>
     </div>
-    <div id="footer" data-role="footer" data-theme="b" data-position="fixed">
-        <a id="shrotcuts" href="#" title="Favourite" data-theme="b">Favourite</a>
-        <a id="preference" href="#" title="Preference" data-theme="b">Preference</a>
-    </div>
+    <t t-call="Footer" />
 </t>
 
 <t t-name="ListView">
-    <div id="header" data-role="header" data-theme="b" data-position="fixed">
-        <h1></h1>
-        <a id="application" class="ui-btn-right" data-iconpos="notext" data-icon="home" href="#oe_menu" title="Home" data-theme="b"></a>
-    </div>
+    <t t-call="Header" />
     <div id="content" data-role="content">
         <ul data-role="listview" data-inset="true" data-theme="d" data-filter="true">
             <li data-theme="c" t-foreach="records" t-as="record">
@@ -151,10 +128,7 @@
             </li>
         </ul>
     </div>
-     <div id="footer" data-role="footer" data-theme="b" data-position="fixed">
-        <a id="shrotcuts" href="#" title="Favourite" data-theme="b">Favourite</a>
-        <a id="preference" href="#" title="Preference" data-theme="b">Preference</a>
-    </div>
+    <t t-call="Footer" />
 </t>
 
 <t t-name="FormView">
-- 
cgit v1.2.3


From e9fe69d85008b204e8076b86b5428ae62b9c87ef Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Tue, 13 Sep 2011 11:53:31 +0530
Subject: [IMP] Dynamically data with theme.

bzr revid: bth@tinyerp.com-20110913062331-l9uk2gjw4za0mbxd
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 68 ++++++++----------------
 addons/web_mobile/static/src/js/list_mobile.js   | 53 ++++++++----------
 2 files changed, 45 insertions(+), 76 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 9bdc004a7ca..931c33701c9 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -133,8 +133,16 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
         $shortcut = $(ev.currentTarget);
         id = $shortcut.data('menu');
         res_id = $shortcut.data('res');
-        this.listview = new openerp.web_mobile.ListView(this, "oe_list", res_id);
-        this.listview.start();
+
+        if(!$('#oe_list').html().length){
+            this.listview = new openerp.web_mobile.ListView(this, "oe_list", res_id);
+             this.listview.start();
+        }else{
+             $('#oe_list').remove();
+             $('<div id="oe_list" data-role="page"> </div>').appendTo('#moe');
+             this.listview = new openerp.web_mobile.ListView(this, "oe_list", res_id);
+             this.listview.start();
+        }
         jQuery("#oe_header").find("h1").html($shortcut.data('name'));
     }
 });
@@ -192,37 +200,15 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
         this.$element
             .removeClass("login_valid")
             .addClass("secondary_menu");
-            //.hide();
-    /*if(!$('#oe_sec_menu').html().length){
-            this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu", this.children);
-                   this.secondary.start();
-         }else{
-            //console.log('heree>>>>>>>>>>>>>>>>>>',$('#'+$('.ui-page-active').attr('id')));
-            var id=$('.ui-page-active').attr('id');
-            //console.log('heree>>>>>>>>>>>>>>>>>>',$('#'+id).removeClass('ui-page-active'));
 
-            this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu", this.children);
-            this.secondary.start();
-            $('#'+id).removeClass('ui-page-active');
-            $('#oe_sec_menu').addClass('ui-page-active');
-            //console.log();
-            $.mobile.changePage($("#oe_menu"), "slide", true, true);
-
-            //if($('.ui-page-active').attr('id').live())
-            //$.mobile.changePage($("#oe_sec_menu"), "slide", true, true);
-           // this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu", this.children);
-                  // this.secondary.start();
-
-
-                   //$.mobile.loadPage();
-                   //$.mobile.changePage($("#oe_sec_menu"), "slide", true, true);
-            //this.$element.find("#content").find('a').attr('href','#oe_sec_menu');
-         }*/
         if(!$('#oe_sec_menu').html().length){
             this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu", this.children);
             this.secondary.start();
         }else{
-            $.mobile.changePage($("#oe_sec_menu"), "slide", true, true);
+             $('#oe_sec_menu').remove();
+             $('<div id="oe_sec_menu" data-role="page"> </div>').appendTo('#moe');
+             this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu", this.children);
+             this.secondary.start();
         }
     }
 });
@@ -233,20 +219,6 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
     },
     start: function(ev, id) {
         var self = this;
-
-     /*   if(this.$element.html().length){
-                self.$element.find('[data-role="listview"]').remove();
-
-                _.each(self.data.children,function(i){
-                    var newul = '<ul data-dividertheme="b" class="ui-listview ui-listview-inset ui-corner-all ui-shadow" data-theme="c" data-inset="true" data-role="listview"><li data-role="list-divider">'+
-                    i.name+'</li></ul>';  // Create New List Item
-                    self.$element.find('#content').append(newul);
-                    //console.log('in for loop',i.children);
-                });
-                console.log('saaasasaaa',self.$element.find('#content'),self.data);
-                //self.$element.find('[data-role="listview"]').listview('refresh');
-            }else{*/
-
         var v = { menu : this.data };
 
         this.$element.html(QWeb.render("Menu.secondary", v));
@@ -281,8 +253,15 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
         var $menu = $(ev.currentTarget);
         id = $menu.data('menu');
         if (id) {
-            this.listview = new openerp.web_mobile.ListView(this, "oe_list", id);
-            this.listview.start();
+            if(!$('#oe_list').html().length){
+                this.listview = new openerp.web_mobile.ListView(this, "oe_list", id);
+                this.listview.start();
+            }else{
+                $('#oe_list').remove();
+                $('<div id="oe_list" data-role="page"> </div>').appendTo('#moe');
+                this.listview = new openerp.web_mobile.ListView(this, "oe_list", id);
+                this.listview.start();
+            }
         }
         jQuery("#oe_header").find("h1").html($menu.data('name'));
     }
@@ -301,7 +280,6 @@ openerp.web_mobile.Options =  openerp.web.Widget.extend({
             }
             else{
                 $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
-                //self.$element.find("#footer").find('#shrotcuts').attr('href','#oe_shortcuts');
             }
         });
         this.$element.find("[data-role=header]").find('#home').click(function(){
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index 8d276a6bc65..5cc28f4972b 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -24,38 +24,29 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
         var self = this;
         var dataset = new openerp.web.DataSetStatic(this, this.action.res_model, this.action.context);
         dataset.name_search('', [], 'ilike',false ,function(result){
-            if(self.$element.html().length){
-                self.$element.find('[data-role="listview"]').find('li').remove();
-                for(var i=0;i<result.length;i++){
-                    var newli = '<li><a id="list-id" data-id='+ result[i][0] +' href="#">' + result[i][1] + '</a></li>';  // Create New List Item
-                    self.$element.find('[data-role="listview"]').append(newli);
+            self.$element.html(QWeb.render("ListView", {'records' : result}));
+            self.$element.find("[data-role=header]").find('h1').html(self.action.name);
+            self.$element.find("[data-role=header]").find('#home').click(function(){
+                $.mobile.changePage($("#oe_menu"), "slide", true, true);
+            });
+            self.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
+                if(!$('#oe_shortcuts').html().length){
+                    this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
+                    this.shortcuts.start();
                 }
-                self.$element.find('[data-role="listview"]').listview('refresh');
-            }else{
-                self.$element.html(QWeb.render("ListView", {'records' : result}));
-                self.$element.find("[data-role=header]").find('h1').html(self.action.name);
-                self.$element.find("[data-role=header]").find('#home').click(function(){
-                    $.mobile.changePage($("#oe_menu"), "slide", true, true);
-                });
-                self.$element.find("[data-role=footer]").find('#shortcuts').click(function(){
-                    if(!$('#oe_shortcuts').html().length){
-                        this.shortcut = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
-                        this.shortcut.start();
-                    }
-                    else{
-                        $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
-                    }
-                });
-                self.$element.find("[data-role=footer]").find('#preference').click(function(){
-                    if(!$('#oe_options').html().length){
-                        this.options = new openerp.web_mobile.Options(self, "oe_options");
-                        this.options.start();
-                    }
-                    else{
-                        $.mobile.changePage($("#oe_options"), "slide", true, true);
-                    }
-                });
-            }
+                else{
+                    $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                }
+            });
+            self.$element.find("[data-role=footer]").find('#preference').click(function(){
+                if(!$('#oe_options').html().length){
+                    this.options = new openerp.web_mobile.Options(self, "oe_options");
+                    this.options.start();
+                }
+                else{
+                    $.mobile.changePage($("#oe_options"), "slide", true, true);
+                }
+            });
             self.$element.find("a#list-id").click(self.on_list_click);
             $.mobile.changePage($("#oe_list"), "slide", true, true);
         });
-- 
cgit v1.2.3


From 655d615f52fabf821d354f0399a792ac595de88e Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Tue, 13 Sep 2011 16:18:13 +0530
Subject: [IMP] click on Logout initialize again from login.

bzr revid: bth@tinyerp.com-20110913104813-8ojtqbjhdh0kxjrq
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 4 ++++
 addons/web_mobile/static/src/xml/web_mobile.xml  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 931c33701c9..4614d70e70b 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -285,6 +285,10 @@ openerp.web_mobile.Options =  openerp.web.Widget.extend({
         this.$element.find("[data-role=header]").find('#home').click(function(){
             $.mobile.changePage($("#oe_menu"), "slide", true, true);
         });
+        this.$element.find("[data-role=content]").find('a').click(function(){
+            $('#oe_login').empty();
+            window.location.replace('');
+        });
         $.mobile.changePage($("#oe_options"), "slide", true, true);
     }
 });
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index 29a325a61ce..24503cfcc29 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -110,7 +110,7 @@
     <div data-role="content">
         <ul data-dividertheme="b" data-theme="c" data-inset="true" data-role="listview">
             <li data-theme="c">
-                <a id="logout" href="#oe_login">Logout</a>
+                <a id="logout">Logout</a>
             </li>
         </ul>
     </div>
-- 
cgit v1.2.3


From c727ee09cd433c8e876631f9062301c634b60004 Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Wed, 14 Sep 2011 11:16:42 +0530
Subject: [IMP] Improved footer to use navbar with icons instead of buttons.

bzr revid: jra@tinyerp.com-20110914054642-qk5dii560zadku7o
---
 addons/web_mobile/static/src/xml/web_mobile.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index 24503cfcc29..95bcb3a01c6 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -53,8 +53,12 @@
 
 <t t-name="Footer">
     <div data-role="footer" data-theme="b" data-position="fixed">
-        <a id="shrotcuts" href="#" title="Favourite" data-theme="b">Favourite</a>
-        <a id="preference" href="#" title="Preference" data-theme="b">Preference</a>
+        <div data-role="navbar">
+            <ul>
+                <li><a id="shrotcuts" href="#" title="Favourite" data-theme="b" data-icon="star" >Favourite</a></li>
+                <li><a id="preference" href="#" title="Preference" data-theme="b" data-icon="gear">Preference</a></li>
+            </ul>
+        </div>
     </div>
 </t>
 
-- 
cgit v1.2.3


From 7c08fb6324b8411651ebd5b651c9ba737878f4ac Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Wed, 14 Sep 2011 12:37:30 +0530
Subject: [IMP]Theme for Formview and header-footer.

bzr revid: bth@tinyerp.com-20110914070730-1ikmiwu4m9aarklz
---
 addons/web_mobile/static/src/js/form_mobile.js  |  33 ++++++--
 addons/web_mobile/static/src/js/list_mobile.js  |  11 ++-
 addons/web_mobile/static/src/xml/web_mobile.xml | 104 +++++++++++++++---------
 3 files changed, 103 insertions(+), 45 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index 3dc777a2bd6..5fd206655f5 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -41,11 +41,32 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                 }
                 self.$element.html(QWeb.render("FormView", {'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : data }));
 
-                    self.$element.find("#header").find('h1').html(self.action.name);
+                    self.$element.find("[data-role=header]").find('h1').html(self.action.name);
+                    self.$element.find("[data-role=header]").find('#home').click(function(){
+                        $.mobile.changePage($("#oe_menu"), "slide", true, true);
+                    });
+                    self.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
+                        if(!$('#oe_shortcuts').html().length){
+                            this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
+                            this.shortcuts.start();
+                        }
+                        else{
+                            $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                        }
+                    });
+                    self.$element.find("[data-role=footer]").find('#preference').click(function(){
+                        if(!$('#oe_options').html().length){
+                            this.options = new openerp.web_mobile.Options(self, "oe_options");
+                            this.options.start();
+                        }
+                        else{
+                            $.mobile.changePage($("#oe_options"), "slide", true, true);
+                        }
+                    });
                     self.$element.find('select').change(function(ev){
                         selection.on_select_option(ev);
                     });
-                    self.$element.find('a').click(function(){
+                    /*self.$element.find('a').click(function(){
                         for (var k = 0; k < notebooks.children.length; k++) {
                             var text = $(this).find('.ui-btn-text').text();
                             var next = $(this).next();
@@ -84,7 +105,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                     }else{
                                         next.find('.detail').append(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data }));
                                     }
-                                }
+                                } */
 
                                 //$.mobile.changePage($("#oe_form"), "slide", true, true);
                                 /*next.find('.detail').find('li').click(function(){
@@ -115,14 +136,14 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                         });
                                     }
                                 });*/
-                            }
+                            /*}
                         }
                         self.$element.find('select').change(function(ev){
                             selection.on_select_option(ev);
                         });
-                    });
+                    });*/
+                    $.mobile.changePage($("#oe_form"), "slide", true, true);
                 });
-                $.mobile.changePage($("#oe_form"), "slide", true, true);
                 //$("#oe_header").find("h1").html(result.arch.attrs.string);
         });
     },
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index 5cc28f4972b..3c872496577 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -55,8 +55,15 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
         var $record = $(ev.currentTarget);
         var self = this;
         id = $record.data('id');
-        this.formview = new openerp.web_mobile.FormView(this, "oe_form", id, this.action);
-        this.formview.start();
+        if(!$('#oe_form').html().length){
+            this.formview = new openerp.web_mobile.FormView(this, "oe_form", id, this.action);
+            this.formview.start();
+        }else{
+            $('#oe_form').remove();
+            $('<div id="oe_form" data-role="page"> </div>').appendTo('#moe');
+            this.formview = new openerp.web_mobile.FormView(this, "oe_form", id, this.action);
+            this.formview.start();
+        }
     }
  });
 };
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index 95bcb3a01c6..7ca793076ea 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -136,63 +136,67 @@
 </t>
 
 <t t-name="FormView">
+    <t t-call="Header" />
     <div role="main" data-role="content">
         <form>
             <t t-foreach="get_fields" t-as="field">
-            <div data-role="fieldcontain">
-                <t t-if="fields[field.attrs.name].type!='one2many' and fields[field.attrs.name].type!='many2many'" >
-                <label class="ui-input-text">
-                    <span>
-                        <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
-                        <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>
-                    </span>:
-                </label>
-                </t>
-                <t t-if="fields[field.attrs.name].type == 'char'">
+            <t t-if="fields[field.attrs.name].type == 'boolean'">
+                <fieldset data-role="controlgroup">
                     <t t-if="values[field.attrs.name]">
-                        <input class="ui-input-text ui-body-null ui-corner-all ui-shadow-inset ui-body-c" type="text" t-att-value="values[field.attrs.name]"/><br/>
+                        <input type="checkbox" name="checkbox-1" id="checkbox-1" checked="yes"/>
+                       <!--   <input type="checkbox" name="checkbox-1" id="checkbox-1" checked="yes" class="custom"/><br/> -->
                     </t>
                     <t t-if="!(values[field.attrs.name])">
-                        <input class="ui-input-text ui-body-null ui-corner-all ui-shadow-inset ui-body-c" type="text" value=""/><br/>
+                        <input type="checkbox" name="checkbox-1" id="checkbox-1" class="custom" />
+                        <!--  <input type="checkbox" name="checkbox-1" id="checkbox-1" class="custom"/><br/> -->
                     </t>
+                    <label for="checkbox-1"><t t-esc="fields[field.attrs.name].string" /></label>
+                </fieldset>
+             </t>
+            <div data-role="fieldcontain">
+                <t t-if="fields[field.attrs.name].type!='one2many' and fields[field.attrs.name].type!='many2many' and fields[field.attrs.name].type!='boolean'" >
+                <label for="">
+                    <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
+                    <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
+                </label>
                 </t>
-                <t t-if="fields[field.attrs.name].type == 'boolean'">
+                <t t-if="fields[field.attrs.name].type == 'char'">
                     <t t-if="values[field.attrs.name]">
-                        <input type="checkbox" checked="yes"/><br/>
+                        <input type="text" id="" t-att-value="values[field.attrs.name]"/><br/>
                     </t>
                     <t t-if="!(values[field.attrs.name])">
-                        <input type="checkbox"/><br/>
-                    </t>
+                        <input type="text" value="" id=""/><br/>
+                     </t>
                 </t>
                 <t t-if="fields[field.attrs.name].type == 'text'">
-                    <textarea style="width:100%;" rows="8" name="textarea" id="textarea"></textarea><br/>
+                    <textarea name="" id=""></textarea><br/>
                 </t>
                 <t t-if="fields[field.attrs.name].type == 'float'">
                     <t t-if="values[field.attrs.name]">
-                        <input class="ui-input-text ui-body-null ui-corner-all ui-shadow-inset ui-body-c" type="text" t-att-value="values[field.attrs.name]"/><br/>
+                        <input id="" type="text" t-att-value="values[field.attrs.name]"/><br/>
                     </t>
                     <t t-if="!(values[field.attrs.name])">
-                        <input class="ui-input-text ui-body-null ui-corner-all ui-shadow-inset ui-body-c" type="text" value=""/><br/>
+                        <input id="" type="text" value=""/><br/>
                     </t>
                 </t>
                 <t t-if="fields[field.attrs.name].type == 'date'">
                     <t t-if="values[field.attrs.name]">
-                        <input class="ui-input-text ui-body-null ui-corner-all ui-shadow-inset ui-body-c" type="text" t-att-value="values[field.attrs.name]"/><br/>
+                        <input id="" type="text" t-att-value="values[field.attrs.name]"/><br/>
                     </t>
                     <t t-if="!(values[field.attrs.name])">
-                        <input class="ui-input-text ui-body-null ui-corner-all ui-shadow-inset ui-body-c" type="text" value=""/><br/>
+                        <input id="" type="text" value=""/><br/>
                     </t>
                 </t>
                 <t t-if="fields[field.attrs.name].type == 'datetime'">
                     <t t-if="values[field.attrs.name]">
-                        <input class="ui-input-text ui-body-null ui-corner-all ui-shadow-inset ui-body-c" type="text" t-att-value="values[field.attrs.name]"/><br/>
+                        <input id="" type="text" t-att-value="values[field.attrs.name]"/><br/>
                     </t>
                     <t t-if="!(values[field.attrs.name])">
-                        <input class="ui-input-text ui-body-null ui-corner-all ui-shadow-inset ui-body-c" type="text" value=""/><br/>
+                        <input id="" type="text" value=""/><br/>
                     </t>
                 </t>
                 <t t-if="fields[field.attrs.name].type == 'selection'">
-                    <div class="ui-select">
+                    <!--  <div class="ui-select">
                         <div data-theme="c" class="ui-btn ui-btn-icon-right ui-btn-corner-all ui-shadow ui-btn-up-c">
                             <span class="ui-btn-inner ui-btn-corner-all">
                                 <span class="ui-btn-text">
@@ -213,10 +217,15 @@
                                 </t>
                             </select>
                         </div>
-                    </div>
+                    </div>-->
+                    <select id="">
+                        <t t-foreach="fields[field.attrs.name].selection" t-as="opt">
+                            <option t-att-value="opt[0]"><t t-esc="opt[1]"/></option>
+                        </t>
+                    </select>
                 </t>
                  <t t-if="fields[field.attrs.name].type == 'many2one'">
-                    <div class="ui-select">
+                   <!--  <div class="ui-select">
                         <div data-theme="c" class="ui-btn ui-btn-icon-right ui-btn-corner-all ui-shadow ui-btn-up-c">
                             <span class="ui-btn-inner ui-btn-corner-all">
                                 <span class="ui-btn-text">
@@ -240,10 +249,30 @@
                                 </t>
                             </select>
                         </div>
-                    </div>
+                    </div>-->
+                    <select id="">
+                                <t t-if="fields[field.attrs.name].selection">
+                                    <t t-foreach="fields[field.attrs.name].selection" t-as="opt">
+                                        <t t-if="values[field.attrs.name]==opt[0]">
+                                            <option t-att-value="opt[0]" selected="true" ><t t-esc="opt[1]"/></option>
+                                        </t>
+                                        <t t-if="values[field.attrs.name]!=opt[0]">
+                                            <option t-att-value="opt[0]" ><t t-esc="opt[1]"/></option>
+                                        </t>
+                                    </t>
+                                </t>
+                            </select>
                 </t>
                 <t t-if="fields[field.attrs.name].type == 'one2many'">
-                    <ul role="listbox" data-role="listview" class="ui-listview ui-listview-inset ui-corner-all ui-shadow">
+                    <ul data-role="listview" data-inset="true" data-theme="d">
+                        <li data-theme="c">
+                            <a href="#">
+                                <t t-esc="til"/>
+                            </a>
+                         </li>
+                     </ul>
+                 </t>
+                 <!--     <ul role="listbox" data-role="listview" class="ui-listview ui-listview-inset ui-corner-all ui-shadow">
                         <li tabindex="0" data-theme="d" role="option" class="ui-btn ui-btn-icon-right ui-li ui-corner-top ui-corner-bottom ui-btn-up-d">
                             <div class="ui-btn-inner">
                                 <div class="ui-btn-text">
@@ -254,7 +283,7 @@
                                 <span class="ui-icon ui-icon-arrow-r"></span>
                             </div>
                         </li>
-                    </ul>
+                    </ul>-->
                     <!--  <div class="info ui-collapsible-contain" data-collapsed="true" data-role="collapsible">
                         <h1 class="ui-collapsible-heading">
                             <a class="ui-collapsible-heading-toggle ui-btn ui-btn-icon-left ui-shadow ui-corner-all ui-btn-up-c" href="#" data-theme="c" t-id="page.attrs.string">
@@ -270,11 +299,11 @@
                                 <div class="detail"></div>
                             </div>
                         </h1>
-                    </div>-->
-                </t>
+                    </div>
+                </t>-->
             </div>
             </t>
-            <t t-if="notebooks">
+           <!-- <t t-if="notebooks">
                 <t t-foreach="notebooks.children" t-as="page">
                     <t t-if="page.attrs.invisible">
                     <div style="display:none;" class="info ui-collapsible-contain" data-collapsed="true" data-role="collapsible">
@@ -282,9 +311,9 @@
                             <a class="ui-collapsible-heading-toggle ui-btn ui-btn-icon-left ui-shadow ui-corner-all ui-btn-up-c" href="#" data-theme="c" t-id="page.attrs.string">
                                 <span class="ui-btn-inner ui-corner-all">
                                     <span class="ui-btn-text">
-                                        <t t-esc="page.attrs.string"></t>
+                                        <t t-esc="page.attrs.string"></t>-->
                                         <!-- <span class="ui-collapsible-heading-status"></span> -->
-                                    </span>
+                                 <!--     </span>
                                     <span data-theme="d" class="ui-btn ui-btn-icon-left ui-btn-corner-all ui-shadow ui-btn-up-d">
                                         <span class="ui-btn-inner ui-btn-corner-all ui-corner-all">
                                             <span class="ui-btn-text"></span>
@@ -305,9 +334,9 @@
                             <a class="ui-collapsible-heading-toggle ui-btn ui-btn-icon-left ui-shadow ui-corner-all ui-btn-up-c" href="#" data-theme="c" t-id="page.attrs.string">
                                 <span class="ui-btn-inner ui-corner-all">
                                     <span class="ui-btn-text">
-                                        <t t-esc="page.attrs.string"></t>
+                                        <t t-esc="page.attrs.string"></t>-->
                                         <!-- <span class="ui-collapsible-heading-status"></span> -->
-                                    </span>
+                                    <!--  </span>
                                     <span data-theme="d" class="ui-btn ui-btn-icon-left ui-btn-corner-all ui-shadow ui-btn-up-d">
                                         <span class="ui-btn-inner ui-btn-corner-all ui-corner-all">
                                             <span class="ui-btn-text"></span>
@@ -323,8 +352,9 @@
                     </div>
                     </t>
                 </t>
-            </t>
+            </t> -->
         </form>
     </div>
+    <t t-call="Footer" />
 </t>
 </templates>
-- 
cgit v1.2.3


From 063eedcc6f05485d690d77c62638e9f6a697237a Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Wed, 14 Sep 2011 18:51:02 +0530
Subject: [IMP] Improved form view layout.

bzr revid: jra@tinyerp.com-20110914132102-peotubq811s0uvio
---
 addons/web_mobile/static/src/xml/web_mobile.xml | 322 +++++++++---------------
 1 file changed, 120 insertions(+), 202 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index 7ca793076ea..fc2daf402af 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -17,7 +17,7 @@
 </t>
 
 <t t-name="Login">
-     <div data-role="header" data-theme="b">
+     <div data-role="header" data-theme="b" data-position="fixed">
         <h1>OpenERP</h1>
     </div>
     <div data-role="content">
@@ -32,9 +32,9 @@
                     </t>
                 </select>
                 <label for="login">Login:</label>
-                <input type="text" id="login" name="login" value=""/><br/>
+                <input type="text" id="login" name="login" value=""/>
                 <label for="password">Password:</label>
-                <input type="password" id="password" name="password" value=""/><br/>
+                <input type="password" id="password" name="password" value=""/>
                 <a id="login_btn" data-theme="c" href="#" data-role="button">Login</a>
                 <div class="login_error_message ui-btn-inner ui-btn-corner-all">
                     <span class="ui-btn-text">Bad username or password</span>
@@ -42,6 +42,10 @@
              </div>
         </fieldset>
     </div>
+    <div data-role="footer" data-theme="b" data-position="fixed">
+        <h1>Powered by openerp.com</h1>
+    </div>
+    
 </t>
 
 <t t-name="Header">
@@ -137,222 +141,136 @@
 
 <t t-name="FormView">
     <t t-call="Header" />
-    <div role="main" data-role="content">
+    <div data-role="content">
         <form>
             <t t-foreach="get_fields" t-as="field">
-            <t t-if="fields[field.attrs.name].type == 'boolean'">
-                <fieldset data-role="controlgroup">
-                    <t t-if="values[field.attrs.name]">
-                        <input type="checkbox" name="checkbox-1" id="checkbox-1" checked="yes"/>
-                       <!--   <input type="checkbox" name="checkbox-1" id="checkbox-1" checked="yes" class="custom"/><br/> -->
-                    </t>
-                    <t t-if="!(values[field.attrs.name])">
-                        <input type="checkbox" name="checkbox-1" id="checkbox-1" class="custom" />
-                        <!--  <input type="checkbox" name="checkbox-1" id="checkbox-1" class="custom"/><br/> -->
-                    </t>
-                    <label for="checkbox-1"><t t-esc="fields[field.attrs.name].string" /></label>
-                </fieldset>
-             </t>
-            <div data-role="fieldcontain">
-                <t t-if="fields[field.attrs.name].type!='one2many' and fields[field.attrs.name].type!='many2many' and fields[field.attrs.name].type!='boolean'" >
-                <label for="">
-                    <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
-                    <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
-                </label>
-                </t>
-                <t t-if="fields[field.attrs.name].type == 'char'">
-                    <t t-if="values[field.attrs.name]">
-                        <input type="text" id="" t-att-value="values[field.attrs.name]"/><br/>
+                <div data-role="fieldcontain">
+                    <t t-if="fields[field.attrs.name].type == 'char'">
+                        <label for="">
+                            <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
+                            <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
+                        </label>
+                        <t t-if="values[field.attrs.name]">
+                            <input type="text" id="" t-att-value="values[field.attrs.name]"/>
+                        </t>
+                        <t t-if="!(values[field.attrs.name])">
+                            <input type="text" value="" id=""/>
+                         </t>
                     </t>
-                    <t t-if="!(values[field.attrs.name])">
-                        <input type="text" value="" id=""/><br/>
-                     </t>
-                </t>
-                <t t-if="fields[field.attrs.name].type == 'text'">
-                    <textarea name="" id=""></textarea><br/>
-                </t>
-                <t t-if="fields[field.attrs.name].type == 'float'">
-                    <t t-if="values[field.attrs.name]">
-                        <input id="" type="text" t-att-value="values[field.attrs.name]"/><br/>
+                    <t t-if="fields[field.attrs.name].type == 'text'">
+                        <label for="">
+                            <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
+                            <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
+                        </label>
+                        <textarea name="" id=""></textarea>
                     </t>
-                    <t t-if="!(values[field.attrs.name])">
-                        <input id="" type="text" value=""/><br/>
+                    <t t-if="fields[field.attrs.name].type == 'float'">
+                        <label for="">
+                            <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
+                            <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
+                        </label>
+                        <t t-if="values[field.attrs.name]">
+                            <input id="" type="text" t-att-value="values[field.attrs.name]"/>
+                        </t>
+                        <t t-if="!(values[field.attrs.name])">
+                            <input id="" type="text" value=""/>
+                        </t>
                     </t>
-                </t>
-                <t t-if="fields[field.attrs.name].type == 'date'">
-                    <t t-if="values[field.attrs.name]">
-                        <input id="" type="text" t-att-value="values[field.attrs.name]"/><br/>
+                    <t t-if="fields[field.attrs.name].type == 'date'">
+                        <label for="">
+                            <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
+                            <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
+                        </label>
+                        <t t-if="values[field.attrs.name]">
+                            <input id="" type="text" t-att-value="values[field.attrs.name]"/>
+                        </t>
+                        <t t-if="!(values[field.attrs.name])">
+                            <input id="" type="text" value=""/>
+                        </t>
                     </t>
-                    <t t-if="!(values[field.attrs.name])">
-                        <input id="" type="text" value=""/><br/>
+                    <t t-if="fields[field.attrs.name].type == 'datetime'">
+                        <label for="">
+                            <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
+                            <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
+                        </label>
+                        <t t-if="values[field.attrs.name]">
+                            <input id="" type="text" t-att-value="values[field.attrs.name]"/>
+                        </t>
+                        <t t-if="!(values[field.attrs.name])">
+                            <input id="" type="text" value=""/>
+                        </t>
                     </t>
-                </t>
-                <t t-if="fields[field.attrs.name].type == 'datetime'">
-                    <t t-if="values[field.attrs.name]">
-                        <input id="" type="text" t-att-value="values[field.attrs.name]"/><br/>
+                    <t t-if="fields[field.attrs.name].type == 'boolean'">
+                        <fieldset data-role="controlgroup">
+                            <t t-if="values[field.attrs.name]">
+                                <input type="checkbox" name="checkbox-1" id="checkbox-1" checked="yes" class="custom"/>
+                            </t>
+                            <t t-if="!(values[field.attrs.name])">
+                                <input type="checkbox" name="checkbox-1" id="checkbox-1" class="custom" />
+                            </t>
+                            <label for="checkbox-1"><t t-esc="fields[field.attrs.name].string" /></label>
+                        </fieldset>
                     </t>
-                    <t t-if="!(values[field.attrs.name])">
-                        <input id="" type="text" value=""/><br/>
+                    <t t-if="fields[field.attrs.name].type == 'selection'">
+                        <label for="" class="select">
+                            <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
+                            <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
+                        </label>
+                        <select id="" data-native-menu="false">
+                            <t t-foreach="fields[field.attrs.name].selection" t-as="opt">
+                                <option t-att-value="opt[0]"><t t-esc="opt[1]"/></option>
+                            </t>
+                        </select>
                     </t>
-                </t>
-                <t t-if="fields[field.attrs.name].type == 'selection'">
-                    <!--  <div class="ui-select">
-                        <div data-theme="c" class="ui-btn ui-btn-icon-right ui-btn-corner-all ui-shadow ui-btn-up-c">
-                            <span class="ui-btn-inner ui-btn-corner-all">
-                                <span class="ui-btn-text">
-                                    <t t-if="values[field.attrs.name]">
-                                        <t t-foreach="fields[field.attrs.name].selection" t-as="opt">
-                                            <t t-if="opt[0] == (values[field.attrs.name])">
-                                                <t t-esc="opt[1]"/>
-                                            </t>
-                                        </t>
-                                    </t>
-                                </span>
-                                <span class="ui-icon ui-icon-arrow-d ui-icon-shadow"></span>
-                            </span>
-
-                            <select t-att-id="'selection_'+fields[field.attrs.name].string">
+                    <t t-if="fields[field.attrs.name].type == 'many2one'">
+                        <label for="" class="select">
+                            <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
+                            <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
+                        </label>
+                        <select id="" data-native-menu="false">
+                            <t t-if="fields[field.attrs.name].selection">
                                 <t t-foreach="fields[field.attrs.name].selection" t-as="opt">
-                                    <option t-att-value="opt[0]"><t t-esc="opt[1]"/></option>
-                                </t>
-                            </select>
-                        </div>
-                    </div>-->
-                    <select id="">
-                        <t t-foreach="fields[field.attrs.name].selection" t-as="opt">
-                            <option t-att-value="opt[0]"><t t-esc="opt[1]"/></option>
-                        </t>
-                    </select>
-                </t>
-                 <t t-if="fields[field.attrs.name].type == 'many2one'">
-                   <!--  <div class="ui-select">
-                        <div data-theme="c" class="ui-btn ui-btn-icon-right ui-btn-corner-all ui-shadow ui-btn-up-c">
-                            <span class="ui-btn-inner ui-btn-corner-all">
-                                <span class="ui-btn-text">
-                                    <t t-if="values[field.attrs.name]">
-                                        <t t-esc="values[field.attrs.name][1]"/>
+                                    <t t-if="values[field.attrs.name]==opt[0]">
+                                        <option t-att-value="opt[0]" selected="true" ><t t-esc="opt[1]"/></option>
                                     </t>
-                                 </span>
-                                <span class="ui-icon ui-icon-arrow-d ui-icon-shadow"></span>
-                            </span>
-
-                            <select t-att-id="'selection_'+fields[field.attrs.name].string">
-                                <t t-if="fields[field.attrs.name].selection">
-                                    <t t-foreach="fields[field.attrs.name].selection" t-as="opt">
-                                        <t t-if="values[field.attrs.name]==opt[0]">
-                                            <option t-att-value="opt[0]" selected="true" ><t t-esc="opt[1]"/></option>
-                                        </t>
-                                        <t t-if="values[field.attrs.name]!=opt[0]">
-                                            <option t-att-value="opt[0]" ><t t-esc="opt[1]"/></option>
-                                        </t>
-                                    </t>
-                                </t>
-                            </select>
-                        </div>
-                    </div>-->
-                    <select id="">
-                                <t t-if="fields[field.attrs.name].selection">
-                                    <t t-foreach="fields[field.attrs.name].selection" t-as="opt">
-                                        <t t-if="values[field.attrs.name]==opt[0]">
-                                            <option t-att-value="opt[0]" selected="true" ><t t-esc="opt[1]"/></option>
-                                        </t>
-                                        <t t-if="values[field.attrs.name]!=opt[0]">
-                                            <option t-att-value="opt[0]" ><t t-esc="opt[1]"/></option>
-                                        </t>
+                                    <t t-if="values[field.attrs.name]!=opt[0]">
+                                        <option t-att-value="opt[0]" ><t t-esc="opt[1]"/></option>
                                     </t>
                                 </t>
-                            </select>
-                </t>
-                <t t-if="fields[field.attrs.name].type == 'one2many'">
-                    <ul data-role="listview" data-inset="true" data-theme="d">
-                        <li data-theme="c">
-                            <a href="#">
-                                <t t-esc="til"/>
-                            </a>
-                         </li>
-                     </ul>
-                 </t>
-                 <!--     <ul role="listbox" data-role="listview" class="ui-listview ui-listview-inset ui-corner-all ui-shadow">
-                        <li tabindex="0" data-theme="d" role="option" class="ui-btn ui-btn-icon-right ui-li ui-corner-top ui-corner-bottom ui-btn-up-d">
-                            <div class="ui-btn-inner">
-                                <div class="ui-btn-text">
-                                    <a href="#" class="ui-link-inherit">
-                                        <span><t t-esc="til"/></span>
-                                    </a>
-                                </div>
-                                <span class="ui-icon ui-icon-arrow-r"></span>
-                            </div>
-                        </li>
-                    </ul>-->
-                    <!--  <div class="info ui-collapsible-contain" data-collapsed="true" data-role="collapsible">
-                        <h1 class="ui-collapsible-heading">
-                            <a class="ui-collapsible-heading-toggle ui-btn ui-btn-icon-left ui-shadow ui-corner-all ui-btn-up-c" href="#" data-theme="c" t-id="page.attrs.string">
-                                <span class="ui-btn-inner ui-corner-all">
-                                    <span class="ui-btn-text">
-                                        <t t-esc="til"></t>
-                                        <span class="ui-collapsible-heading-status"></span>
-                                    </span>
-                                </span>
-                            </a>
-                            <span class="ui-icon ui-icon-arrow-r"></span>
-                            <div class="ui-collapsible-content ui-collapsible-content-collapsed" aria-hidden="true">
-                                <div class="detail"></div>
-                            </div>
-                        </h1>
-                    </div>
-                </t>-->
-            </div>
+                            </t>
+                        </select>
+                    </t>
+                    <t t-if="fields[field.attrs.name].type == 'one2many'">
+                        <ul data-role="listview" data-inset="true" data-theme="d">
+                            <li data-theme="c">
+                                <a href="#">
+                                    <t t-esc="til"/>
+                                </a>
+                             </li>
+                         </ul>
+                     </t>
+                </div>
             </t>
-           <!-- <t t-if="notebooks">
-                <t t-foreach="notebooks.children" t-as="page">
-                    <t t-if="page.attrs.invisible">
-                    <div style="display:none;" class="info ui-collapsible-contain" data-collapsed="true" data-role="collapsible">
-                        <h1 class="ui-collapsible-heading">
-                            <a class="ui-collapsible-heading-toggle ui-btn ui-btn-icon-left ui-shadow ui-corner-all ui-btn-up-c" href="#" data-theme="c" t-id="page.attrs.string">
-                                <span class="ui-btn-inner ui-corner-all">
-                                    <span class="ui-btn-text">
-                                        <t t-esc="page.attrs.string"></t>-->
-                                        <!-- <span class="ui-collapsible-heading-status"></span> -->
-                                 <!--     </span>
-                                    <span data-theme="d" class="ui-btn ui-btn-icon-left ui-btn-corner-all ui-shadow ui-btn-up-d">
-                                        <span class="ui-btn-inner ui-btn-corner-all ui-corner-all">
-                                            <span class="ui-btn-text"></span>
-                                            <span class="ui-icon ui-icon-shadow ui-icon-plus"></span>
-                                        </span>
-                                    </span>
-                                </span>
-                            </a>
-                            <div class="ui-collapsible-content ui-collapsible-content-collapsed" aria-hidden="true">
-                                <div class="detail"></div>
+           <t t-if="notebooks">
+                <div data-role="collapsible-set">
+                    <t t-foreach="notebooks.children" t-as="page">
+                        <t t-if="page.attrs.invisible">
+                            <div style="display:none;" data-collapsed="true" data-role="collapsible">
+                                <h3>
+                                        <t t-esc="page.attrs.string"></t>
+                                </h3>
                             </div>
-                        </h1>
-                    </div>
-                    </t>
-                    <t t-if="!page.attrs.invisible">
-                    <div class="info ui-collapsible-contain" data-collapsed="true" data-role="collapsible">
-                        <h1 class="ui-collapsible-heading">
-                            <a class="ui-collapsible-heading-toggle ui-btn ui-btn-icon-left ui-shadow ui-corner-all ui-btn-up-c" href="#" data-theme="c" t-id="page.attrs.string">
-                                <span class="ui-btn-inner ui-corner-all">
-                                    <span class="ui-btn-text">
-                                        <t t-esc="page.attrs.string"></t>-->
-                                        <!-- <span class="ui-collapsible-heading-status"></span> -->
-                                    <!--  </span>
-                                    <span data-theme="d" class="ui-btn ui-btn-icon-left ui-btn-corner-all ui-shadow ui-btn-up-d">
-                                        <span class="ui-btn-inner ui-btn-corner-all ui-corner-all">
-                                            <span class="ui-btn-text"></span>
-                                            <span class="ui-icon ui-icon-shadow ui-icon-plus"></span>
-                                        </span>
-                                    </span>
-                                </span>
-                            </a>
-                            <div class="ui-collapsible-content ui-collapsible-content-collapsed" aria-hidden="true">
-                                <div class="detail"></div>
+                        </t>
+                        <t t-if="!page.attrs.invisible">
+                            <div data-collapsed="true" data-role="collapsible">
+                                <h3>
+                                        <t t-esc="page.attrs.string"></t>
+                                </h3>
                             </div>
-                        </h1>
-                    </div>
+                        </t>
                     </t>
-                </t>
-            </t> -->
+                </div>
+            </t>
         </form>
     </div>
     <t t-call="Footer" />
-- 
cgit v1.2.3


From e1268a91680435bb88b36e61d8f583c7f0db17ac Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Thu, 15 Sep 2011 19:01:20 +0530
Subject: [IMP] Implement formview fields & notebook with theme.

bzr revid: bth@tinyerp.com-20110915133120-g1pnbvmi9a5tjxpj
---
 addons/web_mobile/static/src/js/chrome_mobile.js |  14 +-
 addons/web_mobile/static/src/js/form_mobile.js   | 106 ++++------------
 addons/web_mobile/static/src/xml/web_mobile.xml  | 155 ++++++++++++++++++++++-
 3 files changed, 184 insertions(+), 91 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 4614d70e70b..1a71236e6f4 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -84,7 +84,19 @@ openerp.web_mobile.Login =  openerp.web.Widget.extend({
         });
     }
 });
-
+openerp.web_mobile.Notepage = openerp.web.Widget.extend({
+    init: function(session, element_id) {
+        this._super(session, element_id);
+        this.get_fields = this.widget_parent.get_fields;
+        this.page_fields = this.widget_parent.page_fields;
+        this.values = this.widget_parent.values;
+        this.til = this.widget_parent.til;
+    },
+    start: function() {
+        console.log(this.get_fields,this.page_fields,this.values,this.til,this.$element);
+        this.$element.html(QWeb.render("NotePage", {'get_fields1': this.get_fields,'fields1' : this.page_fields, 'values1' : this.values,'til1': this.til }));
+    }
+});
 openerp.web_mobile.Header =  openerp.web.Widget.extend({
     init: function(session, element_id) {
         this._super(session, element_id);
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index 5fd206655f5..1699824ce77 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -39,7 +39,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                         var notebooks = view_fields[j];
                     }
                 }
-                self.$element.html(QWeb.render("FormView", {'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : data }));
+                self.$element.html(QWeb.render("FormView", {'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : data ,'temp_flag':'1'}));
 
                     self.$element.find("[data-role=header]").find('h1').html(self.action.name);
                     self.$element.find("[data-role=header]").find('#home').click(function(){
@@ -66,85 +66,35 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                     self.$element.find('select').change(function(ev){
                         selection.on_select_option(ev);
                     });
-                    /*self.$element.find('a').click(function(){
+
+                    self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').each(function(i){
+
                         for (var k = 0; k < notebooks.children.length; k++) {
-                            var text = $(this).find('.ui-btn-text').text();
-                            var next = $(this).next();
-                            var span = $(this).find('span .ui-icon');
-                            if (notebooks.children[k].attrs.string == $.trim(text)) {
+                            if (notebooks.children[k].attrs.string == $(this).attr('id')) {
                                 get_fields = self.get_fields(notebooks.children[k].children);
-                                $(this).parents().find('form').find('div').each( function() {
-                                    var prev = $(this).prev();
-                                    var trim_class = $.trim($(this).attr('class'));
-                                    if (trim_class == self.content_expanded_class || trim_class == self.content_collapsed_class) {
-                                        prev.removeClass('ui-btn-active');
-                                        if ($.trim(prev.find('.ui-btn-text').text()) != notebooks.children[k].attrs.string) {
-                                            self.expanded($(this),prev.find('span .ui-icon'));
+                                for (var i = 0; i < get_fields.length; i++) {
+                                    if (fields[get_fields[i].attrs.name].type == 'one2many'){
+                                        if(fields[get_fields[i].attrs.name].views.form){
+                                            var get_fields_test = self.get_fields(fields[get_fields[i].attrs.name].views.form.arch.children);
+                                            var fields_test = fields[get_fields[i].attrs.name]['views'].form.fields;
+                                            var notebook=fields[get_fields[i].attrs.name].views.form.arch;
                                         }
                                     }
-                                });
-                                if (next.hasClass(self.content_collapsed_class)) {
-                                    self.collapsed(next,span);
                                 }
-                                else if (next.hasClass(self.content_expanded_class)) {
-                                    self.expanded(next,span);
-                                }
-                                if (!next.find('.detail').html().length) {
-                                    for (var i = 0; i < get_fields.length; i++) {
-                                        if (fields[get_fields[i].attrs.name].type == 'one2many'){
-                                            if(fields[get_fields[i].attrs.name].views.form){
-	                                            var get_fields_test = self.get_fields(fields[get_fields[i].attrs.name].views.form.arch.children);
-	                                            var fields_test = fields[get_fields[i].attrs.name]['views'].form.fields;
-	                                            var notebook=fields[get_fields[i].attrs.name].views.form.arch;
-                                            }
-                                            var relational = get_fields[i].attrs.name;
-                                        }
-                                    }
-                                    if(notebook){
-                                        next.find('.detail').append(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data,'til': notebook.attrs.string }));
-                                    }else{
-                                        next.find('.detail').append(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data }));
-                                    }
-                                } */
-
-                                //$.mobile.changePage($("#oe_form"), "slide", true, true);
-                                /*next.find('.detail').find('li').click(function(){
-                                    if(data[relational]){
-                                        var dataset = new openerp.web.DataSetStatic(self, result.fields[relational].relation, result.fields[relational].context);
-                                        dataset.domain=[['id', 'in', data[relational]]];
-                                        dataset.name_search('', dataset.domain, 'in',false ,function(res){
-                                            for(var i=0;i<res.length;i++){
-                                                var splited_data = res[i][1].split(',');
-                                                res[i][1] = splited_data[0];
-                                            }
-                                            self.$element.html(QWeb.render("ListView", {'records' : res}));
-                                            self.$element.find("#searchid").focus();
-                                            self.$element.find("a#list-id").click(function(ev){
-                                                dataset = new openerp.web.DataSetSearch(self, dataset.model, null, null);
-                                                dataset.read_slice([],{}, function (result_relational) {
-                                                for (var i = 0; i < result_relational.length; i++) {
-                                                    if (result_relational[i].id == $(ev.currentTarget).data('id')) {
-                                                        var data_relational = result_relational[i];
-                                                    }
-                                                }
-                                                self.$element.html(QWeb.render("FormView", {'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational }));
-                                                self.$element.find('select').change(function(ev){
-                                                    selection.on_select_option(ev);
-                                                });
-                                                });
-                                            });
-                                        });
-                                    }
-                                });*/
-                            /*}
+                            }
+                            if(notebook){
+                                $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data,'til': notebook.attrs.string }));
+                            }else{
+                                $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data }));
+                            }
                         }
-                        self.$element.find('select').change(function(ev){
-                            selection.on_select_option(ev);
-                        });
-                    });*/
+                    });
+
+                    self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').find('p').find('[data-role=content]').find('ul').find('li').click(function(){
+
+                    });
                     $.mobile.changePage($("#oe_form"), "slide", true, true);
                 });
-                //$("#oe_header").find("h1").html(result.arch.attrs.string);
         });
     },
     get_fields: function(view_fields, fields) {
@@ -158,18 +108,6 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
             }
         }
         return this.fields;
-    },
-    collapsed: function(next,span) {
-        span.removeClass(this.plus_class);
-        span.addClass(this.minus_class);
-        next.removeClass(this.collapsed_class);
-        next.addClass(this.expanded_class);
-    },
-    expanded: function(next,span) {
-        span.removeClass(this.minus_class);
-        span.addClass(this.plus_class);
-        next.removeClass(this.expanded_class);
-        next.addClass(this.collapsed_class);
     }
 });
 };
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index fc2daf402af..208fba1dc77 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -7,6 +7,7 @@
     <div data-role="page" id="oe_login"></div>
     <div id="oe_header" />
     <div id="oe_footer" />
+    <div id="oe_notepage" />
     <div data-role="page" id="oe_sec_menu"></div>
     <div data-role="page" id="oe_sec_menu_new"></div>
     <div data-role="page" id="oe_list"></div>
@@ -45,7 +46,7 @@
     <div data-role="footer" data-theme="b" data-position="fixed">
         <h1>Powered by openerp.com</h1>
     </div>
-    
+
 </t>
 
 <t t-name="Header">
@@ -138,9 +139,147 @@
     </div>
     <t t-call="Footer" />
 </t>
-
+<t t-name="NotePage">
+    <div id="oe_note" data-role="content">
+        <form>
+            <t t-foreach="get_fields1" t-as="field1">
+                <t t-esc="field1.attrs.name" />
+                <div data-role="fieldcontain">
+                    <t t-if="fields1[field1.attrs.name].type == 'char'">
+                        <label for="">
+                            <t t-if="!(field1.attrs.string)" t-esc="fields1[field1.attrs.name].string"></t>
+                            <t t-if="field1.attrs.string" t-esc="field1.attrs.string"></t>:
+                        </label>
+                        <t t-if="values1[field1.attrs.name]">
+                            <input type="text" id="" t-att-value="values1[field1.attrs.name]"/>
+                        </t>
+                        <t t-if="!(values1[field1.attrs.name])">
+                            <input type="text" value="" id=""/>
+                         </t>
+                    </t>
+                    <t t-if="fields1[field1.attrs.name].type == 'text'">
+                        <label for="">
+                            <t t-if="!(field1.attrs.string)" t-esc="fields1[field1.attrs.name].string"></t>
+                            <t t-if="field1.attrs.string" t-esc="field1.attrs.string"></t>:
+                        </label>
+                        <textarea name="" id=""></textarea>
+                    </t>
+                    <t t-if="fields1[field1.attrs.name].type == 'float'">
+                        <label for="">
+                            <t t-if="!(field1.attrs.string)" t-esc="fields1[field1.attrs.name].string"></t>
+                            <t t-if="field1.attrs.string" t-esc="field1.attrs.string"></t>:
+                        </label>
+                        <t t-if="values[field1.attrs.name]">
+                            <input id="" type="text" t-att-value="values1[field1.attrs.name]"/>
+                        </t>
+                        <t t-if="!(values1[field1.attrs.name])">
+                            <input id="" type="text" value=""/>
+                        </t>
+                    </t>
+                    <t t-if="fields1[field1.attrs.name].type == 'date'">
+                        <label for="">
+                            <t t-if="!(field1.attrs.string)" t-esc="fields1[field1.attrs.name].string"></t>
+                            <t t-if="field1.attrs.string" t-esc="field1.attrs.string"></t>:
+                        </label>
+                        <t t-if="values1[field1.attrs.name]">
+                            <input id="" type="text" t-att-value="values1[field1.attrs.name]"/>
+                        </t>
+                        <t t-if="!(values1[field1.attrs.name])">
+                            <input id="" type="text" value=""/>
+                        </t>
+                    </t>
+                    <t t-if="fields1[field1.attrs.name].type == 'datetime'">
+                        <label for="">
+                            <t t-if="!(field1.attrs.string)" t-esc="fields1[field1.attrs.name].string"></t>
+                            <t t-if="field1.attrs.string" t-esc="field1.attrs.string"></t>:
+                        </label>
+                        <t t-if="values1[field1.attrs.name]">
+                            <input id="" type="text" t-att-value="values1[field1.attrs.name]"/>
+                        </t>
+                        <t t-if="!(values1[field1.attrs.name])">
+                            <input id="" type="text" value=""/>
+                        </t>
+                    </t>
+                    <t t-if="fields1[field1.attrs.name].type == 'boolean'">
+                        <fieldset data-role="controlgroup">
+                            <t t-if="values1[field1.attrs.name]">
+                                <input type="checkbox" name="checkbox-1" id="checkbox-1" checked="yes" class="custom"/>
+                            </t>
+                            <t t-if="!(values1[field1.attrs.name])">
+                                <input type="checkbox" name="checkbox-1" id="checkbox-1" class="custom" />
+                            </t>
+                            <label for="checkbox-1"><t t-esc="fields1[field1.attrs.name].string" /></label>
+                        </fieldset>
+                    </t>
+                    <t t-if="fields1[field1.attrs.name].type == 'selection'">
+                        <label for="" class="select">
+                            <t t-if="!(field1.attrs.string)" t-esc="fields1[field1.attrs.name].string"></t>
+                            <t t-if="field1.attrs.string" t-esc="field1.attrs.string"></t>:
+                        </label>
+                        <select id="" data-native-menu="false">
+                            <t t-foreach="fields1[field1.attrs.name].selection" t-as="opt">
+                                <option t-att-value="opt[0]"><t t-esc="opt[1]"/></option>
+                            </t>
+                        </select>
+                    </t>
+                    <t t-if="fields1[field1.attrs.name].type == 'many2one'">
+                        <label for="" class="select">
+                            <t t-if="!(field1.attrs.string)" t-esc="fields1[field1.attrs.name].string"></t>
+                            <t t-if="field1.attrs.string" t-esc="field1.attrs.string"></t>:
+                        </label>
+                        <select id="" data-native-menu="false">
+                            <t t-if="fields1[field1.attrs.name].selection">
+                                <t t-foreach="fields1[field1.attrs.name].selection" t-as="opt">
+                                    <t t-if="values1[field1.attrs.name]==opt[0]">
+                                        <option t-att-value="opt[0]" selected="true" ><t t-esc="opt[1]"/></option>
+                                    </t>
+                                    <t t-if="values1[field1.attrs.name]!=opt[0]">
+                                        <option t-att-value="opt[0]" ><t t-esc="opt[1]"/></option>
+                                    </t>
+                                </t>
+                            </t>
+                        </select>
+                    </t>
+                    <t t-if="fields1[field1.attrs.name].type == 'one2many'">
+                        <ul data-role="listview" data-inset="true" data-theme="d">
+                            <li data-theme="c">
+                                <a href="#">
+                                    <t t-esc="til1"/>
+                                </a>
+                             </li>
+                         </ul>
+                     </t>
+                </div>
+            </t>
+           <!--  <t t-if="notebooks">
+                <div data-role="collapsible-set">
+                    <t t-foreach="notebooks.children" t-as="page">
+                        <t t-if="page.attrs.invisible">
+                            <div style="display:none;" data-collapsed="true" data-role="collapsible">
+                                <h3>
+                                        <t t-esc="page.attrs.string"></t>
+                                </h3>
+                                <p></p>
+                            </div>
+                        </t>
+                        <t t-if="!page.attrs.invisible">
+                            <div data-collapsed="true" data-role="collapsible">
+                                <h3>
+                                        <t t-esc="page.attrs.string"></t>
+                                </h3>
+                            </div>
+                        </t>
+                    </t>
+                </div>
+            </t>-->
+        </form>
+    </div>
+</t>
 <t t-name="FormView">
-    <t t-call="Header" />
+    <t t-if="temp_flag">
+        <t t-call="Header" />
+    </t>
+
     <div data-role="content">
         <form>
             <t t-foreach="get_fields" t-as="field">
@@ -243,7 +382,7 @@
                     <t t-if="fields[field.attrs.name].type == 'one2many'">
                         <ul data-role="listview" data-inset="true" data-theme="d">
                             <li data-theme="c">
-                                <a href="#">
+                                <a href="">
                                     <t t-esc="til"/>
                                 </a>
                              </li>
@@ -255,17 +394,19 @@
                 <div data-role="collapsible-set">
                     <t t-foreach="notebooks.children" t-as="page">
                         <t t-if="page.attrs.invisible">
-                            <div style="display:none;" data-collapsed="true" data-role="collapsible">
+                            <div style="display:none;" data-collapsed="true" data-role="collapsible" t-att-id="page.attrs.string">
                                 <h3>
                                         <t t-esc="page.attrs.string"></t>
                                 </h3>
+                                <p></p>
                             </div>
                         </t>
                         <t t-if="!page.attrs.invisible">
-                            <div data-collapsed="true" data-role="collapsible">
+                            <div data-collapsed="true" data-role="collapsible" t-att-id="page.attrs.string">
                                 <h3>
                                         <t t-esc="page.attrs.string"></t>
                                 </h3>
+                                <p></p>
                             </div>
                         </t>
                     </t>
@@ -273,6 +414,8 @@
             </t>
         </form>
     </div>
+    <t t-if="temp_flag">
     <t t-call="Footer" />
+    </t>
 </t>
 </templates>
-- 
cgit v1.2.3


From 930babc88ec6f5fa24b955afb337f05b435378ec Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Fri, 16 Sep 2011 16:19:38 +0530
Subject: [IMP]Implement Relational Fields in listview and formview with theme.

bzr revid: bth@tinyerp.com-20110916104938-kskhg7c41iwyt465
---
 addons/web_mobile/static/src/js/chrome_mobile.js |  13 ---
 addons/web_mobile/static/src/js/form_mobile.js   | 116 ++++++++++++++++++-
 addons/web_mobile/static/src/js/list_mobile.js   |   6 +-
 addons/web_mobile/static/src/xml/web_mobile.xml  | 139 +----------------------
 4 files changed, 118 insertions(+), 156 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 1a71236e6f4..8cbe19a105c 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -84,19 +84,6 @@ openerp.web_mobile.Login =  openerp.web.Widget.extend({
         });
     }
 });
-openerp.web_mobile.Notepage = openerp.web.Widget.extend({
-    init: function(session, element_id) {
-        this._super(session, element_id);
-        this.get_fields = this.widget_parent.get_fields;
-        this.page_fields = this.widget_parent.page_fields;
-        this.values = this.widget_parent.values;
-        this.til = this.widget_parent.til;
-    },
-    start: function() {
-        console.log(this.get_fields,this.page_fields,this.values,this.til,this.$element);
-        this.$element.html(QWeb.render("NotePage", {'get_fields1': this.get_fields,'fields1' : this.page_fields, 'values1' : this.values,'til1': this.til }));
-    }
-});
 openerp.web_mobile.Header =  openerp.web.Widget.extend({
     init: function(session, element_id) {
         this._super(session, element_id);
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index 1699824ce77..f31742d9760 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -5,10 +5,11 @@
 openerp.web_mobile.form_mobile = function (openerp) {
 
 openerp.web_mobile.FormView = openerp.web.Widget.extend({
-    init: function(session, element_id, list_id, action) {
+    init: function(session, element_id, list_id, action, head_title) {
         this._super(session, element_id);
         this.list_id = list_id;
         this.action = action;
+        this.head_title = head_title;
         this.content_expanded_class = "ui-collapsible-content ui-collapsible-content-expanded";
         this.content_collapsed_class = "ui-collapsible-content ui-collapsible-content-collapsed";
         this.expanded_class = "ui-collapsible-content-expanded";
@@ -41,7 +42,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                 }
                 self.$element.html(QWeb.render("FormView", {'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : data ,'temp_flag':'1'}));
 
-                    self.$element.find("[data-role=header]").find('h1').html(self.action.name);
+                    self.$element.find("[data-role=header]").find('h1').html(self.head_title);
                     self.$element.find("[data-role=header]").find('#home').click(function(){
                         $.mobile.changePage($("#oe_menu"), "slide", true, true);
                     });
@@ -74,6 +75,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                 get_fields = self.get_fields(notebooks.children[k].children);
                                 for (var i = 0; i < get_fields.length; i++) {
                                     if (fields[get_fields[i].attrs.name].type == 'one2many'){
+                                        self.relational_fields = get_fields[i].attrs.name;
                                         if(fields[get_fields[i].attrs.name].views.form){
                                             var get_fields_test = self.get_fields(fields[get_fields[i].attrs.name].views.form.arch.children);
                                             var fields_test = fields[get_fields[i].attrs.name]['views'].form.fields;
@@ -82,16 +84,124 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                     }
                                 }
                             }
+
                             if(notebook){
                                 $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data,'til': notebook.attrs.string }));
                             }else{
                                 $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data }));
                             }
+
                         }
                     });
-
                     self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').find('p').find('[data-role=content]').find('ul').find('li').click(function(){
+                        var latid,lastid;
+                        $(this).parents().each(function(){
+                            latid = $(this).attr('id');
+                            self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').each(function(){
+                                if(latid==$(this).attr('id')){
+                                    lastid = $(this).attr('id');
+                                }
+                            });
+                        });
+                        var relational = $(this).attr('for');
+                        if(result.fields[relational]){
+                            var head = $.trim($(this).text());
+                            var dataset = new openerp.web.DataSetStatic(self, result.fields[relational].relation, result.fields[relational].context);
+                            dataset.domain=[['id', 'in', data[relational]]];
+                            dataset.name_search('', dataset.domain, 'in',false ,function(res){
+                                for(var i=0;i<res.length;i++){
+                                    var splited_data = res[i][1].split(',');
+                                    res[i][1] = splited_data[0];
+                                }
+
+                                if($('#oe_list').html().length){
+                                    $('#oe_list').remove();
+                                    $('<div id="oe_list" data-role="page"> </div>').appendTo('#moe');
 
+                                    $('#oe_list').html(QWeb.render("ListView", {'records' : res}));
+                                    $('#oe_list').find("[data-role=header]").find('h1').html(head);
+                                    $('#oe_list').find("[data-role=header]").find('#home').click(function(){
+                                        $.mobile.changePage($("#oe_menu"), "slide", true, true);
+                                    });
+                                    $('#oe_list').find("[data-role=footer]").find('#shrotcuts').click(function(){
+                                        if(!$('#oe_shortcuts').html().length){
+                                            this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
+                                            this.shortcuts.start();
+                                        }
+                                        else{
+                                            $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                                        }
+                                    });
+                                    $('#oe_list').find("[data-role=footer]").find('#preference').click(function(){
+                                        if(!$('#oe_options').html().length){
+                                            this.options = new openerp.web_mobile.Options(self, "oe_options");
+                                            this.options.start();
+                                        }
+                                        else{
+                                            $.mobile.changePage($("#oe_options"), "slide", true, true);
+                                        }
+                                    });
+                                    $('#oe_list').find("a#list-id").click(function(ev){
+                                        var head_title = $(this).text();
+                                        dataset = new openerp.web.DataSetSearch(self, dataset.model, null, null);
+                                        dataset.read_slice([],{}, function (result_relational) {
+                                            for (var i = 0; i < result_relational.length; i++) {
+                                                if (result_relational[i].id == $(ev.currentTarget).data('id')) {
+                                                    var data_relational = result_relational[i];
+                                                }
+                                            }
+                                            if($('#oe_form').html().length){
+                                                $('#oe_form').remove();
+                                                $('<div id="oe_form" data-role="page"> </div>').appendTo('#moe');
+                                                for (var k = 0; k < notebooks.children.length; k++) {
+                                                    if (notebooks.children[k].attrs.string == lastid) {
+                                                        get_fields = self.get_fields(notebooks.children[k].children);
+                                                        for (var i = 0; i < get_fields.length; i++) {
+                                                            if (fields[get_fields[i].attrs.name].type == 'one2many'){
+                                                                self.relational_fields = get_fields[i].attrs.name;
+                                                                if(fields[get_fields[i].attrs.name].views.form){
+                                                                    var get_fields_test = self.get_fields(fields[get_fields[i].attrs.name].views.form.arch.children);
+                                                                    var fields_test = fields[get_fields[i].attrs.name]['views'].form.fields;
+                                                                    var notebook=fields[get_fields[i].attrs.name].views.form.arch;
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                                $('#oe_form').html(QWeb.render("FormView", {'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational, 'temp_flag':'1' }));
+                                                $('#oe_form').find('select').change(function(ev){
+                                                    selection.on_select_option(ev);
+                                                });
+                                                $('#oe_form').find("[data-role=header]").find('h1').html(head_title);
+                                                $('#oe_form').find("[data-role=header]").find('#home').click(function(){
+                                                    $.mobile.changePage($("#oe_menu"), "slide", true, true);
+                                                });
+                                                $('#oe_form').find("[data-role=footer]").find('#shrotcuts').click(function(){
+                                                    if(!$('#oe_shortcuts').html().length){
+                                                        this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
+                                                        this.shortcuts.start();
+                                                    }
+                                                    else{
+                                                        $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                                                    }
+                                                });
+                                                $('#oe_form').find("[data-role=footer]").find('#preference').click(function(){
+                                                    if(!$('#oe_options').html().length){
+                                                        this.options = new openerp.web_mobile.Options(self, "oe_options");
+                                                        this.options.start();
+                                                    }
+                                                    else{
+                                                        $.mobile.changePage($("#oe_options"), "slide", true, true);
+                                                    }
+                                                });
+                                                $.mobile.changePage($("#oe_form"), "slide", true, true);
+                                            }
+                                        });
+                                    });
+                                    $.mobile.changePage($("#oe_list"), "slide", true, true);
+                                }
+                            });
+                        }
                     });
                     $.mobile.changePage($("#oe_form"), "slide", true, true);
                 });
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index 3c872496577..d7e7918afbe 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -55,13 +55,15 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
         var $record = $(ev.currentTarget);
         var self = this;
         id = $record.data('id');
+
+        head_title = $.trim($record.text());
         if(!$('#oe_form').html().length){
-            this.formview = new openerp.web_mobile.FormView(this, "oe_form", id, this.action);
+            this.formview = new openerp.web_mobile.FormView(this, "oe_form", id, this.action, head_title);
             this.formview.start();
         }else{
             $('#oe_form').remove();
             $('<div id="oe_form" data-role="page"> </div>').appendTo('#moe');
-            this.formview = new openerp.web_mobile.FormView(this, "oe_form", id, this.action);
+            this.formview = new openerp.web_mobile.FormView(this, "oe_form", id, this.action, head_title);
             this.formview.start();
         }
     }
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index 208fba1dc77..a6242858069 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -7,7 +7,6 @@
     <div data-role="page" id="oe_login"></div>
     <div id="oe_header" />
     <div id="oe_footer" />
-    <div id="oe_notepage" />
     <div data-role="page" id="oe_sec_menu"></div>
     <div data-role="page" id="oe_sec_menu_new"></div>
     <div data-role="page" id="oe_list"></div>
@@ -139,142 +138,6 @@
     </div>
     <t t-call="Footer" />
 </t>
-<t t-name="NotePage">
-    <div id="oe_note" data-role="content">
-        <form>
-            <t t-foreach="get_fields1" t-as="field1">
-                <t t-esc="field1.attrs.name" />
-                <div data-role="fieldcontain">
-                    <t t-if="fields1[field1.attrs.name].type == 'char'">
-                        <label for="">
-                            <t t-if="!(field1.attrs.string)" t-esc="fields1[field1.attrs.name].string"></t>
-                            <t t-if="field1.attrs.string" t-esc="field1.attrs.string"></t>:
-                        </label>
-                        <t t-if="values1[field1.attrs.name]">
-                            <input type="text" id="" t-att-value="values1[field1.attrs.name]"/>
-                        </t>
-                        <t t-if="!(values1[field1.attrs.name])">
-                            <input type="text" value="" id=""/>
-                         </t>
-                    </t>
-                    <t t-if="fields1[field1.attrs.name].type == 'text'">
-                        <label for="">
-                            <t t-if="!(field1.attrs.string)" t-esc="fields1[field1.attrs.name].string"></t>
-                            <t t-if="field1.attrs.string" t-esc="field1.attrs.string"></t>:
-                        </label>
-                        <textarea name="" id=""></textarea>
-                    </t>
-                    <t t-if="fields1[field1.attrs.name].type == 'float'">
-                        <label for="">
-                            <t t-if="!(field1.attrs.string)" t-esc="fields1[field1.attrs.name].string"></t>
-                            <t t-if="field1.attrs.string" t-esc="field1.attrs.string"></t>:
-                        </label>
-                        <t t-if="values[field1.attrs.name]">
-                            <input id="" type="text" t-att-value="values1[field1.attrs.name]"/>
-                        </t>
-                        <t t-if="!(values1[field1.attrs.name])">
-                            <input id="" type="text" value=""/>
-                        </t>
-                    </t>
-                    <t t-if="fields1[field1.attrs.name].type == 'date'">
-                        <label for="">
-                            <t t-if="!(field1.attrs.string)" t-esc="fields1[field1.attrs.name].string"></t>
-                            <t t-if="field1.attrs.string" t-esc="field1.attrs.string"></t>:
-                        </label>
-                        <t t-if="values1[field1.attrs.name]">
-                            <input id="" type="text" t-att-value="values1[field1.attrs.name]"/>
-                        </t>
-                        <t t-if="!(values1[field1.attrs.name])">
-                            <input id="" type="text" value=""/>
-                        </t>
-                    </t>
-                    <t t-if="fields1[field1.attrs.name].type == 'datetime'">
-                        <label for="">
-                            <t t-if="!(field1.attrs.string)" t-esc="fields1[field1.attrs.name].string"></t>
-                            <t t-if="field1.attrs.string" t-esc="field1.attrs.string"></t>:
-                        </label>
-                        <t t-if="values1[field1.attrs.name]">
-                            <input id="" type="text" t-att-value="values1[field1.attrs.name]"/>
-                        </t>
-                        <t t-if="!(values1[field1.attrs.name])">
-                            <input id="" type="text" value=""/>
-                        </t>
-                    </t>
-                    <t t-if="fields1[field1.attrs.name].type == 'boolean'">
-                        <fieldset data-role="controlgroup">
-                            <t t-if="values1[field1.attrs.name]">
-                                <input type="checkbox" name="checkbox-1" id="checkbox-1" checked="yes" class="custom"/>
-                            </t>
-                            <t t-if="!(values1[field1.attrs.name])">
-                                <input type="checkbox" name="checkbox-1" id="checkbox-1" class="custom" />
-                            </t>
-                            <label for="checkbox-1"><t t-esc="fields1[field1.attrs.name].string" /></label>
-                        </fieldset>
-                    </t>
-                    <t t-if="fields1[field1.attrs.name].type == 'selection'">
-                        <label for="" class="select">
-                            <t t-if="!(field1.attrs.string)" t-esc="fields1[field1.attrs.name].string"></t>
-                            <t t-if="field1.attrs.string" t-esc="field1.attrs.string"></t>:
-                        </label>
-                        <select id="" data-native-menu="false">
-                            <t t-foreach="fields1[field1.attrs.name].selection" t-as="opt">
-                                <option t-att-value="opt[0]"><t t-esc="opt[1]"/></option>
-                            </t>
-                        </select>
-                    </t>
-                    <t t-if="fields1[field1.attrs.name].type == 'many2one'">
-                        <label for="" class="select">
-                            <t t-if="!(field1.attrs.string)" t-esc="fields1[field1.attrs.name].string"></t>
-                            <t t-if="field1.attrs.string" t-esc="field1.attrs.string"></t>:
-                        </label>
-                        <select id="" data-native-menu="false">
-                            <t t-if="fields1[field1.attrs.name].selection">
-                                <t t-foreach="fields1[field1.attrs.name].selection" t-as="opt">
-                                    <t t-if="values1[field1.attrs.name]==opt[0]">
-                                        <option t-att-value="opt[0]" selected="true" ><t t-esc="opt[1]"/></option>
-                                    </t>
-                                    <t t-if="values1[field1.attrs.name]!=opt[0]">
-                                        <option t-att-value="opt[0]" ><t t-esc="opt[1]"/></option>
-                                    </t>
-                                </t>
-                            </t>
-                        </select>
-                    </t>
-                    <t t-if="fields1[field1.attrs.name].type == 'one2many'">
-                        <ul data-role="listview" data-inset="true" data-theme="d">
-                            <li data-theme="c">
-                                <a href="#">
-                                    <t t-esc="til1"/>
-                                </a>
-                             </li>
-                         </ul>
-                     </t>
-                </div>
-            </t>
-           <!--  <t t-if="notebooks">
-                <div data-role="collapsible-set">
-                    <t t-foreach="notebooks.children" t-as="page">
-                        <t t-if="page.attrs.invisible">
-                            <div style="display:none;" data-collapsed="true" data-role="collapsible">
-                                <h3>
-                                        <t t-esc="page.attrs.string"></t>
-                                </h3>
-                                <p></p>
-                            </div>
-                        </t>
-                        <t t-if="!page.attrs.invisible">
-                            <div data-collapsed="true" data-role="collapsible">
-                                <h3>
-                                        <t t-esc="page.attrs.string"></t>
-                                </h3>
-                            </div>
-                        </t>
-                    </t>
-                </div>
-            </t>-->
-        </form>
-    </div>
-</t>
 <t t-name="FormView">
     <t t-if="temp_flag">
         <t t-call="Header" />
@@ -381,7 +244,7 @@
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'one2many'">
                         <ul data-role="listview" data-inset="true" data-theme="d">
-                            <li data-theme="c">
+                            <li data-theme="c" t-att-for="field.attrs.name">
                                 <a href="">
                                     <t t-esc="til"/>
                                 </a>
-- 
cgit v1.2.3


From 388de148b946aa65fb194d6843ba8a2f2caa7f65 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Fri, 16 Sep 2011 16:39:30 +0530
Subject: [FIX] Fixed Logout.

bzr revid: bth@tinyerp.com-20110916110930-tir8z2iqml9v2abw
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 8cbe19a105c..a26328c294c 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -286,7 +286,7 @@ openerp.web_mobile.Options =  openerp.web.Widget.extend({
         });
         this.$element.find("[data-role=content]").find('a').click(function(){
             $('#oe_login').empty();
-            window.location.replace('');
+            window.location.replace('/mobile');
         });
         $.mobile.changePage($("#oe_options"), "slide", true, true);
     }
-- 
cgit v1.2.3


From 9e7594330122ad71ccb71dbeb090b6a7d45f6b39 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Fri, 16 Sep 2011 18:26:49 +0530
Subject: [IMP] Afer logout on login page displayed selected database and
 username.

bzr revid: bth@tinyerp.com-20110916125649-dyi73ng4d3cj8c9s
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index a26328c294c..4de9cc89a23 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -32,10 +32,16 @@ openerp.web_mobile.Login =  openerp.web.Widget.extend({
     start: function() {
         var self = this;
         jQuery("#oe_header").children().remove();
+
         this.rpc("/web/database/get_list", {}, function(result) {
             var selection = new openerp.web_mobile.Selection();
             self.db_list = result.db_list;
             self.$element.html(QWeb.render("Login", self));
+            if(self.session.db!=""){
+                self.$element.find("#database").val(self.session.db);
+                self.$element.find("#login").val(self.session.login);
+                self.$element.find("#password").val(self.session.password);
+            }
             self.$element.find("#login_btn").click(self.on_login);
             $.mobile.initializePage();
         });
@@ -159,7 +165,6 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
     on_loaded: function(data) {
         var self = this;
         this.data = data;
-
         this.header = new openerp.web_mobile.Header(this, "oe_header");
         this.header.start();
         this.footer = new openerp.web_mobile.Footer(this, "oe_footer");
-- 
cgit v1.2.3


From 388d96e7596f03070d4b3e644f517db5186e319a Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Tue, 20 Sep 2011 18:07:57 +0530
Subject: [IMP] Add HashUrl for Back button action.

bzr revid: jra@tinyerp.com-20110920123757-87thdg8lm3mpemth
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 24 ++++++++++++------------
 addons/web_mobile/static/src/js/form_mobile.js   | 24 ++++++++++++------------
 addons/web_mobile/static/src/js/list_mobile.js   |  8 ++++----
 addons/web_mobile/static/src/web_mobile.html     |  7 +++----
 4 files changed, 31 insertions(+), 32 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index ba467c5e19d..f0dca83b745 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -119,7 +119,7 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
 
             self.$element.find("[data-role=header]").find('h1').html('Favourite');
             self.$element.find("[data-role=header]").find('#home').click(function(){
-                $.mobile.changePage($("#oe_menu"), "slide", true, true);
+                $.mobile.changePage("#oe_menu", "slide", true, true);
             });
             self.$element.find('#content').find("a").click(self.on_clicked);
             self.$element.find("[data-role=footer]").find('#preference').click(function(){
@@ -177,7 +177,7 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
                 this.shortcuts.start();
             }
             else{
-                $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                $.mobile.changePage("#oe_shortcuts", "slide", true, true);
             }
         });
         this.$element.find("[data-role=footer]").find('#preference').click(function(){
@@ -186,11 +186,11 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
                 this.options.start();
             }
             else{
-                $.mobile.changePage($("#oe_options"), "slide", true, true);
+                $.mobile.changePage("#oe_options", "slide", true, true);
             }
         });
         this.$element.add(this.$secondary_menu).find("#content").find('a').click(this.on_menu_click);
-        $.mobile.changePage($("#oe_menu"), "slide", true, true);
+        $.mobile.changePage("#oe_menu", "slide", true, true);
     },
     on_menu_click: function(ev, id) {
         var $menu = $(ev.currentTarget);
@@ -234,7 +234,7 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
                 this.shortcuts.start();
             }
             else{
-                $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                $.mobile.changePage("#oe_shortcuts", "slide", true, true);
             }
         });
         this.$element.find("[data-role=footer]").find('#preference').click(function(){
@@ -243,14 +243,14 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
                 this.options.start();
             }
             else{
-                $.mobile.changePage($("#oe_options"), "slide", true, true);
+                $.mobile.changePage("#oe_options", "slide", true, true);
             }
         });
         this.$element.find("[data-role=header]").find('#home').click(function(){
-            $.mobile.changePage($("#oe_menu"), "slide", true, true);
+            $.mobile.changePage("#oe_menu", "slide", true, true);
         });
 
-        $.mobile.changePage($("#oe_sec_menu"), "slide", true, true);
+        $.mobile.changePage("#oe_sec_menu", "slide", true, true);
     },
     on_menu_click: function(ev, id) {
         var $menu = $(ev.currentTarget);
@@ -282,17 +282,17 @@ openerp.web_mobile.Options =  openerp.web.Widget.extend({
                 this.shortcuts.start();
             }
             else{
-                $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                $.mobile.changePage("#oe_shortcuts", "slide", true, true);
             }
         });
         this.$element.find("[data-role=header]").find('#home').click(function(){
-            $.mobile.changePage($("#oe_menu"), "slide", true, true);
+            $.mobile.changePage("#oe_menu", "slide", true, true);
         });
-        this.$element.find("[data-role=content]").find('a').click(function(){
+        this.$element.find("[data-role=content]").find('a#logout').click(function(){
             $('#oe_login').empty();
             window.location.replace('/mobile');
         });
-        $.mobile.changePage($("#oe_options"), "slide", true, true);
+        $.mobile.changePage("#oe_options", "slide", true, true);
     }
 });
 
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index f31742d9760..269dd435406 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -44,7 +44,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
 
                     self.$element.find("[data-role=header]").find('h1').html(self.head_title);
                     self.$element.find("[data-role=header]").find('#home').click(function(){
-                        $.mobile.changePage($("#oe_menu"), "slide", true, true);
+                        $.mobile.changePage("#oe_menu", "slide", true, true);
                     });
                     self.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
                         if(!$('#oe_shortcuts').html().length){
@@ -52,7 +52,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                             this.shortcuts.start();
                         }
                         else{
-                            $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                            $.mobile.changePage("#oe_shortcuts", "slide", true, true);
                         }
                     });
                     self.$element.find("[data-role=footer]").find('#preference').click(function(){
@@ -61,7 +61,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                             this.options.start();
                         }
                         else{
-                            $.mobile.changePage($("#oe_options"), "slide", true, true);
+                            $.mobile.changePage("#oe_options", "slide", true, true);
                         }
                     });
                     self.$element.find('select').change(function(ev){
@@ -121,7 +121,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                     $('#oe_list').html(QWeb.render("ListView", {'records' : res}));
                                     $('#oe_list').find("[data-role=header]").find('h1').html(head);
                                     $('#oe_list').find("[data-role=header]").find('#home').click(function(){
-                                        $.mobile.changePage($("#oe_menu"), "slide", true, true);
+                                        $.mobile.changePage("#oe_menu", "slide", true, true);
                                     });
                                     $('#oe_list').find("[data-role=footer]").find('#shrotcuts').click(function(){
                                         if(!$('#oe_shortcuts').html().length){
@@ -129,7 +129,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                             this.shortcuts.start();
                                         }
                                         else{
-                                            $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                                            $.mobile.changePage("#oe_shortcuts", "slide", true, true);
                                         }
                                     });
                                     $('#oe_list').find("[data-role=footer]").find('#preference').click(function(){
@@ -138,7 +138,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                             this.options.start();
                                         }
                                         else{
-                                            $.mobile.changePage($("#oe_options"), "slide", true, true);
+                                            $.mobile.changePage("#oe_options", "slide", true, true);
                                         }
                                     });
                                     $('#oe_list').find("a#list-id").click(function(ev){
@@ -174,7 +174,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                 });
                                                 $('#oe_form').find("[data-role=header]").find('h1').html(head_title);
                                                 $('#oe_form').find("[data-role=header]").find('#home').click(function(){
-                                                    $.mobile.changePage($("#oe_menu"), "slide", true, true);
+                                                    $.mobile.changePage("#oe_menu", "slide", true, true);
                                                 });
                                                 $('#oe_form').find("[data-role=footer]").find('#shrotcuts').click(function(){
                                                     if(!$('#oe_shortcuts').html().length){
@@ -182,7 +182,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                         this.shortcuts.start();
                                                     }
                                                     else{
-                                                        $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                                                        $.mobile.changePage("#oe_shortcuts", "slide", true, true);
                                                     }
                                                 });
                                                 $('#oe_form').find("[data-role=footer]").find('#preference').click(function(){
@@ -191,19 +191,19 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                         this.options.start();
                                                     }
                                                     else{
-                                                        $.mobile.changePage($("#oe_options"), "slide", true, true);
+                                                        $.mobile.changePage("#oe_options", "slide", true, true);
                                                     }
                                                 });
-                                                $.mobile.changePage($("#oe_form"), "slide", true, true);
+                                                $.mobile.changePage("#oe_form", "slide", true, true);
                                             }
                                         });
                                     });
-                                    $.mobile.changePage($("#oe_list"), "slide", true, true);
+                                    $.mobile.changePage("#oe_list", "slide", true, true);
                                 }
                             });
                         }
                     });
-                    $.mobile.changePage($("#oe_form"), "slide", true, true);
+                    $.mobile.changePage("#oe_form", "slide", true, true);
                 });
         });
     },
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index d7e7918afbe..ebf31b6d4fd 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -27,7 +27,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
             self.$element.html(QWeb.render("ListView", {'records' : result}));
             self.$element.find("[data-role=header]").find('h1').html(self.action.name);
             self.$element.find("[data-role=header]").find('#home').click(function(){
-                $.mobile.changePage($("#oe_menu"), "slide", true, true);
+                $.mobile.changePage("#oe_menu", "slide", true, true);
             });
             self.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
                 if(!$('#oe_shortcuts').html().length){
@@ -35,7 +35,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
                     this.shortcuts.start();
                 }
                 else{
-                    $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                    $.mobile.changePage("#oe_shortcuts", "slide", true, true);
                 }
             });
             self.$element.find("[data-role=footer]").find('#preference').click(function(){
@@ -44,11 +44,11 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
                     this.options.start();
                 }
                 else{
-                    $.mobile.changePage($("#oe_options"), "slide", true, true);
+                    $.mobile.changePage("#oe_options", "slide", true, true);
                 }
             });
             self.$element.find("a#list-id").click(self.on_list_click);
-            $.mobile.changePage($("#oe_list"), "slide", true, true);
+            $.mobile.changePage("#oe_list", "slide", true, true);
         });
     },
     on_list_click: function(ev) {
diff --git a/addons/web_mobile/static/src/web_mobile.html b/addons/web_mobile/static/src/web_mobile.html
index 9a17ff49dbb..678adc6f735 100755
--- a/addons/web_mobile/static/src/web_mobile.html
+++ b/addons/web_mobile/static/src/web_mobile.html
@@ -4,15 +4,11 @@
     <meta charset="utf-8" />
     <title>OpenERP Web Mobile</title>
 
-    <link rel="stylesheet"  href="/web_mobile/static/lib/jquery_mobile/css/jquery.mobile-1.0a4.1.css"/>
-    <link rel="stylesheet" href="/web_mobile/static/src/css/web_mobile.css"/>
-
     <script type="text/javascript" src="/web/static/lib/jquery/jquery-1.6.2.js"></script>
     <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.8.9.custom.min.js"></script>
     <script type="text/javascript" src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
     <script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>
     <script type="text/javascript" src="/web/static/lib/underscore/underscore.string.js"></script>
-    <script type="text/javascript" src="/web_mobile/static/lib/jquery_mobile/js/jquery.mobile-1.0a4.1.js"></script>
 
     <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
     <script type="text/javascript" src="/web/static/src/js/boot.js"></script>
@@ -26,6 +22,9 @@
     <script type="text/javascript" src="/web_mobile/static/src/js/list_mobile.js"></script>
     <script type="text/javascript" src="/web_mobile/static/src/js/form_mobile.js"></script>
 
+    <link rel="stylesheet"  href="/web_mobile/static/lib/jquery_mobile/css/jquery.mobile-1.0a4.1.css"/>
+    <link rel="stylesheet" href="/web_mobile/static/src/css/web_mobile.css"/>
+    <script type="text/javascript" src="/web_mobile/static/lib/jquery_mobile/js/jquery.mobile-1.0a4.1.js"></script>
     <script type="text/javascript">
         var QWeb;
         $(function() {
-- 
cgit v1.2.3


From 0ede053b364c9913fbe78654029a5c3f052e8284 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Tue, 20 Sep 2011 18:49:17 +0530
Subject: [IMP] Dynamica pages with hashurl.

bzr revid: bth@tinyerp.com-20110920131917-rjxwwazrqojl3nas
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 58 ++++++++++++------------
 addons/web_mobile/static/src/js/form_mobile.js   |  1 +
 addons/web_mobile/static/src/js/list_mobile.js   |  2 +-
 addons/web_mobile/static/src/xml/web_mobile.xml  | 30 ++++++------
 4 files changed, 49 insertions(+), 42 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index f0dca83b745..c7901f60c22 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -135,18 +135,22 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
         });
     },
     on_clicked: function(ev) {
+        var self = this;
+        ev.preventDefault();
+        ev.stopPropagation();
         $shortcut = $(ev.currentTarget);
         id = $shortcut.data('menu');
         res_id = $shortcut.data('res');
-        if(!$('#oe_list').html().length){
-            this.listview = new openerp.web_mobile.ListView(this, "oe_list", res_id);
-             this.listview.start();
-        }else{
-             $('#oe_list').remove();
-             $('<div id="oe_list" data-role="page"> </div>').appendTo('#moe');
-             this.listview = new openerp.web_mobile.ListView(this, "oe_list", res_id);
-             this.listview.start();
-        }
+
+        if(!$('[id^="oe_list_'+res_id+'"]').html()){
+            $('<div id="oe_list_'+res_id+'" data-role="page" data-url="oe_list_'+res_id+'"> </div>').appendTo('#moe');
+            this.listview = new openerp.web_mobile.ListView(self, "oe_list_"+res_id, res_id);
+            this.listview.start();
+         }else{
+              $.mobile.changePage('#oe_list_'+res_id, "slide", true, true);
+         }
+        ev.preventDefault();
+        ev.stopPropagation();
         jQuery("#oe_header").find("h1").html($shortcut.data('name'));
     }
 });
@@ -195,6 +199,8 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
     on_menu_click: function(ev, id) {
         var $menu = $(ev.currentTarget);
         id = $menu.data('menu');
+        ev.preventDefault();
+        ev.stopPropagation();
         for (var i = 0; i < this.data.data.children.length; i++) {
             if (this.data.data.children[i].id == id) {
                 this.children = this.data.data.children[i];
@@ -204,14 +210,12 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
             .removeClass("login_valid")
             .addClass("secondary_menu");
 
-        if(!$('#oe_sec_menu').html().length){
-            this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu", this.children);
-            this.secondary.start();
-        }else{
-             $('#oe_sec_menu').remove();
-             $('<div id="oe_sec_menu" data-role="page"> </div>').appendTo('#moe');
-             this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu", this.children);
+        if(!$('[id^="oe_sec_menu_'+id+'"]').html()){
+            $('<div id="oe_sec_menu_'+id+'" data-role="page" data-url="oe_sec_menu_'+id+'"> </div>').appendTo('#moe');
+            this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
              this.secondary.start();
+        }else{
+            $.mobile.changePage('#oe_sec_menu_'+id, "slide", true, true);
         }
     }
 });
@@ -249,22 +253,20 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
         this.$element.find("[data-role=header]").find('#home').click(function(){
             $.mobile.changePage("#oe_menu", "slide", true, true);
         });
-
-        $.mobile.changePage("#oe_sec_menu", "slide", true, true);
+        $.mobile.changePage("#"+this.element_id, "slide", true, true);
     },
     on_menu_click: function(ev, id) {
         var $menu = $(ev.currentTarget);
         id = $menu.data('menu');
-        if (id) {
-            if(!$('#oe_list').html().length){
-                this.listview = new openerp.web_mobile.ListView(this, "oe_list", id);
-                this.listview.start();
-            }else{
-                $('#oe_list').remove();
-                $('<div id="oe_list" data-role="page"> </div>').appendTo('#moe');
-                this.listview = new openerp.web_mobile.ListView(this, "oe_list", id);
-                this.listview.start();
-            }
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        if(!$('[id^="oe_list_'+id+'"]').html()){
+            $('<div id="oe_list_'+id+'" data-role="page" data-url="oe_list_'+id+'"> </div>').appendTo('#moe');
+            this.listview = new openerp.web_mobile.ListView(this, "oe_list_"+id, id);
+            this.listview.start();
+        }else{
+            $.mobile.changePage('#oe_list_'+id, "slide", true, true);
         }
         jQuery("#oe_header").find("h1").html($menu.data('name'));
     }
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index 269dd435406..bfe8468c720 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -87,6 +87,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
 
                             if(notebook){
                                 $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data,'til': notebook.attrs.string }));
+                                $(this).find('p').find('[data-role=content]').css('padding','0px 0px 0px 0px');
                             }else{
                                 $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data }));
                             }
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index ebf31b6d4fd..5b612d2e782 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -48,7 +48,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
                 }
             });
             self.$element.find("a#list-id").click(self.on_list_click);
-            $.mobile.changePage("#oe_list", "slide", true, true);
+            $.mobile.changePage("#"+self.element_id, "slide", true, true);
         });
     },
     on_list_click: function(ev) {
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index a6242858069..0be5827fbb4 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -7,9 +7,6 @@
     <div data-role="page" id="oe_login"></div>
     <div id="oe_header" />
     <div id="oe_footer" />
-    <div data-role="page" id="oe_sec_menu"></div>
-    <div data-role="page" id="oe_sec_menu_new"></div>
-    <div data-role="page" id="oe_list"></div>
     <div data-role="page" id="oe_form"></div>
     <div data-role="page" id="oe_shortcuts"></div>
     <div data-role="page" id="oe_menu"></div>
@@ -158,6 +155,9 @@
                         <t t-if="!(values[field.attrs.name])">
                             <input type="text" value="" id=""/>
                          </t>
+                         <t t-if="(field.attrs.name == 'email' or field.attrs.name == 'email_from') and values[field.attrs.name]">
+                            <a t-att-href="'mailto:'+values[field.attrs.name]"><img src="/web/static/src/img/icons/terp-mail-message-new.png" /></a>
+                          </t>
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'text'">
                         <label for="">
@@ -203,15 +203,19 @@
                         </t>
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'boolean'">
-                        <fieldset data-role="controlgroup">
-                            <t t-if="values[field.attrs.name]">
-                                <input type="checkbox" name="checkbox-1" id="checkbox-1" checked="yes" class="custom"/>
-                            </t>
-                            <t t-if="!(values[field.attrs.name])">
-                                <input type="checkbox" name="checkbox-1" id="checkbox-1" class="custom" />
-                            </t>
-                            <label for="checkbox-1"><t t-esc="fields[field.attrs.name].string" /></label>
-                        </fieldset>
+                        <div data-role="fieldcontain">
+                            <label for="slider"><t t-esc="fields[field.attrs.name].string" /> :</label>
+                            <select name="slider" id="slider" data-role="slider">
+                                <t t-if="values[field.attrs.name]">
+                                    <option value="on" selected="true">On</option>
+                                    <option value="off">Off</option>
+                                </t>
+                                <t t-if="!values[field.attrs.name]">
+                                    <option value="on">On</option>
+                                    <option value="off" selected="true">Off</option>
+                                </t>
+                            </select>
+                        </div>
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'selection'">
                         <label for="" class="select">
@@ -278,7 +282,7 @@
         </form>
     </div>
     <t t-if="temp_flag">
-    <t t-call="Footer" />
+        <t t-call="Footer" />
     </t>
 </t>
 </templates>
-- 
cgit v1.2.3


From 2ad712d3569451c4d4a332fbcfac1122b79014af Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Tue, 20 Sep 2011 16:00:38 +0200
Subject: [Fix] apply domain filter to get correct elements in list views

bzr revid: valentin.lab@kalysto.org-20110920140038-qr8xsbx931psuo4m
---
 addons/web_mobile/static/src/js/list_mobile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index 5b612d2e782..a584b9cb610 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -23,7 +23,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
     on_search_data: function(ev){
         var self = this;
         var dataset = new openerp.web.DataSetStatic(this, this.action.res_model, this.action.context);
-        dataset.name_search('', [], 'ilike',false ,function(result){
+        dataset.name_search('', this.action.domain, 'ilike', false, function(result){
             self.$element.html(QWeb.render("ListView", {'records' : result}));
             self.$element.find("[data-role=header]").find('h1').html(self.action.name);
             self.$element.find("[data-role=header]").find('#home').click(function(){
-- 
cgit v1.2.3


From b096f095059ff858d570d9968ffa39fff4992de3 Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Wed, 21 Sep 2011 12:41:32 +0530
Subject: [MERGE] Imrpoved Back button action.

bzr revid: jra@tinyerp.com-20110921071132-e4ij5hqvzq2vkn5b
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 24 ++++++++++++------------
 addons/web_mobile/static/src/js/form_mobile.js   | 24 ++++++++++++------------
 addons/web_mobile/static/src/js/list_mobile.js   |  8 ++++----
 3 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index ba467c5e19d..c645eae917a 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -119,7 +119,7 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
 
             self.$element.find("[data-role=header]").find('h1').html('Favourite');
             self.$element.find("[data-role=header]").find('#home').click(function(){
-                $.mobile.changePage($("#oe_menu"), "slide", true, true);
+                $.mobile.changePage("#oe_menu", "slide", true, true);
             });
             self.$element.find('#content').find("a").click(self.on_clicked);
             self.$element.find("[data-role=footer]").find('#preference').click(function(){
@@ -128,10 +128,10 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
                     this.options.start();
                 }
                 else{
-                    $.mobile.changePage($("#oe_options"), "slide", true, true);
+                    $.mobile.changePage("#oe_options", "slide", true, true);
                 }
             });
-            $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+            $.mobile.changePage("#oe_shortcuts", "slide", true, true);
         });
     },
     on_clicked: function(ev) {
@@ -186,11 +186,11 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
                 this.options.start();
             }
             else{
-                $.mobile.changePage($("#oe_options"), "slide", true, true);
+                $.mobile.changePage("#oe_options", "slide", true, true);
             }
         });
         this.$element.add(this.$secondary_menu).find("#content").find('a').click(this.on_menu_click);
-        $.mobile.changePage($("#oe_menu"), "slide", true, true);
+        $.mobile.changePage("#oe_menu", "slide", true, true);
     },
     on_menu_click: function(ev, id) {
         var $menu = $(ev.currentTarget);
@@ -234,7 +234,7 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
                 this.shortcuts.start();
             }
             else{
-                $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                $.mobile.changePage("#oe_shortcuts", "slide", true, true);
             }
         });
         this.$element.find("[data-role=footer]").find('#preference').click(function(){
@@ -243,14 +243,14 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
                 this.options.start();
             }
             else{
-                $.mobile.changePage($("#oe_options"), "slide", true, true);
+                $.mobile.changePage("#oe_options", "slide", true, true);
             }
         });
         this.$element.find("[data-role=header]").find('#home').click(function(){
-            $.mobile.changePage($("#oe_menu"), "slide", true, true);
+            $.mobile.changePage("#oe_menu", "slide", true, true);
         });
 
-        $.mobile.changePage($("#oe_sec_menu"), "slide", true, true);
+        $.mobile.changePage("#oe_sec_menu", "slide", true, true);
     },
     on_menu_click: function(ev, id) {
         var $menu = $(ev.currentTarget);
@@ -282,17 +282,17 @@ openerp.web_mobile.Options =  openerp.web.Widget.extend({
                 this.shortcuts.start();
             }
             else{
-                $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                $.mobile.changePage("#oe_shortcuts", "slide", true, true);
             }
         });
         this.$element.find("[data-role=header]").find('#home').click(function(){
-            $.mobile.changePage($("#oe_menu"), "slide", true, true);
+            $.mobile.changePage("#oe_menu", "slide", true, true);
         });
         this.$element.find("[data-role=content]").find('a').click(function(){
             $('#oe_login').empty();
             window.location.replace('/mobile');
         });
-        $.mobile.changePage($("#oe_options"), "slide", true, true);
+        $.mobile.changePage("#oe_options", "slide", true, true);
     }
 });
 
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index f31742d9760..269dd435406 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -44,7 +44,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
 
                     self.$element.find("[data-role=header]").find('h1').html(self.head_title);
                     self.$element.find("[data-role=header]").find('#home').click(function(){
-                        $.mobile.changePage($("#oe_menu"), "slide", true, true);
+                        $.mobile.changePage("#oe_menu", "slide", true, true);
                     });
                     self.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
                         if(!$('#oe_shortcuts').html().length){
@@ -52,7 +52,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                             this.shortcuts.start();
                         }
                         else{
-                            $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                            $.mobile.changePage("#oe_shortcuts", "slide", true, true);
                         }
                     });
                     self.$element.find("[data-role=footer]").find('#preference').click(function(){
@@ -61,7 +61,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                             this.options.start();
                         }
                         else{
-                            $.mobile.changePage($("#oe_options"), "slide", true, true);
+                            $.mobile.changePage("#oe_options", "slide", true, true);
                         }
                     });
                     self.$element.find('select').change(function(ev){
@@ -121,7 +121,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                     $('#oe_list').html(QWeb.render("ListView", {'records' : res}));
                                     $('#oe_list').find("[data-role=header]").find('h1').html(head);
                                     $('#oe_list').find("[data-role=header]").find('#home').click(function(){
-                                        $.mobile.changePage($("#oe_menu"), "slide", true, true);
+                                        $.mobile.changePage("#oe_menu", "slide", true, true);
                                     });
                                     $('#oe_list').find("[data-role=footer]").find('#shrotcuts').click(function(){
                                         if(!$('#oe_shortcuts').html().length){
@@ -129,7 +129,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                             this.shortcuts.start();
                                         }
                                         else{
-                                            $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                                            $.mobile.changePage("#oe_shortcuts", "slide", true, true);
                                         }
                                     });
                                     $('#oe_list').find("[data-role=footer]").find('#preference').click(function(){
@@ -138,7 +138,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                             this.options.start();
                                         }
                                         else{
-                                            $.mobile.changePage($("#oe_options"), "slide", true, true);
+                                            $.mobile.changePage("#oe_options", "slide", true, true);
                                         }
                                     });
                                     $('#oe_list').find("a#list-id").click(function(ev){
@@ -174,7 +174,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                 });
                                                 $('#oe_form').find("[data-role=header]").find('h1').html(head_title);
                                                 $('#oe_form').find("[data-role=header]").find('#home').click(function(){
-                                                    $.mobile.changePage($("#oe_menu"), "slide", true, true);
+                                                    $.mobile.changePage("#oe_menu", "slide", true, true);
                                                 });
                                                 $('#oe_form').find("[data-role=footer]").find('#shrotcuts').click(function(){
                                                     if(!$('#oe_shortcuts').html().length){
@@ -182,7 +182,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                         this.shortcuts.start();
                                                     }
                                                     else{
-                                                        $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                                                        $.mobile.changePage("#oe_shortcuts", "slide", true, true);
                                                     }
                                                 });
                                                 $('#oe_form').find("[data-role=footer]").find('#preference').click(function(){
@@ -191,19 +191,19 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                         this.options.start();
                                                     }
                                                     else{
-                                                        $.mobile.changePage($("#oe_options"), "slide", true, true);
+                                                        $.mobile.changePage("#oe_options", "slide", true, true);
                                                     }
                                                 });
-                                                $.mobile.changePage($("#oe_form"), "slide", true, true);
+                                                $.mobile.changePage("#oe_form", "slide", true, true);
                                             }
                                         });
                                     });
-                                    $.mobile.changePage($("#oe_list"), "slide", true, true);
+                                    $.mobile.changePage("#oe_list", "slide", true, true);
                                 }
                             });
                         }
                     });
-                    $.mobile.changePage($("#oe_form"), "slide", true, true);
+                    $.mobile.changePage("#oe_form", "slide", true, true);
                 });
         });
     },
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index d7e7918afbe..ebf31b6d4fd 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -27,7 +27,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
             self.$element.html(QWeb.render("ListView", {'records' : result}));
             self.$element.find("[data-role=header]").find('h1').html(self.action.name);
             self.$element.find("[data-role=header]").find('#home').click(function(){
-                $.mobile.changePage($("#oe_menu"), "slide", true, true);
+                $.mobile.changePage("#oe_menu", "slide", true, true);
             });
             self.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
                 if(!$('#oe_shortcuts').html().length){
@@ -35,7 +35,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
                     this.shortcuts.start();
                 }
                 else{
-                    $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                    $.mobile.changePage("#oe_shortcuts", "slide", true, true);
                 }
             });
             self.$element.find("[data-role=footer]").find('#preference').click(function(){
@@ -44,11 +44,11 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
                     this.options.start();
                 }
                 else{
-                    $.mobile.changePage($("#oe_options"), "slide", true, true);
+                    $.mobile.changePage("#oe_options", "slide", true, true);
                 }
             });
             self.$element.find("a#list-id").click(self.on_list_click);
-            $.mobile.changePage($("#oe_list"), "slide", true, true);
+            $.mobile.changePage("#oe_list", "slide", true, true);
         });
     },
     on_list_click: function(ev) {
-- 
cgit v1.2.3


From 9da6ad10409984db10852f93f416958ca6766cf8 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Wed, 21 Sep 2011 15:03:12 +0530
Subject: [IMP] Create Dynamic pages with hashurl and fields in formview.

bzr revid: bth@tinyerp.com-20110921093312-c3s33i6ascpapvzl
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 51 +++++++++----------
 addons/web_mobile/static/src/js/form_mobile.js   | 62 ++++++++++++------------
 addons/web_mobile/static/src/js/list_mobile.js   | 16 +++---
 addons/web_mobile/static/src/xml/web_mobile.xml  | 31 ++++++------
 4 files changed, 82 insertions(+), 78 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index c645eae917a..10616fb0846 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -135,18 +135,21 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
         });
     },
     on_clicked: function(ev) {
+        var self = this;
+        ev.preventDefault();
+        ev.stopPropagation();
         $shortcut = $(ev.currentTarget);
         id = $shortcut.data('menu');
         res_id = $shortcut.data('res');
-        if(!$('#oe_list').html().length){
-            this.listview = new openerp.web_mobile.ListView(this, "oe_list", res_id);
-             this.listview.start();
+        if(!$('[id^="oe_list_'+res_id+'"]').html()){
+            $('<div id="oe_list_'+res_id+'" data-role="page" data-url="oe_list_'+res_id+'"> </div>').appendTo('#moe');
+            this.listview = new openerp.web_mobile.ListView(self, "oe_list_"+res_id, res_id);
+            this.listview.start();
         }else{
-             $('#oe_list').remove();
-             $('<div id="oe_list" data-role="page"> </div>').appendTo('#moe');
-             this.listview = new openerp.web_mobile.ListView(this, "oe_list", res_id);
-             this.listview.start();
+            $.mobile.changePage($('#oe_list_'+res_id), "slide", true, true);
         }
+        ev.preventDefault();
+        ev.stopPropagation();
         jQuery("#oe_header").find("h1").html($shortcut.data('name'));
     }
 });
@@ -195,6 +198,8 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
     on_menu_click: function(ev, id) {
         var $menu = $(ev.currentTarget);
         id = $menu.data('menu');
+        ev.preventDefault();
+        ev.stopPropagation();
         for (var i = 0; i < this.data.data.children.length; i++) {
             if (this.data.data.children[i].id == id) {
                 this.children = this.data.data.children[i];
@@ -204,14 +209,12 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
             .removeClass("login_valid")
             .addClass("secondary_menu");
 
-        if(!$('#oe_sec_menu').html().length){
-            this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu", this.children);
-            this.secondary.start();
-        }else{
-             $('#oe_sec_menu').remove();
-             $('<div id="oe_sec_menu" data-role="page"> </div>').appendTo('#moe');
-             this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu", this.children);
+        if(!$('[id^="oe_sec_menu_'+id+'"]').html()){
+            $('<div id="oe_sec_menu_'+id+'" data-role="page" data-url="oe_sec_menu_'+id+'"> </div>').appendTo('#moe');
+            this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
              this.secondary.start();
+        }else{
+            $.mobile.changePage('#oe_sec_menu_'+id, "slide", true, true);
         }
     }
 });
@@ -250,21 +253,19 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
             $.mobile.changePage("#oe_menu", "slide", true, true);
         });
 
-        $.mobile.changePage("#oe_sec_menu", "slide", true, true);
+        $.mobile.changePage("#"+this.element_id, "slide", true, true);
     },
     on_menu_click: function(ev, id) {
         var $menu = $(ev.currentTarget);
         id = $menu.data('menu');
-        if (id) {
-            if(!$('#oe_list').html().length){
-                this.listview = new openerp.web_mobile.ListView(this, "oe_list", id);
-                this.listview.start();
-            }else{
-                $('#oe_list').remove();
-                $('<div id="oe_list" data-role="page"> </div>').appendTo('#moe');
-                this.listview = new openerp.web_mobile.ListView(this, "oe_list", id);
-                this.listview.start();
-            }
+        ev.preventDefault();
+        ev.stopPropagation();
+        if(!$('[id^="oe_list_'+id+'"]').html()){
+            $('<div id="oe_list_'+id+'" data-role="page" data-url="oe_list_'+id+'"> </div>').appendTo('#moe');
+            this.listview = new openerp.web_mobile.ListView(this, "oe_list_"+id, id);
+            this.listview.start();
+        }else{
+            $.mobile.changePage('#oe_list_'+id, "slide", true, true);
         }
         jQuery("#oe_header").find("h1").html($menu.data('name'));
     }
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index 269dd435406..7b9a922a682 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -10,12 +10,6 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
         this.list_id = list_id;
         this.action = action;
         this.head_title = head_title;
-        this.content_expanded_class = "ui-collapsible-content ui-collapsible-content-expanded";
-        this.content_collapsed_class = "ui-collapsible-content ui-collapsible-content-collapsed";
-        this.expanded_class = "ui-collapsible-content-expanded";
-        this.collapsed_class = "ui-collapsible-content-collapsed";
-        this.plus_class = "ui-icon-plus";
-        this.minus_class = "ui-icon-minus";
     },
     start: function() {
         var self = this;
@@ -93,7 +87,9 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
 
                         }
                     });
-                    self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').find('p').find('[data-role=content]').find('ul').find('li').click(function(){
+                    self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').find('p').find('[data-role=content]').find('ul').find('li').click(function(ev){
+                        ev.preventDefault();
+                        ev.stopPropagation();
                         var latid,lastid;
                         $(this).parents().each(function(){
                             latid = $(this).attr('id');
@@ -113,17 +109,14 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                     var splited_data = res[i][1].split(',');
                                     res[i][1] = splited_data[0];
                                 }
-
-                                if($('#oe_list').html().length){
-                                    $('#oe_list').remove();
-                                    $('<div id="oe_list" data-role="page"> </div>').appendTo('#moe');
-
-                                    $('#oe_list').html(QWeb.render("ListView", {'records' : res}));
-                                    $('#oe_list').find("[data-role=header]").find('h1').html(head);
-                                    $('#oe_list').find("[data-role=header]").find('#home').click(function(){
+                                if(!$('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html()){
+                                    $('<div id="oe_list_'+relational+'_'+self.element_id+'" data-role="page" data-url="oe_list_'+relational+'_'+self.element_id+'"> </div>').appendTo('#moe');
+                                    $('#oe_list_'+relational+'_'+self.element_id).html(QWeb.render("ListView", {'records' : res}));
+                                    $('#oe_list_'+relational+'_'+self.element_id).find("[data-role=header]").find('h1').html(head);
+                                    $('#oe_list_'+relational+'_'+self.element_id).find("[data-role=header]").find('#home').click(function(){
                                         $.mobile.changePage("#oe_menu", "slide", true, true);
                                     });
-                                    $('#oe_list').find("[data-role=footer]").find('#shrotcuts').click(function(){
+                                    $('#oe_list_'+relational+'_'+self.element_id).find("[data-role=footer]").find('#shrotcuts').click(function(){
                                         if(!$('#oe_shortcuts').html().length){
                                             this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
                                             this.shortcuts.start();
@@ -132,7 +125,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                             $.mobile.changePage("#oe_shortcuts", "slide", true, true);
                                         }
                                     });
-                                    $('#oe_list').find("[data-role=footer]").find('#preference').click(function(){
+                                    $('#oe_list_'+relational+'_'+self.element_id).find("[data-role=footer]").find('#preference').click(function(){
                                         if(!$('#oe_options').html().length){
                                             this.options = new openerp.web_mobile.Options(self, "oe_options");
                                             this.options.start();
@@ -141,18 +134,20 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                             $.mobile.changePage("#oe_options", "slide", true, true);
                                         }
                                     });
-                                    $('#oe_list').find("a#list-id").click(function(ev){
+                                    $('#oe_list_'+relational+'_'+self.element_id).find("a#list-id").click(function(ev){
+                                        ev.preventDefault();
+                                        ev.stopPropagation();
                                         var head_title = $(this).text();
+                                        var listid = $(ev.currentTarget).data('id');
                                         dataset = new openerp.web.DataSetSearch(self, dataset.model, null, null);
                                         dataset.read_slice([],{}, function (result_relational) {
                                             for (var i = 0; i < result_relational.length; i++) {
-                                                if (result_relational[i].id == $(ev.currentTarget).data('id')) {
+                                                if (result_relational[i].id == listid) {
                                                     var data_relational = result_relational[i];
                                                 }
                                             }
-                                            if($('#oe_form').html().length){
-                                                $('#oe_form').remove();
-                                                $('<div id="oe_form" data-role="page"> </div>').appendTo('#moe');
+                                            if(!$('[id^="oe_listform_'+listid+'"]').html()){
+                                                $('<div id="oe_listform_'+listid+'" data-role="page" data-url="oe_listform_'+listid+'"> </div>').appendTo('#moe');
                                                 for (var k = 0; k < notebooks.children.length; k++) {
                                                     if (notebooks.children[k].attrs.string == lastid) {
                                                         get_fields = self.get_fields(notebooks.children[k].children);
@@ -168,15 +163,16 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                         }
                                                     }
                                                 }
-                                                $('#oe_form').html(QWeb.render("FormView", {'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational, 'temp_flag':'1' }));
-                                                $('#oe_form').find('select').change(function(ev){
+                                                $('#oe_listform_'+listid).html(QWeb.render("FormView", {'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational, 'temp_flag':'1' }));
+
+                                                $('#oe_listform_'+listid).find('select').change(function(ev){
                                                     selection.on_select_option(ev);
                                                 });
-                                                $('#oe_form').find("[data-role=header]").find('h1').html(head_title);
-                                                $('#oe_form').find("[data-role=header]").find('#home').click(function(){
+                                                $('#oe_listform_'+listid).find("[data-role=header]").find('h1').html(head_title);
+                                                $('#oe_listform_'+listid).find("[data-role=header]").find('#home').click(function(){
                                                     $.mobile.changePage("#oe_menu", "slide", true, true);
                                                 });
-                                                $('#oe_form').find("[data-role=footer]").find('#shrotcuts').click(function(){
+                                                $('#oe_listform_'+listid).find("[data-role=footer]").find('#shrotcuts').click(function(){
                                                     if(!$('#oe_shortcuts').html().length){
                                                         this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
                                                         this.shortcuts.start();
@@ -185,7 +181,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                         $.mobile.changePage("#oe_shortcuts", "slide", true, true);
                                                     }
                                                 });
-                                                $('#oe_form').find("[data-role=footer]").find('#preference').click(function(){
+                                                $('#oe_listform_'+listid).find("[data-role=footer]").find('#preference').click(function(){
                                                     if(!$('#oe_options').html().length){
                                                         this.options = new openerp.web_mobile.Options(self, "oe_options");
                                                         this.options.start();
@@ -194,16 +190,20 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                         $.mobile.changePage("#oe_options", "slide", true, true);
                                                     }
                                                 });
-                                                $.mobile.changePage("#oe_form", "slide", true, true);
+                                                $.mobile.changePage('#oe_listform_'+listid, "slide", true, true);
+                                            }else{
+                                                $.mobile.changePage('#oe_listform_'+listid, "slide", true, true);
                                             }
                                         });
                                     });
-                                    $.mobile.changePage("#oe_list", "slide", true, true);
+                                    $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", true, true);
+                                }else{
+                                    $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", true, true);
                                 }
                             });
                         }
                     });
-                    $.mobile.changePage("#oe_form", "slide", true, true);
+                    $.mobile.changePage("#"+self.element_id, "slide", true, true);
                 });
         });
     },
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index ebf31b6d4fd..ba43274f32e 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -48,23 +48,23 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
                 }
             });
             self.$element.find("a#list-id").click(self.on_list_click);
-            $.mobile.changePage("#oe_list", "slide", true, true);
+            $.mobile.changePage("#"+self.element_id, "slide", true, true);
         });
     },
     on_list_click: function(ev) {
         var $record = $(ev.currentTarget);
         var self = this;
+        ev.preventDefault();
+        ev.stopPropagation();
         id = $record.data('id');
-
         head_title = $.trim($record.text());
-        if(!$('#oe_form').html().length){
-            this.formview = new openerp.web_mobile.FormView(this, "oe_form", id, this.action, head_title);
+
+        if(!$('[id^="oe_form_'+id+'"]').html()){
+            $('<div id="oe_form_'+id+'" data-role="page" data-url="oe_form_'+id+'"> </div>').appendTo('#moe');
+            this.formview = new openerp.web_mobile.FormView(this, "oe_form_"+id, id, this.action, head_title);
             this.formview.start();
         }else{
-            $('#oe_form').remove();
-            $('<div id="oe_form" data-role="page"> </div>').appendTo('#moe');
-            this.formview = new openerp.web_mobile.FormView(this, "oe_form", id, this.action, head_title);
-            this.formview.start();
+            $.mobile.changePage('#oe_form_'+id, "slide", true, true);
         }
     }
  });
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index a6242858069..89734d40890 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -7,10 +7,6 @@
     <div data-role="page" id="oe_login"></div>
     <div id="oe_header" />
     <div id="oe_footer" />
-    <div data-role="page" id="oe_sec_menu"></div>
-    <div data-role="page" id="oe_sec_menu_new"></div>
-    <div data-role="page" id="oe_list"></div>
-    <div data-role="page" id="oe_form"></div>
     <div data-role="page" id="oe_shortcuts"></div>
     <div data-role="page" id="oe_menu"></div>
     <div data-role="page" id="oe_options"></div>
@@ -157,7 +153,10 @@
                         </t>
                         <t t-if="!(values[field.attrs.name])">
                             <input type="text" value="" id=""/>
-                         </t>
+                        </t>
+                        <t t-if="(field.attrs.name == 'email' or field.attrs.name == 'email_from') and values[field.attrs.name]">
+                            <a t-att-href="'mailto:'+values[field.attrs.name]"><img src="/web/static/src/img/icons/terp-mail-message-new.png" /></a>
+                        </t>
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'text'">
                         <label for="">
@@ -203,15 +202,19 @@
                         </t>
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'boolean'">
-                        <fieldset data-role="controlgroup">
-                            <t t-if="values[field.attrs.name]">
-                                <input type="checkbox" name="checkbox-1" id="checkbox-1" checked="yes" class="custom"/>
-                            </t>
-                            <t t-if="!(values[field.attrs.name])">
-                                <input type="checkbox" name="checkbox-1" id="checkbox-1" class="custom" />
-                            </t>
-                            <label for="checkbox-1"><t t-esc="fields[field.attrs.name].string" /></label>
-                        </fieldset>
+                        <div data-role="fieldcontain">
+                            <label for="slider"><t t-esc="fields[field.attrs.name].string" /> :</label>
+                            <select name="slider" id="slider" data-role="slider">
+                                <t t-if="values[field.attrs.name]">
+                                    <option value="on" selected="true">On</option>
+                                    <option value="off">Off</option>
+                                </t>
+                                <t t-if="!values[field.attrs.name]">
+                                    <option value="on">On</option>
+                                    <option value="off" selected="true">Off</option>
+                                </t>
+                            </select>
+                        </div>
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'selection'">
                         <label for="" class="select">
-- 
cgit v1.2.3


From 7d48dabd4a2637e50cb119b916abb99e11d2bfe0 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Thu, 22 Sep 2011 13:03:03 +0530
Subject: [IMP] Dynamic pages for relational fields & on many2one open
 formview.

bzr revid: bth@tinyerp.com-20110922073303-kpewefsb6k6sncp7
---
 addons/web_mobile/static/src/js/chrome_mobile.js |  4 +-
 addons/web_mobile/static/src/js/form_mobile.js   | 94 +++++++++++++++++-------
 addons/web_mobile/static/src/js/list_mobile.js   |  8 +-
 addons/web_mobile/static/src/xml/web_mobile.xml  |  7 +-
 4 files changed, 81 insertions(+), 32 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 10616fb0846..231ba37f366 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -141,12 +141,13 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
         $shortcut = $(ev.currentTarget);
         id = $shortcut.data('menu');
         res_id = $shortcut.data('res');
+
         if(!$('[id^="oe_list_'+res_id+'"]').html()){
             $('<div id="oe_list_'+res_id+'" data-role="page" data-url="oe_list_'+res_id+'"> </div>').appendTo('#moe');
             this.listview = new openerp.web_mobile.ListView(self, "oe_list_"+res_id, res_id);
             this.listview.start();
         }else{
-            $.mobile.changePage($('#oe_list_'+res_id), "slide", true, true);
+            $.mobile.changePage('#oe_list_'+res_id, "slide", true, true);
         }
         ev.preventDefault();
         ev.stopPropagation();
@@ -260,6 +261,7 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
         id = $menu.data('menu');
         ev.preventDefault();
         ev.stopPropagation();
+
         if(!$('[id^="oe_list_'+id+'"]').html()){
             $('<div id="oe_list_'+id+'" data-role="page" data-url="oe_list_'+id+'"> </div>').appendTo('#moe');
             this.listview = new openerp.web_mobile.ListView(this, "oe_list_"+id, id);
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index 7b9a922a682..570f6844ba7 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -5,20 +5,30 @@
 openerp.web_mobile.form_mobile = function (openerp) {
 
 openerp.web_mobile.FormView = openerp.web.Widget.extend({
-    init: function(session, element_id, list_id, action, head_title) {
+    init: function(session, element_id, list_id, action, head_title, resmodel, viewid) {
         this._super(session, element_id);
         this.list_id = list_id;
         this.action = action;
         this.head_title = head_title;
+        this.resmodel = resmodel;
+        this.viewid = viewid;
+
     },
     start: function() {
         var self = this;
         var id = this.list_id;
-        var model = this.action.res_model;
-        var view_id = this.action.views[1][0];
-        this.dataset = new openerp.web.DataSetSearch(this, this.action.res_model, null, null);
+
+        var model = this.action.res_model || this.resmodel;
+        if(this.action){
+            var view_id = this.action.views[1][0];
+        }else{
+            var view_id = this.viewid;
+        }
+
+        this.dataset = new openerp.web.DataSetSearch(this, model, null, null);
         var context = new openerp.web.CompoundContext(this.dataset.get_context());
         this.dataset.read_slice([],{}, function (result) {
+
             for (var i = 0; i < result.length; i++) {
                 if (result[i].id == id) {
                     var data = result[i];
@@ -29,6 +39,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                 var view_fields = result.arch.children;
                 var get_fields = self.get_fields(view_fields);
                 var selection = new openerp.web_mobile.Selection();
+
                 for (var j = 0; j < view_fields.length; j++) {
                     if (view_fields[j].tag == 'notebook') {
                         var notebooks = view_fields[j];
@@ -58,10 +69,19 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                             $.mobile.changePage("#oe_options", "slide", true, true);
                         }
                     });
-                    self.$element.find('select').change(function(ev){
-                        selection.on_select_option(ev);
+                    self.$element.find('#formbutton').click(function(){
+                        var selected_id = $(this).prev().find('select').val();
+                        var select_model = $(this).prev().find('select').attr('for');
+                        if(selected_id!="false"){
+                            if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
+                                $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
+                                    this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', 'head',select_model,false);
+                                    this.formview.start();
+                            }else{
+                                $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", true, true);
+                            }
+                        }
                     });
-
                     self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').each(function(i){
 
                         for (var k = 0; k < notebooks.children.length; k++) {
@@ -84,6 +104,19 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                             }else{
                                 $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data }));
                             }
+                            $(this).find('p').find('#formbutton').click(function(){
+                                var selected_id = $(this).prev().find('select').val();
+                                var select_model = $(this).prev().find('select').attr('for');
+                                if(selected_id!="false"){
+                                    if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
+                                        $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
+                                        this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', 'head',select_model,false);
+                                        this.formview.start();
+                                    }else{
+                                        $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", true, true);
+                                    }
+                                }
+                            });
 
                         }
                     });
@@ -101,6 +134,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                         });
                         var relational = $(this).attr('for');
                         if(result.fields[relational]){
+
                             var head = $.trim($(this).text());
                             var dataset = new openerp.web.DataSetStatic(self, result.fields[relational].relation, result.fields[relational].context);
                             dataset.domain=[['id', 'in', data[relational]]];
@@ -111,12 +145,12 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                 }
                                 if(!$('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html()){
                                     $('<div id="oe_list_'+relational+'_'+self.element_id+'" data-role="page" data-url="oe_list_'+relational+'_'+self.element_id+'"> </div>').appendTo('#moe');
-                                    $('#oe_list_'+relational+'_'+self.element_id).html(QWeb.render("ListView", {'records' : res}));
-                                    $('#oe_list_'+relational+'_'+self.element_id).find("[data-role=header]").find('h1').html(head);
-                                    $('#oe_list_'+relational+'_'+self.element_id).find("[data-role=header]").find('#home').click(function(){
+                                    $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html(QWeb.render("ListView", {'records' : res}));
+                                    $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('h1').html(head);
+                                    $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('#home').click(function(){
                                         $.mobile.changePage("#oe_menu", "slide", true, true);
                                     });
-                                    $('#oe_list_'+relational+'_'+self.element_id).find("[data-role=footer]").find('#shrotcuts').click(function(){
+                                    $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=footer]").find('#shrotcuts').click(function(){
                                         if(!$('#oe_shortcuts').html().length){
                                             this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
                                             this.shortcuts.start();
@@ -125,7 +159,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                             $.mobile.changePage("#oe_shortcuts", "slide", true, true);
                                         }
                                     });
-                                    $('#oe_list_'+relational+'_'+self.element_id).find("[data-role=footer]").find('#preference').click(function(){
+                                    $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=footer]").find('#preference').click(function(){
                                         if(!$('#oe_options').html().length){
                                             this.options = new openerp.web_mobile.Options(self, "oe_options");
                                             this.options.start();
@@ -134,7 +168,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                             $.mobile.changePage("#oe_options", "slide", true, true);
                                         }
                                     });
-                                    $('#oe_list_'+relational+'_'+self.element_id).find("a#list-id").click(function(ev){
+                                    $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("a#list-id").click(function(ev){
                                         ev.preventDefault();
                                         ev.stopPropagation();
                                         var head_title = $(this).text();
@@ -146,8 +180,8 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                     var data_relational = result_relational[i];
                                                 }
                                             }
-                                            if(!$('[id^="oe_listform_'+listid+'"]').html()){
-                                                $('<div id="oe_listform_'+listid+'" data-role="page" data-url="oe_listform_'+listid+'"> </div>').appendTo('#moe');
+                                            if(!$('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html()){
+                                                $('<div id="oe_form_'+listid+result.fields[relational].relation+'" data-role="page" data-url="oe_form_'+listid+result.fields[relational].relation+'"> </div>').appendTo('#moe');
                                                 for (var k = 0; k < notebooks.children.length; k++) {
                                                     if (notebooks.children[k].attrs.string == lastid) {
                                                         get_fields = self.get_fields(notebooks.children[k].children);
@@ -163,16 +197,13 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                         }
                                                     }
                                                 }
-                                                $('#oe_listform_'+listid).html(QWeb.render("FormView", {'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational, 'temp_flag':'1' }));
+                                                $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html(QWeb.render("FormView", {'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational, 'temp_flag':'1' }));
 
-                                                $('#oe_listform_'+listid).find('select').change(function(ev){
-                                                    selection.on_select_option(ev);
-                                                });
-                                                $('#oe_listform_'+listid).find("[data-role=header]").find('h1').html(head_title);
-                                                $('#oe_listform_'+listid).find("[data-role=header]").find('#home').click(function(){
+                                                $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('h1').html(head_title);
+                                                $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('#home').click(function(){
                                                     $.mobile.changePage("#oe_menu", "slide", true, true);
                                                 });
-                                                $('#oe_listform_'+listid).find("[data-role=footer]").find('#shrotcuts').click(function(){
+                                                $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=footer]").find('#shrotcuts').click(function(){
                                                     if(!$('#oe_shortcuts').html().length){
                                                         this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
                                                         this.shortcuts.start();
@@ -181,7 +212,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                         $.mobile.changePage("#oe_shortcuts", "slide", true, true);
                                                     }
                                                 });
-                                                $('#oe_listform_'+listid).find("[data-role=footer]").find('#preference').click(function(){
+                                                $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=footer]").find('#preference').click(function(){
                                                     if(!$('#oe_options').html().length){
                                                         this.options = new openerp.web_mobile.Options(self, "oe_options");
                                                         this.options.start();
@@ -190,9 +221,22 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                         $.mobile.changePage("#oe_options", "slide", true, true);
                                                     }
                                                 });
-                                                $.mobile.changePage('#oe_listform_'+listid, "slide", true, true);
+                                                $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('#formbutton').click(function(){
+                                                    var selected_id = $(this).prev().find('select').val();
+                                                    var select_model = $(this).prev().find('select').attr('for');
+                                                    if(selected_id!="false"){
+                                                        if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
+                                                            $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
+                                                            this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', 'head',select_model,false);
+                                                            this.formview.start();
+                                                        }else{
+                                                            $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", true, true);
+                                                        }
+                                                    }
+                                                });
+                                                $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", true, true);
                                             }else{
-                                                $.mobile.changePage('#oe_listform_'+listid, "slide", true, true);
+                                                $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", true, true);
                                             }
                                         });
                                     });
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index ba43274f32e..654e76ca0be 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -59,12 +59,12 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
         id = $record.data('id');
         head_title = $.trim($record.text());
 
-        if(!$('[id^="oe_form_'+id+'"]').html()){
-            $('<div id="oe_form_'+id+'" data-role="page" data-url="oe_form_'+id+'"> </div>').appendTo('#moe');
-            this.formview = new openerp.web_mobile.FormView(this, "oe_form_"+id, id, this.action, head_title);
+        if(!$('[id^="oe_form_'+id+this.action.res_model+'"]').html()){
+            $('<div id="oe_form_'+id+this.action.res_model+'" data-role="page" data-url="oe_form_'+id+this.action.res_model+'"> </div>').appendTo('#moe');
+            this.formview = new openerp.web_mobile.FormView(this, "oe_form_"+id+this.action.res_model, id, this.action, head_title, '' ,'');
             this.formview.start();
         }else{
-            $.mobile.changePage('#oe_form_'+id, "slide", true, true);
+            $.mobile.changePage('#oe_form_'+id+this.action.res_model, "slide", true, true);
         }
     }
  });
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index 89734d40890..bac1b262596 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -232,7 +232,7 @@
                             <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
                             <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
                         </label>
-                        <select id="" data-native-menu="false">
+                        <select id="" data-native-menu="false" t-att-for="fields[field.attrs.name].relation">
                             <t t-if="fields[field.attrs.name].selection">
                                 <t t-foreach="fields[field.attrs.name].selection" t-as="opt">
                                     <t t-if="values[field.attrs.name]==opt[0]">
@@ -244,6 +244,9 @@
                                 </t>
                             </t>
                         </select>
+                        <t t-if="fields[field.attrs.name].selection">
+                            <a id="formbutton" href="#" title="Form View"><img src="/web/static/src/img/icons/gtk-index.png" /></a>
+                        </t>
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'one2many'">
                         <ul data-role="listview" data-inset="true" data-theme="d">
@@ -281,7 +284,7 @@
         </form>
     </div>
     <t t-if="temp_flag">
-    <t t-call="Footer" />
+        <t t-call="Footer" />
     </t>
 </t>
 </templates>
-- 
cgit v1.2.3


From 27e6b96bb5871129862b2d9fbbcfffdc7df800b9 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Thu, 22 Sep 2011 14:25:25 +0530
Subject: [IMP] Set header for many2one formview.

bzr revid: bth@tinyerp.com-20110922085525-oyw81i2klwednuy5
---
 addons/web_mobile/static/src/js/form_mobile.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index 570f6844ba7..b9879ab1665 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -70,12 +70,13 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                         }
                     });
                     self.$element.find('#formbutton').click(function(){
+                        var head = $(this).prev().find('select').find("option:selected").text();
                         var selected_id = $(this).prev().find('select').val();
                         var select_model = $(this).prev().find('select').attr('for');
                         if(selected_id!="false"){
                             if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
                                 $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
-                                    this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', 'head',select_model,false);
+                                    this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
                                     this.formview.start();
                             }else{
                                 $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", true, true);
@@ -105,12 +106,13 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                 $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data }));
                             }
                             $(this).find('p').find('#formbutton').click(function(){
+                                var head = $(this).prev().find('select').find("option:selected").text();
                                 var selected_id = $(this).prev().find('select').val();
                                 var select_model = $(this).prev().find('select').attr('for');
                                 if(selected_id!="false"){
                                     if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
                                         $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
-                                        this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', 'head',select_model,false);
+                                        this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
                                         this.formview.start();
                                     }else{
                                         $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", true, true);
@@ -222,12 +224,13 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                     }
                                                 });
                                                 $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('#formbutton').click(function(){
+                                                    var head = $(this).prev().find('select').find("option:selected").text();
                                                     var selected_id = $(this).prev().find('select').val();
                                                     var select_model = $(this).prev().find('select').attr('for');
                                                     if(selected_id!="false"){
                                                         if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
                                                             $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
-                                                            this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', 'head',select_model,false);
+                                                            this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
                                                             this.formview.start();
                                                         }else{
                                                             $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", true, true);
-- 
cgit v1.2.3


From b46e84d47abfd7eebc8babd82239c85dbbbd6515 Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Thu, 22 Sep 2011 18:04:40 +0530
Subject: [FIX] Improved slide transition on change page.

bzr revid: jra@tinyerp.com-20110922123440-93ddlany5czr2sur
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 32 +++++++++++-----------
 addons/web_mobile/static/src/js/form_mobile.js   | 34 ++++++++++++------------
 addons/web_mobile/static/src/js/list_mobile.js   | 10 +++----
 3 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 231ba37f366..48187e2e48d 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -119,7 +119,7 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
 
             self.$element.find("[data-role=header]").find('h1').html('Favourite');
             self.$element.find("[data-role=header]").find('#home').click(function(){
-                $.mobile.changePage("#oe_menu", "slide", true, true);
+                $.mobile.changePage("#oe_menu", "slide", false, true);
             });
             self.$element.find('#content').find("a").click(self.on_clicked);
             self.$element.find("[data-role=footer]").find('#preference').click(function(){
@@ -128,10 +128,10 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
                     this.options.start();
                 }
                 else{
-                    $.mobile.changePage("#oe_options", "slide", true, true);
+                    $.mobile.changePage("#oe_options", "slide", false, true);
                 }
             });
-            $.mobile.changePage("#oe_shortcuts", "slide", true, true);
+            $.mobile.changePage("#oe_shortcuts", "slide", false, true);
         });
     },
     on_clicked: function(ev) {
@@ -147,7 +147,7 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
             this.listview = new openerp.web_mobile.ListView(self, "oe_list_"+res_id, res_id);
             this.listview.start();
         }else{
-            $.mobile.changePage('#oe_list_'+res_id, "slide", true, true);
+            $.mobile.changePage('#oe_list_'+res_id, "slide", false, true);
         }
         ev.preventDefault();
         ev.stopPropagation();
@@ -181,7 +181,7 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
                 this.shortcuts.start();
             }
             else{
-                $.mobile.changePage($("#oe_shortcuts"), "slide", true, true);
+                $.mobile.changePage($("#oe_shortcuts"), "slide", false, true);
             }
         });
         this.$element.find("[data-role=footer]").find('#preference').click(function(){
@@ -190,11 +190,11 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
                 this.options.start();
             }
             else{
-                $.mobile.changePage("#oe_options", "slide", true, true);
+                $.mobile.changePage("#oe_options", "slide", false, true);
             }
         });
         this.$element.add(this.$secondary_menu).find("#content").find('a').click(this.on_menu_click);
-        $.mobile.changePage("#oe_menu", "slide", true, true);
+        $.mobile.changePage("#oe_menu", "slide", false, true);
     },
     on_menu_click: function(ev, id) {
         var $menu = $(ev.currentTarget);
@@ -215,7 +215,7 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
             this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
              this.secondary.start();
         }else{
-            $.mobile.changePage('#oe_sec_menu_'+id, "slide", true, true);
+            $.mobile.changePage('#oe_sec_menu_'+id, "slide", false, true);
         }
     }
 });
@@ -238,7 +238,7 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
                 this.shortcuts.start();
             }
             else{
-                $.mobile.changePage("#oe_shortcuts", "slide", true, true);
+                $.mobile.changePage("#oe_shortcuts", "slide", false, true);
             }
         });
         this.$element.find("[data-role=footer]").find('#preference').click(function(){
@@ -247,14 +247,14 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
                 this.options.start();
             }
             else{
-                $.mobile.changePage("#oe_options", "slide", true, true);
+                $.mobile.changePage("#oe_options", "slide", false, true);
             }
         });
         this.$element.find("[data-role=header]").find('#home').click(function(){
-            $.mobile.changePage("#oe_menu", "slide", true, true);
+            $.mobile.changePage("#oe_menu", "slide", false, true);
         });
 
-        $.mobile.changePage("#"+this.element_id, "slide", true, true);
+        $.mobile.changePage("#"+this.element_id, "slide", false, true);
     },
     on_menu_click: function(ev, id) {
         var $menu = $(ev.currentTarget);
@@ -267,7 +267,7 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
             this.listview = new openerp.web_mobile.ListView(this, "oe_list_"+id, id);
             this.listview.start();
         }else{
-            $.mobile.changePage('#oe_list_'+id, "slide", true, true);
+            $.mobile.changePage('#oe_list_'+id, "slide", false, true);
         }
         jQuery("#oe_header").find("h1").html($menu.data('name'));
     }
@@ -285,17 +285,17 @@ openerp.web_mobile.Options =  openerp.web.Widget.extend({
                 this.shortcuts.start();
             }
             else{
-                $.mobile.changePage("#oe_shortcuts", "slide", true, true);
+                $.mobile.changePage("#oe_shortcuts", "slide", false, true);
             }
         });
         this.$element.find("[data-role=header]").find('#home').click(function(){
-            $.mobile.changePage("#oe_menu", "slide", true, true);
+            $.mobile.changePage("#oe_menu", "slide", false, true);
         });
         this.$element.find("[data-role=content]").find('a').click(function(){
             $('#oe_login').empty();
             window.location.replace('/mobile');
         });
-        $.mobile.changePage("#oe_options", "slide", true, true);
+        $.mobile.changePage("#oe_options", "slide", false, true);
     }
 });
 
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index b9879ab1665..6bc209d831f 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -49,7 +49,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
 
                     self.$element.find("[data-role=header]").find('h1').html(self.head_title);
                     self.$element.find("[data-role=header]").find('#home').click(function(){
-                        $.mobile.changePage("#oe_menu", "slide", true, true);
+                        $.mobile.changePage("#oe_menu", "slide", false, true);
                     });
                     self.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
                         if(!$('#oe_shortcuts').html().length){
@@ -57,7 +57,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                             this.shortcuts.start();
                         }
                         else{
-                            $.mobile.changePage("#oe_shortcuts", "slide", true, true);
+                            $.mobile.changePage("#oe_shortcuts", "slide", false, true);
                         }
                     });
                     self.$element.find("[data-role=footer]").find('#preference').click(function(){
@@ -66,7 +66,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                             this.options.start();
                         }
                         else{
-                            $.mobile.changePage("#oe_options", "slide", true, true);
+                            $.mobile.changePage("#oe_options", "slide", false, true);
                         }
                     });
                     self.$element.find('#formbutton').click(function(){
@@ -79,7 +79,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                     this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
                                     this.formview.start();
                             }else{
-                                $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", true, true);
+                                $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", false, true);
                             }
                         }
                     });
@@ -115,7 +115,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                         this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
                                         this.formview.start();
                                     }else{
-                                        $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", true, true);
+                                        $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", false, true);
                                     }
                                 }
                             });
@@ -150,7 +150,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                     $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html(QWeb.render("ListView", {'records' : res}));
                                     $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('h1').html(head);
                                     $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('#home').click(function(){
-                                        $.mobile.changePage("#oe_menu", "slide", true, true);
+                                        $.mobile.changePage("#oe_menu", "slide", false, true);
                                     });
                                     $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=footer]").find('#shrotcuts').click(function(){
                                         if(!$('#oe_shortcuts').html().length){
@@ -158,7 +158,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                             this.shortcuts.start();
                                         }
                                         else{
-                                            $.mobile.changePage("#oe_shortcuts", "slide", true, true);
+                                            $.mobile.changePage("#oe_shortcuts", "slide", false, true);
                                         }
                                     });
                                     $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=footer]").find('#preference').click(function(){
@@ -167,7 +167,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                             this.options.start();
                                         }
                                         else{
-                                            $.mobile.changePage("#oe_options", "slide", true, true);
+                                            $.mobile.changePage("#oe_options", "slide", false, true);
                                         }
                                     });
                                     $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("a#list-id").click(function(ev){
@@ -203,7 +203,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
 
                                                 $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('h1').html(head_title);
                                                 $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('#home').click(function(){
-                                                    $.mobile.changePage("#oe_menu", "slide", true, true);
+                                                    $.mobile.changePage("#oe_menu", "slide", false, true);
                                                 });
                                                 $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=footer]").find('#shrotcuts').click(function(){
                                                     if(!$('#oe_shortcuts').html().length){
@@ -211,7 +211,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                         this.shortcuts.start();
                                                     }
                                                     else{
-                                                        $.mobile.changePage("#oe_shortcuts", "slide", true, true);
+                                                        $.mobile.changePage("#oe_shortcuts", "slide", false, true);
                                                     }
                                                 });
                                                 $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=footer]").find('#preference').click(function(){
@@ -220,7 +220,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                         this.options.start();
                                                     }
                                                     else{
-                                                        $.mobile.changePage("#oe_options", "slide", true, true);
+                                                        $.mobile.changePage("#oe_options", "slide", false, true);
                                                     }
                                                 });
                                                 $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('#formbutton').click(function(){
@@ -233,24 +233,24 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                             this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
                                                             this.formview.start();
                                                         }else{
-                                                            $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", true, true);
+                                                            $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", false, true);
                                                         }
                                                     }
                                                 });
-                                                $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", true, true);
+                                                $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
                                             }else{
-                                                $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", true, true);
+                                                $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
                                             }
                                         });
                                     });
-                                    $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", true, true);
+                                    $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", false, true);
                                 }else{
-                                    $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", true, true);
+                                    $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", false, true);
                                 }
                             });
                         }
                     });
-                    $.mobile.changePage("#"+self.element_id, "slide", true, true);
+                    $.mobile.changePage("#"+self.element_id, "slide", false, true);
                 });
         });
     },
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index 654e76ca0be..250c0dad0c5 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -27,7 +27,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
             self.$element.html(QWeb.render("ListView", {'records' : result}));
             self.$element.find("[data-role=header]").find('h1').html(self.action.name);
             self.$element.find("[data-role=header]").find('#home').click(function(){
-                $.mobile.changePage("#oe_menu", "slide", true, true);
+                $.mobile.changePage("#oe_menu", "slide", false, true);
             });
             self.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
                 if(!$('#oe_shortcuts').html().length){
@@ -35,7 +35,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
                     this.shortcuts.start();
                 }
                 else{
-                    $.mobile.changePage("#oe_shortcuts", "slide", true, true);
+                    $.mobile.changePage("#oe_shortcuts", "slide", false, true);
                 }
             });
             self.$element.find("[data-role=footer]").find('#preference').click(function(){
@@ -44,11 +44,11 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
                     this.options.start();
                 }
                 else{
-                    $.mobile.changePage("#oe_options", "slide", true, true);
+                    $.mobile.changePage("#oe_options", "slide", false, true);
                 }
             });
             self.$element.find("a#list-id").click(self.on_list_click);
-            $.mobile.changePage("#"+self.element_id, "slide", true, true);
+            $.mobile.changePage("#"+self.element_id, "slide", false, true);
         });
     },
     on_list_click: function(ev) {
@@ -64,7 +64,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
             this.formview = new openerp.web_mobile.FormView(this, "oe_form_"+id+this.action.res_model, id, this.action, head_title, '' ,'');
             this.formview.start();
         }else{
-            $.mobile.changePage('#oe_form_'+id+this.action.res_model, "slide", true, true);
+            $.mobile.changePage('#oe_form_'+id+this.action.res_model, "slide", false, true);
         }
     }
  });
-- 
cgit v1.2.3


From 3b2bcff41922d1655f6230f55885ebdb969525b2 Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Thu, 22 Sep 2011 17:54:11 +0200
Subject: [imp] use template attribute to get closer to Widget specification.

bzr revid: valentin.lab@kalysto.org-20110922155411-bio4njyytkkrjfv0
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 39 +++++++++++++++++++-----
 addons/web_mobile/static/src/js/form_mobile.js   | 11 ++++---
 addons/web_mobile/static/src/js/list_mobile.js   |  5 ++-
 3 files changed, 42 insertions(+), 13 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 48187e2e48d..7835c444530 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -12,11 +12,14 @@ openerp.web_mobile.mobilewebclient = function(element_id) {
 };
 
 openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({
+
+    template: "WebClient",
+
     init: function(element_id) {
         this._super(null, element_id);
         QWeb.add_template("xml/web_mobile.xml");
         var params = {};
-        this.$element.html(QWeb.render("WebClient", {}));
+        this.$element.html(QWeb.render(this.template, {}));
         this.session = new openerp.web.Session("oe_errors");
         this.crashmanager =  new openerp.web.CrashManager(this);
         this.login = new openerp.web_mobile.Login(this, "oe_login");
@@ -29,6 +32,9 @@ openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({
 });
 
 openerp.web_mobile.Login =  openerp.web.Widget.extend({
+
+    template: "Login",
+
     start: function() {
         var self = this;
         jQuery("#oe_header").children().remove();
@@ -36,7 +42,7 @@ openerp.web_mobile.Login =  openerp.web.Widget.extend({
         this.rpc("/web/database/get_list", {}, function(result) {
             var selection = new openerp.web_mobile.Selection();
             self.db_list = result.db_list;
-            self.$element.html(QWeb.render("Login", self));
+            self.$element.html(QWeb.render(self.template, self));
             if(self.session.db!=""){
                 self.$element.find("#database").val(self.session.db);
                 self.$element.find("#login").val(self.session.login);
@@ -91,31 +97,39 @@ openerp.web_mobile.Login =  openerp.web.Widget.extend({
     }
 });
 openerp.web_mobile.Header =  openerp.web.Widget.extend({
+
+    template: "Header",
+
     init: function(session, element_id) {
         this._super(session, element_id);
     },
     start: function() {
-        this.$element.html(QWeb.render("Header", this));
+        this.$element.html(QWeb.render(this.template, this));
     }
 });
 
 openerp.web_mobile.Footer =  openerp.web.Widget.extend({
+
+    template: "Footer",
+
     init: function(session, element_id) {
         this._super(session, element_id);
     },
     start: function() {
-        this.$element.html(QWeb.render("Footer", this));
+        this.$element.html(QWeb.render(this.template, this));
     }
 });
 
 openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
+
+    template: "Shortcuts",
     init: function(session, element_id) {
         this._super(session, element_id);
     },
     start: function() {
         var self = this;
         this.rpc('/web/session/sc_list',{} ,function(res){
-            self.$element.html(QWeb.render("Shortcuts", {'sc' : res}))
+            self.$element.html(QWeb.render(self.template, {'sc' : res}))
 
             self.$element.find("[data-role=header]").find('h1').html('Favourite');
             self.$element.find("[data-role=header]").find('#home').click(function(){
@@ -156,6 +170,9 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
 });
 
 openerp.web_mobile.Menu =  openerp.web.Widget.extend({
+
+    template: "Menu",
+
     init: function(session, element_id, secondary_menu_id) {
         this._super(session, element_id);
         this.secondary_menu_id = secondary_menu_id;
@@ -173,7 +190,7 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
         this.footer = new openerp.web_mobile.Footer(this, "oe_footer");
         this.footer.start();
 
-        this.$element.html(QWeb.render("Menu", this.data));
+        this.$element.html(QWeb.render(this.template, this.data));
         this.$element.find("[data-role=header]").find('h1').html('Application');
         this.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
             if(!$('#oe_shortcuts').html().length){
@@ -220,6 +237,9 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
     }
 });
 openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
+
+    template: "Menu.secondary",
+
     init: function(session, element_id, secondary_menu_id) {
         this._super(session, element_id);
         this.data = secondary_menu_id;
@@ -228,7 +248,7 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
         var self = this;
         var v = { menu : this.data };
 
-        this.$element.html(QWeb.render("Menu.secondary", v));
+        this.$element.html(QWeb.render(this.template, v));
 
         this.$element.find("[data-role=header]").find("h1").html(this.data.name);
         this.$element.add(this.$secondary_menu).find('#content').find("a").click(this.on_menu_click);
@@ -274,10 +294,13 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
 });
 
 openerp.web_mobile.Options =  openerp.web.Widget.extend({
+
+    template: "Options",
+
     start: function() {
         var self = this;
 
-        this.$element.html(QWeb.render("Options", this));
+        this.$element.html(QWeb.render(this.template, this));
         this.$element.find("[data-role=header]").find('h1').html('Preference');
         this.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
             if(!$('#oe_shortcuts').html().length){
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index 6bc209d831f..e8fbe393abf 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -5,6 +5,9 @@
 openerp.web_mobile.form_mobile = function (openerp) {
 
 openerp.web_mobile.FormView = openerp.web.Widget.extend({
+
+    template: 'FormView',
+
     init: function(session, element_id, list_id, action, head_title, resmodel, viewid) {
         this._super(session, element_id);
         this.list_id = list_id;
@@ -45,7 +48,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                         var notebooks = view_fields[j];
                     }
                 }
-                self.$element.html(QWeb.render("FormView", {'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : data ,'temp_flag':'1'}));
+                self.$element.html(QWeb.render(self.template, {'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : data ,'temp_flag':'1'}));
 
                     self.$element.find("[data-role=header]").find('h1').html(self.head_title);
                     self.$element.find("[data-role=header]").find('#home').click(function(){
@@ -101,9 +104,9 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                             }
 
                             if(notebook){
-                                $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data,'til': notebook.attrs.string }));
+                                $(this).find('p').html(QWeb.render(self.template, {'get_fields': get_fields,'fields' : result.fields, 'values' : data,'til': notebook.attrs.string }));
                             }else{
-                                $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data }));
+                                $(this).find('p').html(QWeb.render(self.template, {'get_fields': get_fields,'fields' : result.fields, 'values' : data }));
                             }
                             $(this).find('p').find('#formbutton').click(function(){
                                 var head = $(this).prev().find('select').find("option:selected").text();
@@ -199,7 +202,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                         }
                                                     }
                                                 }
-                                                $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html(QWeb.render("FormView", {'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational, 'temp_flag':'1' }));
+                                                $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html(QWeb.render(self.template, {'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational, 'temp_flag':'1' }));
 
                                                 $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('h1').html(head_title);
                                                 $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('#home').click(function(){
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index 250c0dad0c5..b85d2eeb69e 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -5,6 +5,9 @@
 openerp.web_mobile.list_mobile = function (openerp) {
 
 openerp.web_mobile.ListView = openerp.web.Widget.extend({
+
+    template: 'ListView',
+
     init: function(session, element_id, list_id) {
         this._super(session, element_id);
         this.list_id = list_id;
@@ -24,7 +27,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
         var self = this;
         var dataset = new openerp.web.DataSetStatic(this, this.action.res_model, this.action.context);
         dataset.name_search('', [], 'ilike',false ,function(result){
-            self.$element.html(QWeb.render("ListView", {'records' : result}));
+            self.$element.html(QWeb.render(self.template, {'records' : result}));
             self.$element.find("[data-role=header]").find('h1').html(self.action.name);
             self.$element.find("[data-role=header]").find('#home').click(function(){
                 $.mobile.changePage("#oe_menu", "slide", false, true);
-- 
cgit v1.2.3


From f6c6e7846c1c8ab5737c5e70f8dcb6a155eb7bb4 Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Thu, 22 Sep 2011 17:54:58 +0200
Subject: [imp] use Widget's .render() whenever possible to be closer to Widget
 philosophy.

bzr revid: valentin.lab@kalysto.org-20110922155458-mwjgil62eoyhgmb4
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 18 +++++++++---------
 addons/web_mobile/static/src/js/form_mobile.js   | 10 +++++-----
 addons/web_mobile/static/src/js/list_mobile.js   |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 7835c444530..30361852501 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -17,9 +17,9 @@ openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({
 
     init: function(element_id) {
         this._super(null, element_id);
-        QWeb.add_template("xml/web_mobile.xml");
+        openerp.web.qweb.add_template("xml/web_mobile.xml");
         var params = {};
-        this.$element.html(QWeb.render(this.template, {}));
+        this.$element.html(this.render());
         this.session = new openerp.web.Session("oe_errors");
         this.crashmanager =  new openerp.web.CrashManager(this);
         this.login = new openerp.web_mobile.Login(this, "oe_login");
@@ -42,7 +42,7 @@ openerp.web_mobile.Login =  openerp.web.Widget.extend({
         this.rpc("/web/database/get_list", {}, function(result) {
             var selection = new openerp.web_mobile.Selection();
             self.db_list = result.db_list;
-            self.$element.html(QWeb.render(self.template, self));
+            self.$element.html(self.render(self));
             if(self.session.db!=""){
                 self.$element.find("#database").val(self.session.db);
                 self.$element.find("#login").val(self.session.login);
@@ -104,7 +104,7 @@ openerp.web_mobile.Header =  openerp.web.Widget.extend({
         this._super(session, element_id);
     },
     start: function() {
-        this.$element.html(QWeb.render(this.template, this));
+        this.$element.html(this.render(this));
     }
 });
 
@@ -116,7 +116,7 @@ openerp.web_mobile.Footer =  openerp.web.Widget.extend({
         this._super(session, element_id);
     },
     start: function() {
-        this.$element.html(QWeb.render(this.template, this));
+        this.$element.html(this.render(this));
     }
 });
 
@@ -129,7 +129,7 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
     start: function() {
         var self = this;
         this.rpc('/web/session/sc_list',{} ,function(res){
-            self.$element.html(QWeb.render(self.template, {'sc' : res}))
+            self.$element.html(this.render({'sc' : res}))
 
             self.$element.find("[data-role=header]").find('h1').html('Favourite');
             self.$element.find("[data-role=header]").find('#home').click(function(){
@@ -190,7 +190,7 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
         this.footer = new openerp.web_mobile.Footer(this, "oe_footer");
         this.footer.start();
 
-        this.$element.html(QWeb.render(this.template, this.data));
+        this.$element.html(this.render(this.data));
         this.$element.find("[data-role=header]").find('h1').html('Application');
         this.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
             if(!$('#oe_shortcuts').html().length){
@@ -248,7 +248,7 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
         var self = this;
         var v = { menu : this.data };
 
-        this.$element.html(QWeb.render(this.template, v));
+        this.$element.html(this.render(v));
 
         this.$element.find("[data-role=header]").find("h1").html(this.data.name);
         this.$element.add(this.$secondary_menu).find('#content').find("a").click(this.on_menu_click);
@@ -300,7 +300,7 @@ openerp.web_mobile.Options =  openerp.web.Widget.extend({
     start: function() {
         var self = this;
 
-        this.$element.html(QWeb.render(this.template, this));
+        this.$element.html(this.render(this));
         this.$element.find("[data-role=header]").find('h1').html('Preference');
         this.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
             if(!$('#oe_shortcuts').html().length){
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index e8fbe393abf..19a3acd080e 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -48,7 +48,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                         var notebooks = view_fields[j];
                     }
                 }
-                self.$element.html(QWeb.render(self.template, {'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : data ,'temp_flag':'1'}));
+                self.$element.html(self.render({'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : data ,'temp_flag':'1'}));
 
                     self.$element.find("[data-role=header]").find('h1').html(self.head_title);
                     self.$element.find("[data-role=header]").find('#home').click(function(){
@@ -104,9 +104,9 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                             }
 
                             if(notebook){
-                                $(this).find('p').html(QWeb.render(self.template, {'get_fields': get_fields,'fields' : result.fields, 'values' : data,'til': notebook.attrs.string }));
+                                $(this).find('p').html(self.render({'get_fields': get_fields,'fields' : result.fields, 'values' : data,'til': notebook.attrs.string }));
                             }else{
-                                $(this).find('p').html(QWeb.render(self.template, {'get_fields': get_fields,'fields' : result.fields, 'values' : data }));
+                                $(this).find('p').html(self.render({'get_fields': get_fields,'fields' : result.fields, 'values' : data }));
                             }
                             $(this).find('p').find('#formbutton').click(function(){
                                 var head = $(this).prev().find('select').find("option:selected").text();
@@ -150,7 +150,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                 }
                                 if(!$('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html()){
                                     $('<div id="oe_list_'+relational+'_'+self.element_id+'" data-role="page" data-url="oe_list_'+relational+'_'+self.element_id+'"> </div>').appendTo('#moe');
-                                    $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html(QWeb.render("ListView", {'records' : res}));
+                                    $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html(openerp.web.qweb.render("ListView", {'records' : res}));
                                     $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('h1').html(head);
                                     $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('#home').click(function(){
                                         $.mobile.changePage("#oe_menu", "slide", false, true);
@@ -202,7 +202,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                         }
                                                     }
                                                 }
-                                                $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html(QWeb.render(self.template, {'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational, 'temp_flag':'1' }));
+                                                $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html(self.render({'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational, 'temp_flag':'1' }));
 
                                                 $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('h1').html(head_title);
                                                 $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('#home').click(function(){
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index b85d2eeb69e..2d08701eb63 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -27,7 +27,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
         var self = this;
         var dataset = new openerp.web.DataSetStatic(this, this.action.res_model, this.action.context);
         dataset.name_search('', [], 'ilike',false ,function(result){
-            self.$element.html(QWeb.render(self.template, {'records' : result}));
+            self.$element.html(self.render({'records' : result}));
             self.$element.find("[data-role=header]").find('h1').html(self.action.name);
             self.$element.find("[data-role=header]").find('#home').click(function(){
                 $.mobile.changePage("#oe_menu", "slide", false, true);
-- 
cgit v1.2.3


From e0f63ce664e1a00b5cf656a80a5480a433a8e9b0 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Fri, 23 Sep 2011 10:55:19 +0530
Subject: [IMP] After logout displayed used creditentials on login page.

bzr revid: bth@tinyerp.com-20110923052519-vy4cef6fv9h75m0g
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 24 ++++++++++++++++++++++--
 addons/web_mobile/static/src/xml/web_mobile.xml  |  4 ++--
 2 files changed, 24 insertions(+), 4 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 48187e2e48d..f1b4250ac91 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -30,6 +30,17 @@ openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({
 
 openerp.web_mobile.Login =  openerp.web.Widget.extend({
     start: function() {
+
+        this.has_local_storage = typeof(localStorage) != 'undefined';
+        this.remember_creditentials = true;
+        this.selected_login = null;
+        this.selected_password = null;
+
+        if (this.has_local_storage && this.remember_creditentials) {
+            this.selected_login = localStorage.getItem('last_login_login_success');
+            this.selected_password = localStorage.getItem('last_password_login_success');
+        }
+
         var self = this;
         jQuery("#oe_header").children().remove();
 
@@ -39,8 +50,6 @@ openerp.web_mobile.Login =  openerp.web.Widget.extend({
             self.$element.html(QWeb.render("Login", self));
             if(self.session.db!=""){
                 self.$element.find("#database").val(self.session.db);
-                self.$element.find("#login").val(self.session.login);
-                self.$element.find("#password").val(self.session.password);
             }
             self.$element.find("#login_btn").click(self.on_login);
             $.mobile.initializePage();
@@ -60,6 +69,17 @@ openerp.web_mobile.Login =  openerp.web.Widget.extend({
         // Should hide then call callback
         this.session.session_login(db, login, password, function() {
             if(self.session.session_is_valid()) {
+                if (self.has_local_storage) {
+                    if(self.remember_creditentials) {
+                        localStorage.setItem('last_db_login_success', db);
+                        localStorage.setItem('last_login_login_success', login);
+                        localStorage.setItem('last_password_login_success', password);
+                    } else {
+                        localStorage.setItem('last_db_login_success', '');
+                        localStorage.setItem('last_login_login_success', '');
+                        localStorage.setItem('last_password_login_success', '');
+                    }
+                }
                 self.on_login_valid();
             } else {
                 self.on_login_invalid();
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index bac1b262596..c635fa8b3dd 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -28,9 +28,9 @@
                     </t>
                 </select>
                 <label for="login">Login:</label>
-                <input type="text" id="login" name="login" value=""/>
+                <input type="text" id="login" name="login" t-att-value="selected_login || ''" />
                 <label for="password">Password:</label>
-                <input type="password" id="password" name="password" value=""/>
+                <input type="password" id="password" name="password" t-att-value="selected_password || ''" />
                 <a id="login_btn" data-theme="c" href="#" data-role="button">Login</a>
                 <div class="login_error_message ui-btn-inner ui-btn-corner-all">
                     <span class="ui-btn-text">Bad username or password</span>
-- 
cgit v1.2.3


From 0fe90a2bc3f3c3f1c75ae047a91611e41f0c6e53 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Fri, 23 Sep 2011 11:07:26 +0530
Subject: [IMP] Implement Back for home page.

bzr revid: bth@tinyerp.com-20110923053726-1rc8b0haxx3mm147
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index f1b4250ac91..e1e5466baa7 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -97,9 +97,13 @@ openerp.web_mobile.Login =  openerp.web.Widget.extend({
             .removeClass("login_invalid")
             .addClass("login_valid");
             //.hide();
-
-        this.menu = new openerp.web_mobile.Menu(this, "oe_menu", "oe_secondary_menu");
-        this.menu.start();
+        if(!$('#oe_menu').html().length){
+            this.menu = new openerp.web_mobile.Menu(this, "oe_menu", "oe_secondary_menu");
+            this.menu.start();
+        }
+        else{
+            $.mobile.changePage("#oe_menu", "slide", false, true);
+        }
     },
     do_ask_login: function(continuation) {
         this.on_login_invalid();
-- 
cgit v1.2.3


From b4ab00a318177198706d51563a0dafff9e3e707e Mon Sep 17 00:00:00 2001
From: "Maulik (OpenERP)" <mpa@tinyerp.com>
Date: Fri, 23 Sep 2011 14:35:38 +0530
Subject: [IMP]Implement Progressbar an Url Field.

bzr revid: mpa@tinyerp.com-20110923090538-623sot5lwmd4h3kb
---
 addons/web_mobile/static/src/js/form_mobile.js  |  7 +++++++
 addons/web_mobile/static/src/web_mobile.html    |  3 ++-
 addons/web_mobile/static/src/xml/web_mobile.xml | 18 ++++++++++++++----
 3 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index 6bc209d831f..fe857f89c64 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -47,6 +47,13 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                 }
                 self.$element.html(QWeb.render("FormView", {'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : data ,'temp_flag':'1'}));
 
+				for(var i=0;i<get_fields.length;i++)
+				  {
+					if(get_fields[i].attrs.widget=="progressbar")
+						{
+							$("#progress").progressbar({value:data[get_fields[i].attrs.name]})
+						}
+				  }
                     self.$element.find("[data-role=header]").find('h1').html(self.head_title);
                     self.$element.find("[data-role=header]").find('#home').click(function(){
                         $.mobile.changePage("#oe_menu", "slide", false, true);
diff --git a/addons/web_mobile/static/src/web_mobile.html b/addons/web_mobile/static/src/web_mobile.html
index 9a17ff49dbb..8875d61f9eb 100755
--- a/addons/web_mobile/static/src/web_mobile.html
+++ b/addons/web_mobile/static/src/web_mobile.html
@@ -3,7 +3,8 @@
 <head>
     <meta charset="utf-8" />
     <title>OpenERP Web Mobile</title>
-
+
+	<link rel="stylesheet"  href="/web_mobile/static/lib/jquery_mobile/css/jquery-ui-1.8.9.custom.css"/>
     <link rel="stylesheet"  href="/web_mobile/static/lib/jquery_mobile/css/jquery.mobile-1.0a4.1.css"/>
     <link rel="stylesheet" href="/web_mobile/static/src/css/web_mobile.css"/>
 
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index c635fa8b3dd..f5825861813 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -157,6 +157,9 @@
                         <t t-if="(field.attrs.name == 'email' or field.attrs.name == 'email_from') and values[field.attrs.name]">
                             <a t-att-href="'mailto:'+values[field.attrs.name]"><img src="/web/static/src/img/icons/terp-mail-message-new.png" /></a>
                         </t>
+                        <t t-if="field.attrs.name == 'website' and values[field.attrs.name]">
+                            <a t-att-href="values[field.attrs.name]"><img src="/web/static/src/img/icons/gtk-ok.png" title="Open this resource"/></a>
+                        </t>
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'text'">
                         <label for="">
@@ -170,13 +173,20 @@
                             <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
                             <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
                         </label>
-                        <t t-if="values[field.attrs.name]">
-                            <input id="" type="text" t-att-value="values[field.attrs.name]"/>
+                        <t t-if="values[field.attrs.name] and field.attrs.name=='progress_rate'">
+                        	<div id="progress" value="" title="Percent of tasks closed according to total of tasks to do..."></div>
                         </t>
-                        <t t-if="!(values[field.attrs.name])">
-                            <input id="" type="text" value=""/>
+                        <t t-if="!(values[field.attrs.name]) and field.attrs.name=='progress_rate'">
+                        	<div id="progress" value="" title="Percent of tasks closed according to total of tasks to do..."></div>
+                        </t>
+                         <t t-if="values[field.attrs.name] and field.attrs.name!='progress_rate'">
+                            <input id="" type="text" t-att-value="values[field.attrs.name]"/>
                         </t>
+                        <t t-if="!values[field.attrs.name] and field.attrs.name!='progress_rate'">
+                       		<input id="" type="text" value=""/>
+                         </t>
                     </t>
+
                     <t t-if="fields[field.attrs.name].type == 'date'">
                         <label for="">
                             <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
-- 
cgit v1.2.3


From 6c148a4980544a271842406489310be9f0ff7c10 Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Fri, 23 Sep 2011 18:58:36 +0530
Subject: [REM] Remove extra code.

bzr revid: jra@tinyerp.com-20110923132836-4ebia63oamazn7iv
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 8 --------
 addons/web_mobile/static/src/js/form_mobile.js   | 5 -----
 2 files changed, 13 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index e1e5466baa7..bcf13b5c7d7 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -45,7 +45,6 @@ openerp.web_mobile.Login =  openerp.web.Widget.extend({
         jQuery("#oe_header").children().remove();
 
         this.rpc("/web/database/get_list", {}, function(result) {
-            var selection = new openerp.web_mobile.Selection();
             self.db_list = result.db_list;
             self.$element.html(QWeb.render("Login", self));
             if(self.session.db!=""){
@@ -323,11 +322,4 @@ openerp.web_mobile.Options =  openerp.web.Widget.extend({
     }
 });
 
-openerp.web_mobile.Selection = openerp.web.Widget.extend({
-    on_select_option: function(ev){
-        ev.preventDefault();
-        var $this = ev.currentTarget;
-        $($this).prev().find(".ui-btn-text").html($($this).find("option:selected").text());
-    }
-});
 };
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index fe857f89c64..bc52a3a21ae 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -38,15 +38,12 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                 var fields = result.fields;
                 var view_fields = result.arch.children;
                 var get_fields = self.get_fields(view_fields);
-                var selection = new openerp.web_mobile.Selection();
-
                 for (var j = 0; j < view_fields.length; j++) {
                     if (view_fields[j].tag == 'notebook') {
                         var notebooks = view_fields[j];
                     }
                 }
                 self.$element.html(QWeb.render("FormView", {'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : data ,'temp_flag':'1'}));
-
 				for(var i=0;i<get_fields.length;i++)
 				  {
 					if(get_fields[i].attrs.widget=="progressbar")
@@ -106,7 +103,6 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                     }
                                 }
                             }
-
                             if(notebook){
                                 $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data,'til': notebook.attrs.string }));
                             }else{
@@ -143,7 +139,6 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                         });
                         var relational = $(this).attr('for');
                         if(result.fields[relational]){
-
                             var head = $.trim($(this).text());
                             var dataset = new openerp.web.DataSetStatic(self, result.fields[relational].relation, result.fields[relational].context);
                             dataset.domain=[['id', 'in', data[relational]]];
-- 
cgit v1.2.3


From 0f83246331158ca5f63ee237f2d8affdfc4b089e Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Tue, 27 Sep 2011 11:44:28 +0530
Subject: [IMP] Improved secondary menu for more than two child on menu tree.

bzr revid: jra@tinyerp.com-20110927061428-loq3ew8fwdhhay6w
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 42 +++++++++++++++++++-----
 addons/web_mobile/static/src/xml/web_mobile.xml  | 11 +++++--
 2 files changed, 43 insertions(+), 10 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index bcf13b5c7d7..e8260739161 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -236,7 +236,7 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
         if(!$('[id^="oe_sec_menu_'+id+'"]').html()){
             $('<div id="oe_sec_menu_'+id+'" data-role="page" data-url="oe_sec_menu_'+id+'"> </div>').appendTo('#moe');
             this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
-             this.secondary.start();
+            this.secondary.start();
         }else{
             $.mobile.changePage('#oe_sec_menu_'+id, "slide", false, true);
         }
@@ -250,9 +250,7 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
     start: function(ev, id) {
         var self = this;
         var v = { menu : this.data };
-
         this.$element.html(QWeb.render("Menu.secondary", v));
-
         this.$element.find("[data-role=header]").find("h1").html(this.data.name);
         this.$element.add(this.$secondary_menu).find('#content').find("a").click(this.on_menu_click);
         this.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
@@ -276,22 +274,50 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
         this.$element.find("[data-role=header]").find('#home').click(function(){
             $.mobile.changePage("#oe_menu", "slide", false, true);
         });
-
         $.mobile.changePage("#"+this.element_id, "slide", false, true);
     },
     on_menu_click: function(ev, id) {
-        var $menu = $(ev.currentTarget);
+        $menu = $(ev.currentTarget);
         id = $menu.data('menu');
+        name = $menu.data('name');
         ev.preventDefault();
         ev.stopPropagation();
-
-        if(!$('[id^="oe_list_'+id+'"]').html()){
+        var child_len = 0;
+        for (var i = 0; i < this.data.children.length; i++) {
+        	for (var j=0; j < this.data.children[i].children.length; j++) {
+        		if (this.data.children[i].children[j].id == id) {
+        			this.children = this.data.children[i].children[j];
+        			child_len = this.children.children.length;
+        		}
+        	}
+        }
+        if (child_len > 0) {
+            this.$element
+            .addClass("secondary_menu");
+	        if(!$('[id^="oe_sec_menu_'+id+'"]').html()){
+	            $('<div id="oe_sec_menu_'+id+'" data-role="page" data-url="oe_sec_menu_'+id+'"> </div>').appendTo('#moe');
+	            this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
+	            this.secondary.start();
+	        }else{
+	            $.mobile.changePage('#oe_sec_menu_'+id, "slide", false, true);
+	        }
+        }
+        else {
+            if(!$('[id^="oe_list_'+id+'"]').html()){
+                $('<div id="oe_list_'+id+'" data-role="page" data-url="oe_list_'+id+'"> </div>').appendTo('#moe');
+                this.listview = new openerp.web_mobile.ListView(this, "oe_list_"+id, id);
+                this.listview.start();
+            }else{
+                $.mobile.changePage('#oe_list_'+id, "slide", false, true);
+            }
+        }
+/*        if(!$('[id^="oe_list_'+id+'"]').html()){
             $('<div id="oe_list_'+id+'" data-role="page" data-url="oe_list_'+id+'"> </div>').appendTo('#moe');
             this.listview = new openerp.web_mobile.ListView(this, "oe_list_"+id, id);
             this.listview.start();
         }else{
             $.mobile.changePage('#oe_list_'+id, "slide", false, true);
-        }
+        }*/
         jQuery("#oe_header").find("h1").html($menu.data('name'));
     }
 });
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index f5825861813..d2df9a1fed9 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -95,12 +95,19 @@
         <t t-foreach="menu.children" t-as="menu1" >
             <ul data-dividertheme="b" data-theme="c" data-inset="true" data-role="listview">
                 <li data-role="list-divider">
-                    <t t-esc="menu1.name"/>
+                	<t t-if="(menu1.children.length)">
+                		<t t-esc="menu1.name"/>
+                    </t>
+                    <t t-if="!(menu1.children.length)">
+                    	<a href="#" t-attf-id="menu_#{menu1.id}" t-att-data-menu="menu1.id" t-att-data-name="menu1.name">
+                			<t t-esc="menu1.name"/>
+                		</a>
+                	</t>
                 </li>
                 <t t-if="menu1.children.length">
                     <li data-theme="c" t-foreach="menu1.children" t-as="childmenu" >
                         <a href="#" t-attf-id="menu_#{childmenu.id}" t-att-data-menu="childmenu.id" t-att-data-name="childmenu.name">
-                          <t t-esc="childmenu.name" />
+                        	<t t-esc="childmenu.name" />
                         </a>
                     </li>
                 </t>
-- 
cgit v1.2.3


From 7c9a8945f42d5c00fb02987043697cc2ccbfe75c Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Wed, 28 Sep 2011 10:47:00 +0530
Subject: [IMP] On refresh login page load.

bzr revid: bth@tinyerp.com-20110928051700-rb2x9ufn2xcwn8pk
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index e8260739161..3427c0dcdaa 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -14,6 +14,9 @@ openerp.web_mobile.mobilewebclient = function(element_id) {
 openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({
     init: function(element_id) {
         this._super(null, element_id);
+        if(document.URL.length>59){
+            window.location.replace('/mobile');
+        }
         QWeb.add_template("xml/web_mobile.xml");
         var params = {};
         this.$element.html(QWeb.render("WebClient", {}));
-- 
cgit v1.2.3


From 5f59f67e835f3a3fcf046c566ee5b1cd936a0ce8 Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Wed, 28 Sep 2011 11:55:19 +0530
Subject: [IMP] Improved indentation.

bzr revid: jra@tinyerp.com-20110928062519-9pqd1to80a0bwoye
---
 addons/web_mobile/static/src/js/chrome_mobile.js |  45 +--
 addons/web_mobile/static/src/js/form_mobile.js   | 386 +++++++++++------------
 addons/web_mobile/static/src/js/list_mobile.js   |  12 +-
 addons/web_mobile/static/src/xml/web_mobile.xml  |  38 +--
 4 files changed, 224 insertions(+), 257 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 3427c0dcdaa..d3e69027b9e 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -33,20 +33,16 @@ openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({
 
 openerp.web_mobile.Login =  openerp.web.Widget.extend({
     start: function() {
-
         this.has_local_storage = typeof(localStorage) != 'undefined';
         this.remember_creditentials = true;
         this.selected_login = null;
         this.selected_password = null;
-
         if (this.has_local_storage && this.remember_creditentials) {
             this.selected_login = localStorage.getItem('last_login_login_success');
             this.selected_password = localStorage.getItem('last_password_login_success');
         }
-
         var self = this;
         jQuery("#oe_header").children().remove();
-
         this.rpc("/web/database/get_list", {}, function(result) {
             self.db_list = result.db_list;
             self.$element.html(QWeb.render("Login", self));
@@ -66,7 +62,6 @@ openerp.web_mobile.Login =  openerp.web.Widget.extend({
         var db = $e.find("div select[name=database]").val();
         var login = $e.find("div input[name=login]").val();
         var password = $e.find("div input[name=password]").val();
-
         //$e.hide();
         // Should hide then call callback
         this.session.session_login(db, login, password, function() {
@@ -116,6 +111,7 @@ openerp.web_mobile.Login =  openerp.web.Widget.extend({
         });
     }
 });
+
 openerp.web_mobile.Header =  openerp.web.Widget.extend({
     init: function(session, element_id) {
         this._super(session, element_id);
@@ -142,7 +138,6 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
         var self = this;
         this.rpc('/web/session/sc_list',{} ,function(res){
             self.$element.html(QWeb.render("Shortcuts", {'sc' : res}))
-
             self.$element.find("[data-role=header]").find('h1').html('Favourite');
             self.$element.find("[data-role=header]").find('#home').click(function(){
                 $.mobile.changePage("#oe_menu", "slide", false, true);
@@ -167,7 +162,6 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
         $shortcut = $(ev.currentTarget);
         id = $shortcut.data('menu');
         res_id = $shortcut.data('res');
-
         if(!$('[id^="oe_list_'+res_id+'"]').html()){
             $('<div id="oe_list_'+res_id+'" data-role="page" data-url="oe_list_'+res_id+'"> </div>').appendTo('#moe');
             this.listview = new openerp.web_mobile.ListView(self, "oe_list_"+res_id, res_id);
@@ -198,7 +192,6 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
         this.header.start();
         this.footer = new openerp.web_mobile.Footer(this, "oe_footer");
         this.footer.start();
-
         this.$element.html(QWeb.render("Menu", this.data));
         this.$element.find("[data-role=header]").find('h1').html('Application');
         this.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
@@ -235,7 +228,6 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
         this.$element
             .removeClass("login_valid")
             .addClass("secondary_menu");
-
         if(!$('[id^="oe_sec_menu_'+id+'"]').html()){
             $('<div id="oe_sec_menu_'+id+'" data-role="page" data-url="oe_sec_menu_'+id+'"> </div>').appendTo('#moe');
             this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
@@ -245,6 +237,7 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
         }
     }
 });
+
 openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
     init: function(session, element_id, secondary_menu_id) {
         this._super(session, element_id);
@@ -287,23 +280,23 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
         ev.stopPropagation();
         var child_len = 0;
         for (var i = 0; i < this.data.children.length; i++) {
-        	for (var j=0; j < this.data.children[i].children.length; j++) {
-        		if (this.data.children[i].children[j].id == id) {
-        			this.children = this.data.children[i].children[j];
-        			child_len = this.children.children.length;
-        		}
-        	}
+            for (var j=0; j < this.data.children[i].children.length; j++) {
+                if (this.data.children[i].children[j].id == id) {
+                    this.children = this.data.children[i].children[j];
+                    child_len = this.children.children.length;
+                }
+            }
         }
         if (child_len > 0) {
             this.$element
             .addClass("secondary_menu");
-	        if(!$('[id^="oe_sec_menu_'+id+'"]').html()){
-	            $('<div id="oe_sec_menu_'+id+'" data-role="page" data-url="oe_sec_menu_'+id+'"> </div>').appendTo('#moe');
-	            this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
-	            this.secondary.start();
-	        }else{
-	            $.mobile.changePage('#oe_sec_menu_'+id, "slide", false, true);
-	        }
+            if(!$('[id^="oe_sec_menu_'+id+'"]').html()){
+                $('<div id="oe_sec_menu_'+id+'" data-role="page" data-url="oe_sec_menu_'+id+'"> </div>').appendTo('#moe');
+                this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
+                this.secondary.start();
+            }else{
+                $.mobile.changePage('#oe_sec_menu_'+id, "slide", false, true);
+            }
         }
         else {
             if(!$('[id^="oe_list_'+id+'"]').html()){
@@ -314,13 +307,6 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
                 $.mobile.changePage('#oe_list_'+id, "slide", false, true);
             }
         }
-/*        if(!$('[id^="oe_list_'+id+'"]').html()){
-            $('<div id="oe_list_'+id+'" data-role="page" data-url="oe_list_'+id+'"> </div>').appendTo('#moe');
-            this.listview = new openerp.web_mobile.ListView(this, "oe_list_"+id, id);
-            this.listview.start();
-        }else{
-            $.mobile.changePage('#oe_list_'+id, "slide", false, true);
-        }*/
         jQuery("#oe_header").find("h1").html($menu.data('name'));
     }
 });
@@ -328,7 +314,6 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
 openerp.web_mobile.Options =  openerp.web.Widget.extend({
     start: function() {
         var self = this;
-
         this.$element.html(QWeb.render("Options", this));
         this.$element.find("[data-role=header]").find('h1').html('Preference');
         this.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index bc52a3a21ae..cd52ac8b7c4 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -12,23 +12,19 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
         this.head_title = head_title;
         this.resmodel = resmodel;
         this.viewid = viewid;
-
     },
     start: function() {
         var self = this;
         var id = this.list_id;
-
         var model = this.action.res_model || this.resmodel;
         if(this.action){
             var view_id = this.action.views[1][0];
         }else{
             var view_id = this.viewid;
         }
-
         this.dataset = new openerp.web.DataSetSearch(this, model, null, null);
         var context = new openerp.web.CompoundContext(this.dataset.get_context());
         this.dataset.read_slice([],{}, function (result) {
-
             for (var i = 0; i < result.length; i++) {
                 if (result[i].id == id) {
                     var data = result[i];
@@ -44,216 +40,211 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                     }
                 }
                 self.$element.html(QWeb.render("FormView", {'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : data ,'temp_flag':'1'}));
-				for(var i=0;i<get_fields.length;i++)
-				  {
-					if(get_fields[i].attrs.widget=="progressbar")
-						{
-							$("#progress").progressbar({value:data[get_fields[i].attrs.name]})
-						}
-				  }
-                    self.$element.find("[data-role=header]").find('h1').html(self.head_title);
-                    self.$element.find("[data-role=header]").find('#home').click(function(){
-                        $.mobile.changePage("#oe_menu", "slide", false, true);
-                    });
-                    self.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
-                        if(!$('#oe_shortcuts').html().length){
-                            this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
-                            this.shortcuts.start();
-                        }
-                        else{
-                            $.mobile.changePage("#oe_shortcuts", "slide", false, true);
+                for(var i=0;i<get_fields.length;i++) {
+                    if (get_fields[i].attrs.widget=="progressbar") {
+                        $("#progress").progressbar({value:data[get_fields[i].attrs.name]})
+                    }
+                }
+                self.$element.find("[data-role=header]").find('h1').html(self.head_title);
+                self.$element.find("[data-role=header]").find('#home').click(function(){
+                    $.mobile.changePage("#oe_menu", "slide", false, true);
+                });
+                self.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
+                    if(!$('#oe_shortcuts').html().length){
+                        this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
+                        this.shortcuts.start();
+                    }
+                    else{
+                        $.mobile.changePage("#oe_shortcuts", "slide", false, true);
+                    }
+                });
+                self.$element.find("[data-role=footer]").find('#preference').click(function(){
+                    if(!$('#oe_options').html().length){
+                        this.options = new openerp.web_mobile.Options(self, "oe_options");
+                        this.options.start();
+                    }
+                    else{
+                        $.mobile.changePage("#oe_options", "slide", false, true);
+                    }
+                });
+                self.$element.find('#formbutton').click(function(){
+                    var head = $(this).prev().find('select').find("option:selected").text();
+                    var selected_id = $(this).prev().find('select').val();
+                    var select_model = $(this).prev().find('select').attr('for');
+                    if(selected_id!="false"){
+                        if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
+                            $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
+                                this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
+                                this.formview.start();
+                        }else{
+                            $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", false, true);
                         }
-                    });
-                    self.$element.find("[data-role=footer]").find('#preference').click(function(){
-                        if(!$('#oe_options').html().length){
-                            this.options = new openerp.web_mobile.Options(self, "oe_options");
-                            this.options.start();
+                    }
+                });
+                self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').each(function(i){
+                    for (var k = 0; k < notebooks.children.length; k++) {
+                        if (notebooks.children[k].attrs.string == $(this).attr('id')) {
+                            get_fields = self.get_fields(notebooks.children[k].children);
+                            for (var i = 0; i < get_fields.length; i++) {
+                                if (fields[get_fields[i].attrs.name].type == 'one2many'){
+                                    self.relational_fields = get_fields[i].attrs.name;
+                                    if(fields[get_fields[i].attrs.name].views.form){
+                                        var get_fields_test = self.get_fields(fields[get_fields[i].attrs.name].views.form.arch.children);
+                                        var fields_test = fields[get_fields[i].attrs.name]['views'].form.fields;
+                                        var notebook=fields[get_fields[i].attrs.name].views.form.arch;
+                                    }
+                                }
+                            }
                         }
-                        else{
-                            $.mobile.changePage("#oe_options", "slide", false, true);
+                        if(notebook){
+                            $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data,'til': notebook.attrs.string }));
+                        }else{
+                            $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data }));
                         }
-                    });
-                    self.$element.find('#formbutton').click(function(){
-                        var head = $(this).prev().find('select').find("option:selected").text();
-                        var selected_id = $(this).prev().find('select').val();
-                        var select_model = $(this).prev().find('select').attr('for');
-                        if(selected_id!="false"){
-                            if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
-                                $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
+                        $(this).find('p').find('#formbutton').click(function(){
+                            var head = $(this).prev().find('select').find("option:selected").text();
+                            var selected_id = $(this).prev().find('select').val();
+                            var select_model = $(this).prev().find('select').attr('for');
+                            if(selected_id!="false"){
+                                if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
+                                    $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
                                     this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
                                     this.formview.start();
-                            }else{
-                                $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", false, true);
-                            }
-                        }
-                    });
-                    self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').each(function(i){
-
-                        for (var k = 0; k < notebooks.children.length; k++) {
-                            if (notebooks.children[k].attrs.string == $(this).attr('id')) {
-                                get_fields = self.get_fields(notebooks.children[k].children);
-                                for (var i = 0; i < get_fields.length; i++) {
-                                    if (fields[get_fields[i].attrs.name].type == 'one2many'){
-                                        self.relational_fields = get_fields[i].attrs.name;
-                                        if(fields[get_fields[i].attrs.name].views.form){
-                                            var get_fields_test = self.get_fields(fields[get_fields[i].attrs.name].views.form.arch.children);
-                                            var fields_test = fields[get_fields[i].attrs.name]['views'].form.fields;
-                                            var notebook=fields[get_fields[i].attrs.name].views.form.arch;
-                                        }
-                                    }
+                                }else{
+                                    $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", false, true);
                                 }
                             }
-                            if(notebook){
-                                $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data,'til': notebook.attrs.string }));
-                            }else{
-                                $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data }));
+                        });
+                    }
+                });
+                self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').find('p').find('[data-role=content]').find('ul').find('li').click(function(ev){
+                    ev.preventDefault();
+                    ev.stopPropagation();
+                    var latid,lastid;
+                    $(this).parents().each(function(){
+                        latid = $(this).attr('id');
+                        self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').each(function(){
+                            if(latid==$(this).attr('id')){
+                                lastid = $(this).attr('id');
                             }
-                            $(this).find('p').find('#formbutton').click(function(){
-                                var head = $(this).prev().find('select').find("option:selected").text();
-                                var selected_id = $(this).prev().find('select').val();
-                                var select_model = $(this).prev().find('select').attr('for');
-                                if(selected_id!="false"){
-                                    if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
-                                        $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
-                                        this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
-                                        this.formview.start();
-                                    }else{
-                                        $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", false, true);
-                                    }
-                                }
-                            });
-
-                        }
-                    });
-                    self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').find('p').find('[data-role=content]').find('ul').find('li').click(function(ev){
-                        ev.preventDefault();
-                        ev.stopPropagation();
-                        var latid,lastid;
-                        $(this).parents().each(function(){
-                            latid = $(this).attr('id');
-                            self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').each(function(){
-                                if(latid==$(this).attr('id')){
-                                    lastid = $(this).attr('id');
-                                }
-                            });
                         });
-                        var relational = $(this).attr('for');
-                        if(result.fields[relational]){
-                            var head = $.trim($(this).text());
-                            var dataset = new openerp.web.DataSetStatic(self, result.fields[relational].relation, result.fields[relational].context);
-                            dataset.domain=[['id', 'in', data[relational]]];
-                            dataset.name_search('', dataset.domain, 'in',false ,function(res){
-                                for(var i=0;i<res.length;i++){
-                                    var splited_data = res[i][1].split(',');
-                                    res[i][1] = splited_data[0];
-                                }
-                                if(!$('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html()){
-                                    $('<div id="oe_list_'+relational+'_'+self.element_id+'" data-role="page" data-url="oe_list_'+relational+'_'+self.element_id+'"> </div>').appendTo('#moe');
-                                    $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html(QWeb.render("ListView", {'records' : res}));
-                                    $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('h1').html(head);
-                                    $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('#home').click(function(){
-                                        $.mobile.changePage("#oe_menu", "slide", false, true);
-                                    });
-                                    $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=footer]").find('#shrotcuts').click(function(){
-                                        if(!$('#oe_shortcuts').html().length){
-                                            this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
-                                            this.shortcuts.start();
-                                        }
-                                        else{
-                                            $.mobile.changePage("#oe_shortcuts", "slide", false, true);
-                                        }
-                                    });
-                                    $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=footer]").find('#preference').click(function(){
-                                        if(!$('#oe_options').html().length){
-                                            this.options = new openerp.web_mobile.Options(self, "oe_options");
-                                            this.options.start();
-                                        }
-                                        else{
-                                            $.mobile.changePage("#oe_options", "slide", false, true);
-                                        }
-                                    });
-                                    $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("a#list-id").click(function(ev){
-                                        ev.preventDefault();
-                                        ev.stopPropagation();
-                                        var head_title = $(this).text();
-                                        var listid = $(ev.currentTarget).data('id');
-                                        dataset = new openerp.web.DataSetSearch(self, dataset.model, null, null);
-                                        dataset.read_slice([],{}, function (result_relational) {
-                                            for (var i = 0; i < result_relational.length; i++) {
-                                                if (result_relational[i].id == listid) {
-                                                    var data_relational = result_relational[i];
-                                                }
+                    });
+                    var relational = $(this).attr('for');
+                    if(result.fields[relational]){
+                        var head = $.trim($(this).text());
+                        var dataset = new openerp.web.DataSetStatic(self, result.fields[relational].relation, result.fields[relational].context);
+                        dataset.domain=[['id', 'in', data[relational]]];
+                        dataset.name_search('', dataset.domain, 'in',false ,function(res){
+                            for(var i=0;i<res.length;i++){
+                                var splited_data = res[i][1].split(',');
+                                res[i][1] = splited_data[0];
+                            }
+                            if(!$('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html()){
+                                $('<div id="oe_list_'+relational+'_'+self.element_id+'" data-role="page" data-url="oe_list_'+relational+'_'+self.element_id+'"> </div>').appendTo('#moe');
+                                $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html(QWeb.render("ListView", {'records' : res}));
+                                $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('h1').html(head);
+                                $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('#home').click(function(){
+                                    $.mobile.changePage("#oe_menu", "slide", false, true);
+                                });
+                                $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=footer]").find('#shrotcuts').click(function(){
+                                    if(!$('#oe_shortcuts').html().length){
+                                        this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
+                                        this.shortcuts.start();
+                                    }
+                                    else{
+                                        $.mobile.changePage("#oe_shortcuts", "slide", false, true);
+                                    }
+                                });
+                                $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=footer]").find('#preference').click(function(){
+                                    if(!$('#oe_options').html().length){
+                                        this.options = new openerp.web_mobile.Options(self, "oe_options");
+                                        this.options.start();
+                                    }
+                                    else{
+                                        $.mobile.changePage("#oe_options", "slide", false, true);
+                                    }
+                                });
+                                $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("a#list-id").click(function(ev){
+                                    ev.preventDefault();
+                                    ev.stopPropagation();
+                                    var head_title = $(this).text();
+                                    var listid = $(ev.currentTarget).data('id');
+                                    dataset = new openerp.web.DataSetSearch(self, dataset.model, null, null);
+                                    dataset.read_slice([],{}, function (result_relational) {
+                                        for (var i = 0; i < result_relational.length; i++) {
+                                            if (result_relational[i].id == listid) {
+                                                var data_relational = result_relational[i];
                                             }
-                                            if(!$('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html()){
-                                                $('<div id="oe_form_'+listid+result.fields[relational].relation+'" data-role="page" data-url="oe_form_'+listid+result.fields[relational].relation+'"> </div>').appendTo('#moe');
-                                                for (var k = 0; k < notebooks.children.length; k++) {
-                                                    if (notebooks.children[k].attrs.string == lastid) {
-                                                        get_fields = self.get_fields(notebooks.children[k].children);
-                                                        for (var i = 0; i < get_fields.length; i++) {
-                                                            if (fields[get_fields[i].attrs.name].type == 'one2many'){
-                                                                self.relational_fields = get_fields[i].attrs.name;
-                                                                if(fields[get_fields[i].attrs.name].views.form){
-                                                                    var get_fields_test = self.get_fields(fields[get_fields[i].attrs.name].views.form.arch.children);
-                                                                    var fields_test = fields[get_fields[i].attrs.name]['views'].form.fields;
-                                                                    var notebook=fields[get_fields[i].attrs.name].views.form.arch;
-                                                                }
+                                        }
+                                        if(!$('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html()){
+                                            $('<div id="oe_form_'+listid+result.fields[relational].relation+'" data-role="page" data-url="oe_form_'+listid+result.fields[relational].relation+'"> </div>').appendTo('#moe');
+                                            for (var k = 0; k < notebooks.children.length; k++) {
+                                                if (notebooks.children[k].attrs.string == lastid) {
+                                                    get_fields = self.get_fields(notebooks.children[k].children);
+                                                    for (var i = 0; i < get_fields.length; i++) {
+                                                        if (fields[get_fields[i].attrs.name].type == 'one2many'){
+                                                            self.relational_fields = get_fields[i].attrs.name;
+                                                            if(fields[get_fields[i].attrs.name].views.form){
+                                                                var get_fields_test = self.get_fields(fields[get_fields[i].attrs.name].views.form.arch.children);
+                                                                var fields_test = fields[get_fields[i].attrs.name]['views'].form.fields;
+                                                                var notebook=fields[get_fields[i].attrs.name].views.form.arch;
                                                             }
                                                         }
                                                     }
                                                 }
-                                                $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html(QWeb.render("FormView", {'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational, 'temp_flag':'1' }));
-
-                                                $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('h1').html(head_title);
-                                                $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('#home').click(function(){
-                                                    $.mobile.changePage("#oe_menu", "slide", false, true);
-                                                });
-                                                $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=footer]").find('#shrotcuts').click(function(){
-                                                    if(!$('#oe_shortcuts').html().length){
-                                                        this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
-                                                        this.shortcuts.start();
-                                                    }
-                                                    else{
-                                                        $.mobile.changePage("#oe_shortcuts", "slide", false, true);
-                                                    }
-                                                });
-                                                $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=footer]").find('#preference').click(function(){
-                                                    if(!$('#oe_options').html().length){
-                                                        this.options = new openerp.web_mobile.Options(self, "oe_options");
-                                                        this.options.start();
-                                                    }
-                                                    else{
-                                                        $.mobile.changePage("#oe_options", "slide", false, true);
-                                                    }
-                                                });
-                                                $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('#formbutton').click(function(){
-                                                    var head = $(this).prev().find('select').find("option:selected").text();
-                                                    var selected_id = $(this).prev().find('select').val();
-                                                    var select_model = $(this).prev().find('select').attr('for');
-                                                    if(selected_id!="false"){
-                                                        if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
-                                                            $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
-                                                            this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
-                                                            this.formview.start();
-                                                        }else{
-                                                            $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", false, true);
-                                                        }
-                                                    }
-                                                });
-                                                $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
-                                            }else{
-                                                $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
                                             }
-                                        });
+                                            $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html(QWeb.render("FormView", {'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational, 'temp_flag':'1' }));
+                                            $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('h1').html(head_title);
+                                            $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('#home').click(function(){
+                                                $.mobile.changePage("#oe_menu", "slide", false, true);
+                                            });
+                                            $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=footer]").find('#shrotcuts').click(function(){
+                                                if(!$('#oe_shortcuts').html().length){
+                                                    this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
+                                                    this.shortcuts.start();
+                                                }
+                                                else{
+                                                    $.mobile.changePage("#oe_shortcuts", "slide", false, true);
+                                                }
+                                            });
+                                            $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=footer]").find('#preference').click(function(){
+                                                if(!$('#oe_options').html().length){
+                                                    this.options = new openerp.web_mobile.Options(self, "oe_options");
+                                                    this.options.start();
+                                                }
+                                                else{
+                                                    $.mobile.changePage("#oe_options", "slide", false, true);
+                                                }
+                                            });
+                                            $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('#formbutton').click(function(){
+                                                var head = $(this).prev().find('select').find("option:selected").text();
+                                                var selected_id = $(this).prev().find('select').val();
+                                                var select_model = $(this).prev().find('select').attr('for');
+                                                if(selected_id!="false"){
+                                                    if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
+                                                        $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
+                                                        this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
+                                                        this.formview.start();
+                                                    }else{
+                                                        $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", false, true);
+                                                    }
+                                                }
+                                            });
+                                            $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
+                                        }else{
+                                            $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
+                                        }
                                     });
-                                    $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", false, true);
-                                }else{
-                                    $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", false, true);
-                                }
-                            });
-                        }
-                    });
-                    $.mobile.changePage("#"+self.element_id, "slide", false, true);
+                                });
+                                $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", false, true);
+                            }else{
+                                $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", false, true);
+                            }
+                        });
+                    }
                 });
+                $.mobile.changePage("#"+self.element_id, "slide", false, true);
+            });
         });
     },
     get_fields: function(view_fields, fields) {
@@ -269,4 +260,5 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
         return this.fields;
     }
 });
+
 };
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index e4498ccbdd5..778d0a568d3 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -10,8 +10,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
         this.list_id = list_id;
     },
     start: function() {
-        this.rpc('/web/menu/action', {'menu_id': this.list_id},
-                    this.on_menu_action_loaded);
+        this.rpc('/web/menu/action', {'menu_id': this.list_id}, this.on_menu_action_loaded);
     },
     on_menu_action_loaded: function(data) {
         var self = this;
@@ -30,11 +29,10 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
                 $.mobile.changePage("#oe_menu", "slide", false, true);
             });
             self.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
-                if(!$('#oe_shortcuts').html().length){
+                if (!$('#oe_shortcuts').html().length) {
                     this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
                     this.shortcuts.start();
-                }
-                else{
+                }else{
                     $.mobile.changePage("#oe_shortcuts", "slide", false, true);
                 }
             });
@@ -42,8 +40,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
                 if(!$('#oe_options').html().length){
                     this.options = new openerp.web_mobile.Options(self, "oe_options");
                     this.options.start();
-                }
-                else{
+                }else{
                     $.mobile.changePage("#oe_options", "slide", false, true);
                 }
             });
@@ -58,7 +55,6 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
         ev.stopPropagation();
         id = $record.data('id');
         head_title = $.trim($record.text());
-
         if(!$('[id^="oe_form_'+id+this.action.res_model+'"]').html()){
             $('<div id="oe_form_'+id+this.action.res_model+'" data-role="page" data-url="oe_form_'+id+this.action.res_model+'"> </div>').appendTo('#moe');
             this.formview = new openerp.web_mobile.FormView(this, "oe_form_"+id+this.action.res_model, id, this.action, head_title, '' ,'');
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index d2df9a1fed9..977057c11f1 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -41,7 +41,6 @@
     <div data-role="footer" data-theme="b" data-position="fixed">
         <h1>Powered by openerp.com</h1>
     </div>
-
 </t>
 
 <t t-name="Header">
@@ -75,6 +74,7 @@
    </div>
    <t t-call="Footer" />
 </t>
+
 <t t-name="Menu">
     <t t-call="Header" />
     <div id="content" data-role="content">
@@ -95,19 +95,19 @@
         <t t-foreach="menu.children" t-as="menu1" >
             <ul data-dividertheme="b" data-theme="c" data-inset="true" data-role="listview">
                 <li data-role="list-divider">
-                	<t t-if="(menu1.children.length)">
-                		<t t-esc="menu1.name"/>
+                    <t t-if="(menu1.children.length)">
+                        <t t-esc="menu1.name"/>
                     </t>
                     <t t-if="!(menu1.children.length)">
-                    	<a href="#" t-attf-id="menu_#{menu1.id}" t-att-data-menu="menu1.id" t-att-data-name="menu1.name">
-                			<t t-esc="menu1.name"/>
-                		</a>
-                	</t>
+                        <a href="#" t-attf-id="menu_#{menu1.id}" t-att-data-menu="menu1.id" t-att-data-name="menu1.name">
+                            <t t-esc="menu1.name"/>
+                        </a>
+                    </t>
                 </li>
                 <t t-if="menu1.children.length">
                     <li data-theme="c" t-foreach="menu1.children" t-as="childmenu" >
                         <a href="#" t-attf-id="menu_#{childmenu.id}" t-att-data-menu="childmenu.id" t-att-data-name="childmenu.name">
-                        	<t t-esc="childmenu.name" />
+                            <t t-esc="childmenu.name" />
                         </a>
                     </li>
                 </t>
@@ -116,6 +116,7 @@
     </div>
      <t t-call="Footer" />
 </t>
+
 <t t-name="Options">
     <t t-call="Header" />
     <div data-role="content">
@@ -141,11 +142,11 @@
     </div>
     <t t-call="Footer" />
 </t>
+
 <t t-name="FormView">
     <t t-if="temp_flag">
         <t t-call="Header" />
     </t>
-
     <div data-role="content">
         <form>
             <t t-foreach="get_fields" t-as="field">
@@ -181,19 +182,18 @@
                             <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
                         </label>
                         <t t-if="values[field.attrs.name] and field.attrs.name=='progress_rate'">
-                        	<div id="progress" value="" title="Percent of tasks closed according to total of tasks to do..."></div>
+                            <div id="progress" value="" title="Percent of tasks closed according to total of tasks to do..."></div>
                         </t>
                         <t t-if="!(values[field.attrs.name]) and field.attrs.name=='progress_rate'">
-                        	<div id="progress" value="" title="Percent of tasks closed according to total of tasks to do..."></div>
+                            <div id="progress" value="" title="Percent of tasks closed according to total of tasks to do..."></div>
                         </t>
                          <t t-if="values[field.attrs.name] and field.attrs.name!='progress_rate'">
                             <input id="" type="text" t-att-value="values[field.attrs.name]"/>
                         </t>
                         <t t-if="!values[field.attrs.name] and field.attrs.name!='progress_rate'">
-                       		<input id="" type="text" value=""/>
+                            <input id="" type="text" value=""/>
                          </t>
                     </t>
-
                     <t t-if="fields[field.attrs.name].type == 'date'">
                         <label for="">
                             <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
@@ -276,23 +276,17 @@
                      </t>
                 </div>
             </t>
-           <t t-if="notebooks">
+            <t t-if="notebooks">
                 <div data-role="collapsible-set">
                     <t t-foreach="notebooks.children" t-as="page">
                         <t t-if="page.attrs.invisible">
                             <div style="display:none;" data-collapsed="true" data-role="collapsible" t-att-id="page.attrs.string">
-                                <h3>
-                                        <t t-esc="page.attrs.string"></t>
-                                </h3>
-                                <p></p>
+                                <h3><t t-esc="page.attrs.string"></t></h3>
                             </div>
                         </t>
                         <t t-if="!page.attrs.invisible">
                             <div data-collapsed="true" data-role="collapsible" t-att-id="page.attrs.string">
-                                <h3>
-                                        <t t-esc="page.attrs.string"></t>
-                                </h3>
-                                <p></p>
+                                <h3><t t-esc="page.attrs.string"></t></h3>
                             </div>
                         </t>
                     </t>
-- 
cgit v1.2.3


From 9a980009b06b8ed30d479b5701e8fa5f5ba3dc92 Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Wed, 28 Sep 2011 12:28:42 +0530
Subject: [IMP] Minor change for notebook content to replace <p> to <div>.

bzr revid: jra@tinyerp.com-20110928065842-pl1skf0oyoo6jds4
---
 addons/web_mobile/static/src/js/form_mobile.js  | 26 ++++++++++---------------
 addons/web_mobile/static/src/xml/web_mobile.xml |  2 ++
 2 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index cd52ac8b7c4..9dbd0442e8f 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -53,8 +53,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                     if(!$('#oe_shortcuts').html().length){
                         this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
                         this.shortcuts.start();
-                    }
-                    else{
+                    }else{
                         $.mobile.changePage("#oe_shortcuts", "slide", false, true);
                     }
                 });
@@ -62,8 +61,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                     if(!$('#oe_options').html().length){
                         this.options = new openerp.web_mobile.Options(self, "oe_options");
                         this.options.start();
-                    }
-                    else{
+                    }else{
                         $.mobile.changePage("#oe_options", "slide", false, true);
                     }
                 });
@@ -97,11 +95,11 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                             }
                         }
                         if(notebook){
-                            $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data,'til': notebook.attrs.string }));
+                            $(this).find('div#page_content').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data,'til': notebook.attrs.string }));
                         }else{
-                            $(this).find('p').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data }));
+                            $(this).find('div#page_content').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data }));
                         }
-                        $(this).find('p').find('#formbutton').click(function(){
+                        $(this).find('div#page_content').find('#formbutton').click(function(){
                             var head = $(this).prev().find('select').find("option:selected").text();
                             var selected_id = $(this).prev().find('select').val();
                             var select_model = $(this).prev().find('select').attr('for');
@@ -117,7 +115,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                         });
                     }
                 });
-                self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').find('p').find('[data-role=content]').find('ul').find('li').click(function(ev){
+                self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').find('div#page_content').find('[data-role=content]').find('ul').find('li').click(function(ev){
                     ev.preventDefault();
                     ev.stopPropagation();
                     var latid,lastid;
@@ -150,8 +148,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                     if(!$('#oe_shortcuts').html().length){
                                         this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
                                         this.shortcuts.start();
-                                    }
-                                    else{
+                                    }else{
                                         $.mobile.changePage("#oe_shortcuts", "slide", false, true);
                                     }
                                 });
@@ -159,8 +156,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                     if(!$('#oe_options').html().length){
                                         this.options = new openerp.web_mobile.Options(self, "oe_options");
                                         this.options.start();
-                                    }
-                                    else{
+                                    }else{
                                         $.mobile.changePage("#oe_options", "slide", false, true);
                                     }
                                 });
@@ -202,8 +198,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                 if(!$('#oe_shortcuts').html().length){
                                                     this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
                                                     this.shortcuts.start();
-                                                }
-                                                else{
+                                                }else{
                                                     $.mobile.changePage("#oe_shortcuts", "slide", false, true);
                                                 }
                                             });
@@ -211,8 +206,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                                 if(!$('#oe_options').html().length){
                                                     this.options = new openerp.web_mobile.Options(self, "oe_options");
                                                     this.options.start();
-                                                }
-                                                else{
+                                                }else{
                                                     $.mobile.changePage("#oe_options", "slide", false, true);
                                                 }
                                             });
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index 977057c11f1..e4468fdeb15 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -282,11 +282,13 @@
                         <t t-if="page.attrs.invisible">
                             <div style="display:none;" data-collapsed="true" data-role="collapsible" t-att-id="page.attrs.string">
                                 <h3><t t-esc="page.attrs.string"></t></h3>
+                                <div id="page_content" />
                             </div>
                         </t>
                         <t t-if="!page.attrs.invisible">
                             <div data-collapsed="true" data-role="collapsible" t-att-id="page.attrs.string">
                                 <h3><t t-esc="page.attrs.string"></t></h3>
+                                <div id="page_content" />
                             </div>
                         </t>
                     </t>
-- 
cgit v1.2.3


From aa98635b5f15de151c89b1802da4f820f18280ce Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Wed, 28 Sep 2011 14:02:59 +0200
Subject: [imp] extracted on_loaded function for customizability and
 readability's sake

bzr revid: valentin.lab@kalysto.org-20110928120259-9wqx2iijr498t2sq
---
 addons/web_mobile/static/src/js/form_mobile.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index 9dbd0442e8f..ce3a7374bc4 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -27,22 +27,27 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
         this.dataset.read_slice([],{}, function (result) {
             for (var i = 0; i < result.length; i++) {
                 if (result[i].id == id) {
-                    var data = result[i];
+                    self.datarecord = result[i];
                 }
             }
-            self.rpc("/web/view/load", {"model": model, "view_id": view_id, "view_type": "form", context: context}, function (result) {
+            self.rpc("/web/view/load", {"model": model, "view_id": view_id, "view_type": "form", context: context}, self.on_loaded)
+        });
+    },
+    on_loaded: function(result) {
+                var self = this;
                 var fields = result.fields;
                 var view_fields = result.arch.children;
-                var get_fields = self.get_fields(view_fields);
+                var get_fields = this.get_fields(view_fields);
+
                 for (var j = 0; j < view_fields.length; j++) {
                     if (view_fields[j].tag == 'notebook') {
                         var notebooks = view_fields[j];
                     }
                 }
-                self.$element.html(QWeb.render("FormView", {'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : data ,'temp_flag':'1'}));
+                self.$element.html(QWeb.render("FormView", {'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : self.datarecord ,'temp_flag':'1'}));
                 for(var i=0;i<get_fields.length;i++) {
                     if (get_fields[i].attrs.widget=="progressbar") {
-                        $("#progress").progressbar({value:data[get_fields[i].attrs.name]})
+                        $("#progress").progressbar({value:self.datarecord[get_fields[i].attrs.name]})
                     }
                 }
                 self.$element.find("[data-role=header]").find('h1').html(self.head_title);
@@ -95,9 +100,9 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                             }
                         }
                         if(notebook){
-                            $(this).find('div#page_content').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data,'til': notebook.attrs.string }));
+                            $(this).find('div#page_content').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : self.datarecord,'til': notebook.attrs.string }));
                         }else{
-                            $(this).find('div#page_content').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : data }));
+                            $(this).find('div#page_content').html(QWeb.render("FormView", {'get_fields': get_fields,'fields' : result.fields, 'values' : self.datarecord}));
                         }
                         $(this).find('div#page_content').find('#formbutton').click(function(){
                             var head = $(this).prev().find('select').find("option:selected").text();
@@ -131,7 +136,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                     if(result.fields[relational]){
                         var head = $.trim($(this).text());
                         var dataset = new openerp.web.DataSetStatic(self, result.fields[relational].relation, result.fields[relational].context);
-                        dataset.domain=[['id', 'in', data[relational]]];
+                        dataset.domain=[['id', 'in', self.datarecord[relational]]];
                         dataset.name_search('', dataset.domain, 'in',false ,function(res){
                             for(var i=0;i<res.length;i++){
                                 var splited_data = res[i][1].split(',');
@@ -238,8 +243,6 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                     }
                 });
                 $.mobile.changePage("#"+self.element_id, "slide", false, true);
-            });
-        });
     },
     get_fields: function(view_fields, fields) {
         this.fields = fields || [];
-- 
cgit v1.2.3


From 3fba4c077a2343434f5f4a655d75dabb1a2ac7eb Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Thu, 29 Sep 2011 15:18:06 +0530
Subject: [FIX] Minor change for render shortcut and improved indentation.

bzr revid: jra@tinyerp.com-20110929094806-jvf391ahuc8918ke
---
 addons/web_mobile/static/src/js/chrome_mobile.js |  27 +-
 addons/web_mobile/static/src/js/form_mobile.js   | 359 +++++++++++------------
 2 files changed, 189 insertions(+), 197 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index d1ce7d841e6..bdde5efbdc4 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -103,8 +103,7 @@ openerp.web_mobile.Login =  openerp.web.Widget.extend({
         if(!$('#oe_menu').html().length){
             this.menu = new openerp.web_mobile.Menu(this, "oe_menu", "oe_secondary_menu");
             this.menu.start();
-        }
-        else{
+        }else{
             $.mobile.changePage("#oe_menu", "slide", false, true);
         }
     },
@@ -145,13 +144,14 @@ openerp.web_mobile.Footer =  openerp.web.Widget.extend({
 openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
 
     template: "Shortcuts",
+
     init: function(session, element_id) {
         this._super(session, element_id);
     },
     start: function() {
         var self = this;
         this.rpc('/web/session/sc_list',{} ,function(res){
-            self.$element.html(this.render({'sc' : res}))
+            self.$element.html(self.render({'sc' : res}))
             self.$element.find("[data-role=header]").find('h1').html('Favourite');
             self.$element.find("[data-role=header]").find('#home').click(function(){
                 $.mobile.changePage("#oe_menu", "slide", false, true);
@@ -161,8 +161,7 @@ openerp.web_mobile.Shortcuts =  openerp.web.Widget.extend({
                 if(!$('#oe_options').html().length){
                     this.options = new openerp.web_mobile.Options(self, "oe_options");
                     this.options.start();
-                }
-                else{
+                }else{
                     $.mobile.changePage("#oe_options", "slide", false, true);
                 }
             });
@@ -215,8 +214,7 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
             if(!$('#oe_shortcuts').html().length){
                 this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
                 this.shortcuts.start();
-            }
-            else{
+            }else{
                 $.mobile.changePage($("#oe_shortcuts"), "slide", false, true);
             }
         });
@@ -224,8 +222,7 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
             if(!$('#oe_options').html().length){
                 this.options = new openerp.web_mobile.Options(self, "oe_options");
                 this.options.start();
-            }
-            else{
+            }else{
                 $.mobile.changePage("#oe_options", "slide", false, true);
             }
         });
@@ -273,8 +270,7 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
             if(!$('#oe_shortcuts').html().length){
                 this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
                 this.shortcuts.start();
-            }
-            else{
+            }else{
                 $.mobile.changePage("#oe_shortcuts", "slide", false, true);
             }
         });
@@ -282,8 +278,7 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
             if(!$('#oe_options').html().length){
                 this.options = new openerp.web_mobile.Options(self, "oe_options");
                 this.options.start();
-            }
-            else{
+            }else{
                 $.mobile.changePage("#oe_options", "slide", false, true);
             }
         });
@@ -317,8 +312,7 @@ openerp.web_mobile.Secondary =  openerp.web.Widget.extend({
             }else{
                 $.mobile.changePage('#oe_sec_menu_'+id, "slide", false, true);
             }
-        }
-        else {
+        }else {
             if(!$('[id^="oe_list_'+id+'"]').html()){
                 $('<div id="oe_list_'+id+'" data-role="page" data-url="oe_list_'+id+'"> </div>').appendTo('#moe');
                 this.listview = new openerp.web_mobile.ListView(this, "oe_list_"+id, id);
@@ -343,8 +337,7 @@ openerp.web_mobile.Options =  openerp.web.Widget.extend({
             if(!$('#oe_shortcuts').html().length){
                 this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
                 this.shortcuts.start();
-            }
-            else{
+            }else{
                 $.mobile.changePage("#oe_shortcuts", "slide", false, true);
             }
         });
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index cf4aa52ae22..69182a92f65 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -37,215 +37,214 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
         });
     },
     on_loaded: function(result) {
-                var self = this;
-                var fields = result.fields;
-                var view_fields = result.arch.children;
-                var get_fields = this.get_fields(view_fields);
-
-                for (var j = 0; j < view_fields.length; j++) {
-                    if (view_fields[j].tag == 'notebook') {
-                        var notebooks = view_fields[j];
-                    }
+        var self = this;
+        var fields = result.fields;
+        var view_fields = result.arch.children;
+        var get_fields = this.get_fields(view_fields);
+        for (var j = 0; j < view_fields.length; j++) {
+            if (view_fields[j].tag == 'notebook') {
+                var notebooks = view_fields[j];
+            }
+        }
+        self.$element.html(self.render({'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : self.datarecord ,'temp_flag':'1'}));
+        for(var i=0;i<get_fields.length;i++) {
+            if (get_fields[i].attrs.widget=="progressbar") {
+                $("#progress").progressbar({value:self.datarecord[get_fields[i].attrs.name]})
+            }
+        }
+        self.$element.find("[data-role=header]").find('h1').html(self.head_title);
+        self.$element.find("[data-role=header]").find('#home').click(function(){
+            $.mobile.changePage("#oe_menu", "slide", false, true);
+        });
+        self.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
+            if(!$('#oe_shortcuts').html().length){
+                this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
+                this.shortcuts.start();
+            }else{
+                $.mobile.changePage("#oe_shortcuts", "slide", false, true);
+            }
+        });
+        self.$element.find("[data-role=footer]").find('#preference').click(function(){
+            if(!$('#oe_options').html().length){
+                this.options = new openerp.web_mobile.Options(self, "oe_options");
+                this.options.start();
+            }else{
+                $.mobile.changePage("#oe_options", "slide", false, true);
+            }
+        });
+        self.$element.find('#formbutton').click(function(){
+            var head = $(this).prev().find('select').find("option:selected").text();
+            var selected_id = $(this).prev().find('select').val();
+            var select_model = $(this).prev().find('select').attr('for');
+            if(selected_id!="false"){
+                if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
+                    $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
+                        this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
+                        this.formview.start();
+                }else{
+                    $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", false, true);
                 }
-                self.$element.html(self.render({'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : self.datarecord ,'temp_flag':'1'}));
-                for(var i=0;i<get_fields.length;i++) {
-                    if (get_fields[i].attrs.widget=="progressbar") {
-                        $("#progress").progressbar({value:self.datarecord[get_fields[i].attrs.name]})
+            }
+        });
+        self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').each(function(i){
+            for (var k = 0; k < notebooks.children.length; k++) {
+                if (notebooks.children[k].attrs.string == $(this).attr('id')) {
+                    get_fields = self.get_fields(notebooks.children[k].children);
+                    for (var i = 0; i < get_fields.length; i++) {
+                        if (fields[get_fields[i].attrs.name].type == 'one2many'){
+                            self.relational_fields = get_fields[i].attrs.name;
+                            if(fields[get_fields[i].attrs.name].views.form){
+                                var get_fields_test = self.get_fields(fields[get_fields[i].attrs.name].views.form.arch.children);
+                                var fields_test = fields[get_fields[i].attrs.name]['views'].form.fields;
+                                var notebook=fields[get_fields[i].attrs.name].views.form.arch;
+                            }
+                        }
                     }
                 }
-                self.$element.find("[data-role=header]").find('h1').html(self.head_title);
-                self.$element.find("[data-role=header]").find('#home').click(function(){
-                    $.mobile.changePage("#oe_menu", "slide", false, true);
-                });
-                self.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
-                    if(!$('#oe_shortcuts').html().length){
-                        this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
-                        this.shortcuts.start();
-                    }else{
-                        $.mobile.changePage("#oe_shortcuts", "slide", false, true);
-                    }
-                });
-                self.$element.find("[data-role=footer]").find('#preference').click(function(){
-                    if(!$('#oe_options').html().length){
-                        this.options = new openerp.web_mobile.Options(self, "oe_options");
-                        this.options.start();
-                    }else{
-                        $.mobile.changePage("#oe_options", "slide", false, true);
-                    }
-                });
-                self.$element.find('#formbutton').click(function(){
+                if(notebook){
+                    $(this).find('div#page_content').html(self.render({'get_fields': get_fields,'fields' : result.fields, 'values' : self.datarecord,'til': notebook.attrs.string }));
+                }else{
+                    $(this).find('div#page_content').html(self.render({'get_fields': get_fields,'fields' : result.fields, 'values' : self.datarecord}));
+                }
+                $(this).find('div#page_content').find('#formbutton').click(function(){
                     var head = $(this).prev().find('select').find("option:selected").text();
                     var selected_id = $(this).prev().find('select').val();
                     var select_model = $(this).prev().find('select').attr('for');
                     if(selected_id!="false"){
                         if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
                             $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
-                                this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
-                                this.formview.start();
+                            this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
+                            this.formview.start();
                         }else{
                             $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", false, true);
                         }
                     }
                 });
-                self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').each(function(i){
-                    for (var k = 0; k < notebooks.children.length; k++) {
-                        if (notebooks.children[k].attrs.string == $(this).attr('id')) {
-                            get_fields = self.get_fields(notebooks.children[k].children);
-                            for (var i = 0; i < get_fields.length; i++) {
-                                if (fields[get_fields[i].attrs.name].type == 'one2many'){
-                                    self.relational_fields = get_fields[i].attrs.name;
-                                    if(fields[get_fields[i].attrs.name].views.form){
-                                        var get_fields_test = self.get_fields(fields[get_fields[i].attrs.name].views.form.arch.children);
-                                        var fields_test = fields[get_fields[i].attrs.name]['views'].form.fields;
-                                        var notebook=fields[get_fields[i].attrs.name].views.form.arch;
-                                    }
-                                }
-                            }
-                        }
-                        if(notebook){
-                            $(this).find('div#page_content').html(self.render({'get_fields': get_fields,'fields' : result.fields, 'values' : self.datarecord,'til': notebook.attrs.string }));
-                        }else{
-                            $(this).find('div#page_content').html(self.render({'get_fields': get_fields,'fields' : result.fields, 'values' : self.datarecord}));
-                        }
-                        $(this).find('div#page_content').find('#formbutton').click(function(){
-                            var head = $(this).prev().find('select').find("option:selected").text();
-                            var selected_id = $(this).prev().find('select').val();
-                            var select_model = $(this).prev().find('select').attr('for');
-                            if(selected_id!="false"){
-                                if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
-                                    $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
-                                    this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
-                                    this.formview.start();
-                                }else{
-                                    $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", false, true);
-                                }
-                            }
-                        });
+            }
+        });
+        self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').find('div#page_content').find('[data-role=content]').find('ul').find('li').click(function(ev){
+            ev.preventDefault();
+            ev.stopPropagation();
+            var latid,lastid;
+            $(this).parents().each(function(){
+                latid = $(this).attr('id');
+                self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').each(function(){
+                    if(latid==$(this).attr('id')){
+                        lastid = $(this).attr('id');
                     }
                 });
-                self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').find('div#page_content').find('[data-role=content]').find('ul').find('li').click(function(ev){
-                    ev.preventDefault();
-                    ev.stopPropagation();
-                    var latid,lastid;
-                    $(this).parents().each(function(){
-                        latid = $(this).attr('id');
-                        self.$element.find('[data-role=collapsible-set]').find('[data-role=collapsible]').each(function(){
-                            if(latid==$(this).attr('id')){
-                                lastid = $(this).attr('id');
+            });
+            var relational = $(this).attr('for');
+            if(result.fields[relational]){
+                var head = $.trim($(this).text());
+                var dataset = new openerp.web.DataSetStatic(self, result.fields[relational].relation, result.fields[relational].context);
+                dataset.domain=[['id', 'in', self.datarecord[relational]]];
+                dataset.name_search('', dataset.domain, 'in',false ,function(res){
+                    for(var i=0;i<res.length;i++){
+                        var splited_data = res[i][1].split(',');
+                        res[i][1] = splited_data[0];
+                    }
+                    if(!$('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html()){
+                        $('<div id="oe_list_'+relational+'_'+self.element_id+'" data-role="page" data-url="oe_list_'+relational+'_'+self.element_id+'"> </div>').appendTo('#moe');
+                        $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html(openerp.web.qweb.render("ListView", {'records' : res}));
+                        $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('h1').html(head);
+                        $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('#home').click(function(){
+                            $.mobile.changePage("#oe_menu", "slide", false, true);
+                        });
+                        $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=footer]").find('#shrotcuts').click(function(){
+                            if(!$('#oe_shortcuts').html().length){
+                                this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
+                                this.shortcuts.start();
+                            }else{
+                                $.mobile.changePage("#oe_shortcuts", "slide", false, true);
                             }
                         });
-                    });
-                    var relational = $(this).attr('for');
-                    if(result.fields[relational]){
-                        var head = $.trim($(this).text());
-                        var dataset = new openerp.web.DataSetStatic(self, result.fields[relational].relation, result.fields[relational].context);
-                        dataset.domain=[['id', 'in', self.datarecord[relational]]];
-                        dataset.name_search('', dataset.domain, 'in',false ,function(res){
-                            for(var i=0;i<res.length;i++){
-                                var splited_data = res[i][1].split(',');
-                                res[i][1] = splited_data[0];
+                        $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=footer]").find('#preference').click(function(){
+                            if(!$('#oe_options').html().length){
+                                this.options = new openerp.web_mobile.Options(self, "oe_options");
+                                this.options.start();
+                            }else{
+                                $.mobile.changePage("#oe_options", "slide", false, true);
                             }
-                            if(!$('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html()){
-                                $('<div id="oe_list_'+relational+'_'+self.element_id+'" data-role="page" data-url="oe_list_'+relational+'_'+self.element_id+'"> </div>').appendTo('#moe');
-                                $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html(openerp.web.qweb.render("ListView", {'records' : res}));
-                                $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('h1').html(head);
-                                $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('#home').click(function(){
-                                    $.mobile.changePage("#oe_menu", "slide", false, true);
-                                });
-                                $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=footer]").find('#shrotcuts').click(function(){
-                                    if(!$('#oe_shortcuts').html().length){
-                                        this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
-                                        this.shortcuts.start();
-                                    }else{
-                                        $.mobile.changePage("#oe_shortcuts", "slide", false, true);
-                                    }
-                                });
-                                $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=footer]").find('#preference').click(function(){
-                                    if(!$('#oe_options').html().length){
-                                        this.options = new openerp.web_mobile.Options(self, "oe_options");
-                                        this.options.start();
-                                    }else{
-                                        $.mobile.changePage("#oe_options", "slide", false, true);
+                        });
+                        $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("a#list-id").click(function(ev){
+                            ev.preventDefault();
+                            ev.stopPropagation();
+                            var head_title = $(this).text();
+                            var listid = $(ev.currentTarget).data('id');
+                            dataset = new openerp.web.DataSetSearch(self, dataset.model, null, null);
+                            dataset.read_slice([],{}, function (result_relational) {
+                                for (var i = 0; i < result_relational.length; i++) {
+                                    if (result_relational[i].id == listid) {
+                                        var data_relational = result_relational[i];
                                     }
-                                });
-                                $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("a#list-id").click(function(ev){
-                                    ev.preventDefault();
-                                    ev.stopPropagation();
-                                    var head_title = $(this).text();
-                                    var listid = $(ev.currentTarget).data('id');
-                                    dataset = new openerp.web.DataSetSearch(self, dataset.model, null, null);
-                                    dataset.read_slice([],{}, function (result_relational) {
-                                        for (var i = 0; i < result_relational.length; i++) {
-                                            if (result_relational[i].id == listid) {
-                                                var data_relational = result_relational[i];
-                                            }
-                                        }
-                                        if(!$('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html()){
-                                            $('<div id="oe_form_'+listid+result.fields[relational].relation+'" data-role="page" data-url="oe_form_'+listid+result.fields[relational].relation+'"> </div>').appendTo('#moe');
-                                            for (var k = 0; k < notebooks.children.length; k++) {
-                                                if (notebooks.children[k].attrs.string == lastid) {
-                                                    get_fields = self.get_fields(notebooks.children[k].children);
-                                                    for (var i = 0; i < get_fields.length; i++) {
-                                                        if (fields[get_fields[i].attrs.name].type == 'one2many'){
-                                                            self.relational_fields = get_fields[i].attrs.name;
-                                                            if(fields[get_fields[i].attrs.name].views.form){
-                                                                var get_fields_test = self.get_fields(fields[get_fields[i].attrs.name].views.form.arch.children);
-                                                                var fields_test = fields[get_fields[i].attrs.name]['views'].form.fields;
-                                                                var notebook=fields[get_fields[i].attrs.name].views.form.arch;
-                                                            }
-                                                        }
+                                }
+                                if(!$('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html()){
+                                    $('<div id="oe_form_'+listid+result.fields[relational].relation+'" data-role="page" data-url="oe_form_'+listid+result.fields[relational].relation+'"> </div>').appendTo('#moe');
+                                    for (var k = 0; k < notebooks.children.length; k++) {
+                                        if (notebooks.children[k].attrs.string == lastid) {
+                                            get_fields = self.get_fields(notebooks.children[k].children);
+                                            for (var i = 0; i < get_fields.length; i++) {
+                                                if (fields[get_fields[i].attrs.name].type == 'one2many'){
+                                                    self.relational_fields = get_fields[i].attrs.name;
+                                                    if(fields[get_fields[i].attrs.name].views.form){
+                                                        var get_fields_test = self.get_fields(fields[get_fields[i].attrs.name].views.form.arch.children);
+                                                        var fields_test = fields[get_fields[i].attrs.name]['views'].form.fields;
+                                                        var notebook=fields[get_fields[i].attrs.name].views.form.arch;
                                                     }
                                                 }
                                             }
-                                            $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html(self.render({'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational, 'temp_flag':'1' }));
-                                            $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('h1').html(head_title);
-                                            $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('#home').click(function(){
-                                                $.mobile.changePage("#oe_menu", "slide", false, true);
-                                            });
-                                            $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=footer]").find('#shrotcuts').click(function(){
-                                                if(!$('#oe_shortcuts').html().length){
-                                                    this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
-                                                    this.shortcuts.start();
-                                                }else{
-                                                    $.mobile.changePage("#oe_shortcuts", "slide", false, true);
-                                                }
-                                            });
-                                            $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=footer]").find('#preference').click(function(){
-                                                if(!$('#oe_options').html().length){
-                                                    this.options = new openerp.web_mobile.Options(self, "oe_options");
-                                                    this.options.start();
-                                                }else{
-                                                    $.mobile.changePage("#oe_options", "slide", false, true);
-                                                }
-                                            });
-                                            $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('#formbutton').click(function(){
-                                                var head = $(this).prev().find('select').find("option:selected").text();
-                                                var selected_id = $(this).prev().find('select').val();
-                                                var select_model = $(this).prev().find('select').attr('for');
-                                                if(selected_id!="false"){
-                                                    if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
-                                                        $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
-                                                        this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
-                                                        this.formview.start();
-                                                    }else{
-                                                        $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", false, true);
-                                                    }
-                                                }
-                                            });
-                                            $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
+                                        }
+                                    }
+                                    $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').html(self.render({'get_fields': get_fields_test, 'notebooks': false, 'fields' : fields_test, 'values' : data_relational, 'temp_flag':'1' }));
+                                    $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('h1').html(head_title);
+                                    $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=header]").find('#home').click(function(){
+                                        $.mobile.changePage("#oe_menu", "slide", false, true);
+                                    });
+                                    $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=footer]").find('#shrotcuts').click(function(){
+                                        if(!$('#oe_shortcuts').html().length){
+                                            this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
+                                            this.shortcuts.start();
                                         }else{
-                                            $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
+                                            $.mobile.changePage("#oe_shortcuts", "slide", false, true);
                                         }
                                     });
-                                });
-                                $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", false, true);
-                            }else{
-                                $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", false, true);
-                            }
+                                    $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find("[data-role=footer]").find('#preference').click(function(){
+                                        if(!$('#oe_options').html().length){
+                                            this.options = new openerp.web_mobile.Options(self, "oe_options");
+                                            this.options.start();
+                                        }else{
+                                            $.mobile.changePage("#oe_options", "slide", false, true);
+                                        }
+                                    });
+                                    $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('#formbutton').click(function(){
+                                        var head = $(this).prev().find('select').find("option:selected").text();
+                                        var selected_id = $(this).prev().find('select').val();
+                                        var select_model = $(this).prev().find('select').attr('for');
+                                        if(selected_id!="false"){
+                                            if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
+                                                $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
+                                                this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
+                                                this.formview.start();
+                                            }else{
+                                                $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", false, true);
+                                            }
+                                        }
+                                    });
+                                    $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
+                                }else{
+                                    $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
+                                }
+                            });
                         });
+                        $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", false, true);
+                    }else{
+                        $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", false, true);
                     }
                 });
-                $.mobile.changePage("#"+self.element_id, "slide", false, true);
+            }
+        });
+        $.mobile.changePage("#"+self.element_id, "slide", false, true);
     },
     get_fields: function(view_fields, fields) {
         this.fields = fields || [];
-- 
cgit v1.2.3


From 0815c7b05647bba7155a024445f91ce01a3e231c Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Mon, 3 Oct 2011 09:21:42 +0200
Subject: [fix] remove QWeb2 instanciation which is not used anymore.

bzr revid: valentin.lab@kalysto.org-20111003072142-9n7lo6y2j0xsu39o
---
 addons/web_mobile/static/src/web_mobile.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/web_mobile.html b/addons/web_mobile/static/src/web_mobile.html
index 8875d61f9eb..3900b8ba0cc 100755
--- a/addons/web_mobile/static/src/web_mobile.html
+++ b/addons/web_mobile/static/src/web_mobile.html
@@ -30,7 +30,6 @@
     <script type="text/javascript">
         var QWeb;
         $(function() {
-            QWeb = window.QWeb || new QWeb2.Engine();
             var oe = openerp.init();
             openerp.web_mobile(oe);
             oe.web_mobile.mobilewebclient("moe");
-- 
cgit v1.2.3


From 7d762f3a7965abbcd607811841db7b80fc044d90 Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Mon, 3 Oct 2011 12:03:55 +0200
Subject: [fix] removes endless refresh.

bzr revid: valentin.lab@kalysto.org-20111003100355-d3912c54azy10jhq
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index bdde5efbdc4..5d9f6c0d2ba 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -17,9 +17,6 @@ openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({
 
     init: function(element_id) {
         this._super(null, element_id);
-        if(document.URL.length>59){
-            window.location.replace('/mobile');
-        }
         openerp.web.qweb.add_template("xml/web_mobile.xml");
         var params = {};
         this.$element.html(this.render());
-- 
cgit v1.2.3


From d22c121a107ca9938f63cc9ed58cc2da5effad33 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Fri, 7 Oct 2011 17:52:46 +0530
Subject: [IMP]Fields attributes & format according to fields in formview.

bzr revid: bth@tinyerp.com-20111007122246-67cavlpebuldrmk6
---
 addons/web_mobile/static/src/js/form_mobile.js  | 76 ++++++++++++++++++++++++-
 addons/web_mobile/static/src/web_mobile.html    | 16 +++++-
 addons/web_mobile/static/src/xml/web_mobile.xml | 16 +++---
 3 files changed, 96 insertions(+), 12 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index 69182a92f65..96694f1f784 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -48,6 +48,24 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
         }
         self.$element.html(self.render({'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : self.datarecord ,'temp_flag':'1'}));
         for(var i=0;i<get_fields.length;i++) {
+            self.$element.find('input').each(function(){
+                if($(this).attr('id')==get_fields[i].attrs.name){
+                    if(fields[get_fields[i].attrs.name].type=="date"){
+                        $("#"+get_fields[i].attrs.name).datepicker();
+                        $("#"+get_fields[i].attrs.name).attr('disabled','true');
+                        var dateresult = openerp.web.format_value(self.datarecord[get_fields[i].attrs.name], {"widget": result.fields[get_fields[i].attrs.name].type});
+                        $(this).val(dateresult);
+                    }
+                    else if(fields[get_fields[i].attrs.name].type=="datetime"){
+                        $("#"+get_fields[i].attrs.name).datetimepicker();
+                        $("#"+get_fields[i].attrs.name).attr('disabled','true');
+                        var dateresult = openerp.web.format_value(self.datarecord[get_fields[i].attrs.name], {"widget": result.fields[get_fields[i].attrs.name].type});
+                        $(this).val(dateresult);
+                    }
+                }
+                $(this).attr('readonly','true');
+
+            });
             if (get_fields[i].attrs.widget=="progressbar") {
                 $("#progress").progressbar({value:self.datarecord[get_fields[i].attrs.name]})
             }
@@ -106,6 +124,38 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                 }else{
                     $(this).find('div#page_content').html(self.render({'get_fields': get_fields,'fields' : result.fields, 'values' : self.datarecord}));
                 }
+                for(var i=0;i<get_fields.length;i++) {
+                   self.$element.find('input').each(function(){
+                       if($(this).attr('id')==get_fields[i].attrs.name){
+                           if(fields[get_fields[i].attrs.name].type=="date"){
+                             $("#"+get_fields[i].attrs.name).datepicker();
+                             $(this).attr('disabled','true');
+                             var dateresult = openerp.web.format_value(self.datarecord[get_fields[i].attrs.name], {"widget": result.fields[get_fields[i].attrs.name].type});
+                             $(this).val(dateresult);
+                           }
+                           else if(fields[get_fields[i].attrs.name].type=="datetime"){
+                             $("#"+get_fields[i].attrs.name).datetimepicker();
+                             $("#"+get_fields[i].attrs.name).attr('disabled','true');
+                             var dateresult = openerp.web.format_value(self.datarecord[get_fields[i].attrs.name], {"widget": result.fields[get_fields[i].attrs.name].type});
+                             $(this).val(dateresult);
+                           }
+                       }
+                       $(this).attr('readonly','true');
+
+                   });
+               }
+               $(this).find('div#page_content').find('select').each(function(){
+                    $(this).find('option').attr('disabled','true');
+                    if($(this).attr('id')=="slider"){
+                        $(this).attr('disable','true');
+                    }
+                });
+                $(this).find('div#page_content').find('input').each(function(){
+                    $(this).attr('readonly','true')
+                });
+                $(this).find('div#page_content').find('textarea').each(function(){
+                    $(this).attr('readonly','true')
+                });
                 $(this).find('div#page_content').find('#formbutton').click(function(){
                     var head = $(this).prev().find('select').find("option:selected").text();
                     var selected_id = $(this).prev().find('select').val();
@@ -231,7 +281,19 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                             }
                                         }
                                     });
-                                    $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
+                                    $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('select').each(function(){
+                                        $(this).find('option').attr('disabled','true');
+                                        if($(this).attr('id')=="slider"){
+                                            $(this).attr('disable','true');
+                                        }
+                                    });
+                                    $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('input').each(function(){
+                                        $(this).attr('readonly','true')
+                                    });
+                                    $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('textarea').each(function(){
+                                        $(this).attr('readonly','true')
+                                    });
+                                   $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
                                 }else{
                                     $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
                                 }
@@ -244,6 +306,18 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                 });
             }
         });
+        self.$element.find('select').each(function(){
+            $(this).find('option').attr('disabled','true')
+            if($(this).attr('id')=="slider"){
+                $(this).attr('disable','true');
+            }
+        });
+        self.$element.find('input').each(function(){
+            $(this).attr('readonly','true')
+        });
+        self.$element.find('textarea').each(function(){
+            $(this).attr('readonly','true')
+        });
         $.mobile.changePage("#"+self.element_id, "slide", false, true);
     },
     get_fields: function(view_fields, fields) {
diff --git a/addons/web_mobile/static/src/web_mobile.html b/addons/web_mobile/static/src/web_mobile.html
index 3900b8ba0cc..8c5634a888d 100755
--- a/addons/web_mobile/static/src/web_mobile.html
+++ b/addons/web_mobile/static/src/web_mobile.html
@@ -4,7 +4,8 @@
     <meta charset="utf-8" />
     <title>OpenERP Web Mobile</title>
 
-	<link rel="stylesheet"  href="/web_mobile/static/lib/jquery_mobile/css/jquery-ui-1.8.9.custom.css"/>
+	<!--  <link rel="stylesheet"  href="/web_mobile/static/lib/jquery_mobile/css/jquery-ui-1.8.9.custom.css"/>-->
+	<link rel="stylesheet"  href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css"/>
     <link rel="stylesheet"  href="/web_mobile/static/lib/jquery_mobile/css/jquery.mobile-1.0a4.1.css"/>
     <link rel="stylesheet" href="/web_mobile/static/src/css/web_mobile.css"/>
 
@@ -13,14 +14,23 @@
     <script type="text/javascript" src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
     <script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>
     <script type="text/javascript" src="/web/static/lib/underscore/underscore.string.js"></script>
-    <script type="text/javascript" src="/web_mobile/static/lib/jquery_mobile/js/jquery.mobile-1.0a4.1.js"></script>
+    <script type="text/javascript" src="/web_mobile/static/lib/jquery_mobile/js/jquery.mobile-1.0a4.1.js"></script>
+
+    <script type="text/javascript" src="/web/static/lib/datejs/globalization/en-US.js"></script>
+    <script type="text/javascript" src="/web/static/lib/datejs/core.js"></script>
+    <script type="text/javascript" src="/web/static/lib/datejs/extras.js"></script>
+    <script type="text/javascript" src="/web/static/lib/datejs/parser.js"></script>
+    <script type="text/javascript" src="/web/static/lib/datejs/sugarpak.js"></script>
+    <script type="text/javascript" src="/web/static/lib/datejs/time.js"></script>
+    <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-timepicker-addon.js"></script>
 
     <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
     <script type="text/javascript" src="/web/static/src/js/boot.js"></script>
     <script type="text/javascript" src="/web/static/src/js/core.js"></script>
     <script type="text/javascript" src="/web/static/src/js/chrome.js"></script>
     <script type="text/javascript" src="/web/static/src/js/data.js"></script>
-    <script type="text/javascript" src="/web/static/src/js/formats.js"></script>
+    <script type="text/javascript" src="/web/static/src/js/formats.js"></script>
++    <script type="text/javascript" src="/web/static/src/js/dates.js"></script>
 
     <script type="text/javascript" src="/web_mobile/static/src/js/web_mobile.js"></script>
     <script type="text/javascript" src="/web_mobile/static/src/js/chrome_mobile.js"></script>
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index e4468fdeb15..1e9f2a93251 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -195,27 +195,27 @@
                          </t>
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'date'">
-                        <label for="">
+                        <label t-att-for="field.attrs.name">
                             <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
                             <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
                         </label>
                         <t t-if="values[field.attrs.name]">
-                            <input id="" type="text" t-att-value="values[field.attrs.name]"/>
+                            <input t-att-id="field.attrs.name" type="text" data-role="datebox" t-att-value="values[field.attrs.name]"/>
                         </t>
                         <t t-if="!(values[field.attrs.name])">
-                            <input id="" type="text" value=""/>
+                            <input t-att-id="field.attrs.name" type="text" value=""/>
                         </t>
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'datetime'">
-                        <label for="">
+                        <label t-att-for="field.attrs.name">
                             <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
                             <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
                         </label>
                         <t t-if="values[field.attrs.name]">
-                            <input id="" type="text" t-att-value="values[field.attrs.name]"/>
+                            <input t-att-id="field.attrs.name" type="text" t-att-value="values[field.attrs.name]"/>
                         </t>
                         <t t-if="!(values[field.attrs.name])">
-                            <input id="" type="text" value=""/>
+                            <input t-att-id="field.attrs.name" type="text" value=""/>
                         </t>
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'boolean'">
@@ -234,11 +234,11 @@
                         </div>
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'selection'">
-                        <label for="" class="select">
+                        <label t-att-for="field.attrs.name" class="select">
                             <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
                             <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
                         </label>
-                        <select id="" data-native-menu="false">
+                        <select t-att-id="field.attrs.name" data-native-menu="false">
                             <t t-foreach="fields[field.attrs.name].selection" t-as="opt">
                                 <option t-att-value="opt[0]"><t t-esc="opt[1]"/></option>
                             </t>
-- 
cgit v1.2.3


From cb6bebc55e3124ddbf1bbae7b263799e43ca1707 Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Mon, 10 Oct 2011 16:21:14 +0530
Subject: [IMP] Imroved code for disabled/readonly fields on formview.

bzr revid: jra@tinyerp.com-20111010105114-fsb8if7u0f2996im
---
 addons/web_mobile/static/src/js/form_mobile.js  | 124 +++++++++++-------------
 addons/web_mobile/static/src/web_mobile.html    |   5 +-
 addons/web_mobile/static/src/xml/web_mobile.xml |  19 ++--
 3 files changed, 69 insertions(+), 79 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index 96694f1f784..5c2c49a95c8 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -48,27 +48,27 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
         }
         self.$element.html(self.render({'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : self.datarecord ,'temp_flag':'1'}));
         for(var i=0;i<get_fields.length;i++) {
+            if (get_fields[i].attrs.widget=="progressbar") {
+                $("#progress").progressbar({value:self.datarecord[get_fields[i].attrs.name]})
+            }
             self.$element.find('input').each(function(){
+                // Set Date and Datetime field for main form
                 if($(this).attr('id')==get_fields[i].attrs.name){
                     if(fields[get_fields[i].attrs.name].type=="date"){
                         $("#"+get_fields[i].attrs.name).datepicker();
-                        $("#"+get_fields[i].attrs.name).attr('disabled','true');
-                        var dateresult = openerp.web.format_value(self.datarecord[get_fields[i].attrs.name], {"widget": result.fields[get_fields[i].attrs.name].type});
-                        $(this).val(dateresult);
-                    }
-                    else if(fields[get_fields[i].attrs.name].type=="datetime"){
+                    }else if(fields[get_fields[i].attrs.name].type=="datetime"){
                         $("#"+get_fields[i].attrs.name).datetimepicker();
-                        $("#"+get_fields[i].attrs.name).attr('disabled','true');
-                        var dateresult = openerp.web.format_value(self.datarecord[get_fields[i].attrs.name], {"widget": result.fields[get_fields[i].attrs.name].type});
-                        $(this).val(dateresult);
                     }
+                    // Temp: Set as disabled
+                    $("#"+get_fields[i].attrs.name).attr('disabled','true');
+                    var dateresult = openerp.web.format_value(self.datarecord[get_fields[i].attrs.name], {"widget": result.fields[get_fields[i].attrs.name].type});
+                    $(this).val(dateresult);
                 }
-                $(this).attr('readonly','true');
-
             });
-            if (get_fields[i].attrs.widget=="progressbar") {
-                $("#progress").progressbar({value:self.datarecord[get_fields[i].attrs.name]})
-            }
+            // Temp: Selection set as disabled
+            self.$element.find('select').each(function(){
+                $(this).find('option').attr('disabled','true')
+            });
         }
         self.$element.find("[data-role=header]").find('h1').html(self.head_title);
         self.$element.find("[data-role=header]").find('#home').click(function(){
@@ -125,37 +125,28 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                     $(this).find('div#page_content').html(self.render({'get_fields': get_fields,'fields' : result.fields, 'values' : self.datarecord}));
                 }
                 for(var i=0;i<get_fields.length;i++) {
-                   self.$element.find('input').each(function(){
-                       if($(this).attr('id')==get_fields[i].attrs.name){
-                           if(fields[get_fields[i].attrs.name].type=="date"){
-                             $("#"+get_fields[i].attrs.name).datepicker();
-                             $(this).attr('disabled','true');
-                             var dateresult = openerp.web.format_value(self.datarecord[get_fields[i].attrs.name], {"widget": result.fields[get_fields[i].attrs.name].type});
-                             $(this).val(dateresult);
-                           }
-                           else if(fields[get_fields[i].attrs.name].type=="datetime"){
-                             $("#"+get_fields[i].attrs.name).datetimepicker();
-                             $("#"+get_fields[i].attrs.name).attr('disabled','true');
-                             var dateresult = openerp.web.format_value(self.datarecord[get_fields[i].attrs.name], {"widget": result.fields[get_fields[i].attrs.name].type});
-                             $(this).val(dateresult);
-                           }
-                       }
-                       $(this).attr('readonly','true');
-
-                   });
-               }
-               $(this).find('div#page_content').find('select').each(function(){
-                    $(this).find('option').attr('disabled','true');
-                    if($(this).attr('id')=="slider"){
-                        $(this).attr('disable','true');
+                    if (get_fields[i].attrs.widget=="progressbar") {
+                        $("#progress").progressbar({value:self.datarecord[get_fields[i].attrs.name]})
                     }
-                });
-                $(this).find('div#page_content').find('input').each(function(){
-                    $(this).attr('readonly','true')
-                });
-                $(this).find('div#page_content').find('textarea').each(function(){
-                    $(this).attr('readonly','true')
-                });
+                    // Set Date and Datetime for notebook page
+                    $(this).find('div#page_content').find('input').each(function(){
+                        if($(this).attr('id')==get_fields[i].attrs.name){
+                            if(fields[get_fields[i].attrs.name].type=="date"){
+                                $("#"+get_fields[i].attrs.name).datepicker();
+                            }else if(fields[get_fields[i].attrs.name].type=="datetime"){
+                                $("#"+get_fields[i].attrs.name).datetimepicker();
+                            }
+                            // Temp: Set as disabled
+                            $("#"+get_fields[i].attrs.name).attr('disabled','true');
+                            var dateresult = openerp.web.format_value(self.datarecord[get_fields[i].attrs.name], {"widget": result.fields[get_fields[i].attrs.name].type});
+                            $(this).val(dateresult);
+                        }
+                    });
+                    // Temp: Selection set as disabled
+                    $(this).find('div#page_content').find('select').each(function(){
+                        $(this).find('option').attr('disabled','true')
+                    });
+                }
                 $(this).find('div#page_content').find('#formbutton').click(function(){
                     var head = $(this).prev().find('select').find("option:selected").text();
                     var selected_id = $(this).prev().find('select').val();
@@ -281,19 +272,30 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                             }
                                         }
                                     });
-                                    $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('select').each(function(){
-                                        $(this).find('option').attr('disabled','true');
-                                        if($(this).attr('id')=="slider"){
-                                            $(this).attr('disable','true');
+                                    for(var i=0;i<get_fields.length;i++) {
+                                        if (get_fields[i].attrs.widget=="progressbar") {
+                                            $("#progress").progressbar({value:self.datarecord[get_fields[i].attrs.name]})
                                         }
-                                    });
-                                    $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('input').each(function(){
-                                        $(this).attr('readonly','true')
-                                    });
-                                    $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('textarea').each(function(){
-                                        $(this).attr('readonly','true')
-                                    });
-                                   $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
+                                        // Set Date and Datetime for o2m field form.
+                                        $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('input').each(function(){
+                                            if($(this).attr('id')==get_fields[i].attrs.name){
+                                                if(fields[get_fields[i].attrs.name].type=="date"){
+                                                    $("#"+get_fields[i].attrs.name).datepicker();
+                                                }else if(fields[get_fields[i].attrs.name].type=="datetime"){
+                                                    $("#"+get_fields[i].attrs.name).datetimepicker();
+                                                }
+                                                // Temp: Set as disabled
+                                                $("#"+get_fields[i].attrs.name).attr('disabled','true');
+                                                var dateresult = openerp.web.format_value(self.datarecord[get_fields[i].attrs.name], {"widget": result.fields[get_fields[i].attrs.name].type});
+                                                $(this).val(dateresult);
+                                            }
+                                        });
+                                        // Temp: Selection set as disabled.
+                                        $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('select').each(function(){
+                                            $(this).find('option').attr('disabled','true')
+                                        });
+                                    }
+                                    $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
                                 }else{
                                     $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
                                 }
@@ -306,18 +308,6 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                 });
             }
         });
-        self.$element.find('select').each(function(){
-            $(this).find('option').attr('disabled','true')
-            if($(this).attr('id')=="slider"){
-                $(this).attr('disable','true');
-            }
-        });
-        self.$element.find('input').each(function(){
-            $(this).attr('readonly','true')
-        });
-        self.$element.find('textarea').each(function(){
-            $(this).attr('readonly','true')
-        });
         $.mobile.changePage("#"+self.element_id, "slide", false, true);
     },
     get_fields: function(view_fields, fields) {
diff --git a/addons/web_mobile/static/src/web_mobile.html b/addons/web_mobile/static/src/web_mobile.html
index 8c5634a888d..2afa79dcb5e 100755
--- a/addons/web_mobile/static/src/web_mobile.html
+++ b/addons/web_mobile/static/src/web_mobile.html
@@ -4,8 +4,7 @@
     <meta charset="utf-8" />
     <title>OpenERP Web Mobile</title>
 
-	<!--  <link rel="stylesheet"  href="/web_mobile/static/lib/jquery_mobile/css/jquery-ui-1.8.9.custom.css"/>-->
-	<link rel="stylesheet"  href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css"/>
+    <link rel="stylesheet"  href="/web_mobile/static/lib/jquery_mobile/css/jquery-ui-1.8.9.custom.css"/>
     <link rel="stylesheet"  href="/web_mobile/static/lib/jquery_mobile/css/jquery.mobile-1.0a4.1.css"/>
     <link rel="stylesheet" href="/web_mobile/static/src/css/web_mobile.css"/>
 
@@ -30,7 +29,7 @@
     <script type="text/javascript" src="/web/static/src/js/chrome.js"></script>
     <script type="text/javascript" src="/web/static/src/js/data.js"></script>
     <script type="text/javascript" src="/web/static/src/js/formats.js"></script>
-+    <script type="text/javascript" src="/web/static/src/js/dates.js"></script>
+    <script type="text/javascript" src="/web/static/src/js/dates.js"></script>
 
     <script type="text/javascript" src="/web_mobile/static/src/js/web_mobile.js"></script>
     <script type="text/javascript" src="/web_mobile/static/src/js/chrome_mobile.js"></script>
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index 1e9f2a93251..9c3dd94f839 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -148,6 +148,7 @@
         <t t-call="Header" />
     </t>
     <div data-role="content">
+    
         <form>
             <t t-foreach="get_fields" t-as="field">
                 <div data-role="fieldcontain">
@@ -157,10 +158,10 @@
                             <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
                         </label>
                         <t t-if="values[field.attrs.name]">
-                            <input type="text" id="" t-att-value="values[field.attrs.name]"/>
+                            <input type="text" id="" readonly="true" t-att-value="values[field.attrs.name]"/>
                         </t>
                         <t t-if="!(values[field.attrs.name])">
-                            <input type="text" value="" id=""/>
+                            <input type="text" value="" readonly="true" id=""/>
                         </t>
                         <t t-if="(field.attrs.name == 'email' or field.attrs.name == 'email_from') and values[field.attrs.name]">
                             <a t-att-href="'mailto:'+values[field.attrs.name]"><img src="/web/static/src/img/icons/terp-mail-message-new.png" /></a>
@@ -174,7 +175,7 @@
                             <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
                             <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
                         </label>
-                        <textarea name="" id=""></textarea>
+                        <textarea name="" id="" readonly="true"></textarea>
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'float'">
                         <label for="">
@@ -188,9 +189,9 @@
                             <div id="progress" value="" title="Percent of tasks closed according to total of tasks to do..."></div>
                         </t>
                          <t t-if="values[field.attrs.name] and field.attrs.name!='progress_rate'">
-                            <input id="" type="text" t-att-value="values[field.attrs.name]"/>
+                            <input id="" type="text" t-att-value="values[field.attrs.name]" readonly="true"/>
                         </t>
-                        <t t-if="!values[field.attrs.name] and field.attrs.name!='progress_rate'">
+                        <t t-if="!values[field.attrs.name] and field.attrs.name!='progress_rate'" readonly="true">
                             <input id="" type="text" value=""/>
                          </t>
                     </t>
@@ -200,10 +201,10 @@
                             <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
                         </label>
                         <t t-if="values[field.attrs.name]">
-                            <input t-att-id="field.attrs.name" type="text" data-role="datebox" t-att-value="values[field.attrs.name]"/>
+                            <input t-att-id="field.attrs.name" readonly="true" type="text" data-role="datebox" t-att-value="values[field.attrs.name]"/>
                         </t>
                         <t t-if="!(values[field.attrs.name])">
-                            <input t-att-id="field.attrs.name" type="text" value=""/>
+                            <input t-att-id="field.attrs.name" readonly="true" type="text" value=""/>
                         </t>
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'datetime'">
@@ -212,10 +213,10 @@
                             <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
                         </label>
                         <t t-if="values[field.attrs.name]">
-                            <input t-att-id="field.attrs.name" type="text" t-att-value="values[field.attrs.name]"/>
+                            <input t-att-id="field.attrs.name" readonly="true" type="text" t-att-value="values[field.attrs.name]"/>
                         </t>
                         <t t-if="!(values[field.attrs.name])">
-                            <input t-att-id="field.attrs.name" type="text" value=""/>
+                            <input t-att-id="field.attrs.name" readonly="true" type="text" value=""/>
                         </t>
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'boolean'">
-- 
cgit v1.2.3


From 88f35d04cd93adbd04185b7c700f3ec2247bac4d Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Mon, 10 Oct 2011 17:53:18 +0530
Subject: [IMP]Improved code for attributes of fields.

bzr revid: bth@tinyerp.com-20111010122318-3fjzgm7dnfqogep7
---
 addons/web_mobile/static/src/js/form_mobile.js | 113 ++++++++++---------------
 1 file changed, 44 insertions(+), 69 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index 5c2c49a95c8..fa61ceebb63 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -47,29 +47,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
             }
         }
         self.$element.html(self.render({'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : self.datarecord ,'temp_flag':'1'}));
-        for(var i=0;i<get_fields.length;i++) {
-            if (get_fields[i].attrs.widget=="progressbar") {
-                $("#progress").progressbar({value:self.datarecord[get_fields[i].attrs.name]})
-            }
-            self.$element.find('input').each(function(){
-                // Set Date and Datetime field for main form
-                if($(this).attr('id')==get_fields[i].attrs.name){
-                    if(fields[get_fields[i].attrs.name].type=="date"){
-                        $("#"+get_fields[i].attrs.name).datepicker();
-                    }else if(fields[get_fields[i].attrs.name].type=="datetime"){
-                        $("#"+get_fields[i].attrs.name).datetimepicker();
-                    }
-                    // Temp: Set as disabled
-                    $("#"+get_fields[i].attrs.name).attr('disabled','true');
-                    var dateresult = openerp.web.format_value(self.datarecord[get_fields[i].attrs.name], {"widget": result.fields[get_fields[i].attrs.name].type});
-                    $(this).val(dateresult);
-                }
-            });
-            // Temp: Selection set as disabled
-            self.$element.find('select').each(function(){
-                $(this).find('option').attr('disabled','true')
-            });
-        }
+        self.formatdata(get_fields, fields, result, self.datarecord,self.element_id,'element');
         self.$element.find("[data-role=header]").find('h1').html(self.head_title);
         self.$element.find("[data-role=header]").find('#home').click(function(){
             $.mobile.changePage("#oe_menu", "slide", false, true);
@@ -124,29 +102,8 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                 }else{
                     $(this).find('div#page_content').html(self.render({'get_fields': get_fields,'fields' : result.fields, 'values' : self.datarecord}));
                 }
-                for(var i=0;i<get_fields.length;i++) {
-                    if (get_fields[i].attrs.widget=="progressbar") {
-                        $("#progress").progressbar({value:self.datarecord[get_fields[i].attrs.name]})
-                    }
-                    // Set Date and Datetime for notebook page
-                    $(this).find('div#page_content').find('input').each(function(){
-                        if($(this).attr('id')==get_fields[i].attrs.name){
-                            if(fields[get_fields[i].attrs.name].type=="date"){
-                                $("#"+get_fields[i].attrs.name).datepicker();
-                            }else if(fields[get_fields[i].attrs.name].type=="datetime"){
-                                $("#"+get_fields[i].attrs.name).datetimepicker();
-                            }
-                            // Temp: Set as disabled
-                            $("#"+get_fields[i].attrs.name).attr('disabled','true');
-                            var dateresult = openerp.web.format_value(self.datarecord[get_fields[i].attrs.name], {"widget": result.fields[get_fields[i].attrs.name].type});
-                            $(this).val(dateresult);
-                        }
-                    });
-                    // Temp: Selection set as disabled
-                    $(this).find('div#page_content').find('select').each(function(){
-                        $(this).find('option').attr('disabled','true')
-                    });
-                }
+                self.formatdata(get_fields, fields, result, self.datarecord,'page_content','element');
+
                 $(this).find('div#page_content').find('#formbutton').click(function(){
                     var head = $(this).prev().find('select').find("option:selected").text();
                     var selected_id = $(this).prev().find('select').val();
@@ -272,30 +229,9 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                                             }
                                         }
                                     });
-                                    for(var i=0;i<get_fields.length;i++) {
-                                        if (get_fields[i].attrs.widget=="progressbar") {
-                                            $("#progress").progressbar({value:self.datarecord[get_fields[i].attrs.name]})
-                                        }
-                                        // Set Date and Datetime for o2m field form.
-                                        $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('input').each(function(){
-                                            if($(this).attr('id')==get_fields[i].attrs.name){
-                                                if(fields[get_fields[i].attrs.name].type=="date"){
-                                                    $("#"+get_fields[i].attrs.name).datepicker();
-                                                }else if(fields[get_fields[i].attrs.name].type=="datetime"){
-                                                    $("#"+get_fields[i].attrs.name).datetimepicker();
-                                                }
-                                                // Temp: Set as disabled
-                                                $("#"+get_fields[i].attrs.name).attr('disabled','true');
-                                                var dateresult = openerp.web.format_value(self.datarecord[get_fields[i].attrs.name], {"widget": result.fields[get_fields[i].attrs.name].type});
-                                                $(this).val(dateresult);
-                                            }
-                                        });
-                                        // Temp: Selection set as disabled.
-                                        $('[id^="oe_form_'+listid+result.fields[relational].relation+'"]').find('select').each(function(){
-                                            $(this).find('option').attr('disabled','true')
-                                        });
-                                    }
+                                    self.formatdata(get_fields_test, fields_test, result, data_relational,'oe_form_'+listid+result.fields[relational].relation,'element');
                                     $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
+                                    self.formatdata('', '', '', '','oe_form_'+listid+result.fields[relational].relation,'slider');
                                 }else{
                                     $.mobile.changePage('#oe_form_'+listid+result.fields[relational].relation, "slide", false, true);
                                 }
@@ -309,6 +245,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
             }
         });
         $.mobile.changePage("#"+self.element_id, "slide", false, true);
+        self.formatdata('', '', '', '',self.element_id,'slider');
     },
     get_fields: function(view_fields, fields) {
         this.fields = fields || [];
@@ -321,6 +258,44 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
             }
         }
         return this.fields;
+    },
+    formatdata: function(getfields, fields, result, data, id, flag){
+        if(flag == "element") {
+            for(var i = 0; i < getfields.length; i++) {
+                if (getfields[i].attrs.widget == "progressbar") {
+                    $("#progress").progressbar({value: data[getfields[i].attrs.name]})
+                }
+                $('[id^="'+id+'"]').find('input').each(function() {
+                    // Set Date and Datetime field for main form
+                    if($(this).attr('id') == getfields[i].attrs.name) {
+                        if(fields[getfields[i].attrs.name].type == "date") {
+                            $("#"+getfields[i].attrs.name).datepicker();
+                        }else if(fields[getfields[i].attrs.name].type == "datetime") {
+                            $("#"+getfields[i].attrs.name).datetimepicker();
+                        }
+                        // Temp: Set as disabled
+                        $("#"+getfields[i].attrs.name).attr('disabled', 'true');
+                        var dateresult = openerp.web.format_value(data[getfields[i].attrs.name], {"widget": result.fields[getfields[i].attrs.name].type});
+                        $(this).val(dateresult);
+                    }
+                });
+                // Temp: Selection set as disabled
+                $('[id^="'+id+'"]').find('select').each(function() {
+                    $(this).find('option').attr('disabled', 'true')
+                });
+            }
+        }
+        if(flag == "slider") {
+            $('[id^="'+id+'"]').find('#slider').each(function() {
+                $(this).slider({ disabled: "true" });
+            });
+            $('[id^="'+id+'"]').find('.ui-selectmenu').each(function(){
+                $(this).click(function() {
+                    $(this).css('top', '-9999px');
+                    $(this).css('left', '-9999px');
+                });
+            });
+        }
     }
 });
 
-- 
cgit v1.2.3


From 77ad674798fbb82c364a82341763614aaede686d Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Mon, 10 Oct 2011 18:25:14 +0530
Subject: [IMP] Minor change to hide link 'home' on homepage(Applications
 page).

bzr revid: jra@tinyerp.com-20111010125514-t8z8begr54u24x36
---
 addons/web_mobile/static/src/js/chrome_mobile.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 5d9f6c0d2ba..99b9651fa7b 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -206,7 +206,8 @@ openerp.web_mobile.Menu =  openerp.web.Widget.extend({
         this.footer = new openerp.web_mobile.Footer(this, "oe_footer");
         this.footer.start();
         this.$element.html(this.render(this.data));
-        this.$element.find("[data-role=header]").find('h1').html('Application');
+        this.$element.find("[data-role=header]").find('h1').html('Applications');
+        this.$element.find("[data-role=header]").find('#home').hide();
         this.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
             if(!$('#oe_shortcuts').html().length){
                 this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
-- 
cgit v1.2.3


From 6592f2aeb3a8983093a3a77500c3c97cac5716b1 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Wed, 12 Oct 2011 16:00:15 +0530
Subject: [IMP]Set attributes & format related fields in formview.

bzr revid: bth@tinyerp.com-20111012103015-0gva8otxwd9npcp5
---
 addons/web_mobile/static/src/js/form_mobile.js  |  8 ++++--
 addons/web_mobile/static/src/xml/web_mobile.xml | 38 ++++++++++++++++++++-----
 2 files changed, 36 insertions(+), 10 deletions(-)

(limited to 'addons/web_mobile/static/src')

diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index fa61ceebb63..1cb1dfb494e 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -270,13 +270,15 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
                     if($(this).attr('id') == getfields[i].attrs.name) {
                         if(fields[getfields[i].attrs.name].type == "date") {
                             $("#"+getfields[i].attrs.name).datepicker();
-                        }else if(fields[getfields[i].attrs.name].type == "datetime") {
+                        }else if(fields[getfields[i].attrs.name].type == "datetime" || fields[getfields[i].attrs.name].type == "time") {
                             $("#"+getfields[i].attrs.name).datetimepicker();
                         }
                         // Temp: Set as disabled
                         $("#"+getfields[i].attrs.name).attr('disabled', 'true');
-                        var dateresult = openerp.web.format_value(data[getfields[i].attrs.name], {"widget": result.fields[getfields[i].attrs.name].type});
-                        $(this).val(dateresult);
+                        if(result.fields[getfields[i].attrs.name]){
+                            var dateresult = openerp.web.format_value(data[getfields[i].attrs.name], {"widget": result.fields[getfields[i].attrs.name].type});
+                            $(this).val(dateresult);
+                        }
                     }
                 });
                 // Temp: Selection set as disabled
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index 9c3dd94f839..775ac90c66c 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -148,7 +148,7 @@
         <t t-call="Header" />
     </t>
     <div data-role="content">
-    
+
         <form>
             <t t-foreach="get_fields" t-as="field">
                 <div data-role="fieldcontain">
@@ -158,10 +158,10 @@
                             <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
                         </label>
                         <t t-if="values[field.attrs.name]">
-                            <input type="text" id="" readonly="true" t-att-value="values[field.attrs.name]"/>
+                            <input type="text" t-att-id="field.attrs.name" readonly="true" t-att-value="values[field.attrs.name]"/>
                         </t>
                         <t t-if="!(values[field.attrs.name])">
-                            <input type="text" value="" readonly="true" id=""/>
+                            <input type="text" value="" readonly="true" t-att-id="field.attrs.name"/>
                         </t>
                         <t t-if="(field.attrs.name == 'email' or field.attrs.name == 'email_from') and values[field.attrs.name]">
                             <a t-att-href="'mailto:'+values[field.attrs.name]"><img src="/web/static/src/img/icons/terp-mail-message-new.png" /></a>
@@ -170,13 +170,37 @@
                             <a t-att-href="values[field.attrs.name]"><img src="/web/static/src/img/icons/gtk-ok.png" title="Open this resource"/></a>
                         </t>
                     </t>
-                    <t t-if="fields[field.attrs.name].type == 'text'">
+                    <t t-if="fields[field.attrs.name].type == 'text' or fields[field.attrs.name].type == 'text_wiki'">
                         <label for="">
                             <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
                             <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
                         </label>
                         <textarea name="" id="" readonly="true"></textarea>
                     </t>
+                    <t t-if="fields[field.attrs.name].type == 'integer'">
+                        <label for="">
+                            <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
+                            <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
+                        </label>
+                        <t t-if="values[field.attrs.name]">
+                            <input t-att-id="field.attrs.name" type="text" t-att-value="values[field.attrs.name]" readonly="true"/>
+                        </t>
+                        <t t-if="!values[field.attrs.name]" readonly="true">
+                            <input t-att-id="field.attrs.name" type="text" value=""/>
+                         </t>
+                    </t>
+                    <t t-if="fields[field.attrs.name].type == 'float_time'">
+                        <label for="">
+                            <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
+                            <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
+                        </label>
+                        <t t-if="values[field.attrs.name]">
+                            <input t-att-id="field.attrs.name" type="text" t-att-value="values[field.attrs.name]" readonly="true"/>
+                        </t>
+                        <t t-if="!values[field.attrs.name]" readonly="true">
+                            <input t-att-id="field.attrs.name" type="text" value=""/>
+                         </t>
+                    </t>
                     <t t-if="fields[field.attrs.name].type == 'float'">
                         <label for="">
                             <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
@@ -189,10 +213,10 @@
                             <div id="progress" value="" title="Percent of tasks closed according to total of tasks to do..."></div>
                         </t>
                          <t t-if="values[field.attrs.name] and field.attrs.name!='progress_rate'">
-                            <input id="" type="text" t-att-value="values[field.attrs.name]" readonly="true"/>
+                            <input t-att-id="field.attrs.name" type="text" t-att-value="values[field.attrs.name]" readonly="true"/>
                         </t>
                         <t t-if="!values[field.attrs.name] and field.attrs.name!='progress_rate'" readonly="true">
-                            <input id="" type="text" value=""/>
+                            <input t-att-id="field.attrs.name" type="text" value=""/>
                          </t>
                     </t>
                     <t t-if="fields[field.attrs.name].type == 'date'">
@@ -207,7 +231,7 @@
                             <input t-att-id="field.attrs.name" readonly="true" type="text" value=""/>
                         </t>
                     </t>
-                    <t t-if="fields[field.attrs.name].type == 'datetime'">
+                    <t t-if="fields[field.attrs.name].type == 'datetime' or fields[field.attrs.name].type == 'time'">
                         <label t-att-for="field.attrs.name">
                             <t t-if="!(field.attrs.string)" t-esc="fields[field.attrs.name].string"></t>
                             <t t-if="field.attrs.string" t-esc="field.attrs.string"></t>:
-- 
cgit v1.2.3