projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6026d49)
use aloha temporarly
authorAntony Lesuisse <al@openerp.com>
Tue, 2 Jul 2013 10:36:34 +0000 (12:36 +0200)
committerAntony Lesuisse <al@openerp.com>
Tue, 2 Jul 2013 10:36:34 +0000 (12:36 +0200)
bzr revid: al@openerp.com-20130702103634-xg1x9h1j1eyox8fo

addons/website/static/src/js/website.js patch | blob | history
addons/website/views/views.xml patch | blob | history

diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index e5a1070..ae03a12 100644 (file)
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -18,19 +18,19 @@ instance.website.EditorBar = instance.web.Widget.extend({
         //     e.stopPropagation();
         //     e.preventDefault();
         // });
-        $('body').on("keypress.oe_webeditor", ".oe_editable", function(e) {
-            var $e = $(e.currentTarget);
-            if (!$e.is('.oe_dirty')) {
-                $e.addClass('oe_dirty');
-                self.$('button').prop('disabled', false);
-                // TODO: Are we going to use a meta-data flag in order to know if the field shall be text or html ?
-                $e.data('original', $e.text());
-            }
-            if (e.which == 13) {
-                $e.blur();
-                e.preventDefault();
-            }
-        });
+        //$('body').on("keypress.oe_webeditor", ".oe_editable", function(e) {
+        //    var $e = $(e.currentTarget);
+        //    if (!$e.is('.oe_dirty')) {
+        //        $e.addClass('oe_dirty');
+        //        self.$('button').prop('disabled', false);
+        //        // TODO: Are we going to use a meta-data flag in order to know if the field shall be text or html ?
+        //        $e.data('original', $e.text());
+        //    }
+        //    if (e.which == 13) {
+        //        $e.blur();
+        //        e.preventDefault();
+        //    }
+        //});
         return r;
     },
     save: function () {
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 7522ccb..166b2bf 100644 (file)
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -12,13 +12,38 @@
                         <link rel="stylesheet" href="/web/webclient/css"/>
                         <link rel='stylesheet' href='https://www.openerp.com/saas_master/static/site_new/fonts/lato/stylesheet.css'/>
                         <link rel='stylesheet' href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700'/>
-                        <!--
-                        <link rel="stylesheet" href="https://www.openerp.com/saas_master/static/site_new/css/website.css"/>
-                        -->
                         <script type="text/javascript" src="/web/webclient/js"></script>
-                        <t t-if="editable"><script type="text/javascript" src="/website/static/src/js/website_bootstrap.js"></script></t>
+                        <t t-if="editable">
+                            <script type="text/javascript" src="/website/static/src/js/website_bootstrap.js"></script>
+                            <script type="text/javascript" src="http://cdn.aloha-editor.org/latest/lib/require.js"></script>
+                            <script type="text/javascript" src="http://cdn.aloha-editor.org/latest/lib/vendor/jquery-1.7.2.js"></script>
+                            <script src="http://cdn.aloha-editor.org/latest/lib/aloha.js" data-aloha-plugins="common/ui, common/format, common/list, common/link, common/highlighteditables"></script>
+                            <link href="http://cdn.aloha-editor.org/latest/css/aloha.css" rel="stylesheet" type="text/css" />
+                            <script type="text/javascript">
+                            Aloha.ready( function() {
+                            var $ = Aloha.jQuery;
+                            $('.editable').aloha();
+                            });
+                            </script>
+                        </t>
                     </head>
                     <body class="oe_website">
+                        <div class="editable">
+                        TEST editable TEST editable TEST editable TEST editable TEST editable TEST editable
+                        TEST editable
+                        TEST editable
+                        TEST editable
+                        TEST editable
+                        TEST editable
+                        TEST editable
+                        TEST editable
+                        TEST editable
+                        TEST editable
+                        TEST editable
+                        TEST editable
+                        TEST editable
+                        TEST editable
+                        </div>
                         <header class="oe_website_header">
                             <div class="container">
                                 <div class="row">
@@ -65,7 +90,6 @@
                                             <li><a href="/page/website.news">News</a></li>
                                             <li><a href="/page/website.contactus">About us</a></li>
                                             <li>&amp;#x2706; <t t-esc="res_company.phone"/></li>
-                                            <li><span>Pay us in</span> <span t-record="res_company" t-field="currency_id">none</span></li>
                                         </ul>
                                     </div>
                                 </div>
Unnamed repository; edit this file 'description' to name the repository.