diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2011-11-29 11:53:32 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2011-11-29 11:53:32 +0530 |
| commit | 11dee02df245f00bb26ed6022f8e41c9369728b3 (patch) | |
| tree | fd56a3d192151c6b119461277b866d9cfbe8e5b8 /addons/web_mobile/static/src | |
| parent | 990ece97a5dfd2b22be25d73193452c034424cdb (diff) | |
| parent | 2b9c52ee8b1ba890b161812374facdd58e49896f (diff) | |
[MERGE] Merge from openerp-web.
bzr revid: jra@tinyerp.com-20111129062332-nt36fttsgf8movqd
Diffstat (limited to 'addons/web_mobile/static/src')
| -rwxr-xr-x | addons/web_mobile/static/src/web_mobile.html | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/addons/web_mobile/static/src/web_mobile.html b/addons/web_mobile/static/src/web_mobile.html index 2afa79dcb5e..3d91fb405c2 100755 --- a/addons/web_mobile/static/src/web_mobile.html +++ b/addons/web_mobile/static/src/web_mobile.html @@ -3,24 +3,24 @@ <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-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"/>
- <script type="text/javascript" src="/web/static/lib/jquery/jquery-1.6.2.js"></script>
+ <script type="text/javascript" src="/web/static/lib/jquery/jquery-1.6.4.js"></script>
<script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.8.9.custom.min.js"></script>
<script type="text/javascript" src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
<script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>
<script type="text/javascript" src="/web/static/lib/underscore/underscore.string.js"></script>
- <script type="text/javascript" src="/web_mobile/static/lib/jquery_mobile/js/jquery.mobile-1.0a4.1.js"></script> - - <script type="text/javascript" src="/web/static/lib/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_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>
@@ -28,7 +28,7 @@ <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>
|