diff options
| author | vta vta@openerp.com <> | 2012-08-07 17:39:26 +0200 |
|---|---|---|
| committer | vta vta@openerp.com <> | 2012-08-07 17:39:26 +0200 |
| commit | d3441f111bab4c2c4dd4b26c70a849434e23ae97 (patch) | |
| tree | e47b82f6b05d108b565f5d0b2d0c3c8ed58e2a17 /addons/web/static/src | |
| parent | d159b218c71781d5c8ed4ed0d8b202578d4c718c (diff) | |
[FIX] Full CSS stagesbar.
bzr revid: vta@openerp.com-20120807153926-xvklvq5419mup6hq
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 77 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 5 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 3 |
3 files changed, 75 insertions, 10 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a7a749be187..86f52d40cec 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1945,6 +1945,8 @@ padding: 0; margin: 0; text-shadow: 0 1px 1px white; + /*background: #dfdfdf;*/ + overflow: hidden; } .openerp ul.oe_form_steps img { vertical-align: top; @@ -1960,22 +1962,89 @@ padding: 0 0 0 12px; } .openerp ul.oe_form_steps li:first-child { + padding-left: 12px; border-left: 1px solid #cacaca; } .openerp ul.oe_form_steps li:last-child { margin-right: 12px; - padding-right: 12px; + /*padding-right: 12px;*/ border-right: 1px solid #cacaca; } -.openerp ul.oe_form_steps li a { +.openerp ul.oe_form_steps li { color: #4c4c4c; + text-decoration: none; + padding: 0 0 0 30px; + position: relative; + display: block; + float: left; + height: 30px; + background-color: #8a89ba; + color: white; +} +.openerp ul.oe_form_steps li span { + display:block; + margin-left: 10px; } .openerp ul.oe_form_steps li a:hover { color: black; } -.openerp ul.oe_form_steps .oe_form_steps_active { +.openerp ul.oe_form_steps li:after { + content: " "; + display: :block; + width: 0; + height: 0; + border-top: 50px solid transparent; + border-bottom: 50px solid transparent; + border-left: 30px solid #8a89ba; + position: absolute; + top: 50%; + margin-top: -50px; + left: 100%; + z-index: 2; +} +.openerp ul.oe_form_steps li:before { + content: " "; + display: :block; + width: 0; + height: 0; + border-top: 50px solid transparent; + border-bottom: 50px solid transparent; + border-left: 30px solid #eeeeee; + position: absolute; + top: 50%; + margin-top: -50px; + margin-left: 2px; + left: 100%; + z-index: 1; +} +.openerp ul.oe_form_steps li:hover { + background: #807fb4; +} +.openerp ul.oe_form_steps li:hover:after { + border-left-color: #807fb4; +} +.openerp ul.oe_form_steps li.oe_form_steps_active { font-weight: bold; - color: #b33630; + /*color: #b33630;*/ + text-shadow: 0 1px 1px #999999; + /*background-color: #dc5f59;*/ + background-color: #b33630; + color: white; +} +.openerp ul.oe_form_steps li.oe_form_steps_active:after { + content: " "; + display: :block; + width: 0; + height: 0; + border-top: 50px solid transparent; + border-bottom: 50px solid transparent; + /*border-left: 30px solid #dc5f59;*/ + border-left: 30px solid #b33630; + position: absolute; + top: 50%; + margin-top: -50px; + left: 100%; + z-index: 2; } .openerp .oe_form .oe_subtotal_footer { width: 1% !important; diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index b8ec1ac9d37..2f644d986a3 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4706,8 +4706,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ _.each(elemts, function(element){ $item = $(element); if ($item.attr("data-id") != self.selected_value) { - $item.attr("style", "cursor: pointer; background: #ba3d37; position: relative; left: 5px; top: -3px;"); - $item.parent().attr("style", "background: #ba3d37; height: 24px; margin-top: 3px;"); + $item.attr("style", "cursor: pointer;"); $item.click(function(event){ var data_id = parseInt($(this).attr("data-id")) self.view.dataset.call('stage_set', [[self.view.datarecord.id],data_id]).then(function() { @@ -4715,8 +4714,6 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ }); }); } else { - $item.attr("style", "background: #8a89ba; position: relative; left: 5px; top: -3px;"); - $item.parent().attr("style", "background: #8a89ba; height: 24px; margin-top: 3px;"); } }); } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 112f1321a28..f210b46b91a 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1033,8 +1033,7 @@ <t t-foreach="_.range(size)" t-as="i"> <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe_form_steps_active' : ''"> <span class="oe_form_steps_item" t-att-data-id="widget.to_show[i][0]"><t t-esc="widget.to_show[i][1]"/></span> - <img t-att-src='_s + "/web/static/src/img/form_steps_separator_v4.png"' style="position: relative; left: 10px; height: 24px" class="oe_form_steps_arrow" t-if="i < size - 1"/> - <!-- <img t-att-src='_s + "/web/static/src/img/form_steps_separator.png"' class="oe_form_steps_arrow" t-if="i < size - 1"/> --> + <img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i < size - 1"/> </li> </t> </t> |
