diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-07 12:46:34 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-07 12:46:34 +0200 |
| commit | ebe47cf4d963caf5f765509eec7b6e80a42a084b (patch) | |
| tree | e739aa2aa9e518ff453cfb40d64a6a8126b131bf /ishtar_common | |
| parent | 23d974f2165926db14f69307948daac5e80cc1a1 (diff) | |
| download | Ishtar-ebe47cf4d963caf5f765509eec7b6e80a42a084b.tar.bz2 Ishtar-ebe47cf4d963caf5f765509eec7b6e80a42a084b.zip | |
Display a message to warn about related items and history - many improvment on sheet layout
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/static/media/style.css | 17 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/window_nav.html | 3 |
2 files changed, 19 insertions, 1 deletions
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index c6a151dc8..beff03393 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -163,6 +163,14 @@ h4{ margin:10px 0; } +pre { + padding: 0.5em 1em; + white-space: pre-wrap; + white-space: -moz-pre-wrap; + white-space: -pre-wrap; + white-space: -o-pre-wrap; +} + select{ max-width:550px; } @@ -621,7 +629,6 @@ ul.form-flex li li label { padding:0.2em; margin-left:auto; margin-right:auto; - width:600px; background-color:#F1F2F6; } @@ -1090,13 +1097,21 @@ p.alert{ color:#D14; } +p.info-box{ + color: #1c94c4; +} + div.form p.alert{ background-color:#FFF; } +#window p.info-box, #window p.alert{ background-color:#EEE; + padding: 6px 16px; padding-left: 30px; + width: auto; + margin: 6px 10px; } #window p.alert label{ diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html index c225a5822..13069b1eb 100644 --- a/ishtar_common/templates/ishtar/blocks/window_nav.html +++ b/ishtar_common/templates/ishtar/blocks/window_nav.html @@ -45,3 +45,6 @@ <a class='badge' href='{% url show_url item.pk "odt" %}' title='{% trans "Export as OpenOffice.org file"%}'>ODT</a> <a class='badge' href='{% url show_url item.pk "pdf" %}' title='{% trans "Export as PDF file"%}'>PDF</a> </div> <hr class='clear'> +{% if next %} + <p class='info-box'><i class="fa fa-info-circle" aria-hidden="true"></i> <em>{% trans "Relation between items are not historized." %}</em></p> +{% endif %} |