github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/select_all_extensions

Browse Source
This commit is contained in:
Antoine Nguyen
2014-11-24 18:21:22 +01:00
parent 6a5ffde764 f04ad8b5bd
commit 37d5fa9374
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/templates/common/generic_modal.html
+1 -1
View File
@@ -10,8 +10,8 @@
{% block modalbody %}{% endblock %}
</div>
<div class="modal-footer">
{% if action_label %}<a href="#" class="btn btn-primary {{ action_classes }}">{{ action_label }}</a>{% endif %}
<a class="btn btn-default" data-dismiss="modal">{% trans "Close" %}</a>
{% if action_label %}<a href="#" class="btn btn-primary {{ action_classes }}">{{ action_label }}</a>{% endif %}
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
modoboa/templates/common/wizard_forms.html
+1 -1
View File
@@ -24,6 +24,7 @@
</div>
<div class="modal-footer">
<div class="buttons_list">
<button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Close" %}</button>
{% for step in wizard.steps %}
<div id="step{{ forloop.counter }}_buttons"
class="bset{% if forloop.first %} active{% endif %}">
@@ -31,7 +32,6 @@
{% if step.next %}<a href="#" class="btn btn-primary next">{% trans "Next" %}</a>{% else %}<a href="#" class="btn btn-primary submit">{{ wizard.submit_button_label }}</a>{% endif %}
</div>
{% endfor %}
<button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Close" %}</button>
</div>
</div>
</div>