[Merge] upto revno 1024.

bzr revid: vme@tinyerp.com-20110914053746-ri6d5s341mm6tc7n

1 files changed, 138 insertions, 112 deletions

diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index a3af2e39b90..75d30af55b1 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -4,10 +4,14 @@
 <templates id="template" xml:space="preserve">
 
 <t t-name="WebClient">
-    <div data-role="page">
-        <div id="oe_header"></div>
-        <div id="oe_app"></div>
-    </div>
+    <div data-role="page" id="oe_login"></div>
+    <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>
 </t>
 
 <t t-name="Login">
@@ -38,131 +42,123 @@
     </div>
 </t>
 
-<t t-name="HomePage">
-    <div role="main" class="ui-content" data-role="content">
-        <div id="oe_shortcuts" class="shortcuts"></div>
-        <div id="oe_menu" class="menu"></div>
-        <div id="oe_options" class="options"></div>
+<t t-name="Header">
+    <div data-role="header" data-theme="b" data-position="fixed">
+        <h1>OpenERP</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="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>
+<t t-name="Footer">
+    <div data-role="footer" data-theme="b" data-position="fixed">
+        <h1></h1>
     </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">
-            Shortcuts
-        </li>
-        <li data-theme="c" class="ui-btn ui-btn-icon-right ui-li ui-btn-up-c" t-foreach="sc" t-as="opt">
-            <div class="ui-btn-inner ui-li">
-                <div class="ui-btn-text">
-                    <a href="#" class="ui-link-inherit" t-att-data-menu="opt.id" t-att-data-name="opt.name" t-att-data-res="opt.res_id">
-                        <span><t t-esc="opt.name"/></span>
-                    </a>
-                </div>
-                <span class="ui-icon ui-icon-arrow-r"></span>
-            </div>
-        </li>
-    </ul>
+    <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>
+    <div id="content" data-role="content">
+        <ul data-role="listview" data-inset="true">
+            <li data-theme="c" t-foreach="sc" t-as="opt">
+                <a href="#" t-att-data-menu="opt.id" t-att-data-name="opt.name" t-att-data-res="opt.res_id">
+                    <span><t t-esc="opt.name"/></span>
+                </a>
+            </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 t-name="Menu">
-    <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">
-            Menu
-        </li>
-        <li data-theme="c" class="ui-btn ui-btn-icon-right ui-li ui-btn-up-c" t-foreach="data.children" t-as="menu">
-            <div class="ui-btn-inner ui-li">
-                <div class="ui-btn-text">
-                    <a href="#" class="ui-link-inherit" t-att-data-menu="menu.id" t-att-data-name="menu.name">
-                        <span><t t-esc="menu.name"/></span>
-                    </a>
-                </div>
-                <span class="ui-icon ui-icon-arrow-r"></span>
-            </div>
-        </li>
-    </ul>
+     <div data-role="header" data-theme="b" data-position="fixed">
+        <h1>Applications</h1>
+    </div>
+    <div id="content" data-role="content">
+        <ul data-role="listview" data-inset="true">
+            <li data-theme="c" t-foreach="data.children" t-as="menu">
+                <a href="#" t-att-data-menu="menu.id" t-att-data-name="menu.name">
+                    <span><t t-esc="menu.name"/></span>
+                </a>
+            </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 t-name="Menu.secondary">
-    <div role="main" class="ui-content" data-role="content">
-        <ul data-role="listview" class="ui-listview">
-            <li data-theme="c" class="ui-btn ui-btn-icon-right ui-li ui-btn-up-c" t-foreach="menu.children" t-as="menu">
-                <div class="ui-btn-inner ui-li">
-                    <div class="ui-btn-text">
-                        <a href="#" class="ui-link-inherit" t-attf-id="menu_#{menu.id}" t-att-data-menu="menu.id" t-att-data-name="menu.name">
-                            <span><t t-esc="menu.name"/></span>
+    <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>
+    <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">
+                <li data-role="list-divider">
+                    <t t-esc="menu1.name"/>
+                </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" />
                         </a>
-                    </div>
-                        <span class="ui-icon ui-icon-arrow-r"></span>
-                </div>
-            </li>
-        </ul>
+                    </li>
+                </t>
+            </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 t-name="Options">
-    <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">
-            Options
-        </li>
-        <li data-theme="c" class="ui-btn ui-btn-icon-right ui-li ui-btn-up-c">
-            <div class="ui-btn-inner ui-li">
-                <div class="ui-btn-text">
-                    <a id="logout" href="#" class="ui-link-inherit">
-                        Logout
-                    </a>
-                </div>
-                    <span class="ui-icon ui-icon-arrow-r"></span>
-            </div>
-        </li>
-        <li data-theme="c" class="ui-btn ui-btn-icon-right ui-li ui-btn-up-c">
-            <div class="ui-btn-inner ui-li">
-                <div class="ui-btn-text">
-                    <a id="pref" href="#" class="ui-link-inherit">
-                        Preferences
-                    </a>
-                </div>
-                    <span class="ui-icon ui-icon-arrow-r"></span>
-            </div>
-        </li>
-    </ul>
+    <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>
+    <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>
+            </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 t-name="ListView">
-    <div role="main" class="ui-content" data-role="content">
-        <form class="ui-listview-filter ui-bar-c" role="search">
-            <div id="search-data" class="ui-input-search ui-shadow-inset ui-btn-corner-all ui-btn-shadow ui-icon-searchfield ui-body-c">
-                <input id="searchid" placeholder="Filter items..." data-type="search" class="ui-input-text ui-body-null" autosearch="true" setTimeDefault="700"/>
-            </div>
-        </form>
-        <ul role="listbox" data-role="listview" class="ui-listview">
-            <li data-theme="c" class="ui-btn ui-btn-icon-right ui-li ui-btn-up-c" t-foreach="records" t-as="record">
-                <div class="ui-btn-inner ui-li">
-                    <div class="ui-btn-text">
-                        <a id="list-id" t-att-data-id="record[0]" href="#" class="ui-link-inherit">
-                            <span><t t-esc="record[1]"/></span>
-                        </a>
-                    </div>
-                        <span class="ui-icon ui-icon-arrow-r"></span>
-                </div>
+    <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>
+    <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">
+                <a id="list-id" t-att-data-id="record[0]" href="#">
+                    <t t-esc="record[1]"/>
+                </a>
             </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 t-name="FormView">
-    <div role="main" class="ui-content" data-role="content">
+    <div role="main" data-role="content">
         <form>
             <t t-foreach="get_fields" t-as="field">
             <div data-role="fieldcontain">
@@ -242,7 +238,6 @@
                     </div>
                 </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">
@@ -270,12 +265,46 @@
                     </div>
                 </t>
                 <t t-if="fields[field.attrs.name].type == 'one2many'">
-                    <div class="info ui-collapsible-contain" data-collapsed="true" data-role="collapsible">
+                    <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>
+            <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">
@@ -291,11 +320,8 @@
                             </div>
                         </h1>
                     </div>
-                </t>
-            </div>
-            </t>
-            <t t-if="notebooks">
-                <t t-foreach="notebooks.children" t-as="page">
+                    </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">
@@ -317,10 +343,10 @@
                             </div>
                         </h1>
                     </div>
+                    </t>
                 </t>
             </t>
         </form>
     </div>
 </t>
-
 </templates>