diff options
Diffstat (limited to 'ishtar_common/templates/ishtar')
6 files changed, 50 insertions, 12 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_json.html b/ishtar_common/templates/ishtar/blocks/sheet_json.html index 8927eb057..df9340c6f 100644 --- a/ishtar_common/templates/ishtar/blocks/sheet_json.html +++ b/ishtar_common/templates/ishtar/blocks/sheet_json.html @@ -5,5 +5,7 @@ {% if forloop.first %}<div class='row'>{% endif %} {% field_flex label value %} {% if forloop.last %}</div>{% endif %} +{% empty %} +{% trans "No data" %} {% endfor %} {% endfor %} diff --git a/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple_full.html b/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple_full.html new file mode 100644 index 000000000..b70c1d2fc --- /dev/null +++ b/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple_full.html @@ -0,0 +1,8 @@ +{% load i18n %}{% if data.count %} + <dl class="col-12 row"> + <dt class="col-12">{% trans caption %}</dt> + <dd class="col-12">{% for d in data.distinct.all %} + {% if forloop.counter0 %} ; {% endif %}{{ d }} + {% endfor %}</dd> + </dl> +{% endif %} diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html index 6cd4bff40..62caff142 100644 --- a/ishtar_common/templates/ishtar/blocks/window_nav.html +++ b/ishtar_common/templates/ishtar/blocks/window_nav.html @@ -27,9 +27,9 @@ {% endif %} </div> </div> - <div class='offset-md-6 col-md-4 text-right'> + <div class='offset-md-4 col-md-6 text-right'> {% else %} - <div class='offset-md-8 col-md-4 text-right'> + <div class='offset-md-6 col-md-6 text-right'> {% endif %} {% if pin_action and item.SLUG %} <div class="btn-group btn-group-sm" role="group" @@ -38,6 +38,8 @@ onclick='$.get("{% url "pin" item.SLUG item.pk %}", function(){load_shortcut_menu(); display_info("{% trans 'Item pined in your shortcut menu.' %}")});' title="{% trans 'Pin' %}"> <i class="fa fa-thumb-tack"></i> </a> + {% block post_pin %} + {% endblock %} </div> {% endif %} <div class="btn-group btn-group-sm" role="group" aria-label="{% trans 'Actions' %}"> @@ -55,15 +57,33 @@ </a> {% endfor %} </div> + <div class="btn-group btn-group-sm" role="group" aria-label="{% trans 'Export' %}"> - <a class="btn btn-secondary" href='{% url show_url item.pk "odt" %}' - title='{% trans "Export as OpenOffice.org file"%}'> - ODT <i class="fa fa-file-word-o" aria-hidden="true"></i> - <a class="btn btn-secondary" href='{% url show_url item.pk "pdf" %}' - title='{% trans "Export as PDF file"%}'> - PDF <i class="fa fa-file-pdf-o" aria-hidden="true"></i> - </a> + <div class="dropdown btn-secondary"> + <button class="btn btn-sm btn-secondary dropdown-toggle" type="button" + id="dropdown-sheet-export-{{window_id}}" + data-toggle="dropdown"aria-haspopup="true" + aria-expanded="false"> + <i class="fa fa-file-word-o"></i> {% trans "Export" %} + </button> + <div class="dropdown-menu" + aria-labelledby="dropdown-sheet-export-{{window_id}}"> + <a class="dropdown-item" href='{% url show_url item.pk "odt" %}' + title='{% trans "Export as OpenOffice.org file"%}'> + ODT <i class="fa fa-file-word-o" aria-hidden="true"></i> + </a> + <a class="dropdown-item" href='{% url show_url item.pk "pdf" %}' + title='{% trans "Export as PDF file"%}'> + PDF <i class="fa fa-file-pdf-o" aria-hidden="true"></i> + </a>{% for template_name, template_url in extra_templates %} + <a class="dropdown-item" href='{{template_url}}'> + {{template_name}} <i class="fa fa-file-word-o" aria-hidden="true"></i> + </a>{% endfor %} + </div> + </div> + + </div> </div> </div> diff --git a/ishtar_common/templates/ishtar/form.html b/ishtar_common/templates/ishtar/form.html index b99d504a0..bcd69959e 100644 --- a/ishtar_common/templates/ishtar/form.html +++ b/ishtar_common/templates/ishtar/form.html @@ -1,5 +1,8 @@ {% extends "base.html" %} {% load i18n inline_formset table_form %} +{% block extra_head %} +{{form.media}} +{% endblock %} {% block pre_container %} <form enctype="multipart/form-data" action="." method="post"{% if confirm %} onsubmit='return confirm("{{confirm}}");'{% endif %}>{% csrf_token %} diff --git a/ishtar_common/templates/ishtar/forms/qa_base.html b/ishtar_common/templates/ishtar/forms/qa_base.html index 70fe70e65..367acfcd8 100644 --- a/ishtar_common/templates/ishtar/forms/qa_base.html +++ b/ishtar_common/templates/ishtar/forms/qa_base.html @@ -1,7 +1,6 @@ {% load i18n inline_formset table_form %} -<div - class="modal-dialog {% if modal_size == 'large' %}modal-lg {% elif modal_size == 'small'%}modal-sm {% endif%}modal-dialog-centered"> +<div class="modal-dialog {% if modal_size == 'large' %}modal-lg {% elif modal_size == 'small'%}modal-sm {% endif%}modal-dialog-centered"> <div class="modal-content"> <div class="modal-header"> <h2>{{page_name|safe}}</h2> diff --git a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html index 401fe570c..9829058a8 100644 --- a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html @@ -9,7 +9,12 @@ <form action="." method="post">{% csrf_token %} <div class='form'> {% block "warning_informations" %}{% endblock %} - <p>{% if confirm_msg %}{{confirm_msg|safe}}{%else%}{% trans "You have entered the following informations:" %}{%endif%}</p> + {% block "warning_message" %} + <div class="alert alert-info"> + {% if confirm_msg %}{{confirm_msg|safe}}{%else%}{% trans "You have entered the following informations:" %}{%endif%} + </div> + {% endblock %} + {% block "detailed_informations" %} {% for form_label, form_data in datas %} <div class="card"> @@ -42,6 +47,7 @@ {{ extra_form }} </table> {% endif %} + {% endblock %} {% block "extra_informations" %}{% endblock %} {% block "footer" %} |