diff options
| -rw-r--r-- | addons/note/static/src/less/note.less | 19 | ||||
| -rw-r--r-- | addons/note/views/note_views.xml | 6 |
2 files changed, 16 insertions, 9 deletions
diff --git a/addons/note/static/src/less/note.less b/addons/note/static/src/less/note.less index 99038b491c2..c92c5cd0500 100644 --- a/addons/note/static/src/less/note.less +++ b/addons/note/static/src/less/note.less @@ -3,14 +3,23 @@ text-decoration: line-through; } -.openerp .oe_form { - .oe_pad.oe_memo { - width: auto; +.o_note_form_view.o_form_view { + .o_form_statusbar { + margin-bottom: 0; } .oe_form_field.oe_memo { - margin: 0; + margin: 0 (@padding-large-horizontal * -1); padding: 0; - width: 100%; min-height: 200px; + + .note-editor { + border: none; + } + } + &.o_form_readonly { + .oe_memo { + padding: @padding-large-horizontal; + border-bottom: 1px solid @legend-border-color; + } } } diff --git a/addons/note/views/note_views.xml b/addons/note/views/note_views.xml index 0ac37d8bf46..f14912d4d68 100644 --- a/addons/note/views/note_views.xml +++ b/addons/note/views/note_views.xml @@ -154,12 +154,10 @@ <field name="arch" type="xml"> <form string="Note" class="oe_form_nomargin o_note_form_view"> <header> + <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" placeholder="Tags"/> <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" options="{'clickable': '1'}"/> </header> - <sheet> - <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" placeholder="Tags"/> - <field name="memo" widget="html" class="oe_memo" editor_height="450px" /> - </sheet> + <field name="memo" type="html" class="oe_memo"/> <div class="oe_chatter"> <field name="message_follower_ids" widget="mail_followers"/> <field name="activity_ids" widget="mail_activity"/> |