summaryrefslogtreecommitdiff
path: root/ishtar_common/templates
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common/templates')
-rw-r--r--ishtar_common/templates/blocks/JQueryAutocomplete.js2
-rw-r--r--ishtar_common/templates/blocks/bs_field_snippet.html1
-rw-r--r--ishtar_common/templates/ishtar/forms/qa_new_item.html3
-rw-r--r--ishtar_common/templates/ishtar/wizard/default_wizard.html2
-rw-r--r--ishtar_common/templates/ishtar/wizard/parcels_wizard.html7
5 files changed, 11 insertions, 4 deletions
diff --git a/ishtar_common/templates/blocks/JQueryAutocomplete.js b/ishtar_common/templates/blocks/JQueryAutocomplete.js
index 7cd0e2a60..aaf493db9 100644
--- a/ishtar_common/templates/blocks/JQueryAutocomplete.js
+++ b/ishtar_common/templates/blocks/JQueryAutocomplete.js
@@ -52,7 +52,7 @@ $(function() {
{{safe_field_id}}_modify = function(){
var current_val = $('#id_{{field_id}}').val();
if (current_val){
- dt_qa_open('/modify-{{model_name}}/' + current_val + "/",
+ dt_qa_open('/modify-{{model_name}}/{{field_id}}/' + current_val + "/",
'modal-dynamic-form-{{model_name}}');
}
}
diff --git a/ishtar_common/templates/blocks/bs_field_snippet.html b/ishtar_common/templates/blocks/bs_field_snippet.html
index 644f7f433..dcee87f7f 100644
--- a/ishtar_common/templates/blocks/bs_field_snippet.html
+++ b/ishtar_common/templates/blocks/bs_field_snippet.html
@@ -2,6 +2,7 @@
<div id="main_div-{{field.auto_id}}" class="form-group{% if not field.label %} no-label{% endif %} {% if field.field.widget.attrs.cols or force_large_col %}col-lg-12{% else %}col-lg-6{% endif %}{% if field.errors %} is-invalid{% endif %}{% if field.field.required %} required{% endif %}{% if force_large_col %} full-width{% endif %}"
data-alt-name="{{field.field.alt_name}}">
{% if field.label %}{{ field.label_tag }}{% endif %}
+ {% if extra_field_label %}<label><em>{{extra_field_label}}</em></label>{% endif %}
{% if show_field_number or form.show_field_number %}
{% if field.field.order_number %}<span class="badge badge-pill badge-success field-tip">
{{field.field.order_number}}
diff --git a/ishtar_common/templates/ishtar/forms/qa_new_item.html b/ishtar_common/templates/ishtar/forms/qa_new_item.html
index ae57adfc2..435531594 100644
--- a/ishtar_common/templates/ishtar/forms/qa_new_item.html
+++ b/ishtar_common/templates/ishtar/forms/qa_new_item.html
@@ -3,7 +3,8 @@
{% block main_form %}
{% if new_item_pk %}
-<p>{% if new_item_label %}{{new_item_label}}{% else %}{% trans "Item" %}{% endif %} {% trans "created." %}</p>
+<p>{% if new_item_label %}{{new_item_label}}{% else %}{% trans "Item" %}{% endif %}
+ {% if modify %}{% trans "modified." %}{% else %}{% trans "created." %}{% endif %}</p>
{% else %}
{% bs_compact_form form %}
{% endif %}
diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html
index b5ea4207c..cfd17e58f 100644
--- a/ishtar_common/templates/ishtar/wizard/default_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html
@@ -62,6 +62,8 @@ $(document).ready(function(){
return false;
});
{% if open_url %}load_window("{{open_url}}");{% endif %}
+ {% block "js_extra_ready" %}
+ {% endblock %}
});
</script>
{% endblock %}
diff --git a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html
index 2028d8792..d8c902c72 100644
--- a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html
@@ -22,13 +22,16 @@
{% bs_form wizard.form.selection_form %}
<table class='inline-table' id='parcel-table'>
- <tr>{% for field in wizard.form.forms.0 %}<th{% if not forloop.last %} rowspan='2'{% endif %}>{{ field.label_tag }}</th>{% endfor %}</tr>
+ <tr>{% for field in wizard.form.forms.0 %}
+ {% if field.required %}<th{%else%}<td{% endif %}{% if not forloop.last %} rowspan='2'{% endif %}>
+ {{ field.label_tag }}{% if field.required %}</th>{%else%}</td>{% endif %}{% endfor %}
+ </tr>
<tr><td>({% trans "all"%} <input type='checkbox' name='check-all' class='check-all'/>)</td></tr>
{% inline_formset 'Parcels' wizard.form.forms False %}
</table>
{% if add_all %}<p><input type='checkbox' name='add_all_parcels' id='add_all_parcels'> <label for='add_all_parcels'>{% trans "Add all parcels from the archaeological file" %}</label></p>{% endif %}
- <div class="text-center">
+ <div class="mt-3 text-center">
<button class="btn btn-success" name="formset_modify" value="{{wizard.steps.current}}">
{% trans "Add/Modify" %}
</button>