Label generation: label generation available at the bottom of tables

2 files changed, 40 insertions, 14 deletions

diff --git a/ishtar_common/templates/blocks/DataTables-content.html b/ishtar_common/templates/blocks/DataTables-content.html
index 1b069f674..4a9257f65 100644
--- a/ishtar_common/templates/blocks/DataTables-content.html
+++ b/ishtar_common/templates/blocks/DataTables-content.html
@@ -21,19 +21,39 @@
             </div>
         </div>
         <div>
-            <div class="btn-group btn-group-sm" role="group"
-                 aria-label="{% trans 'Export'%}">
-                {% if source_full or extra_sources %}
-                <a class="btn btn-secondary {{sname}}-csv" href='{{source}}csv' target='_blank'
-                   title="{% trans 'Export as CSV - ' %}{% trans 'simple'%}">{% trans "Simple CSV" %}</a>
-                {% if source_full %}<a class='btn btn-secondary {{sname}}-csv-full' href='{{source_full}}csv' target='_blank' title="{% trans 'Export as CSV - full' %}">{% trans "CSV full" %}</a>{% endif %}
-                {% for slug, name, extra_source in extra_sources %}
-                <a class="btn btn-secondary {{slug}}-csv-full" href='{{extra_source}}csv' target='_blank' title="{% trans 'Export as CSV - ' %}{{name}}">{{name}}</a>
-                {% endfor %}
-                {% else %}
-                <a class="btn btn-secondary {{sname}}-csv" href="{{source}}csv" target="_blank" title="{% trans 'Export as CSV' %}">{% trans "CSV" %}</a>
-                {% endif %}
+            <div class="btn-group btn-group-sm" role="group">
+                  <button id="export-{{name}}" type="button"
+                          class="btn btn-secondary dropdown-toggle" data-toggle="dropdown"
+                          aria-haspopup="true" aria-expanded="false">
+                    {% trans 'Export'%}
+                  </button>
+                  <div class="dropdown-menu" aria-labelledby="export-{{name}}">
+                    {% if source_full or extra_sources %}
+                    <a class="dropdown-item {{sname}}-csv" href='{{source}}csv' target='_blank'
+                    title="{% trans 'Export as CSV - ' %}{% trans 'simple'%}">{% trans "Simple CSV" %}</a>
+                    {% if source_full %}<a class='dropdown-item {{sname}}-csv-full' href='{{source_full}}csv' target='_blank' title="{% trans 'Export as CSV - full' %}">{% trans "CSV full" %}</a>{% endif %}
+                    {% for slug, name, extra_source in extra_sources %}
+                    <a class="dropdown-item {{slug}}-csv-full" href='{{extra_source}}csv' target='_blank' title="{% trans 'Export as CSV - ' %}{{name}}">{{name}}</a>
+                    {% endfor %}
+                    {% else %}
+                    <a class="dropdown-item {{sname}}-csv" href="{{source}}csv" target="_blank" title="{% trans 'Export as CSV' %}">{% trans "CSV" %}</a>
+                    {% endif %}
+                  </div>
             </div>
+            {% if current_model.has_label_templates %}<div class="btn-group btn-group-sm" role="group">
+                  <button id="export-labels-{{name}}" type="button"
+                          class="btn btn-secondary dropdown-toggle" data-toggle="dropdown"
+                          aria-haspopup="true" aria-expanded="false">
+                    {% trans 'Labels'%}
+                  </button>
+                  <div class="dropdown-menu" aria-labelledby="export-labels-{{name}}">
+                  {% for template in current_model.label_templates %}
+                    <a class="dropdown-item {{template.slug}}-labels" href="{{template.get_baselink_for_labels}}" target="_blank" title="{{template.name}}">
+                        {{template.name}}
+                    </a>
+                  {% endfor %}
+                  </div>
+            </div>{% endif %}
         </div>
     </div>
 
diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html
index 90eced2f9..a20a151a9 100644
--- a/ishtar_common/templates/blocks/DataTables.html
+++ b/ishtar_common/templates/blocks/DataTables.html
@@ -163,8 +163,14 @@ update_submit_args = function(){
     var csv_full_url = "{{source_full}}csv?submited=1&" + data;
     $(".{{sname}}-csv-full").attr("href", csv_full_url);
     {% for slug, name, extra_source in extra_sources %}
-    $(".{{slug}}-csv-full").attr("href", '{{extra_source}}csv?submited=1&' + data);
-    {% endfor %}
+    $(".{{slug}}-csv-full").attr("href", '{{extra_source}}csv?submited=1&' + data);{% endfor %}
+    {% for template in current_model.label_templates %}
+    $(".{{template.slug}}-labels").attr("href", '{{template.get_baselink_for_labels}}?submited=1&' + data);{% endfor %}
+
+    if ($('.modal-progress').length > 0){
+        $('.modal-progress').modal('hide');
+    }
+    return false;
 };