diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-06 16:53:10 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-06 16:53:10 +0100 |
| commit | 67208dbd830ce4eb75d77f59d1ffd31c63b19d80 (patch) | |
| tree | cff73359a85d362bd3b24f853fb6d461a583b91b /ishtar_common/templates/ishtar | |
| parent | 161d29195cb9719b9c6ae4903c2c526f797bdf5f (diff) | |
| parent | ad5d9f7c0d5b0ca5a0ba76e279fc5d6e2683216a (diff) | |
| download | Ishtar-67208dbd830ce4eb75d77f59d1ffd31c63b19d80.tar.bz2 Ishtar-67208dbd830ce4eb75d77f59d1ffd31c63b19d80.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/templates/ishtar')
3 files changed, 7 insertions, 5 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html b/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html index 2cf80da06..1758bcf54 100644 --- a/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html +++ b/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html @@ -13,7 +13,7 @@ </span> <div class="short-menu-buttons btn-group" role="group"> <button type="button" class="btn" id='short-menu-simple' title="{% trans 'Simple menu limited to your own items. Be careful only the last 100 items are displayed.' %}">{% trans "simple" %}</button> - <button type="button" class="btn btn-selected" id='short-menu-advanced' title="{% trans 'Advanced menu.' %}">{% trans "advanced" %}</button> + <button type="button" class="btn btn-selected" id='short-menu-advanced' title="{% trans 'Advanced menu' %}">{% trans "advanced" %}</button> </div> <div id='action_current_items'> <p><i class="icon fa fa-thumb-tack fa-2x" aria-hidden="true" title="{% trans 'Pin an item in order to constrain default searches with this item. By default only your items are displayed. New created and modified items are auto-pin.' %}"></i></p> diff --git a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html index 05aaed6d8..5973eba3f 100644 --- a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html +++ b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html @@ -13,7 +13,7 @@ </span> <div class="short-menu-buttons btn-group" role="group"> <button type="button" class="btn btn-selected" id='short-menu-simple' title="{% trans 'Simple menu limited to your own items. Be careful only the last 100 items are displayed.' %}">{% trans "simple" %}</button> - <button type="button" class="btn" id='short-menu-advanced' title="{% trans 'Advanced menu.' %}">{% trans "advanced" %}</button> + <button type="button" class="btn" id='short-menu-advanced' title="{% trans 'Advanced menu' %}">{% trans "advanced" %}</button> </div> <div> <i class="icon fa fa-thumb-tack fa-2x" aria-hidden="true" title="{% trans 'Pin an item in order to constrain default searches with this item. By default only your items are displayed. New created and modified items are auto-pin.' %}"></i> diff --git a/ishtar_common/templates/ishtar/wizard/validation_bar.html b/ishtar_common/templates/ishtar/wizard/validation_bar.html index 09907af67..a1590858f 100644 --- a/ishtar_common/templates/ishtar/wizard/validation_bar.html +++ b/ishtar_common/templates/ishtar/wizard/validation_bar.html @@ -1,7 +1,9 @@ {% load i18n %} {% load url from future %} <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 %} - <a href='{% url 'reset_wizards' %}' id="reset_wizards" class='button'>{% trans "Cancel" %}</a> + <input type="submit" id="submit_form" name='validate' value="{% trans 'Validate' %}"/> + {% if last_step_is_available and next_steps %} + <input type="submit" id="submit_end_form" name='validate_and_end' value="{% trans 'Validate and end' %}"/> + {% endif %} + <a href="{% url 'reset_wizards' %}" id="reset_wizards" class='button'>{% trans "Cancel" %}</a> </div> |