[MERGE] merged trunk up to revision 9281

bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al

6 files changed, 21 insertions, 9 deletions

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index e9df2841347..354796a053e 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -414,9 +414,6 @@ div.carousel .carousel-indicators .active {
 .oe_dark {
   background: #eff8f8;
   background: rgba(200, 200, 200, 0.14);
-  -webkit-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset;
-  -moz-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset;
-  box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset;
 }
 
 .oe_black {
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 2c8d5d2fdda..77da53c2958 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -342,7 +342,6 @@ div.carousel
 .oe_dark
     background: #eff8f8
     background: rgba(200, 200, 200, 0.14)
-    +box-shadow(0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset)
 
 .oe_black
     background-color: rgba(0, 0, 0, 0.9)
@@ -429,3 +428,9 @@ span[data-oe-type="monetary"]
 .oe_website_login_container
     width: 400px
     margin: 40px auto
+
+.oe_website_overflow_ellipsis
+    white-space:nowrap
+    overflow:hidden
+    text-overflow:ellipsis
+
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index ae126ad16ab..c965c5ef834 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -1500,7 +1500,8 @@
                 args: [],
                 kwargs: {
                     fields: ['name', 'website_url'],
-                    domain: [['res_model', '=', 'ir.ui.view']],
+                    domain: [['res_model', '=', 'ir.ui.view'], '|',
+                        ['mimetype', '=', false], ['mimetype', '=like', 'image/%']],
                     order: 'id desc',
                     context: website.get_context(),
                 }
diff --git a/addons/website/static/src/js/website.editor.newpage.js b/addons/website/static/src/js/website.editor.newpage.js
index 77a086790fa..b475223ecd9 100644
--- a/addons/website/static/src/js/website.editor.newpage.js
+++ b/addons/website/static/src/js/website.editor.newpage.js
@@ -48,7 +48,7 @@
                     }
                 }).then(function (val, field, $dialog) {
                     if (val) {
-                        var url = '/website/add' + encodeURI(val);
+                        var url = '/website/add/' + encodeURI(val);
                         if ($dialog.find('input[type="checkbox"]').is(':checked')) url +="?add_menu=1";
                         document.location = url;
                     }
diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js
index 44e2117a7f0..e88b1e4a6b6 100644
--- a/addons/website/static/src/js/website.translator.js
+++ b/addons/website/static/src/js/website.translator.js
@@ -34,11 +34,17 @@
                     dialog.$el.modal('hide');
                     self.translate().then(function () {
                         mysuper.call(self);
+                        if(self.gengo_translate){
+                            self.translation_gengo_display()
+                        }
                     });
                 });
             } else {
                 this.translate().then(function () {
                     mysuper.call(self);
+                    if(self.gengo_translate){
+                        self.translation_gengo_display()
+                    }
                 });
             }
         },
@@ -68,7 +74,7 @@
             var source_attr = 'data-oe-source-id';
             var $editables = $('[data-oe-model="ir.ui.view"]')
                     .not('link, script')
-                    .not('.oe_snippets,.oe_snippet, .oe_snippet *')
+                    .not('.oe_snippets,.oe_snippet, .oe_snippet *, .navbar-toggle')
                     .not('[data-oe-type]');
 
             $editables.each(function () {
@@ -92,7 +98,7 @@
                         self.sanitizeNode($node[0]);
                     }
                     if (self.getInitialContent($node[0]) !== $node.text()) {
-                        $node.addClass('oe_dirty').removeClass('oe_translatable_todo');
+                        $node.addClass('oe_dirty').removeClass('oe_translatable_todo oe_translatable_inprogress');
                     }
                 }, 0);
             });
@@ -119,6 +125,9 @@
             });
             if (trans.length) {
                 node.setAttribute('data-oe-translation-id', trans[0].id);
+                if(trans[0].gengo_translation && (trans[0].state == 'inprogress' || trans[0].state == 'to_translate')){
+                        node.className += ' oe_translatable_inprogress';
+                }
             } else {
                 node.className += ' oe_translatable_todo';
             }
diff --git a/addons/website/static/src/xml/website.translator.xml b/addons/website/static/src/xml/website.translator.xml
index d1d9ab14a39..480489ad9b3 100644
--- a/addons/website/static/src/xml/website.translator.xml
+++ b/addons/website/static/src/xml/website.translator.xml
@@ -38,7 +38,7 @@
                     </section>
                 </div>
                 <div class="modal-footer">
-                    <div class="pull-left">
+                    <div class="pull-right">
                         <input type="checkbox" name="do_not_show"/>
                         Do not show this dialog later.
                     </div>