diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py index 63e293ed751..fd32d0258e9 100644 --- a/addons/note/__openerp__.py +++ b/addons/note/__openerp__.py @@ -43,7 +43,6 @@ Notes can be found in the 'Home' menu. 'mail', ], 'data': [ - 'security/note_security.xml', 'security/ir.rule.xml', 'security/ir.model.access.csv', 'note_data.xml', diff --git a/addons/note/note.py b/addons/note/note.py index 2d6e5f8c098..2db3173a907 100644 --- a/addons/note/note.py +++ b/addons/note/note.py @@ -172,12 +172,11 @@ class note_note(osv.osv): offset=offset, limit=limit, context=context, orderby=orderby,lazy=lazy) -#upgrade config setting page to configure pad, fancy and tags mode +#upgrade config setting page to configure pad class note_base_config_settings(osv.osv_memory): _inherit = 'base.config.settings' _columns = { 'module_note_pad': fields.boolean('Use collaborative pads (etherpad)'), - 'group_note_fancy': fields.boolean('Use fancy layouts for notes', implied_group='note.group_note_fancy'), } class res_users(osv.Model): diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml index 47cb89097a8..1bca50edb75 100644 --- a/addons/note/note_view.xml +++ b/addons/note/note_view.xml @@ -54,9 +54,7 @@ - - -
+
@@ -154,10 +152,6 @@
-
- -
diff --git a/addons/note/security/note_security.xml b/addons/note/security/note_security.xml deleted file mode 100644 index 8fedb29ea2e..00000000000 --- a/addons/note/security/note_security.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Notes / Fancy mode - - - - - - - - diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css index 4abd5f395b1..780cd280830 100644 --- a/addons/note/static/src/css/note.css +++ b/addons/note/static/src/css/note.css @@ -1,122 +1,13 @@ -@charset "utf-8"; .oe_kanban_column .note_text_line_through { - text-decoration: line-through; -} + text-decoration: line-through; } .openerp .oe_form .oe_pad.oe_memo { - width: auto; -} + width: auto; } .openerp .oe_form .oe_form_field.oe_memo { margin: 0; padding: 0px; width: 100%; - min-height: 200px; -} -.openerp .oe_form .oe_form_field.oe_memo .cleditorMain { - border: none; - padding: 0px; -} -.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_0 { - box-shadow: 0px 4px 9px rgba(48, 48, 48, 0.15); -} -.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_1 { - box-shadow: 0px 4px 9px rgba(0, 0, 0, 0.15); -} -.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_2 { - box-shadow: 0px 4px 9px rgba(48, 0, 0, 0.15); -} -.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_3 { - box-shadow: 0px 4px 9px rgba(97, 93, 0, 0.16); -} -.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_4 { - box-shadow: 0px 4px 9px rgba(77, 128, 0, 0.17); -} -.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_5 { - box-shadow: 0px 4px 9px rgba(0, 88, 11, 0.15); -} -.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_6 { - box-shadow: 0px 4px 9px rgba(0, 80, 95, 0.15); -} -.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_7 { - box-shadow: 0px 4px 9px rgba(3, 13, 133, 0.18); -} -.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_8 { - box-shadow: 0px 4px 9px rgba(56, 0, 128, 0.15); -} -.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_9 { - box-shadow: 0px 4px 9px rgba(102, 0, 116, 0.15); -} -.openerp .oe_kanban_record .oe_kanban_card_fancy { - text-shadow: none; - border-radius: 2px; - padding: 8px; - margin-left: 3px; - margin-right: 3px; - padding-bottom: 8px; - margin-bottom: 10px; - -webkit-transform: rotate(-2deg); - -o-transform: rotate(-2deg); - -moz-transform: rotate(-2deg); - -webkit-transition: all 300ms cubic-bezier(0.5, 0, 0.5, 1); - -moz-transition: all 300ms cubic-bezier(0.5, 0, 0.5, 1); - -ms-transition: all 300ms cubic-bezier(0.5, 0, 0.5, 1); - transition: all 300ms cubic-bezier(0.5, 0, 0.5, 1); -} -.openerp .oe_kanban_record .oe_kanban_card_fancy .fa { - margin-top: 8px; - margin-right: 6px; -} -.openerp .oe_kanban_record:nth-of-type(even) .oe_kanban_card_fancy { - -webkit-transform: rotate(1deg); - -o-transform: rotate(1deg); - -moz-transform: rotate(1deg); -} -.openerp .oe_kanban_record:nth-of-type(3n) .oe_kanban_card_fancy { - -webkit-transform: rotate(4deg); - -o-transform: rotate(4deg); - -moz-transform: rotate(4deg); -} -.openerp .oe_kanban_column:nth-of-type(even) .oe_kanban_card_fancy { - -webkit-transform: rotate(2deg); - -o-transform: rotate(2deg); - -moz-transform: rotate(2deg); -} -.openerp .oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(even) .oe_kanban_card_fancy { - -webkit-transform: rotate(-3deg); - -o-transform: rotate(-3deg); - -moz-transform: rotate(-3deg); -} -.openerp .oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card_fancy { - -webkit-transform: rotate(1deg); - -o-transform: rotate(1deg); - -moz-transform: rotate(1deg); -} -.openerp .oe_kanban_column:nth-of-type(3n) .oe_kanban_card_fancy { - -webkit-transform: rotate(-2deg); - -o-transform: rotate(-2deg); - -moz-transform: rotate(-2deg); -} -.openerp .oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(even) .oe_kanban_card_fancy { - -webkit-transform: rotate(1deg); - -o-transform: rotate(1deg); - -moz-transform: rotate(1deg); -} -.openerp .oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card_fancy { - -webkit-transform: rotate(-1deg); - -o-transform: rotate(-1deg); - -moz-transform: rotate(-1deg); -} - -.openerp .oe_kanban_column .oe_fold_column .oe_kanban_card_fancy:hover, -.openerp .oe_kanban_column .oe_fold_column .oe_kanban_card_fancy:focus { - position: relative; - z-index: 5; - border-color: rgba(0, 0, 0, 0.4); - -webkit-transition: all 150ms cubic-bezier(0.5, 0, 0.5, 1); - -moz-transition: all 150ms cubic-bezier(0.5, 0, 0.5, 1); - -ms-transition: all 150ms cubic-bezier(0.5, 0, 0.5, 1); - transition: all 150ms cubic-bezier(0.5, 0, 0.5, 1); - -webkit-transform: rotate(0) !important; - -o-transform: rotate(0) !important; - -moz-transform: rotate(0) !important; -} + min-height: 200px; } + .openerp .oe_form .oe_form_field.oe_memo .cleditorMain { + border: none; + padding: 0px; } diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass index 69285cfd606..08f0548bd22 100644 --- a/addons/note/static/src/css/note.sass +++ b/addons/note/static/src/css/note.sass @@ -27,81 +27,3 @@ .cleditorMain border: none padding: 0px - .oe_kanban_view.oe_notes - .oe_kanban_card_fancy.oe_kanban_color_0 - box-shadow: 0px 4px 9px rgba(48,48,48,0.15) - .oe_kanban_card_fancy.oe_kanban_color_1 - box-shadow: 0px 4px 9px rgba(0,0,0,0.15) - .oe_kanban_card_fancy.oe_kanban_color_2 - box-shadow: 0px 4px 9px rgba(48,0,0,0.15) - .oe_kanban_card_fancy.oe_kanban_color_3 - box-shadow: 0px 4px 9px rgba(97,93,0,0.16) - .oe_kanban_card_fancy.oe_kanban_color_4 - box-shadow: 0px 4px 9px rgba(77,128,0,0.17) - .oe_kanban_card_fancy.oe_kanban_color_5 - box-shadow: 0px 4px 9px rgba(0,88,11,0.15) - .oe_kanban_card_fancy.oe_kanban_color_6 - box-shadow: 0px 4px 9px rgba(0,80,95,0.15) - .oe_kanban_card_fancy.oe_kanban_color_7 - box-shadow: 0px 4px 9px rgba(3,13,133,0.18) - .oe_kanban_card_fancy.oe_kanban_color_8 - box-shadow: 0px 4px 9px rgba(56,0,128,0.15) - .oe_kanban_card_fancy.oe_kanban_color_9 - box-shadow: 0px 4px 9px rgba(102,0,116,0.15) - .oe_kanban_record - .oe_kanban_card_fancy - text-shadow: none - border-radius: 2px - padding: 8px - margin-left: 3px - margin-right: 3px - padding-bottom: 8px - margin-bottom: 10px - @include rotate(-2deg) - @include transition(all, 300ms) - .fa - margin-top: 8px - margin-right: 6px - .oe_kanban_record:nth-of-type(even) - .oe_kanban_card_fancy - @include rotate(1deg) - .oe_kanban_record:nth-of-type(3n) - .oe_kanban_card_fancy - @include rotate(4deg) - .oe_kanban_column:nth-of-type(even) - .oe_kanban_card_fancy - @include rotate(2deg) - .oe_kanban_column:nth-of-type(even) - .oe_kanban_record:nth-of-type(even) - .oe_kanban_card_fancy - @include rotate(-3deg) - .oe_kanban_column:nth-of-type(even) - .oe_kanban_record:nth-of-type(3n) - .oe_kanban_card_fancy - @include rotate(1deg) - .oe_kanban_column:nth-of-type(3n) - .oe_kanban_card_fancy - @include rotate(-2deg) - .oe_kanban_column:nth-of-type(3n) - .oe_kanban_record:nth-of-type(even) - .oe_kanban_card_fancy - @include rotate(1deg) - .oe_kanban_column:nth-of-type(3n) - .oe_kanban_record:nth-of-type(3n) - .oe_kanban_card_fancy - @include rotate(-1deg) - - -.openerp - .oe_kanban_column - .oe_fold_column - .oe_kanban_card_fancy:hover, - .oe_kanban_card_fancy:focus - position: relative - z-index: 5 - border-color: rgba(0,0,0,0.4) - @include transition(all, 150ms) - -webkit-transform: rotate(0) !important - -o-transform: rotate(0) !important - -moz-transform: rotate(0) !important -