fix merge issue

portal/templates/portal/secure/user/dataset_details.html

@@ -13,36 +13,24 @@
                 <li class="nav-item">
                     <a class="nav-link" href="#settings" id="settings-tab" data-toggle="tab" role="tab" aria-controls="settings" aria-selected="false">{% trans 'Sharing Parameters' %}</a>
                 </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#log" id="log-tab" data-toggle="tab" role="tab" aria-controls="log" aria-selected="false">{% trans 'Log' %}</a>
+                </li>
             </ul>
         </div>
         <div class="card-body tab-content">
 
-<h2><span class="text-info">{{ object.name }}</span> {% trans 'Dataset Details' %}</h2>
-<div class="card">
-    <div class="card-header">
-        <ul class="nav nav-tabs card-header-tabs">
-            <li class="nav-item">
-                <a class="nav-link active" href="#files" id="files-tab" data-toggle="tab" role="tab" aria-controls="files" aria-selected="true">{% trans 'Files' %}</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="#settings" id="settings-tab" data-toggle="tab" role="tab" aria-controls="settings" aria-selected="false">{% trans 'Sharing Parameters' %}</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="#log" id="log-tab" data-toggle="tab" role="tab" aria-controls="log" aria-selected="false">{% trans 'Log' %}</a>
-            </li>
-        </ul>
-    </div>
-    <div class="card-body tab-content">
+            <div class="tab-pane active" id="files" role="tabpanel" aria-labelledby="files-tab">
+                {% include 'portal/widgets/files_table.html' %}
+            </div>
 
             <div class="tab-pane" id="settings" role="tabpanel" aria-labelledby="settings-tab">
-                <dl class="row">
-
-        <div class="tab-pane" id="settings" role="tabpanel" aria-labelledby="settings-tab">
-            {% include 'portal/widgets/dataset_sharing.html' %}
-        </div>
+                {% include 'portal/widgets/dataset_sharing.html' %}
+            </div>
 
-        <div class="tab-pane" id="log" role="tabpanel" aria-labelledby="log-tab">
-            {% include 'portal/widgets/dataset_log.html' %}
+            <div class="tab-pane" id="log" role="tabpanel" aria-labelledby="log-tab">
+                {% include 'portal/widgets/dataset_log.html' %}
+            </div>
         </div>
     </div>
 </div>