[MERGE] from trunk

bzr revid: xmo@openerp.com-20131007085750-hkv4fgeph0cc65eb

3 files changed, 0 insertions, 233 deletions

diff --git a/addons/web_shortcuts/static/src/css/web_shortcuts.css b/addons/web_shortcuts/static/src/css/web_shortcuts.css
deleted file mode 100644
index 5d4e34f53b9..00000000000
--- a/addons/web_shortcuts/static/src/css/web_shortcuts.css
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Shortcuts*/
-.oe_systray_shortcuts .oe_star_off {
-    color: #eee;
-}
-.oe_shortcuts_toggle {
-    height: 20px;
-    margin-top: 3px;
-    padding: 0;
-    width: 24px;
-    cursor: pointer;
-    display: block;
-    background: url(/web/static/src/img/add-shortcut.png) no-repeat center center;
-    float: left;
-}
-.oe_shortcuts_remove{
-    background: url(/web/static/src/img/remove-shortcut.png) no-repeat center center;
-}
-.oe_shortcuts {
-    position: absolute;
-    margin: 0;
-    padding: 6px 15px;
-    top: 37px;
-    left: 197px;
-    right: 0;
-    height: 17px;
-    line-height: 1.2;
-}
-.oe_shortcuts ul {
-    display: block;
-    overflow: hidden;
-    list-style: none;
-    white-space: nowrap;
-    padding: 0;
-    margin: 0;
-}
-.oe_shortcuts li {
-    cursor: pointer;
-    display: -moz-inline-stack;
-    display: inline-block;
-    display: inline; /*IE7 */
-    color: #fff;
-    text-align: center;
-    border-left: 1px solid #909090;
-    padding: 0 4px;
-    font-size: 80%;
-    font-weight: normal;
-    vertical-align: top;
-}
-
-.oe_shortcuts li:hover {
-    background-color: #666;
-}
-.oe_shortcuts li:first-child {
-    border-left: none;
-    padding-left: 0;
-}
-.oe_systray_shortcuts_items > li > a:hover {
-    overflow:visible;
-    white-space: normal;
-}
\ No newline at end of file
diff --git a/addons/web_shortcuts/static/src/js/web_shortcuts.js b/addons/web_shortcuts/static/src/js/web_shortcuts.js
deleted file mode 100644
index 045bc5b5ae6..00000000000
--- a/addons/web_shortcuts/static/src/js/web_shortcuts.js
+++ /dev/null
@@ -1,149 +0,0 @@
-/*############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011-2012 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-############################################################################*/
-
-openerp.web_shortcuts = function (instance) {
-
-var QWeb = instance.web.qweb,
-    _t = instance.web._t;
-
-instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
-    template: 'Systray.Shortcuts',
-
-    init: function() {
-        this._super();
-        this.on('load', this, this.load);
-        this.on('add', this, this.add);
-        this.on('display', this, this.display);
-        this.on('remove', this, this.remove);
-        this.on('click', this, this.click);
-        this.model = new instance.web.Model('ir.ui.view_sc');
-    },
-    start: function() {
-        var self = this;
-        this._super();
-        this.trigger('load');
-        this.$el.on('click', '.oe_systray_shortcuts_items a', function() {
-            self.trigger('click', $(this));
-        });
-    },
-    load: function() {
-        var self = this;
-        this.$el.find('.oe_systray_shortcuts_items').empty();
-        return this.model.call('get_sc', [
-            instance.session.uid,
-            'ir.ui.menu',
-            instance.web.pyeval.eval('context', {})
-        ]).done(function(shortcuts) {
-            _.each(shortcuts, function(sc) {
-                self.trigger('display', sc);
-            });
-        });
-    },
-    add: function (sc) {
-        var self = this;
-        this.model.call('create', [sc]).then(function(out){
-            self.trigger('load');
-        });
-    },
-    display: function(sc) {
-        var self = this;
-        this.$el.find('.oe_systray_shortcuts_items').append();
-        var $sc = $(QWeb.render('Systray.Shortcuts.Item', {'shortcut': sc}));
-        $sc.appendTo(self.$el.find('.oe_systray_shortcuts_items'));
-    },
-    remove: function (menu_id) {
-        var menu_id = this.session.active_id;
-        var $shortcut = this.$el.find('.oe_systray_shortcuts_items li a[data-id=' + menu_id + ']');
-        var shortcut_id = $shortcut.data('shortcut-id');
-        $shortcut.remove();
-        this.model.call('unlink', [shortcut_id]);
-    },
-    click: function($link) {
-        var self = this,
-            id = $link.data('id');
-        self.session.active_id = id;
-        // TODO: Use do_action({menu_id: id, type: 'ir.actions.menu'})
-        self.rpc('/web/menu/action', {'menu_id': id}).done(function(ir_menu_data) {
-            if (ir_menu_data.action.length){
-                instance.webclient.on_menu_action({action_id: ir_menu_data.action[0][2].id});
-            }
-        });
-        this.$el.find('.oe_systray_shortcuts').trigger('mouseout');
-    },
-    has: function(menu_id) {
-        return !!this.$el.find('a[data-id=' + menu_id + ']').length;
-    }
-});
-
-instance.web.UserMenu.include({
-    do_update: function() {
-        var self = this;
-        this._super.apply(this, arguments);
-        this.update_promise.done(function() {
-            if (self.shortcuts) {
-                self.shortcuts.trigger('load');
-            } else {
-                self.shortcuts = new instance.web_shortcuts.Shortcuts(self);
-                self.shortcuts.appendTo(instance.webclient.$el.find('.oe_systray'));
-            }
-        });
-    },
-});
-
-instance.web.ViewManagerAction.include({
-    switch_mode: function (view_type, no_store) {
-        var self = this;
-        this._super.apply(this, arguments).done(function() {
-            self.shortcut_check(self.views[view_type]);
-        });
-    },
-    shortcut_check : function(view) {
-        var self = this;
-        var shortcuts_menu = instance.webclient.user_menu.shortcuts;
-        var grandparent = this.getParent() && this.getParent().getParent();
-        // display shortcuts if on the first view for the action
-        var $shortcut_toggle = this.$el.find('.oe_shortcuts_toggle');
-        if (!this.action.name ||
-                !(view.view_type === this.views_src[0].view_type
-                    && view.view_id === this.views_src[0].view_id)) {
-            $shortcut_toggle.hide();
-            return;
-        }
-        // Anonymous users don't have user_menu
-        if (shortcuts_menu) {
-            $shortcut_toggle.toggleClass('oe_shortcuts_remove', shortcuts_menu.has(self.session.active_id));
-            $shortcut_toggle.unbind("click").click(function() {
-                if ($shortcut_toggle.hasClass("oe_shortcuts_remove")) {
-                    shortcuts_menu.trigger('remove', self.session.active_id);
-                } else {
-                    shortcuts_menu.trigger('add', {
-                        'user_id': self.session.uid,
-                        'res_id': self.session.active_id,
-                        'resource': 'ir.ui.menu',
-                        'name': self.action.name
-                    });
-                }
-                $shortcut_toggle.toggleClass("oe_shortcuts_remove");
-            });
-        }
-    }
-});
-
-};
diff --git a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
deleted file mode 100644
index 0b9701f9f1a..00000000000
--- a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
-<templates id="template" xml:space="preserve">
-<t t-name="Systray.Shortcuts">
-    <div class="oe_systray_shortcuts oe_topbar_item oe_dropdown_toggle">
-        <span class="oe_e oe_star_off">7</span>
-        <ul class="oe_systray_shortcuts_items oe_dropdown_menu"/>
-    </div>
-</t>
-<t t-name="Systray.Shortcuts.Item">
-    <li>
-        <a href="#" t-att-data-id="shortcut.res_id" t-att-data-shortcut-id="shortcut.id">
-            <t t-esc="shortcut.name"/>
-        </a>
-    </li>
-</t>
-<t t-extend="ViewManagerAction">
-    <t t-jquery="h2.oe_view_title" t-operation="prepend">
-        <a t-if="widget.flags.display_title !== false" class="oe_shortcuts_toggle" title="Add / Remove Shortcut..."
-            href="javascript: void(0)"> </a>
-    </t>
-</t>
-</templates>