diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js index 72c4eee1eca..568a6e2babd 100644 --- a/addons/board/static/src/js/dashboard.js +++ b/addons/board/static/src/js/dashboard.js @@ -90,13 +90,14 @@ var DashBoard = form_common.FormWidget.extend({ var qdict = { current_layout : this.$el.find('.oe_dashboard').attr('data-layout') }; - var $dialog = new Dialog(this, { - title: _t("Edit Layout"), - }, QWeb.render('DashBoard.layouts', qdict)).open(); - $dialog.$el.find('li').click(function() { + var dialog = new Dialog(this, { + title: _t("Edit Layout"), + $content: QWeb.render('DashBoard.layouts', qdict) + }).open(); + dialog.$el.find('li').click(function() { var layout = $(this).attr('data-layout'); self.do_change_layout(layout); - $dialog.$dialog_box.modal('hide'); + dialog.close(); }); }, do_change_layout: function(new_layout) { diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index e29feecf414..21ac9d5e171 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -1266,18 +1266,17 @@ var ComposeMessage = Attachment.extend ({ var partner_id = partner_info.partner_id; var parsed_email = mail_utils.parse_email(partner_name); - var pop = new form_common.FormOpenPopup(this); - pop.show_element( - 'res.partner', - partner_id, - { 'force_email': true, + var pop = new form_common.FormViewDialog(this, { + res_model: 'res.partner', + res_id: partner_id, + context: { + 'force_email': true, 'ref': "compound_context", 'default_name': parsed_email[0], 'default_email': parsed_email[1], - }, { - title: _t("Please complete partner's informations"), - } - ); + }, + title: _t("Please complete partner's informations"), + }).open(); pop.on('closed', self, function () { deferred.resolve(); }); diff --git a/addons/mail/static/src/js/many2many_tags_email.js b/addons/mail/static/src/js/many2many_tags_email.js index 604c1662579..2250935e1da 100644 --- a/addons/mail/static/src/js/many2many_tags_email.js +++ b/addons/mail/static/src/js/many2many_tags_email.js @@ -61,15 +61,12 @@ var FieldMany2ManyTagsEmail = form_relational.FieldMany2ManyTags.extend({ // unvalid partner _.each(record_ids, function (id) { - var pop = new form_common.FormOpenPopup(self); - pop.show_element( - 'res.partner', - id, - self.build_context(), - { - title: _t("Please complete partner's informations and Email"), - } - ); + var pop = new form_common.FormViewDialog(self, { + res_model: 'res.partner', + res_id: id, + context: self.build_context(), + title: _t("Please complete partner's informations and Email"), + }).open(); pop.on('write_completed', self, function () { this.values.push(id); this.values_checking = _.without(this.values_checking, id); diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 81a1460b0bd..440c83cd14b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1105,21 +1105,6 @@ .openerp .oe-control-panel .oe-pager-buttons { min-height: 30px; } -.openerp .o-modal-header > div { - margin-left: 45%; -} -.openerp .oe_popup_form { - display: none; -} -.openerp .oe_popup_form .oe_formview .oe_form_pager { - display: none !important; -} -.openerp .oe_popup_form table label { - font-weight: normal; -} -.openerp .oe_popup_list_pager { - float: right; -} .openerp .oe_searchview { cursor: text; position: relative; @@ -3189,49 +3174,6 @@ body.oe_single_form .oe_single_form_container { background-image: url("/web/static/lib/jquery.ui/images/ui-icons_ffffff_256x240.png"); } -.modal .modal-header button.close { - border: none; - background: none; - padding: 1px; - height: 18px; - font-size: 20px; -} -.modal .modal-body { - overflow: auto; - padding: 0; -} -.modal .modal-body .oe_application { - width: 100%; -} -.modal .modal-body .oe_popup_list { - display: none; - min-height: 150px; -} -.modal .modal-body .oe-view-manager { - min-height: 150px; -} -.modal .modal-body .oe_form_sheetbg .oe_form_sheet { - padding: 0; -} -.modal .modal-footer { - text-align: left; -} -.modal .oe_button { - margin: 0 4px 0 0; -} -.modal .oe_act_window.modal-body { - padding: 0; -} -.modal .oe-view-manager-content { - position: static !important; -} - -@media (min-width: 768px) { - .modal .modal-body { - max-height: -webkit-calc(100vh - 170px); - max-height: calc(100vh - 170px); - } -} .ui-datepicker { z-index: 1500 !important; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1f7a0c1560f..4ecea186b4b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -954,21 +954,6 @@ $sheet-padding: 16px min-height: 30px // }}} - // FormPopup {{{ - .o-modal-header - > div - margin-left: 45% - .oe_popup_form - display: none - .oe_formview .oe_form_pager - display: none !important - // Customize label weight for popup wizard appear from another wizard according bootstrap3 - table label - font-weight: normal - // End of customize - .oe_popup_list_pager - float: right - // }}} // SearchView {{{ .oe_searchview cursor: text @@ -2628,41 +2613,6 @@ body.oe_single_form background-image: url("/web/static/lib/jquery.ui/images/ui-icons_ffffff_256x240.png") // End jquery-ui override}}} -// Customized modal according bootstrap3 -.modal - .modal-header button.close - border: none - background: none - padding: 1px - height: 18px - font-size: 20px - .modal-body - overflow: auto - padding: 0 - .oe_application - width: 100% - .oe_popup_list - display: none - min-height: 150px - .oe-view-manager - min-height: 150px - .oe_form_sheetbg - .oe_form_sheet - padding: 0 - .modal-footer - text-align: left - .oe_button - margin: 0 4px 0 0 - .oe_act_window.modal-body - padding: 0 - .oe-view-manager-content - position: static !important - -@media (min-width: 768px) - .modal .modal-body - max-height: -webkit-calc(100vh - 170px) - max-height: calc(100vh - 170px) - .ui-datepicker z-index: 1500 !important diff --git a/addons/web/static/src/js/action_manager.js b/addons/web/static/src/js/action_manager.js index 6700932b4bc..68a81a9dc68 100644 --- a/addons/web/static/src/js/action_manager.js +++ b/addons/web/static/src/js/action_manager.js @@ -529,14 +529,13 @@ var ActionManager = Widget.extend({ * @return {*} */ ir_actions_common: function(executor, options) { - var widget; if (executor.action.target === 'new') { var pre_dialog = (this.dialog && !this.dialog.isDestroyed()) ? this.dialog : null; if (pre_dialog){ // prevent previous dialog to consider itself closed, // right now, as we're opening a new one (prevents // reload of original form view) - pre_dialog.off('closing', null, pre_dialog.on_close); + pre_dialog.off('closed', null, pre_dialog.on_close); } if (this.dialog_widget && !this.dialog_widget.isDestroyed()) { this.dialog_widget.destroy(); @@ -547,6 +546,7 @@ var ActionManager = Widget.extend({ this.dialog = new Dialog(this, { title: executor.action.name, dialogClass: executor.klass, + buttons: [] }); // chain on_close triggers with previous dialog, if any @@ -560,34 +560,32 @@ var ActionManager = Widget.extend({ pre_dialog.on_close(); } }; - this.dialog.on("closing", null, this.dialog.on_close); - widget = executor.widget(); - if (widget instanceof ViewManager) { - _.extend(widget.flags, { - $buttons: this.dialog.$buttons, + this.dialog.on("closed", null, this.dialog.on_close); + this.dialog_widget = executor.widget(); + if (this.dialog_widget instanceof ViewManager) { + _.extend(this.dialog_widget.flags, { + $buttons: this.dialog.$footer, footer_to_buttons: true, }); - if (widget.action.view_mode === 'form') { - widget.flags.headless = true; + if (this.dialog_widget.action.view_mode === 'form') { + this.dialog_widget.flags.headless = true; } } - if (widget.need_control_panel) { + if (this.dialog_widget.need_control_panel) { // Set a fake bus to Dialogs needing a ControlPanel as they should not // communicate with the main ControlPanel - widget.set_cp_bus(new core.Bus()); + this.dialog_widget.set_cp_bus(new core.Bus()); } - this.dialog_widget = widget; this.dialog_widget.setParent(this.dialog); - var initialized = this.dialog_widget.appendTo(this.dialog.$el); this.dialog.open(); - return $.when(initialized); + + return this.dialog_widget.appendTo(this.dialog.$el); } if (this.inner_widget && this.webclient.has_uncommitted_changes()) { return $.Deferred().reject(); } - widget = executor.widget(); this.dialog_stop(executor.action); - return this.push_action(widget, executor.action, options); + return this.push_action(executor.widget(), executor.action, options); }, ir_actions_act_window: function (action, options) { var self = this; @@ -596,7 +594,7 @@ var ActionManager = Widget.extend({ return new ViewManager(self, null, null, null, action); }, action: action, - klass: 'oe_act_window', + klass: 'o_act_window', }, options); }, ir_actions_client: function (action, options) { diff --git a/addons/web/static/src/js/control_panel.js b/addons/web/static/src/js/control_panel.js index 5e607d86a5c..64b493b5270 100644 --- a/addons/web/static/src/js/control_panel.js +++ b/addons/web/static/src/js/control_panel.js @@ -159,7 +159,7 @@ var ControlPanel = Widget.extend({ function make_breadcrumb (bc, is_last) { var $bc = $('
  • ') - .append(is_last ? bc.title : $('').text(bc.title)) + .append(is_last ? bc.title : $('').html(bc.title)) .toggleClass('active', is_last); if (!is_last) { $bc.click(function () { diff --git a/addons/web/static/src/js/framework/crash_manager.js b/addons/web/static/src/js/framework/crash_manager.js index 303cd66a4a3..4ab40f456bc 100644 --- a/addons/web/static/src/js/framework/crash_manager.js +++ b/addons/web/static/src/js/framework/crash_manager.js @@ -118,23 +118,17 @@ var CrashManager = core.Class.extend({ size: 'medium', title: "Odoo " + (_.str.capitalize(error.type) || _t("Warning")), subtitle: error.data.title, - buttons: [ - {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }} - ], - }, $('
    ' + QWeb.render('CrashManager.warning', {error: error}) + '
    ')).open(); + $content: $('
    ').html(QWeb.render('CrashManager.warning', {error: error})) + }).open(); }, show_error: function(error) { if (!this.active) { return; } - var buttons = {}; - buttons[_t("Ok")] = function() { - this.parents('.modal').modal('hide'); - }; new Dialog(this, { title: "Odoo " + _.str.capitalize(error.type), - buttons: buttons - }, QWeb.render('CrashManager.error', {session: session, error: error})).open(); + $content: QWeb.render('CrashManager.error', {session: session, error: error}) + }).open(); }, show_message: function(exception) { this.show_error({ @@ -181,16 +175,14 @@ var RedirectWarningHandler = Dialog.extend(ExceptionHandler, { size: 'medium', title: "Odoo " + (_.str.capitalize(error.type) || "Warning"), buttons: [ - {text: error.data.arguments[2], - oe_link_class : 'oe_highlight', - post_text : _t("or"), - click: function() { - window.location.href='#action='+error.data.arguments[1]; - self.destroy(); - }}, - {text: _t("Cancel"), oe_link_class: 'oe_link', click: function() { self.$el.parents('.modal').modal('hide'); self.destroy();}} + {text: error.data.arguments[2], classes : "btn-primary", click: function() { + window.location.href = '#action='+error.data.arguments[1]; + self.destroy(); + }}, + {text: _t("Cancel"), click: function() { self.destroy(); }, close: true} ], - }, QWeb.render('CrashManager.warning', {error: error})).open(); + $content: QWeb.render('CrashManager.warning', {error: error}) + }).open(); } }); diff --git a/addons/web/static/src/js/framework/data.js b/addons/web/static/src/js/framework/data.js index efbce3a5056..597af06118d 100644 --- a/addons/web/static/src/js/framework/data.js +++ b/addons/web/static/src/js/framework/data.js @@ -542,8 +542,8 @@ var DataSet = Class.extend(mixins.PropertiesMixin, { /** * @param name */ - name_create: function(name) { - return this._model.call('name_create', [name], {context: this.get_context()}); + name_create: function(name, context) { + return this._model.call('name_create', [name], {context: this.get_context(context)}); }, exec_workflow: function (id, signal) { return this._model.exec_workflow(id, signal); diff --git a/addons/web/static/src/js/framework/dialog.js b/addons/web/static/src/js/framework/dialog.js index 81d8860d4c3..45a00bcaa60 100644 --- a/addons/web/static/src/js/framework/dialog.js +++ b/addons/web/static/src/js/framework/dialog.js @@ -5,190 +5,167 @@ var core = require('web.core'); var Widget = require('web.Widget'); var QWeb = core.qweb; -var opened_modals = []; +var _t = core._t; /** A useful class to handle dialogs. Attributes: - - $buttons: A jQuery element targeting a dom part where buttons can be added. It always exists + - $footer: A jQuery element targeting a dom part where buttons can be added. It always exists during the lifecycle of the dialog. */ var Dialog = Widget.extend({ - dialog_title: "", /** Constructor. @param {Widget} parent - @param {dictionary} options A dictionary that will be forwarded to jQueryUI Dialog. Additionaly, that - dictionary can contain the following keys: + @param {dictionary} options + - title + - subtitle - size: one of the following: 'large', 'medium', 'small' - - dialogClass: class to add to the body of dialog - - buttons: Deprecated. The buttons key is not propagated to jQueryUI Dialog. It must be a dictionary (key = button - label, value = click handler) or a list of dictionaries (each element in the dictionary is send to the - corresponding method of a jQuery element targeting the -

    -
    -
    +

    +
    +
    - - - - -
    -

    - - var message = d.message ? d.message : d.error.data.message; - d.html_error = context.engine.tools.html_escape(message) - .replace(/\n/g, '
    '); -     - -

    -
    +
    + + var message = d.message ? d.message : d.error.data.message; + d.html_error = context.engine.tools.html_escape(message).replace(/\n/g, '
    '); +     + +
    -
    +
    -
    @@ -330,7 +322,6 @@ - or @@ -815,7 +806,7 @@
    - +
    @@ -1175,12 +1166,10 @@
    - - + +
    @@ -1497,8 +1486,7 @@ - - - @@ -1542,51 +1529,13 @@ - -
    -
    -
    -
    -
    -
    -
    -
    -
    - - - - - - - - or Cancel - - - - - - - - - - - or - - - - Discard - - - Close - - - + this.removeAttr('t-if'); diff --git a/addons/web/static/test/menu.js b/addons/web/static/test/menu.js index 78c006fa8ba..8f183481bb5 100644 --- a/addons/web/static/test/menu.js +++ b/addons/web/static/test/menu.js @@ -249,10 +249,10 @@ Tour.register({ { title: "Select next action", onload: function () { - if ($(".oe_error_detail").size()) { + if ($(".o_error_detail").size()) { console.log("Tour 'test_menu' has detected an error."); } - if ($(".oe_dialog_warning").size()) { + if ($(".o_dialog_warning").size()) { console.log("Tour 'test_menu' has detected a warning."); } diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml index 2cc1f28641a..690b56b044c 100644 --- a/addons/web/views/webclient_templates.xml +++ b/addons/web/views/webclient_templates.xml @@ -75,6 +75,7 @@ + diff --git a/addons/web_calendar/static/src/css/web_fullcalendar.sass b/addons/web_calendar/static/src/css/web_fullcalendar.sass deleted file mode 100644 index 7c70c036c93..00000000000 --- a/addons/web_calendar/static/src/css/web_fullcalendar.sass +++ /dev/null @@ -1,423 +0,0 @@ -@charset "utf-8" - - -$color1: #ac725e -$color2: #d06b64 -$color3: #f83a22 -$color4: #fa573c -$color5: #ff7537 -$color6: #ffad46 -$color7: #42d692 -$color8: #16a765 -$color9: #7bd148 -$color10: #b3dc6c -$color11: #fbe983 -$color12: #fad165 -$color13: #92e1c0 -$color14: #9fe1e7 -$color15: #9fc6e7 -$color16: #4986e7 -$color17: #9a9cff -$color18: #b99aff -$color19: #c2c2c2 -$color20: #cabdbf -$color21: #cca6ac -$color22: #f691b2 -$color23: #cd74e6 -$color24: #a47ae2 -$ecolor1: #a4bdfc -$ecolor2: #7ae7bf -$ecolor3: #dbadff -$ecolor4: #ff887c -$ecolor5: #fbd75b -$ecolor6: #ffb878 -$ecolor7: #46d6db -$ecolor8: #e1e1e1 -$ecolor9: #5484ed -$ecolor10:#51b749 -$ecolor11: #dc2127 -$fontcolor: #0d0d0d - -.openerp - .oe_calendar_quick_create - margin: 12px - - .oe-view-manager-view-calendar - position: relative - padding-top: 10px - padding-left: 5px - -.openerp - .oe_searchview.oe_searchview_open_drawer - .oe_searchview_drawer - z-index: 10 - -.openerp - td.oe_calendar_sidebar_container - padding: 10px - -.openerp - .o-dashboard - td.oe_calendar_sidebar_container - display: none - -img.attendee_head - height: 18px - width: 18px - -.openerp .oe_calendar_table - .attendee_head - float: right - margin-left: 1px - size: 18px !important - - .cal_avatar - height: 24px - width: 24px - - .cal_opacity - opacity: 0.6 - - .event_color_1 - background-color: $ecolor1 - color: $fontcolor - - .event_color_2 - background-color: $ecolor2 - color: $fontcolor - - .event_color_3 - background-color: $ecolor3 - color: $fontcolor - - .event_color_4 - background-color: $ecolor4 - color: $fontcolor - - .event_color_5 - background-color: $ecolor5 - color: $fontcolor - - .event_color_6 - background-color: $ecolor6 - color: $fontcolor - - .event_color_7 - background-color: $ecolor7 - color: $fontcolor - - .event_color_8 - background-color: $ecolor8 - color: $fontcolor - - .event_color_9 - background-color: $ecolor9 - color: $fontcolor - - .event_color_10 - background-color: $ecolor10 - color: $fontcolor - - .event_color_11 - background-color: $ecolor11 - color: $fontcolor - - .calendar_color_1 - border-color: $color1 - background-color: $color1 - color: $fontcolor - - .calendar_color_2 - border-color: $color2 - background-color: $color2 - color: $fontcolor - - .calendar_color_3 - border-color: $color3 - background-color: $color3 - color: $fontcolor - - .calendar_color_4 - border-color: $color4 - background-color: $color4 - color: $fontcolor - - .calendar_color_5 - border-color: $color5 - background-color: $color5 - color: $fontcolor - - .calendar_color_6 - border-color: $color6 - background-color: $color6 - color: $fontcolor - - .calendar_color_7 - border-color: $color7 - background-color: $color7 - color: $fontcolor - - .calendar_color_8 - border-color: $color8 - background-color: $color8 - color: $fontcolor - - .calendar_color_9 - border-color: $color9 - background-color: $color9 - color: $fontcolor - - .calendar_color_10 - border-color: $color10 - background-color: $color10 - color: $fontcolor - - .calendar_color_11 - border-color: $color11 - background-color: $color11 - color: $fontcolor - - .calendar_color_12 - border-color: $color12 - background-color: $color12 - color: $fontcolor - - .calendar_color_13 - border-color: $color13 - background-color: $color13 - color: $fontcolor - - .calendar_color_14 - border-color: $color14 - background-color: $color14 - color: $fontcolor - - .calendar_color_15 - border-color: $color15 - background-color: $color15 - color: $fontcolor - - .calendar_color_16 - border-color: $color16 - background-color: $color16 - color: $fontcolor - - .calendar_color_17 - border-color: $color17 - background-color: $color17 - color: $fontcolor - - .calendar_color_18 - border-color: $color18 - background-color: $color18 - color: $fontcolor - - .calendar_color_19 - border-color: $color19 - background-color: $color19 - color: $fontcolor - - .calendar_color_20 - border-color: $color20 - background-color: $color20 - color: $fontcolor - - .calendar_color_21 - border-color: $color21 - background-color: $color21 - color: $fontcolor - - .calendar_color_22 - border-color: $color22 - background-color: $color22 - color: $fontcolor - - .calendar_color_23 - border-color: $color23 - background-color: $color23 - color: $fontcolor - - .calendar_color_24 - border-color: $color24 - background-color: $color24 - color: $fontcolor - - - - .underline_ecolor_1 - border-bottom: 4px solid $ecolor1 - - .underline_ecolor_2 - border-bottom: 4px solid $ecolor2 - - .underline_ecolor_3 - border-bottom: 4px solid $ecolor3 - - .underline_ecolor_4 - border-bottom: 4px solid $ecolor4 - - .underline_ecolor_5 - border-bottom: 4px solid $ecolor5 - - .underline_ecolor_6 - border-bottom: 4px solid $ecolor6 - - .underline_ecolor_7 - border-bottom: 4px solid $ecolor7 - - .underline_ecolor_8 - border-bottom: 4px solid $ecolor8 - - .underline_ecolor_9 - border-bottom: 4px solid $ecolor9 - - .underline_ecolor_10 - border-bottom: 4px solid $ecolor10 - - .underline_ecolor_11 - border-bottom: 4px solid $ecolor11 - - - .underline_color_1 - border-bottom: 4px solid $color1 - - .underline_color_2 - border-bottom: 4px solid $color2 - - .underline_color_3 - border-bottom: 4px solid $color3 - - .underline_color_4 - border-bottom: 4px solid $color4 - - .underline_color_5 - border-bottom: 4px solid $color5 - - .underline_color_6 - border-bottom: 4px solid $color6 - - .underline_color_7 - border-bottom: 4px solid $color7 - - .underline_color_8 - border-bottom: 4px solid $color8 - - .underline_color_9 - border-bottom: 4px solid $color9 - - .underline_color_10 - border-bottom: 4px solid $color10 - - .underline_color_11 - border-bottom: 4px solid $color11 - - .underline_color_12 - border-bottom: 4px solid $color12 - - .underline_color_13 - border-bottom: 4px solid $color13 - - .underline_color_14 - border-bottom: 4px solid $color14 - - .underline_color_15 - border-bottom: 4px solid $color15 - - .underline_color_16 - border-bottom: 4px solid $color16 - - .underline_color_17 - border-bottom: 4px solid $color17 - - .underline_color_18 - border-bottom: 4px solid $color18 - - .underline_color_19 - border-bottom: 4px solid $color19 - - .underline_color_20 - border-bottom: 4px solid $color20 - - .underline_color_21 - border-bottom: 4px solid $color21 - - .underline_color_22 - border-bottom: 4px solid $color22 - - .underline_color_23 - border-bottom: 4px solid $color23 - - .underline_color_24 - border-bottom: 4px solid $color24 - - .color_1 - color: $color1 - - .color_2 - color: $color2 - - .color_3 - color: $color3 - - .color_4 - color: $color4 - - .color_5 - color: $color5 - - .color_6 - color: $color6 - - .color_7 - color: $color7 - - .color_8 - color: $color8 - - .color_9 - color: $color9 - - .color_10 - color: $color10 - - .color_11 - color: $color11 - - .color_12 - color: $color12 - - .color_13 - color: $color13 - - .color_14 - color: $color14 - - .color_15 - color: $color15 - - .color_16 - color: $color16 - - .color_17 - color: $color17 - - .color_18 - color: $color18 - - .color_19 - color: $color19 - - .color_20 - color: $color20 - - .color_21 - color: $color21 - - .color_22 - color: $color22 - - .color_23 - color: $color23 - - .color_24 - color: $color24 diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js index 61c878d79ab..d2a57bab06a 100644 --- a/addons/web_calendar/static/src/js/web_calendar.js +++ b/addons/web_calendar/static/src/js/web_calendar.js @@ -32,12 +32,6 @@ function get_fc_defaultOptions() { return { weekNumberTitle: _t("W"), allDayText: _t("All day"), - buttonText : { - today: _t("Today"), - month: _t("Month"), - week: _t("Week"), - day: _t("Day") - }, monthNames: moment.months(), monthNamesShort: moment.monthsShort(), dayNames: moment.weekdays(), @@ -53,7 +47,7 @@ function get_fc_defaultOptions() { }, titleFormat: { month: 'MMMM yyyy', - week: dateFormat + "{ '—'"+ dateFormat, + week: "W", day: dateFormat, }, columnFormat: { @@ -94,6 +88,8 @@ var CalendarView = View.extend({ this.range_stop = null; this.selected_filters = []; + this.title = (this.options.action)? this.options.action.name : ''; + this.shown = $.Deferred(); }, @@ -117,7 +113,7 @@ var CalendarView = View.extend({ var attrs = fv.arch.attrs, self = this; this.fields_view = fv; - this.$calendar = this.$el.find(".oe_calendar_widget"); + this.$calendar = this.$(".o_calendar_widget"); this.info_fields = []; @@ -138,6 +134,10 @@ var CalendarView = View.extend({ this.how_display_event = ''; this.attendee_people = attrs.attendee; + // Check whether the date field is editable (i.e. if the events can be dragged and dropped) + var main_date_field = this.date_start || this.date_end || this.date_delay; + this.editable = !this.options.read_only_mode && !this.fields_view.fields[main_date_field].readonly; + //if quick_add = False, we don't allow quick_add //if quick_add = not specified in view, we use the default quick_create_instance //if quick_add = is NOT False and IS specified in view, we this one for quick_create_instance' @@ -249,15 +249,28 @@ var CalendarView = View.extend({ render_buttons: function($node) { var self = this; this.$buttons = $(QWeb.render("CalendarView.buttons", {'widget': this})); - this.$buttons.on('click', 'button.oe_calendar_button_new', function () { + this.$buttons.on('click', 'button.o_calendar_button_new', function () { self.dataset.index = null; self.do_switch_view('form'); }); + + var bindCalendarButton = function(selector, arg1, arg2) { + self.$buttons.on('click', selector, _.bind(self.$calendar.fullCalendar, self.$calendar, arg1, arg2)); + } + bindCalendarButton('.o_calendar_button_prev', 'prev'); + bindCalendarButton('.o_calendar_button_today', 'today'); + bindCalendarButton('.o_calendar_button_next', 'next'); + bindCalendarButton('.o_calendar_button_day', 'changeView', 'agendaDay'); + bindCalendarButton('.o_calendar_button_week', 'changeView', 'agendaWeek'); + bindCalendarButton('.o_calendar_button_month', 'changeView', 'month'); + + this.$buttons.find('.o_calendar_button_' + this.mode).addClass('active'); + $node = $node || this.options.$buttons; if ($node) { this.$buttons.appendTo($node); } else { - this.$('.oe_calendar_buttons').replaceWith(this.$buttons); + this.$('.o_calendar_buttons').replaceWith(this.$buttons); } }, get_fc_init_options: function () { @@ -265,21 +278,25 @@ var CalendarView = View.extend({ var self = this; return $.extend({}, get_fc_defaultOptions(), { - defaultView: (this.mode == "month")?"month": - (this.mode == "week"?"agendaWeek": - (this.mode == "day"?"agendaDay":"month")), - header: { - left: 'prev,next today', - center: 'title', - right: 'month,agendaWeek,agendaDay' - }, + defaultView: (this.mode == "month")? "month" : ((this.mode == "week")? "agendaWeek" : ((this.mode == "day")? "agendaDay" : "agendaWeek")), + header: false, selectable: !this.options.read_only_mode && this.create_right, selectHelper: true, - editable: !this.options.read_only_mode, + editable: this.editable, droppable: true, // callbacks + viewRender: function(view) { + var mode = (view.name == "month")? "month" : ((view.name == "agendaWeek") ? "week" : "day"); + if(self.$buttons !== undefined) { + self.$buttons.find('.active').removeClass('active'); + self.$buttons.find('.o_calendar_button_' + mode).addClass('active'); + } + + var title = self.title + ' (' + ((mode === "week")? _t("Week ") : "") + view.title + ")"; + self.set({'title': title}); + }, eventDrop: function (event, _day_delta, _minute_delta, _all_day, _revertFunc) { var data = self.get_event_data(event); self.proxy('update_record')(event._id, data); // we don't revert the event, but update it. @@ -307,18 +324,15 @@ var CalendarView = View.extend({ allDay: all_day, }); self.open_quick_create(data_template); - }, unselectAuto: false, - - }); }, calendarMiniChanged: function (context) { return function(datum,obj) { - var curView = context.$calendar.fullCalendar( 'getView'); + var curView = context.$calendar.fullCalendar('getView'); var curDate = new Date(obj.currentYear , obj.currentMonth, obj.currentDay); if (curView.name == "agendaWeek") { @@ -327,7 +341,7 @@ var CalendarView = View.extend({ } } else if (curView.name != "agendaDay" || (curView.name == "agendaDay" && moment(curDate).diff(moment(curView.start))===0)) { - context.$calendar.fullCalendar('changeView','agendaWeek'); + context.$calendar.fullCalendar('changeView','agendaWeek'); } context.$calendar.fullCalendar('gotoDate', obj.currentYear , obj.currentMonth, obj.currentDay); }; @@ -339,9 +353,9 @@ var CalendarView = View.extend({ if (!this.sidebar) { var translate = get_fc_defaultOptions(); this.sidebar = new widgets.Sidebar(this); - this.sidebar.appendTo(this.$el.find('.oe_calendar_sidebar_container')); + this.sidebar.appendTo(this.$('.o_calendar_sidebar_container')); - this.$small_calendar = self.$el.find(".oe_calendar_mini"); + this.$small_calendar = self.$(".o_calendar_mini"); this.$small_calendar.datepicker({ onSelect: self.calendarMiniChanged(self), dayNamesMin : translate.dayNamesShort, @@ -361,9 +375,9 @@ var CalendarView = View.extend({ get_quick_create_class: function () { return widgets.QuickCreate; }, - open_quick_create: function(data_template) { + open_quick_create: function(data_template) { // FIXME if (!isNullOrUndef(this.quick)) { - return this.quick.trigger('close'); + return this.quick.close(); } var QuickCreate = this.get_quick_create_class(); @@ -371,14 +385,16 @@ var CalendarView = View.extend({ this.quick = new QuickCreate(this, this.dataset, true, this.options, data_template); this.quick.on('added', this, this.quick_created) .on('slowadded', this, this.slow_created) - .on('close', this, function() { - this.quick.destroy(); + .on('closed', this, function() { delete this.quick; this.$calendar.fullCalendar('unselect'); }); - this.quick.replace(this.$el.find('.oe_calendar_qc_placeholder')); - if (!this.options.disable_quick_create) { + + if(!this.options.disable_quick_create) { + this.quick.open(); this.quick.focus(); + } else { + this.quick.start(); } }, @@ -561,7 +577,7 @@ var CalendarView = View.extend({ attendee_showed += 1; if (attendee_showed<= MAX_ATTENDEES) { if (self.avatar_model !== null) { - the_title_avatar += ''; } else { @@ -569,7 +585,7 @@ var CalendarView = View.extend({ var tempColor = (self.all_filters[the_attendee_people] !== undefined) ? self.all_filters[the_attendee_people].color : (self.all_filters[-1] ? self.all_filters[-1].color : 1); - the_title_avatar += ''; + the_title_avatar += ''; }//else don't add myself } } @@ -579,7 +595,7 @@ var CalendarView = View.extend({ } ); if (attendee_other.length>2) { - the_title_avatar += '+'; + the_title_avatar += '+'; } the_title = the_title_avatar + the_title; } @@ -603,11 +619,11 @@ var CalendarView = View.extend({ if (typeof color_key === "object") { color_key = color_key[0]; } - r.className = 'cal_opacity calendar_color_'+ this.get_color(color_key); + r.className = 'o_calendar_color_'+ this.get_color(color_key); } } else { // if form all, get color -1 - r.className = 'cal_opacity calendar_color_'+ self.all_filters[-1].color; + r.className = 'o_calendar_color_'+ self.all_filters[-1].color; } return r; }, @@ -665,7 +681,6 @@ var CalendarView = View.extend({ } if (this.date_delay) { - data[this.date_delay] = diff_seconds / 3600; } return data; @@ -861,38 +876,26 @@ var CalendarView = View.extend({ } } else { - var pop = new form_common.FormOpenPopup(this); - var id_cast = parseInt(id).toString() == id ? parseInt(id) : id; - pop.show_element(this.dataset.model, id_cast, this.dataset.get_context(), { - title: _.str.sprintf(_t("View: %s"),title), + var dialog = new form_common.FormViewDialog(this, { + res_model: this.dataset.model, + res_id: parseInt(id).toString() == id ? parseInt(id) : id, + context: this.dataset.get_context(), + title: title, view_id: +this.open_popup_action, - res_id: id_cast, - target: 'new', - readonly:true - }); - - var form_controller = pop.view_form; - form_controller.on("load_record", self, function(){ - var button_delete = _.str.sprintf("",_t("Delete")); - var button_edit = _.str.sprintf("",_t("Edit Event")); - - pop.$el.closest(".modal").find(".modal-footer").prepend(button_delete); - pop.$el.closest(".modal").find(".modal-footer").prepend(button_edit); - - $('.delme').click( - function() { - $('.oe_form_button_cancel').trigger('click'); - self.remove_event(id); - } - ); - $('.editme').click( - function() { - $('.oe_form_button_cancel').trigger('click'); + readonly: true, + buttons: [ + {text: _t("Edit"), classes: 'btn-primary', close: true, click: function() { self.dataset.index = self.dataset.get_id_index(id); self.do_switch_view('form', null, { mode: "edit" }); - } - ); - }); + }}, + + {text: _t("Delete"), close: true, click: function() { + self.remove_event(id); + }}, + + {text: _t("Close"), close: true} + ] + }).open(); } return false; }, diff --git a/addons/web_calendar/static/src/js/widgets.js b/addons/web_calendar/static/src/js/widgets.js index 37b1a479541..09165d4d9dd 100644 --- a/addons/web_calendar/static/src/js/widgets.js +++ b/addons/web_calendar/static/src/js/widgets.js @@ -19,9 +19,8 @@ var QWeb = core.qweb; * @class * @type {*} */ -var QuickCreate = Widget.extend({ +var QuickCreate = Dialog.extend({ init: function(parent, dataset, buttons, options, data_template) { - this._super(parent); this.dataset = dataset; this._buttons = buttons || false; this.options = options; @@ -29,6 +28,23 @@ var QuickCreate = Widget.extend({ // Can hold data pre-set from where you clicked on agenda this.data_template = data_template || {}; this.$input = $(); + + var self = this; + this._super(parent, { + title: this.get_title(), + size: 'small', + buttons: this._buttons ? [ + {text: _t("Create event"), classes: 'btn-primary', click: function (e) { + if (!self.quick_add()) { + self.focus(); + } + }}, + {text: _t("Edit event"), click: function (e) { + self.slow_add(); + }} + ] : [], + $content: QWeb.render('CalendarView.quick_create', {widged: this}) + }); }, get_title: function () { var parent = this.getParent(); @@ -37,7 +53,7 @@ var QuickCreate = Widget.extend({ } var title = (_.isUndefined(parent.field_widget)) ? (parent.string || parent.name) : - parent.field_widget.string || parent.field_widget.name || ''; + (parent.field_widget.string || parent.field_widget.name || ''); return _t("Create: ") + title; }, start: function () { @@ -47,38 +63,22 @@ var QuickCreate = Widget.extend({ this.slow_create(); return; } - self.on('added', self, function() { - self.trigger('close'); + this.on('added', this, function() { + self.close(); }); - this.$dialog = new Dialog(this, { - title: this.get_title(), - size: 'small', - buttons: this._buttons ? [ - {text: _t("Create event"), oe_link_class: 'oe_highlight', click: function (e) { - if (!self.quick_add()) { - self.focus(); - } - }}, - {text: _t("Edit event"), oe_link_class: 'oe_link', click: function (e) { - self.slow_add(); - }} - ] : [] - }, QWeb.render('CalendarView.quick_create', {widged: this})) - .on('closed', self, function() { - self.trigger('close'); - }) - .open(); - this.$input = this.$dialog.$('input').keyup(function enterHandler (e) { - if(e.keyCode == 13){ + this.$input = this.$('input').keyup(function enterHandler (e) { + if(e.keyCode == $.ui.keyCode.ENTER) { self.$input.off('keyup', enterHandler); if (!self.quick_add()){ self.$input.on('keyup', enterHandler); } - } else if (e.keyCode == 27 && self._buttons) { - self.trigger('close'); + } else if (e.keyCode == $.ui.keyCode.ESCAPE && self._buttons) { + self.close(); } }); + + return this._super(); }, focus: function() { this.$input.focus(); @@ -88,15 +88,12 @@ var QuickCreate = Widget.extend({ * Gathers data from the quick create dialog a launch quick_create(data) method */ quick_add: function() { - var val = this.$input.val(); - if (/^\s*$/.test(val)) { - return false; - } - return this.quick_create({'name': val}).always(function() { return true; }); + var val = this.$input.val().trim(); + return (val)? this.quick_create({'name': val}) : false; }, slow_add: function() { - var val = this.$input.val(); + var val = this.$input.val().trim(); this.slow_create({'name': val}); }, @@ -109,7 +106,7 @@ var QuickCreate = Widget.extend({ .then(function(id) { self.trigger('added', id); self.$input.val(""); - }).fail(function(r, event) { + }, function(r, event) { event.preventDefault(); // This will occurs if there are some more fields required self.slow_create(data); @@ -143,9 +140,10 @@ var QuickCreate = Widget.extend({ }); var pop_infos = self.get_form_popup_infos(); - var pop = new form_common.FormOpenPopup(this); var context = new data.CompoundContext(this.dataset.context, defaults); - pop.show_element(this.dataset.model, null, this.dataset.get_context(defaults), { + var pop = new form_common.FormViewDialog(this, { + res_model: this.dataset.model, + context: this.dataset.get_context(defaults), title: this.get_title(), disable_multiple_selection: true, view_id: pop_infos.view_id, @@ -165,12 +163,9 @@ var QuickCreate = Widget.extend({ throw new Error(r); } }); - }, - }); + } + }).open(); pop.on('closed', self, function() { - // ``self.trigger('close')`` would itself destroy all child element including - // the slow create popup, which would then re-trigger recursively the 'closed' signal. - // Thus, here, we use a deferred and its state to cut the endless recurrence. if (def.state() === "pending") { def.resolve(); } @@ -184,7 +179,8 @@ var QuickCreate = Widget.extend({ var parent = self.getParent(); parent.$calendar.fullCalendar('refetchEvents'); } - self.trigger('close'); + self.close(); + self.trigger("closed"); }); return def; }, @@ -199,7 +195,7 @@ var Sidebar = Widget.extend({ start: function() { this._super(); this.filter = new SidebarFilter(this, this.getParent()); - this.filter.appendTo(this.$el.find('.oe_calendar_filter')); + this.filter.appendTo(this.$('.o_calendar_filter')); } }); var SidebarFilter = Widget.extend({ @@ -216,7 +212,7 @@ var SidebarFilter = Widget.extend({ var self = this; _.forEach(self.view.all_filters, function(o) { if (_.contains(self.view.now_filter_ids, o.value)) { - self.$('div.oe_calendar_responsible input[value=' + o.value + ']').prop('checked',o.is_checked); + self.$('div.o_calendar_responsible input[value=' + o.value + ']').prop('checked',o.is_checked); } }); }, diff --git a/addons/web_calendar/static/src/less/web_calendar.less b/addons/web_calendar/static/src/less/web_calendar.less new file mode 100644 index 00000000000..a5c0da53d35 --- /dev/null +++ b/addons/web_calendar/static/src/less/web_calendar.less @@ -0,0 +1,147 @@ + +.o_calendar_container { + @nb-calendar-colors: 24; + + .calendar_color_loop(@index) when (@index < @nb-calendar-colors+1) { + .o_calendar_color_@{index} { + color: #0D0D0D; + background-color: spin(rgb(255, 192, 192), 360/(@nb-calendar-colors+1) * @index); + border-color: spin(rgb(255, 192, 192), 360/(@nb-calendar-colors+1) * @index); + opacity: 0.7; + } + .calendar_color_loop(@index + 1); + } + .calendar_color_loop(1); + + .underline_color_loop(@index) when (@index < @nb-calendar-colors+1) { + .o_underline_color_@{index} { + border-bottom: 4px solid spin(rgba(255, 192, 192, 0.7), 360/(@nb-calendar-colors+1) * @index); + } + .underline_color_loop(@index + 1); + } + .underline_color_loop(1); + + .o_calendar_view { + padding: 8px; + + .o_calendar_widget { + background-color: @odoo-view-background-color; + * { + z-index: 0; // FIXME + } + .fc-week-number, .fc-widget-header { + background-color: lighten(@odoo-brand-secondary, 30%); + } + .o_attendee_head { + float: right; + margin-left: 1px; + width: 18px; + height: 18px; + } + } + } + + .o_calendar_sidebar_container { + padding: 8px; + padding-left: 0; + + .ui-datepicker { + width: 100%; + font-size: 8pt; + font-family: Roboto, "Nimbus Sans L"; + + .ui-widget-header { + background: none; + background-color: lighten(@odoo-brand-secondary, 30%); + + .ui-corner-all { + position: static; + cursor: pointer; + text-align: center; + &:hover { + color: @odoo-view-background-color; + background: none; + background-color: @odoo-brand-secondary; + border: none; + text-decoration: none; + } + .ui-icon { + display: none; + } + } + .ui-datepicker-prev { + float: left; + &::after { + font-family: FontAwesome; + content: ""; + } + } + .ui-datepicker-next { + float: right; + &::before { + font-family: FontAwesome; + content: ""; + } + } + } + table { + td { + padding: 0 2px 2px 0; + background-color: @odoo-view-background-color; + a { + border: none; + background: none; + background-color: lighten(@odoo-brand-secondary, 40%); + } + } + .ui-state-default { + color: @odoo-brand-primary; + &:hover { + background: none; + background-color: fade(@odoo-brand-primary, 50%); + border-color: @odoo-brand-primary; + color: @odoo-view-background-color; + }; + } + .ui-state-active { + background: none; + background-color: @odoo-brand-primary; + color: @odoo-view-background-color; + } + } + } + .o_calendar_filter { + padding: 8px; + background: @odoo-view-background-color; + } + .o_cal_avatar { + height: 24px; + width: 24px; + } + } +} + +.o_calendar_invitation { + display: inline-block; + width: 10px; + height: 10px; + border-radius: 5px; + + &.accepted { + background-color: @brand-success; // FIXME brand-success in green badge ... + } + + &.needsAction { + background-color: @odoo-brand-secondary; + } +} + +.o-dashboard { + .o_calendar_container .o_calendar_sidebar_container { + display: none; + } + + .o_calendar_container .o_calendar_view { + width: 100%; + } +} diff --git a/addons/web_calendar/static/src/xml/web_fullcalendar.xml b/addons/web_calendar/static/src/xml/web_fullcalendar.xml index cc4734dc4aa..efb8bac16b3 100644 --- a/addons/web_calendar/static/src/xml/web_fullcalendar.xml +++ b/addons/web_calendar/static/src/xml/web_fullcalendar.xml @@ -1,68 +1,60 @@ diff --git a/addons/web_calendar/views/web_calendar.xml b/addons/web_calendar/views/web_calendar.xml index 7f7f17baccb..60949374acf 100644 --- a/addons/web_calendar/views/web_calendar.xml +++ b/addons/web_calendar/views/web_calendar.xml @@ -3,7 +3,7 @@