Merge lp:~fabien-morin/unifield-web/fm-us-3172 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/__init__.py'
--- addons/openerp/controllers/__init__.py	2017-06-19 14:54:07 +0000
+++ addons/openerp/controllers/__init__.py	2017-09-26 07:32:44 +0000
@@ -16,6 +16,7 @@
 import selection
 import shortcuts
 import banner
+import shortcut_tooltip
 import requests
 import unifield_version
 import openm2o

=== added file 'addons/openerp/controllers/shortcut_tooltip.py'
--- addons/openerp/controllers/shortcut_tooltip.py	1970-01-01 00:00:00 +0000
+++ addons/openerp/controllers/shortcut_tooltip.py	2017-09-26 07:32:44 +0000
@@ -0,0 +1,33 @@
+###############################################################################
+#
+#  Copyright (C) 2007-TODAY OpenERP SA. All Rights Reserved.
+#
+#  $Id$
+#
+#  Developed by OpenERP (http://openerp.com) and Axelor (http://axelor.com).
+#
+#  The OpenERP web client is distributed under the "OpenERP Public License".
+#  It's based on Mozilla Public License Version (MPL) 1.1 with following
+#  restrictions:
+#
+#  -   All names, links and logos of OpenERP must be kept as in original
+#      distribution without any changes in all software screens, especially
+#      in start-up page and the software header, even if the application
+#      source code has been changed or updated or code has been added.
+#
+#  You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
+#
+###############################################################################
+from openerp.controllers import SecuredController
+from openerp.utils import rpc
+
+
+class ShortcutTooltip(SecuredController):
+
+    _cp_path = "/openerp/shortcut_tooltip"
+
+    def get_show_shortcut(self):
+        proxy = rpc.RPCProxy('sync.client.entity')
+        return proxy.display_shortcut_message()
+
+# vim: ts=4 sts=4 sw=4 si et

=== modified file 'addons/openerp/controllers/templates/base.mako'
--- addons/openerp/controllers/templates/base.mako	2017-09-14 13:33:18 +0000
+++ addons/openerp/controllers/templates/base.mako	2017-09-26 07:32:44 +0000
@@ -10,11 +10,11 @@
     <script type="text/javascript" src="/openerp/static/javascript/scripts.js"></script>
     <script type="text/javascript" src="/openerp/static/javascript/form.js?v=6.0"></script>
     <script type="text/javascript" src="/openerp/static/javascript/form_state.js?v=2.3b2"></script>
-    <script type="text/javascript" src="/openerp/static/javascript/listgrid.js?v=2.8b1"></script>
+    <script type="text/javascript" src="/openerp/static/javascript/listgrid.js?v=2.9"></script>
 
-    <script type="text/javascript" src="/openerp/static/javascript/m2o.js?v=2.6b4"></script>
+    <script type="text/javascript" src="/openerp/static/javascript/m2o.js?v=2.7"></script>
     <script type="text/javascript" src="/openerp/static/javascript/m2m.js"></script>
-    <script type="text/javascript" src="/openerp/static/javascript/o2m.js"></script>
+    <script type="text/javascript" src="/openerp/static/javascript/o2m.js?v=2.7"></script>
     <script type="text/javascript" src="/openerp/static/javascript/binary.js"></script>
     <script type="text/javascript" src="/openerp/static/jscal/calendar.js"></script>
     <script type="text/javascript" src="/openerp/static/jscal/calendar-setup.js"></script>

=== modified file 'addons/openerp/controllers/templates/exp.mako'
--- addons/openerp/controllers/templates/exp.mako	2017-08-29 09:33:08 +0000
+++ addons/openerp/controllers/templates/exp.mako	2017-09-26 07:32:44 +0000
@@ -286,7 +286,7 @@
                 <table width="100%">
                     <tr>
                         <td class="imp-header" align="right">
-                            <a class="button-a" href="javascript: void(0)" onclick="window.frameElement.close()">${_("Cancel")}</a>
+                            <a class="button-a oe_form_button_cancel" href="javascript: void(0)" onclick="window.frameElement.close()">${_("Cancel")}</a>
                             <a class="button-a" href="javascript: void(0)" onclick="do_export('view_form')">${_("Export to File")}</a>
                         </td>
                         <td width="5%"></td>

=== modified file 'addons/openerp/controllers/templates/header.mako'
--- addons/openerp/controllers/templates/header.mako	2016-06-14 16:01:53 +0000
+++ addons/openerp/controllers/templates/header.mako	2017-09-26 07:32:44 +0000
@@ -4,7 +4,6 @@
     ROOT = cp.request.pool.get_controller("/openerp")
     SHORTCUTS = cp.request.pool.get_controller("/openerp/shortcuts")
     REQUESTS = cp.request.pool.get_controller("/openerp/requests")
-    UF_VERSION = cp.request.pool.get_controller("/openerp/unifield_version")
 
     shortcuts = SHORTCUTS.my()
     requests, total_request = REQUESTS.my()
@@ -30,9 +29,6 @@
 add_style = cp.config('server.environment') in css_style_dict.keys()
 if add_style:
     css_style = css_style_dict.get(cp.config('server.environment'), "")
-
-from openobject import release
-version = release.version
 %>
 <td id="top"
     % if add_style:
@@ -153,6 +149,6 @@
             src:this.href
         }, null, {
             height: 350
-        });
+        }).focus();
     });
 </script>

=== modified file 'addons/openerp/controllers/templates/imp.mako'
--- addons/openerp/controllers/templates/imp.mako	2015-10-23 08:08:51 +0000
+++ addons/openerp/controllers/templates/imp.mako	2017-09-26 07:32:44 +0000
@@ -202,7 +202,7 @@
                 <table width="100%">
                     <tr>
                         <td class="imp-header" align="left">
-                            <a class="button-a" href="javascript: void(0)" onclick="window.frameElement.close()">${_("Close")}</a>
+                            <a class="button-a oe_form_button_cancel" href="javascript: void(0)" onclick="window.frameElement.close()">${_("Close")}</a>
                             <a class="button-a" href="javascript: void(0)" onclick="do_import();">${_("Import File")}</a>
                         </td>
                         <td width="5%"></td>

=== modified file 'addons/openerp/controllers/templates/index.mako'
--- addons/openerp/controllers/templates/index.mako	2017-06-19 14:54:07 +0000
+++ addons/openerp/controllers/templates/index.mako	2017-09-26 07:32:44 +0000
@@ -94,6 +94,9 @@
             <tr>
                 <%include file="banner.mako"/>
             </tr>
+            <tr>
+                <%include file="shortcut_tooltip.mako"/>
+            </tr>
             % if tools is not None:
                 <tr>
                     <td id="secondary" class="sidenav-open">

=== modified file 'addons/openerp/controllers/templates/preferences/index.mako'
--- addons/openerp/controllers/templates/preferences/index.mako	2016-11-21 09:45:23 +0000
+++ addons/openerp/controllers/templates/preferences/index.mako	2017-09-26 07:32:44 +0000
@@ -35,7 +35,7 @@
                     <button type='button' class="static_boxes"
                             onclick="open_password(); return false;"
                             >${_("Change Password")}</button>
-                    <button type='button' class="static_boxes" onclick="window.frameElement.close();">${_("Cancel")}</button>
+                    <button type='button' class="static_boxes oe_form_button_cancel" onclick="window.frameElement.close();">${_("Cancel")}</button>
                     <button type='button' class="static_boxes" onclick="submit_form('ok');">${_("Save")}</button>
                 </td>
             </tr>

=== added file 'addons/openerp/controllers/templates/shortcut_tooltip.mako'
--- addons/openerp/controllers/templates/shortcut_tooltip.mako	1970-01-01 00:00:00 +0000
+++ addons/openerp/controllers/templates/shortcut_tooltip.mako	2017-09-26 07:32:44 +0000
@@ -0,0 +1,13 @@
+<%
+# put in try block to prevent improper redirection on connection refuse error
+try:
+    SHORTCUT = cp.request.pool.get_controller("/openerp/shortcut_tooltip")
+    display_message = SHORTCUT.get_show_shortcut()
+    message = _("You haven't recently used a keyboard shortcut. You can see what shortcuts are available on this screen by holding SHIFT + CTRL.")
+except:
+    display_message = False
+    message = 'toto'
+%>
+% if display_message:
+<td id="shortcut_message" colspan="3">${message | h}</td>
+% endif

=== modified file 'addons/openerp/po/messages/fr.po'
--- addons/openerp/po/messages/fr.po	2017-01-02 14:59:00 +0000
+++ addons/openerp/po/messages/fr.po	2017-09-26 07:32:44 +0000
@@ -1775,3 +1775,7 @@
 #~ msgid "Click here to add new image."
 #~ msgstr "Cliquez ici pour ajouter une nouvelle image"
 
+#: controllers/templates/shortcut_tooltip.mako:6
+#, python-format
+msgid "You haven't recently used a keyboard shortcut. You can see what shortcuts are available on this screen by holding SHIFT + CTRL."
+msgstr "Vous n'avez pas utilisé de raccourci clavier récemment. Vous pouvez voir quels raccourcis sont disponibles sur cet écrant en utilisant CTRL + SHIFT."

=== modified file 'addons/openerp/static/css/screen.css'
--- addons/openerp/static/css/screen.css	2017-07-10 08:56:45 +0000
+++ addons/openerp/static/css/screen.css	2017-09-26 07:32:44 +0000
@@ -2378,3 +2378,13 @@
     background: rgba(255, 165, 0, .6);
     white-space: pre-line;
 }
+
+#shortcut_message {
+    font-weight: bold;
+    font-size: 1.2em;
+    height: 2em;
+    text-align: center;
+    background: rgb(184, 222, 130);
+    background: rgba(184, 222, 130, .6);
+    white-space: pre-line;
+}

=== modified file 'addons/openerp/static/css/tips.css'
--- addons/openerp/static/css/tips.css	2010-11-23 10:11:52 +0000
+++ addons/openerp/static/css/tips.css	2017-09-26 07:32:44 +0000
@@ -39,3 +39,22 @@
     font-size: 12px;
 }
 
+
+.shortcut_tooltip {
+    padding: 4px;
+    text-align: center;
+    font-family: sans-serif;
+    font-size: 11px;
+    color: #666666;
+    z-index: 1000;
+    border-radius: 6px;
+    -moz-border-radius: 6px;
+    -webkit-border-radius: 6px;
+    background: #FCF9A7;
+    border: 1px solid #999;
+    max-width: 500px;
+    opacity: 1;
+    -webkit-transition: opacity 1000ms linear;
+    transition: opacity 1000ms linear;
+    font-weight: bold;
+}

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2017-09-11 10:35:51 +0000
+++ addons/openerp/static/javascript/form.js	2017-09-26 07:32:44 +0000
@@ -255,11 +255,11 @@
 }
 
 
-function error_display(msg) {
+function error_display(msg, title='Warning Message') {
     var error = jQuery("<table>",{'width': '100%', 'height': '100%'}
                 ).append(
                     jQuery("<tr>").append(
-                        jQuery("<td>", {'colspan': 2, 'class': 'error_message_header'}).text(_('Warning Message'))
+                        jQuery("<td>", {'colspan': 2, 'class': 'error_message_header'}).text(_(title))
                     ),
                     jQuery("<tr>").append(
                         jQuery("<td>", {'css': 'padding: 4px 2px;'}).append(
@@ -275,7 +275,13 @@
                             .text('OK')
                         )
                 ));
-    window.top.jQuery.fancybox(error, {scrolling: 'no'});
+    error.find('.button-a').focus()
+    window.top.jQuery.fancybox(error, {
+        scrolling: 'no',
+        onComplete: function () {
+            $(this).find(".button-a").focus()
+        }
+    });
 }
 
 function get_sidebar_status(args, noterp) {

=== modified file 'addons/openerp/static/javascript/listgrid.js'
--- addons/openerp/static/javascript/listgrid.js	2017-06-26 09:38:41 +0000
+++ addons/openerp/static/javascript/listgrid.js	2017-09-26 07:32:44 +0000
@@ -1101,7 +1101,7 @@
         }, null, {
             height: '98%',
             max_height: 600
-        });
+        }).focus();
     },
 
     importData: function() {
@@ -1115,7 +1115,7 @@
             height: '98%',
             max_height: 550,
             width: '95%'
-        });
+        }).focus();
     }
 });
 

=== modified file 'addons/openerp/static/javascript/m2m.js'
--- addons/openerp/static/javascript/m2m.js	2017-01-02 14:59:00 +0000
+++ addons/openerp/static/javascript/m2m.js	2017-09-26 07:32:44 +0000
@@ -190,7 +190,7 @@
         } else {
             url = '/openerp/search/new';
         }
-        return $.frame_dialog({
+        var $frame = $.frame_dialog({
                 src: openobject.http.getURL(url, options)
             }, {
                 'source-window': $this[0],
@@ -199,6 +199,8 @@
                 width: '90%',
                 height: '95%'
             });
+        $frame.focus();
+        return $frame;
     }
 
     /**

=== modified file 'addons/openerp/static/javascript/m2o.js'
--- addons/openerp/static/javascript/m2o.js	2017-06-01 13:48:36 +0000
+++ addons/openerp/static/javascript/m2o.js	2017-09-26 07:32:44 +0000
@@ -606,7 +606,7 @@
         } else {
             url = '/openerp/search/new';
         }
-        return $.frame_dialog({
+        var $frame = $.frame_dialog({
                 src: openobject.http.getURL(url, options)
             }, {
                 'source-window': $this[0],
@@ -616,6 +616,8 @@
                 max_width: 1200,
                 height: '95%'
             });
+        $frame.focus();
+        return $frame;
     }
 
     /**
@@ -681,7 +683,7 @@
         if(arguments[0] === "close") {
             return close($this, arguments[1]);
         } else {
-            return open($this, arguments[0]);
+            return open($this, arguments[0]).focus();
         }
     };
 })(jQuery);

=== modified file 'addons/openerp/static/javascript/o2m.js'
--- addons/openerp/static/javascript/o2m.js	2017-01-02 14:59:00 +0000
+++ addons/openerp/static/javascript/o2m.js	2017-09-26 07:32:44 +0000
@@ -252,7 +252,13 @@
         });
         $frame.load(function() {
             $frame_content = $frame.contents();
-            $frame_content.find("[autofocus='autofocus']").focus();
+            if ($frame_content.find("[autofocus='autofocus']").lenght) {
+                // if a field have an autofocus attribute, set the focus on it
+                $frame_content.find("[autofocus='autofocus']").focus();
+            }
+            else {
+                $frame.focus();  // set the focus on the whole frame
+            }
         });
         var $form = jQuery('<form>', {
             method: 'POST',

=== modified file 'addons/openerp/static/javascript/openerp/openerp.base.js'
--- addons/openerp/static/javascript/openerp/openerp.base.js	2017-09-11 10:40:59 +0000
+++ addons/openerp/static/javascript/openerp/openerp.base.js	2017-09-26 07:32:44 +0000
@@ -187,13 +187,14 @@
     var $dialogs = jQuery('.action-dialog');
     switch(target) {
         case 'new':
-            jQuery.frame_dialog({
+            $frame = jQuery.frame_dialog({
                 src: action_url,
                 'class': 'action-dialog'
             }, null, {
                 width: '90%',
                 height: '95%'
             });
+            $frame.focus();
             if (terp_id && !$dialogs.length) {
                 if (jQuery('#_terp_id').val() == 'False') {
                     // we are opening an action on an unsaved record,

=== modified file 'addons/openerp/static/javascript/web_keyboard_shortcuts.js'
--- addons/openerp/static/javascript/web_keyboard_shortcuts.js	2017-09-12 09:54:25 +0000
+++ addons/openerp/static/javascript/web_keyboard_shortcuts.js	2017-09-26 07:32:44 +0000
@@ -28,9 +28,107 @@
 
 $.ctrlshift = function(key, callback, args) {
     $(document).keydown(function(e) {
+        if (e.ctrlKey && e.shiftKey) {
+            var class_to_parse = null
+            if (key == 'S'){
+                class_to_parse = '.oe_form_button_save, .oe_form_button_save_line, .oe_form_button_save_close';
+            }
+            else if (key == 'E'){
+                class_to_parse = '.oe_form_button_save_edit, .oe_form_button_edit';
+            }
+            else if (key == '46'){
+                class_to_parse = '.oe_form_button_delete';
+            }
+            else if (key == 'Z'){
+                class_to_parse = '.oe_form_button_cancel';
+            }
+            else if (key == 'C'){
+                class_to_parse = '.oe_form_button_create, .oe_form_button_save_create';
+            }
+            else if (key == 'D'){
+                class_to_parse = '.oe_form_button_duplicate';
+            }
+            else if (key == '13'){
+                class_to_parse = '.oe_form_button_search';
+            }
+            else if (key == '38'){
+                class_to_parse = '.oe_button_pager[action="first"]';
+            }
+            else if (key == '37'){
+                class_to_parse = '.oe_button_pager[action="previous"]';
+            }
+            else if (key == '39'){
+                class_to_parse = '.oe_button_pager[action="next"]';
+            }
+            else if (key == '40'){
+                class_to_parse = '.oe_button_pager[action="last"]';
+            }
+            if (class_to_parse != null){
+                //$('.oe_form_button_save')
+                $(class_to_parse).each(function() {
+
+                    // do not display tooltips on hidden notebook-page
+                    if ($(this).closest('.notebook-page').length && !$(this).closest('.notebook-page-active').length){
+                        console.log('notebook page not active');
+
+                    }
+                    else {
+                        if (key == '46'){
+                            key_to_display = 'Del.'
+                        }
+                        else if (key == '13') {
+                            key_to_display = 'Enter&nbsp;&#8629;'  // Enter
+                            //key_to_display = 'Enter'  // Enter
+                        }
+                        else if (key == '38') {
+                            key_to_display = '&#8679;'  // UP
+                        }
+                        else if (key == '37') {
+                            key_to_display = '&#8678;'  // Left
+                        }
+                        else if (key == '39') {
+                            key_to_display = '&#8680;'  // Right
+                        }
+                        else if (key == '40') {
+                            key_to_display = '&#8681;'  // Down
+                        }
+                        else {
+                            key_to_display = key
+                        }
+                        if ($(this).width() == 0) {
+                            return false;
+                        }
+                        var $newdiv1 = $( "<span class='shortcut_tooltip'>" + key_to_display + "</span>" );
+                        $( "body" ).append($newdiv1);
+                        var postion = $(this).position();
+                        var new_top = postion.top + 20;
+                        if ($(this).width() <= 20){
+                            var new_left = postion.left - $newdiv1.width()/2;
+                        }
+                        else {
+                            var new_left = postion.left + $(this).width()/2 - $newdiv1.width()/2 + 6;
+                        }
+                        $newdiv1.css({top: new_top, left: new_left, position:'absolute'});
+                        setTimeout(function() {
+                            $newdiv1.css({'opacity': '0'});
+                        }, 1000);
+
+                        setTimeout(function() {
+                           $newdiv1.remove();
+                        }, 2000);
+                     }
+                });
+            }
+        }
         if(!args) args=[]; // IE barks when args is null
         if((e.keyCode == key.charCodeAt(0) || e.keyCode == key) && e.ctrlKey && e.shiftKey) {
             e.preventDefault();  // override the browser shortcut keys
+            if (!document.nb_shortcut_used){
+                document.nb_shortcut_used = 1;
+            }
+            else{
+                document.nb_shortcut_used += 1;
+            }
             callback.apply(this, args);
             return false;
         }
@@ -132,14 +230,14 @@
     });
 });
 
-//Previous object (arrow right)
+//Previous object (arrow left)
 $.ctrlshift('37', function() {
     $('.oe_button_pager[action="previous"]').each(function() {
         fake_click(this);
     });
 });
 
-//Next object (arrow left)
+//Next object (arrow right)
 $.ctrlshift('39', function() {
     $('.oe_button_pager[action="next"]').each(function() {
         fake_click(this);