diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 18db06c44a1..aa9d5eab36f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -515,6 +515,28 @@ .openerp .oe_webclient .oe_star_on { color: gold; } +.openerp header { + position: relative; + border-bottom: 1px solid #cacaca; + padding-left: 2px; + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); +} +.openerp header > span { + margin-left: 4px; +} +.openerp header ul { + display: inline-block; + float: right; +} +.openerp header .oe_button { + margin: 3px 2px 1px; +} .openerp .oe_tag { border: 1px solid #afafb6; font-size: 11px; @@ -1176,7 +1198,7 @@ color: white; padding: 2px 4px; margin: 1px 6px 0 0; - border: 1px solid lightgrey; + border: 1px solid lightGray; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1201,7 +1223,7 @@ transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { - border-top: 1px solid lightgrey; + border-top: 1px solid lightGray; border-bottom: 1px solid #dedede; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); @@ -2009,68 +2031,46 @@ .openerp .oe_application .oe_form_sheet .oe_notebook_page { padding: 0 16px; } -.openerp .oe_form header { - position: relative; - border-bottom: 1px solid #cacaca; - padding-left: 2px; - background-color: #fcfcfc; - background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); - background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); - background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); - background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); - background-image: -o-linear-gradient(top, #fcfcfc, #dedede); - background-image: linear-gradient(to bottom, #fcfcfc, #dedede); -} -.openerp .oe_form header > span { - margin-left: 4px; -} -.openerp .oe_form header ul { - display: inline-block; - float: right; -} -.openerp .oe_form header .oe_form_button { - margin: 3px 2px 1px; -} .openerp .oe_form header .oe_tags { margin: 5px 0 0 5px; width: 400px; padding-bottom: 0; } -.openerp .oe_form div.oe_chatter { +.openerp .oe_form header .oe_tags div.oe_chatter { min-width: 650px; max-width: 860px; margin: 0 auto; padding: 16px 0 48px; } -.openerp .oe_form .oe_grey { +.openerp .oe_form header .oe_tags .oe_grey { color: #aaaaaa; max-width: 650px; margin: 0 0 10px 0; } -.openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol { +.openerp .oe_form header .oe_tags div.oe_form_configuration p, .openerp .oe_form header .oe_tags div.oe_form_configuration ul, .openerp .oe_form header .oe_tags div.oe_form_configuration ol { color: #aaaaaa; max-width: 650px; } -.openerp .oe_form div.oe_form_configuration label { +.openerp .oe_form header .oe_tags div.oe_form_configuration label { min-width: 150px; } -.openerp .oe_form div.oe_form_configuration .oe_form_group_cell_label { +.openerp .oe_form header .oe_tags div.oe_form_configuration .oe_form_group_cell_label { padding: 1px 0; } -.openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div { +.openerp .oe_form header .oe_tags div.oe_form_configuration .oe_form_group_cell div div { padding: 1px 0; } -.openerp .oe_form .oe_subtotal_footer { +.openerp .oe_form header .oe_tags .oe_subtotal_footer { width: 1% !important; } -.openerp .oe_form .oe_subtotal_footer td.oe_form_group_cell { +.openerp .oe_form header .oe_tags .oe_subtotal_footer td.oe_form_group_cell { text-align: right; padding: 0 !important; } -.openerp .oe_form .oe_subtotal_footer td.oe_form_group_cell_label { +.openerp .oe_form header .oe_tags .oe_subtotal_footer td.oe_form_group_cell_label { border-right: none; } -.openerp .oe_form .oe_subtotal_footer .oe_subtotal_footer_separator { +.openerp .oe_form header .oe_tags .oe_subtotal_footer .oe_subtotal_footer_separator { width: 108px; border-top: 1px solid #cacaca; margin-top: 4px; @@ -2078,14 +2078,14 @@ font-weight: bold; font-size: 18px; } -.openerp .oe_form .oe_subtotal_footer label:after { +.openerp .oe_form header .oe_tags .oe_subtotal_footer label:after { content: ":"; } -.openerp .oe_form .oe_subtotal_footer label.oe_subtotal_footer_separator { +.openerp .oe_form header .oe_tags .oe_subtotal_footer label.oe_subtotal_footer_separator { font-weight: bold !important; padding: 2px 11px 2px 0px !important; } -.openerp .oe_form .oe_subtotal_footer label.oe_form_label_help { +.openerp .oe_form header .oe_tags .oe_subtotal_footer label.oe_form_label_help { font-weight: normal; } .openerp .oe_form .oe_form_button { @@ -2117,7 +2117,7 @@ } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; - color: darkgreen; + color: darkGreen; vertical-align: top; position: relative; top: -4px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 851d0c3f9c9..c56c4d6a3e9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -451,6 +451,22 @@ $sheet-max-width: 860px .oe_star_on color: gold // }}} + + // Generic blocks {{{ + header + position: relative + border-bottom: 1px solid #cacaca + padding-left: 2px + @include vertical-gradient(#fcfcfc, #dedede) + > span + margin-left: 4px + ul + display: inline-block + float: right + .oe_button + margin: 3px 2px 1px + // }}} + // Tags (for many2many tags, among others) {{{ .oe_tag border: 1px solid $tag-border @@ -1594,23 +1610,10 @@ $sheet-max-width: 860px padding: 0 16px // }}} // FormView.custom tags and classes {{{ - .oe_form - header - position: relative - border-bottom: 1px solid #cacaca - padding-left: 2px - @include vertical-gradient(#fcfcfc, #dedede) - > span - margin-left: 4px - ul - display: inline-block - float: right - .oe_form_button - margin: 3px 2px 1px - .oe_tags - margin: 5px 0 0 5px - width: 400px - padding-bottom: 0 + .oe_form header .oe_tags + margin: 5px 0 0 5px + width: 400px + padding-bottom: 0 div.oe_chatter min-width: 650px max-width: $sheet-max-width diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index fdf39633186..3d979186aa3 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -2,6 +2,12 @@ + +
+ +
+
+
diff --git a/doc/index.rst b/doc/index.rst index 4aa9dcd3b25..0f0c4bf87f5 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -22,6 +22,8 @@ Contents: list-view form-notes + templates + Indices and tables ================== diff --git a/doc/templates.rst b/doc/templates.rst new file mode 100644 index 00000000000..3977682399a --- /dev/null +++ b/doc/templates.rst @@ -0,0 +1,45 @@ +.. highlight:: xml + +Generic templates +================= + +Generic template names should be prefixed by ``ui.`` to indicate their +special role. + +Global Header: ``ui.Header`` +---------------------------- + +Role +++++ + +This template is mostly dedicated to client actions taking over the +whole content area, and full-HTML form views (especially those opening +in the ``inline`` target). + +It is used to display a buttons container (and can also be used for +status bars). The buttons should simply be placed inside the +``ui.Header`` body. + +Arguments ++++++++++ + +The template only uses its body as argument. + +Example ++++++++ + +:: + + +