|
@@ -1,7 +1,10 @@
|
|
|
|
+<<<<<<< HEAD
|
|
{% extends "tables/editor_table.html" %}
|
|
{% extends "tables/editor_table.html" %}
|
|
{% block table_body %}
|
|
{% block table_body %}
|
|
{% for idx in range(0, length) %}
|
|
{% for idx in range(0, length) %}
|
|
<tbody>
|
|
<tbody>
|
|
|
|
+=======
|
|
|
|
+>>>>>>> adjust blogs table buttons and delete options
|
|
<tr>
|
|
<tr>
|
|
<td>{{ idx }}</td>
|
|
<td>{{ idx }}</td>
|
|
<td>{{ blogs[idx].title }}</td>
|
|
<td>{{ blogs[idx].title }}</td>
|
|
@@ -16,6 +19,7 @@
|
|
</div>
|
|
</div>
|
|
</td>
|
|
</td>
|
|
</tr>
|
|
</tr>
|
|
|
|
+<<<<<<< HEAD
|
|
</tbody>
|
|
</tbody>
|
|
{% endfor %}
|
|
{% endfor %}
|
|
{% endblock table_body %}
|
|
{% endblock table_body %}
|
|
@@ -35,3 +39,5 @@
|
|
</div>
|
|
</div>
|
|
</form>
|
|
</form>
|
|
{% endblock modal_body %}
|
|
{% endblock modal_body %}
|
|
|
|
+=======
|
|
|
|
+able buttons and delete options
|