diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-07-10 21:54:31 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-07-10 21:54:31 +0200 |
| commit | 96ad8d81594a31502bb0b0473876482e8b053f9e (patch) | |
| tree | 23dedcb8264d623308e2463c50c682a7216929a9 /ishtar_common | |
| parent | 6f50ea8965abd59e91e18390dd6305635a9fc3d7 (diff) | |
| parent | efdc0e0fd8c8d128b75b6ea8516d2ba79545413f (diff) | |
| download | Ishtar-96ad8d81594a31502bb0b0473876482e8b053f9e.tar.bz2 Ishtar-96ad8d81594a31502bb0b0473876482e8b053f9e.zip | |
Merge branch 'stable'
Conflicts:
ishtar_common/templates/ishtar/wizard/parcels_wizard.html
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/static/media/style.css | 4 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/wizard/parcels_wizard.html | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 0505e21a5..a00fce2cf 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -860,6 +860,10 @@ p.alert{ background-position:left center; } +div.form p.alert{ + background-color:#FFF; +} + #window p.alert{ background-color:#EEE; } diff --git a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html index ce2bc9780..5afa69360 100644 --- a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html @@ -9,6 +9,7 @@ {{ wizard.form.media }} {{ wizard.management_form }} {{ wizard.form.management_form }} +{% if automatic_parcel_association %}<p class='alert'><label>{%trans "Existing parcels from the operation will be automatically added to the archaeological file." %}</label></p>{% endif %} {%if wizard.form.non_form_errors%} <table class='formset'> <tr class='error'><th colspan='2'>{{wizard.form.non_form_errors}}</th></tr> |