m

bzr revid: al@openerp.com-20130702171614-opy0xy7l1h3r330u

diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 73943f1..85c1a9c 100644 (file)
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -3,13 +3,17 @@ openerp.website = function(instance) {
 instance.website.EditorBar = instance.web.Widget.extend({
     template: 'Website.EditorBar',
     events: {
+        'click button[data-action=edit]': 'edit',
         'click button[data-action=save]': 'save',
         'click button[data-action=cancel]': 'cancel',
     },
     container: 'body',
     start: function() {
         var self = this;
-        var r = this._super.apply(this, arguments);
+        return this._super.apply(this, arguments);
+    },
+    edit: function () {
+        var self = this;
         Aloha.ready(function() {
             Aloha.jQuery('[data-oe-model]').aloha(); //.attr('contentEditable', 'true').addClass('oe_editable');
             self.$('button').prop('disabled', true);
@@ -23,7 +27,6 @@ instance.website.EditorBar = instance.web.Widget.extend({
                 }
             });
         });
-        return r;
     },
     save: function () {
         var self = this;

diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index a58e21d..5f68cba 100644 (file)
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -3,10 +3,45 @@
 -->
 <templates id="template" xml:space="preserve">
 <t t-name="Website.EditorBar">
+
+    OK
+<div class="navbar">
+    <div class="navbar-inner">
+        <a class="brand" href="#">Title</a>
+        <ul class="nav">
+        <li class="active"><a href="#">Home</a></li>
+        <li><a href="#">Link</a></li>
+        <li><a href="#">Link</a></li>
+        </ul>
+    </div>
+</div>
+
+    <div class="navbar navbar-inverse">
+      <div class="navbar-inner">
+        <div class="container">
+          <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="brand" href="./index.html">Bootstrap</a>
+          <div class="nav-collapse collapse">
+            <ul class="nav">
+              <li class=""><a href="./index.html">Home</a> </li>
+              <li class=""> <a href="./getting-started.html">Get started</a> </li>
+              <li class=""> <a href="./customize.html">Customize</a> </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+
+
     <ul class="oe_website_editorbar openerp">
-        <li><strong>OpenERP Website Editor</strong></li>
+        <li><strong> YESSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS OpenERP Website Editor</strong></li>
         <li class="oe_right"><button data-action="save">Save</button></li>
         <li class="oe_right"><button data-action="cancel">Cancel</button></li>
+        <li class="oe_right"><button data-action="edit">Edit</button></li>
     </ul>
 </t>
 </templates>