[IMP]merge with main branch of view editor.

bzr revid: vme@tinyerp.com-20111025112548-eakr7fio6diovn2m
author: Vidhin Mehta (OpenERP) <vme@tinyerp.com> 2011-10-25 16:55:48 +0530
committer: Vidhin Mehta (OpenERP) <vme@tinyerp.com> 2011-10-25 16:55:48 +0530
commit: c17c8a0bd10d5c9cedd6c34bc0110c02ecdcd6b2 (patch)
tree: b4543c28941307f8ebdd60191f2eb2494139aad2 /addons/web_mobile/static
parent: 1ee677eadbfa3e4c7d9836c48bea735f41f6a5a7 (diff)
parent: 55ad46220db83d2f5d6dd86d243d0d9843b74511 (diff)
7 files changed, 1222 insertions, 447 deletions
diff --git a/addons/web_mobile/static/lib/jquery_mobile/css/jquery-ui-1.8.9.custom.css b/addons/web_mobile/static/lib/jquery_mobile/css/jquery-ui-1.8.9.custom.css
new file mode 100644
index 00000000000..8a73ef48ce9
--- /dev/null
+++ b/addons/web_mobile/static/lib/jquery_mobile/css/jquery-ui-1.8.9.custom.css
@@ -0,0 +1,573 @@
+/*
+ * jQuery UI CSS Framework 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
+.ui-widget-header a { color: #222222; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+.ui-corner-right {  -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+ * jQuery UI Resizable 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Accordion 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordion .ui-accordion-content-active { display: block; }
+/*
+ * jQuery UI Autocomplete 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete { position: absolute; cursor: default; }
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.9
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+	float: left;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/*
+ * jQuery UI Button 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; }
+button.ui-button-icons-only { width: 3.7em; }
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+/*
+ * jQuery UI Dialog 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/*
+ * jQuery UI Slider 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+ * jQuery UI Tabs 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs#theming
+ */
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/*
+ * jQuery UI Datepicker 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/*
+ * jQuery UI Progressbar 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
+.ui-progressbar { height:1.2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%;background-image:url(/web_mobile/static/lib/jquery_mobile/img/progress-bar.gif) }
+\ No newline at end of file
diff --git a/addons/web_mobile/static/lib/jquery_mobile/img/progress-bar.gif b/addons/web_mobile/static/lib/jquery_mobile/img/progress-bar.gif
new file mode 100644
index 00000000000..d8446a9ab7f
--- /dev/null
+++ b/addons/web_mobile/static/lib/jquery_mobile/img/progress-bar.gif
diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index b52b4642b67..99b9651fa7b 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");
+        openerp.web.qweb.add_template("xml/web_mobile.xml");
         var params = {};
-        this.$element.html(QWeb.render("WebClient", {}));
+        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");
@@ -29,13 +32,26 @@ openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({
 });
 
 openerp.web_mobile.Login =  openerp.web.Widget.extend({
+
+    template: "Login",
+
     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) {
-            var selection = new openerp.web_mobile.Selection();
             self.db_list = result.db_list;
-            self.$element.html(QWeb.render("Login", self));
+            self.$element.html(self.render(self));
+            if(self.session.db!=""){
+                self.$element.find("#database").val(self.session.db);
+            }
             self.$element.find("#login_btn").click(self.on_login);
             $.mobile.initializePage();
         });
@@ -49,11 +65,21 @@ 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() {
             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();
@@ -71,9 +97,12 @@ 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();
@@ -86,59 +115,80 @@ 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() {
-        var self = this;
-        self.$element.html(QWeb.render("Header", this));
+        this.$element.html(this.render(this));
     }
 });
 
 openerp.web_mobile.Footer =  openerp.web.Widget.extend({
+
+    template: "Footer",
+
     init: function(session, element_id) {
         this._super(session, element_id);
     },
     start: function() {
-        var self = this;
-        self.$element.html(QWeb.render("Footer", this));
+        this.$element.html(this.render(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(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);
+            });
             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');
+                }else{
+                    $.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) {
+        var self = this;
+        ev.preventDefault();
+        ev.stopPropagation();
         $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, res_id);
-//        this.header.start();
-        this.listview.appendTo($("#oe_list"));
+        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", false, true);
+        }
+        ev.preventDefault();
+        ev.stopPropagation();
         jQuery("#oe_header").find("h1").html($shortcut.data('name'));
     }
 });
 
 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;
@@ -151,32 +201,37 @@ 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(this.render(this.data));
+        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");
                 this.shortcuts.start();
-            }
-            else{
-                self.$element.find("#footer").find('#shrotcuts').attr('href','#oe_shortcuts');
+            }else{
+                $.mobile.changePage($("#oe_shortcuts"), "slide", false, 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');
+            }else{
+                $.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);
         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];
@@ -185,102 +240,114 @@ 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{
-            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);
+        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{
-          //  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');
-        }*/
-
+            $.mobile.changePage('#oe_sec_menu_'+id, "slide", false, true);
+        }
     }
 });
+
 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;
     },
     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();
-
-                _.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));
-        this.$element.find("#header").find("h1").html(this.data.name);
+        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);
-        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');
+            }else{
+                $.mobile.changePage("#oe_shortcuts", "slide", false, 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{
+                $.mobile.changePage("#oe_options", "slide", false, true);
             }
-            else{
-                self.$element.find("#footer").find('#preference').attr('href','#oe_options');
-            }
         });
-        $.mobile.changePage($("#oe_sec_menu"), "slide", true, true);
+        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');
-        if (id) {
-            this.listview = new openerp.web_mobile.ListView(this, id);
-            this.listview.appendTo("#oe_list");
+        name = $menu.data('name');
+        ev.preventDefault();
+        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;
+                }
+            }
+        }
+        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);
+            }
         }
         jQuery("#oe_header").find("h1").html($menu.data('name'));
     }
 });
 
 openerp.web_mobile.Options =  openerp.web.Widget.extend({
+
+    template: "Options",
+
     start: function() {
         var self = this;
-        this.$element.html(QWeb.render("Options", this));
-        this.$element.find("#footer").find('#shrotcuts').click(function(){
+        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){
                 this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
                 this.shortcuts.start();
+            }else{
+                $.mobile.changePage("#oe_shortcuts", "slide", false, true);
             }
-            else{
-                self.$element.find("#footer").find('#shrotcuts').attr('href','#oe_shortcuts');
-            }
         });
-        $.mobile.changePage($("#oe_options"), "slide", true, true);
+        this.$element.find("[data-role=header]").find('#home').click(function(){
+            $.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", false, true);
     }
 });
 
-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 3dc777a2bd6..1cb1dfb494e 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -5,126 +5,247 @@
 openerp.web_mobile.form_mobile = function (openerp) {
 
 openerp.web_mobile.FormView = openerp.web.Widget.extend({
-    init: function(session, element_id, list_id, action) {
+
+    template: 'FormView',
+
+    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.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";
+        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];
+                    self.datarecord = result[i];
+                }
+            }
+            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 = 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'}));
+        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);
+        });
+        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.rpc("/web/view/load", {"model": model, "view_id": view_id, "view_type": "form", context: context}, function (result) {
-                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.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.html(QWeb.render("FormView", {'get_fields': get_fields, 'notebooks': notebooks || false, 'fields' : fields, 'values' : data }));
+                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}));
+                }
+                self.formatdata(get_fields, fields, result, self.datarecord,'page_content','element');
 
-                    self.$element.find("#header").find('h1').html(self.action.name);
-                    self.$element.find('select').change(function(ev){
-                        selection.on_select_option(ev);
-                    });
-                    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();
-                            var span = $(this).find('span .ui-icon');
-                            if (notebooks.children[k].attrs.string == $.trim(text)) {
-                                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'));
-                                        }
+                $(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');
+                    }
+                });
+            });
+            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);
+                            }
+                        });
+                        $('[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 (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;
+                                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;
+                                                    }
+                                                }
                                             }
-                                            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];
+                                    $('[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);
                                             }
-                                            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);
-                                                });
-                                                });
-                                            });
-                                        });
-                                    }
-                                });*/
-                            }
-                        }
-                        self.$element.find('select').change(function(ev){
-                            selection.on_select_option(ev);
+                                        }
+                                    });
+                                    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);
+                                }
+                            });
                         });
-                    });
+                        $.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($("#oe_form"), "slide", true, true);
-                //$("#oe_header").find("h1").html(result.arch.attrs.string);
+            }
         });
+        $.mobile.changePage("#"+self.element_id, "slide", false, true);
+        self.formatdata('', '', '', '',self.element_id,'slider');
     },
     get_fields: function(view_fields, fields) {
         this.fields = fields || [];
@@ -138,17 +259,46 @@ 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);
+    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" || fields[getfields[i].attrs.name].type == "time") {
+                            $("#"+getfields[i].attrs.name).datetimepicker();
+                        }
+                        // Temp: Set as disabled
+                        $("#"+getfields[i].attrs.name).attr('disabled', 'true');
+                        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
+                $('[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');
+                });
+            });
+        }
     }
 });
+
 };
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index 1d4e0d72ca2..ec6de48e941 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -5,13 +5,15 @@
 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;
     },
     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;
@@ -23,48 +25,46 @@ 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){
-            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.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');
+        dataset.name_search('', this.action.domain, 'ilike', false, function(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);
+            });
+            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("#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');
+                }else{
+                    $.mobile.changePage("#oe_options", "slide", false, true);
                 }
             });
-            }
             self.$element.find("a#list-id").click(self.on_list_click);
-            $.mobile.changePage($("#oe_list"), "slide", true, true);
+            $.mobile.changePage("#"+self.element_id, "slide", false, true);
         });
     },
     on_list_click: function(ev) {
         var $record = $(ev.currentTarget);
         var self = this;
+        ev.preventDefault();
+        ev.stopPropagation();
         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();
+        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, '' ,'');
+            this.formview.start();
+        }else{
+            $.mobile.changePage('#oe_form_'+id+this.action.res_model, "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..2afa79dcb5e 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"/>
 
@@ -12,14 +13,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>
@@ -29,7 +39,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");
diff --git a/addons/web_mobile/static/src/xml/web_mobile.xml b/addons/web_mobile/static/src/xml/web_mobile.xml
index 75d30af55b1..775ac90c66c 100644
--- a/addons/web_mobile/static/src/xml/web_mobile.xml
+++ b/addons/web_mobile/static/src/xml/web_mobile.xml
@@ -5,17 +5,15 @@
 
 <t t-name="WebClient">
     <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 id="oe_header" />
+    <div id="oe_footer" />
     <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">
-     <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">
@@ -30,9 +28,9 @@
                     </t>
                 </select>
                 <label for="login">Login:</label>
-                <input type="text" id="login" name="login" value=""/><br/>
+                <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=""/><br/>
+                <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>
@@ -40,26 +38,31 @@
              </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">
     <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>
+        <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>
 
 <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 +72,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" 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,61 +86,51 @@
             </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">
                 <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>
             </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">
-                <a id="logout" href="#oe_login">Logout</a>
+                <a id="logout">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-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,202 +140,189 @@
             </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">
-    <div role="main" data-role="content">
+    <t t-if="temp_flag">
+        <t t-call="Header" />
+    </t>
+    <div 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="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/>
-                    </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/>
-                    </t>
-                </t>
-                <t t-if="fields[field.attrs.name].type == 'boolean'">
-                    <t t-if="values[field.attrs.name]">
-                        <input type="checkbox" checked="yes"/><br/>
-                    </t>
-                    <t t-if="!(values[field.attrs.name])">
-                        <input type="checkbox"/><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" 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" 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>
+                        </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 t-if="fields[field.attrs.name].type == 'text'">
-                    <textarea style="width:100%;" rows="8" name="textarea" id="textarea"></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/>
+                    <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="!(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/>
+                    <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 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/>
+                    <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="!(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/>
+                    <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] 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'">
+                            <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 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 t-att-id="field.attrs.name" type="text" value=""/>
+                         </t>
                     </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/>
+                    <t t-if="fields[field.attrs.name].type == 'date'">
+                        <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 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" readonly="true" type="text" value=""/>
+                        </t>
                     </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/>
+                    <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>:
+                        </label>
+                        <t t-if="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" readonly="true" type="text" value=""/>
+                        </t>
                     </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-foreach="fields[field.attrs.name].selection" t-as="opt">
-                                    <option t-att-value="opt[0]"><t t-esc="opt[1]"/></option>
+                    <t t-if="fields[field.attrs.name].type == 'boolean'">
+                        <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>
-                    </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">
-                                <span class="ui-btn-text">
-                                    <t t-if="values[field.attrs.name]">
-                                        <t t-esc="values[field.attrs.name][1]"/>
+                    </t>
+                    <t t-if="fields[field.attrs.name].type == 'selection'">
+                        <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 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>
+                        </select>
+                    </t>
+                    <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-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]">
+                                        <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-if="values[field.attrs.name]!=opt[0]">
+                                        <option t-att-value="opt[0]" ><t t-esc="opt[1]"/></option>
                                     </t>
                                 </t>
-                            </select>
-                        </div>
-                    </div>
-                </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">
-                        <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-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">
+                            <li data-theme="c" t-att-for="field.attrs.name">
+                                <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>
+                <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>
+                                <div id="page_content" />
                             </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" t-att-id="page.attrs.string">
+                                <h3><t t-esc="page.attrs.string"></t></h3>
+                                <div id="page_content" />
                             </div>
-                        </h1>
-                    </div>
+                        </t>
                     </t>
-                </t>
+                </div>
             </t>
         </form>
     </div>
+    <t t-if="temp_flag">
+        <t t-call="Footer" />
+    </t>
 </t>
 </templates>
author	Vidhin Mehta (OpenERP) <vme@tinyerp.com>	2011-10-25 16:55:48 +0530
committer	Vidhin Mehta (OpenERP) <vme@tinyerp.com>	2011-10-25 16:55:48 +0530
commit	c17c8a0bd10d5c9cedd6c34bc0110c02ecdcd6b2 (patch)
tree	b4543c28941307f8ebdd60191f2eb2494139aad2 /addons/web_mobile/static
parent	1ee677eadbfa3e4c7d9836c48bea735f41f6a5a7 (diff)
parent	55ad46220db83d2f5d6dd86d243d0d9843b74511 (diff)