diff options
5 files changed, 36 insertions, 7 deletions
diff --git a/ishtar_common/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po index ca771a136..f9926d744 100644 --- a/ishtar_common/locale/fr/LC_MESSAGES/django.po +++ b/ishtar_common/locale/fr/LC_MESSAGES/django.po @@ -1392,7 +1392,7 @@ msgstr "Vous avez entré les informations suivantes :" #: templates/ishtar/wizard/confirm_wizard.html:39 msgid "Would you like to save them?" -msgstr "Voulez vous sauver ces informations ?" +msgstr "Voulez vous enregistrer ces informations ?" #: templates/ishtar/wizard/default_wizard.html:34 #: templates/ishtar/wizard/parcels_wizard.html:24 diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 3f027668d..3e8efc131 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -102,6 +102,10 @@ h3{ margin:1em 0 0.5em 0; } +h4{ + margin:10px 0; +} + select{ max-width:550px; } @@ -212,8 +216,7 @@ div#header{ width:100%; text-align:left; font-size: 0.9em; - background-color: #f1f2f6; - border-bottom:1px solid #CCC; + background-color: #CCC; margin-bottom:10px; line-height:30px; padding:0 20px; @@ -233,6 +236,28 @@ div#logo{ background-repeat:no-repeat; } +div#validation-bar{ + position: fixed; + bottom: 0px; + background-color: #CCC; + width: 100%; + left: 0px; + height: 40px; + padding: 5px; +} + +div#validation-bar p{ + margin:0; +} + +div#validation-bar input{ + margin:0 30px; +} + +div#validation-bar.big{ + height:60px; +} + .display_details_inline, .display_details{ display:inline-block; @@ -363,7 +388,7 @@ div#main_menu > ul > li{ div#content{ clear:both; - margin:0 200px; + margin:0 200px 70px 200px; text-align:center; } diff --git a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html index 0dd1f6f12..15bb9e9bd 100644 --- a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html @@ -36,8 +36,10 @@ </table> {% endif %} {% block "extra_informations" %}{% endblock %} +<div id='validation-bar' class='big'> <p>{%if confirm_end_msg %}{{confirm_end_msg|safe}}{%else%}{% trans "Would you like to save them?" %}{%endif%}</p> <input type="submit" value="{% trans "Validate" %}"/> </div> +</div> </form> {% endblock %} diff --git a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html index b550cf6c4..73e86e53f 100644 --- a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html @@ -9,7 +9,6 @@ {{ wizard.form.media }} {{ wizard.management_form }} {{ wizard.form.management_form }} -<div class='top_button'><input type="submit" id="submit_form" value="{% trans "Validate" %}"/></div> {%if wizard.form.non_form_errors%} <table class='formset'> <tr class='error'><th colspan='2'>{{wizard.form.non_form_errors}}</th></tr> @@ -24,8 +23,10 @@ <p><button name="formset_modify" value="{{wizard.steps.current}}">{% trans "Add/Modify" %}</button></p> <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" /> {{ previous_fields|safe }} +<div id='validation-bar'> <input type="submit" id="submit_form" name='validate' value="{% trans "Validate" %}"/> {% if next_steps %}<input type="submit" id="submit_end_form" name='validate_and_end' value="{% trans "Validate and end" %}"/>{% endif %} </div> +</div> </form> {% endblock %} diff --git a/ishtar_common/templates/ishtar/wizard/towns_wizard.html b/ishtar_common/templates/ishtar/wizard/towns_wizard.html index 8e0b3551f..07717d26a 100644 --- a/ishtar_common/templates/ishtar/wizard/towns_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/towns_wizard.html @@ -9,7 +9,6 @@ <div class='form'> {% if TOWNS %} {% if wizard.form.forms %} -<div class='top_button'><input type="submit" id="submit_form" value="{% trans "Validate" %}"/></div> <table class='formset'> {{ wizard.management_form }} {%if wizard.form.non_form_errors%}<tr class='error'><th colspan='2'>{{wizard.form.non_form_errors}}</th></tr>{%endif%} @@ -29,7 +28,9 @@ {% endif %} <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" /> {{ previous_fields|safe }} -<input type="submit" id="submit_form" value="{% trans "Validate" %}"/> +<div id='validation-bar'> + <input type="submit" id="submit_form" value="{% trans "Validate" %}"/> +</div> </div> </form> {% endblock %} |