[IMP] Improve web mobile

- Change dependancy qweb to qweb2
- Remove unnecessary dependancy from mobile web
- Modify base js for mobile
- Add methods in base for shortcut list and logout

bzr revid: jra@tinyerp.com-20110610125006-7dg7f22uu5iazmhh

2 files changed, 7 insertions, 12 deletions

diff --git a/addons/web_mobile/static/src/js/web_mobile.js b/addons/web_mobile/static/src/js/web_mobile.js
index 0bbbffb4f6a..16d43de75e9 100644
--- a/addons/web_mobile/static/src/js/web_mobile.js
+++ b/addons/web_mobile/static/src/js/web_mobile.js
@@ -56,7 +56,7 @@ openerp.web_mobile.Shortcuts =  openerp.base.Controller.extend({
     },
     start: function() {
         var self = this;
-        this.rpc('/web_mobile/mobile/sc_list',{} ,function(res){
+        this.rpc('/base/session/sc_list',{} ,function(res){
             self.$element.html(QWeb.render("Shortcuts", {'sc' : res}))
             self.$element.find("a").click(self.on_clicked);
         })
@@ -94,7 +94,7 @@ openerp.web_mobile.ListView = openerp.base.Controller.extend({
         var context = action.context;
         var domain = action.domain;
 
-        self.rpc('/base/listview/load', {
+        self.rpc('/base/listview/records', {
             'model': model,
             'view_id': view_id,
             'toolbar': false,
@@ -189,7 +189,7 @@ openerp.web_mobile.Options =  openerp.base.Controller.extend({
         $opt = $(ev.currentTarget);
         current_id = $opt.attr('id');
         if (current_id == 'logout') {
-            this.rpc('/web_mobile/mobile/logout', {});
+            this.rpc('/base/session/logout', {});
             this.login = new openerp.web_mobile.Login(this.session, "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 c061e0b3e3f..ee924fd0c33 100755
--- a/addons/web_mobile/static/src/web_mobile.html
+++ b/addons/web_mobile/static/src/web_mobile.html
@@ -11,24 +11,19 @@
     <script type="text/javascript" src="/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>

     <script type="text/javascript" src="/base/static/lib/underscore/underscore.js"></script>

     <script type="text/javascript" src="/base/static/lib/underscore/underscore.string.js"></script>

-    <script type="text/javascript" src="/base/static/lib/qweb/qweb.js"></script>

-    

+

+    <script type="text/javascript" src="/base/static/lib/qweb/qweb2.js"></script>

+

     <script type="text/javascript" src="/base/static/src/js/base.js"></script>

     <script type="text/javascript" src="/base/static/src/js/chrome.js"></script>

     <script type="text/javascript" src="/base/static/src/js/data.js"></script>

     <script type="text/javascript" src="/base/static/src/js/dates.js"></script>

-    <script type="text/javascript" src="/base/static/src/js/views.js"></script>

-    <script type="text/javascript" src="/base/static/src/js/search.js"></script>

-    <script type="text/javascript" src="/base/static/src/js/list.js"></script>

-    <script type="text/javascript" src="/base/static/src/js/tree.js"></script>

-    <script type="text/javascript" src="/base/static/src/js/m2o.js"></script>

-    <script type="text/javascript" src="/base/static/src/js/form.js"></script>

     

     <script type="text/javascript" src="/web_mobile/static/src/js/web_mobile.js"></script>

-	

 

     <script type="text/javascript">

         $(function() {

+            QWeb = window.QWeb || new QWeb2.Engine();

             var oe = openerp.init();

             openerp.web_mobile(oe);

             oe.web_mobile.mobilewebclient("moe");