1 files changed, 9 insertions, 73 deletions
diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html
index 07725353c..2e2897539 100644
--- a/ishtar_common/templates/blocks/DataTables.html
+++ b/ishtar_common/templates/blocks/DataTables.html
@@ -27,79 +27,11 @@
   </div>
 </div>
 
-<ul class="nav nav-tabs m-3">
-  <li class="nav-item">
-    <a class="nav-link active" id="tab-grid-{{name}}" data-toggle="tab"
-       href="#tab-content-grid-{{name}}" role="tab"
-       aria-controls="tab-content-grid-{{name}}" aria-selected="true">
-        {% trans "Table" %}
-    </a>
-  </li>
-  <li class="nav-item">
-      <a class="nav-link" id="tab-gallery-{{name}}" data-toggle="tab"
-         href="#tab-content-gallery-{{name}}" role="tab"
-         aria-controls="tab-content-gallery-{{name}}" aria-selected="true">
-          {% trans "Gallery" %}
-      </a>
-  </li>
-</ul>
-
-
-<div class="tab-content">
-  <div class="tab-pane active"
-       id="tab-content-grid-{{name}}" role="tabpanel"
-       aria-labelledby="tab-grid-{{name}}">
-
-    <div id="grid_{{name}}_meta_wrapper">
-        <table id='grid_{{name}}' class="display" width="100%">
-            <thead>
-            <tr>
-                <th></th>
-                <th></th>{% for col in col_names %}
-                <th>{{col}}</th>
-            {% endfor %}</tr>
-            </thead>
-        </table>
-    </div>
-
-    <div id='foot_{{name}}' class="gridfooter row toolbar">
-        <div class='col-md-2'>
-            <div class="btn-group btn-group-sm" role="group">
-                <button type='button' class="btn btn-secondary" data-toggle="modal"
-                        data-target="#modal_grid_{{name}}">
-                    {% trans "Expand table" %} <i class="fa fa-expand" aria-hidden="true"></i>
-                </button>
-            </div>
-        </div>
-        <div class='col-md-2'>
-            <div class="btn-group btn-group-sm" role="group"
-                 aria-label="{% trans 'Export'%}">
-                {% if source_full or extra_sources %}
-                <a class="btn btn-secondary" href='{{source}}csv' target='_blank'
-                   title="{% trans 'Export as CSV - ' %}{% trans 'simple'%}">{% trans "Simple CSV" %}</a>
-                {% if source_full %}<a class='btn btn-secondary' 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" href='{{extra_source}}csv' target='_blank' title="{% trans 'Export as CSV - ' %}{{name}}">{{name}}</a>
-                {% endfor %}
-                {% else %}
-                <a class="btn btn-secondary" href="{{source}}csv" target="_blank" title="{% trans 'Export as CSV' %}">{% trans "CSV" %}</a>
-                {% endif %}
-            </div>
-        </div>
-    </div>
-
-    {% if multiple %}
-    <input type="button" id="add_button_{{name}}" value="{% trans 'Add' %}"/>
-    <ul id="selectmulti_{{name}}" class="selectmulti"></ul>
-    {% endif %}
-
-    <input type="hidden" id="hidden_{{name}}" name="{{name}}"/>
-  </div>
-  <div class="tab-pane active"
-       id="tab-content-gallery-{{name}}" role="tabpanel"
-       aria-labelledby="tab-gallery-{{name}}">
-  </div>
-</div>
+{% if gallery %}
+{% include "blocks/DataTables-gallery.html" %}
+{% else %}
+{% include "blocks/DataTables-content.html" %}
+{% endif %}
 
 <script type="text/javascript" language='javascript'>
 $('#modal_grid_{{name}}').on('show.bs.modal', function (e) {
@@ -119,6 +51,7 @@ $('#modal_grid_{{name}}').on('hide.bs.modal', function (e) {
     current_modal = null;
 });
 
+{% if gallery %}
 $("#tab-gallery-{{name}}").click(function(){
     current_tab = "gallery";
     gallery_submit_search();
@@ -128,11 +61,13 @@ $("#tab-grid-{{name}}").click(function(){
     current_tab = "table";
     datatable_submit_search();
 });
+{% endif %}
 
 
 var query_vars = new Array({{col_idx|safe}});
 var selItems_{{sname}} = new Array();
 
+{% if gallery %}
 gallery_submit_search = function(){
     var data = search_get_query_data(query_vars, "{{name}}");
     var nb_select = jQuery("#id_{{name}}-length_image").val();
@@ -151,6 +86,7 @@ gallery_submit_search = function(){
     }
     return false;
 };
+{% endif %}
 
 datatable_submit_search = function(){
     var data = search_get_query_data(query_vars, "{{name}}");