[IMP] Improved selection menu as custom menu from login page.

bzr revid: jra@tinyerp.com-20110819130232-ixkvx5rgrs7dimce

3 files changed, 29 insertions, 40 deletions

diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 0bf5deed6db..588c848c248 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -40,10 +40,6 @@ openerp.web_mobile.Login =  openerp.base.Widget.extend({
             var selection = new openerp.web_mobile.Selection();
             self.db_list = result.db_list;
             self.$element.html(QWeb.render("Login", self));
-            self.$element.find('#database').prev().find(".ui-btn-text").html($('#database').find("option:selected").text());
-            self.$element.find('#database').change(function(ev){
-                selection.on_select_option(ev);
-            });
             self.$element.find("#login").click(self.on_login);
             $.mobile.initializePage();
         });
@@ -78,9 +74,7 @@ openerp.web_mobile.Login =  openerp.base.Widget.extend({
             .removeClass("login_invalid")
             .addClass("login_valid");
             //.hide();
-        this.header = new openerp.web_mobile.Header(this, "oe_header");
         this.homepage = new openerp.web_mobile.HomePage(this, "oe_app");
-        this.header.start();
         this.homepage.start();
     },
     do_ask_login: function(continuation) {
@@ -99,9 +93,11 @@ openerp.web_mobile.HomePage =  openerp.base.Widget.extend({
     },
     start: function() {
         this.$element.html(QWeb.render("HomePage", {}));
+        this.header = new openerp.web_mobile.Header(this, "oe_header");
         this.shortcuts = new openerp.web_mobile.Shortcuts(this, "oe_shortcuts");
         this.menu = new openerp.web_mobile.Menu(this, "oe_menu", "oe_secondary_menu");
         this.options = new openerp.web_mobile.Options(this, "oe_options");
+        this.header.start();
         this.shortcuts.start();
         this.menu.start();
         this.options.start();
@@ -115,8 +111,9 @@ openerp.web_mobile.Header =  openerp.base.Widget.extend({
         this._super(session, element_id);
     },
     start: function() {
-        this.$element.html(QWeb.render("Header", this));
-        this.$element.find("a").click(this.on_clicked);
+        var self = this;
+        self.$element.html(QWeb.render("Header", this));
+        self.$element.find("a").click(this.on_clicked);
     },
     on_clicked: function(ev) {
         $opt = $(ev.currentTarget);
@@ -230,8 +227,8 @@ openerp.web_mobile.Options =  openerp.base.Widget.extend({
     },
     on_logout: function(ev) {
         this.session.logout();
-        this.login = new openerp.web_mobile.Login(this, "oe_app");
-        this.login.start();
+//        this.login = new openerp.web_mobile.Login(this, "oe_app");
+//        this.login.start();
     }
 });
 
diff --git a/addons/web_mobile/static/src/web_mobile.html b/addons/web_mobile/static/src/web_mobile.html
index 18e51df9bfe..a7ab447d905 100755
--- a/addons/web_mobile/static/src/web_mobile.html
+++ b/addons/web_mobile/static/src/web_mobile.html
@@ -35,6 +35,6 @@
     </script>

 </head>

 <body>

-    <div id="moe" class="openerp" data-role="page"></div>

+    <div id="moe" class="openerp"></div>

 </body>

 </html>
\ No newline at end of file
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index ca31bb8f04e..746080315c6 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -4,47 +4,27 @@
 <templates id="template" xml:space="preserve">
 
 <t t-name="WebClient">
-    <div class="ui-page ui-body-c ui-page-active" data-role="page">
+    <div data-role="page">
         <div id="oe_header"></div>
         <div id="oe_app"></div>
     </div>
 </t>
 
-<t t-name="Header">
-     <div role="banner" class="ui-bar-b ui-header" data-role="header" data-theme="b">
-        <h1 aria-level="1" role="heading" tabindex="0" class="ui-title">OpenERP</h1>
-        <a id="home" class="ui-btn-right jqm-home ui-btn ui-btn-icon-notext ui-btn-corner-all ui-shadow ui-btn-up-b" data-direction="reverse" data-iconpos="notext" data-icon="home" href="#" title="Home" data-theme="b">
-            <span class="ui-btn-inner ui-btn-corner-all">
-                <span class="ui-btn-text">Home</span>
-                <span class="ui-icon ui-icon-home ui-icon-shadow"></span>
-            </span>
-        </a>
-    </div>
-</t>
-
 <t t-name="Login">
-     <div role="banner" class="ui-bar-b ui-header" data-role="header" data-theme="b">
+     <div data-role="header" data-theme="b">
         <h1 aria-level="1" role="heading" tabindex="0" class="ui-title">OpenERP</h1>
     </div>
-    <div role="main" class="ui-content" data-role="content">
+    <div data-role="content">
         <fieldset>
-            <div class="ui-field-contain ui-body ui-br" data-role="fieldcontain">
-                <label for="database" class="select ui-select">Database:</label>
-                <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 id="db_text" class="ui-btn-text"></span>
-                        <span class="ui-icon ui-icon-arrow-d ui-icon-shadow"></span>
-                    </span>
-                    <select id="database" name="database">
-                        <t t-if="db_list">
+            <div data-role="fieldcontain">
+                <label for="database" class="select">Database:</label>
+                <select id="database" name="database" data-native-menu="false">
+                    <t t-if="db_list">
                         <t t-foreach="db_list" t-as="opt">
                             <option t-att-value="opt"><t t-esc="opt"/></option>
                         </t>
-                        </t>
-                    </select>
-                    </div>
-                </div>
+                    </t>
+                </select>
                 <label class="ui-input-text" for="name">Login:</label>
                 <input class="ui-input-text ui-body-null ui-corner-all ui-shadow-inset ui-body-c" type="text" name="login" value=""/><br/>
                 <label class="ui-input-text" for="name">Password:</label>
@@ -70,6 +50,18 @@
     </div>
 </t>
 
+<t t-name="Header">
+<div role="banner" class="ui-bar-b ui-header" data-role="header" data-theme="b">
+        <h1 aria-level="1" role="heading" tabindex="0" class="ui-title">OpenERP</h1>
+        <a id="home" class="ui-btn-right jqm-home ui-btn ui-btn-icon-notext ui-btn-corner-all ui-shadow ui-btn-up-b" data-direction="reverse" data-iconpos="notext" data-icon="home" href="#" title="Home" data-theme="b">
+            <span class="ui-btn-inner ui-btn-corner-all">
+                <span class="ui-btn-text">Home</span>
+                <span class="ui-icon ui-icon-home ui-icon-shadow"></span>
+            </span>
+        </a>
+</div>
+</t>
+
 <t t-name="Shortcuts">
     <ul data-dividertheme="b" data-theme="c" data-inset="true" data-role="listview" class="ui-listview ui-listview-inset ui-corner-all ui-shadow">
         <li data-role="list-divider" role="heading" class="ui-li ui-li-divider ui-btn ui-bar-b ui-corner-top ui-btn-up-undefined">