Merge branch 'master' of https://github.com/bashmak/djing

abonapp/templates/abonapp/task_log.html

@@ -35,6 +35,13 @@
             </tr>
         {% endfor %}
         </tbody>
+        <tfoot>
+        <tr>
+            <td colspan="6">
+                {% include 'taskapp/footer_btns.html' %}
+            </td>
+        </tr>
+        </tfoot>
 
     </table>
     {% include 'toolbar_page.html' with pag=tasks %}

taskapp/templates/taskapp/footer_btns.html

@@ -1,6 +1,6 @@
 {% load i18n %}
 {% if perms.taskapp.add_task %}
-<a href="{% url 'taskapp:add' %}" class="btn btn-sm btn-success" title="Создать новую задачу">
+<a href="{% url 'taskapp:add' %}" class="btn btn-sm btn-success" title="{% trans 'Add new task' %}">
     <span class="glyphicon glyphicon-plus"></span> {% trans 'Add new task' %}
 </a>
 {% endif %}

taskapp/templates/taskapp/tasklist_all.html

@@ -68,6 +68,17 @@
                 </tr>
             {% endfor %}
             </tbody>
+            <tfoot>
+            <tr>
+                <td colspan="12">
+                    {% if perms.taskapp.add_task %}
+                    <a href="{% url 'taskapp:add' %}" class="btn btn-sm btn-success" title="{% trans 'Add new task' %}">
+                        <span class="glyphicon glyphicon-plus"></span> {% trans 'Add new task' %}
+                    </a>
+                    {% endif %}
+                </td>
+            </tr>
+            </tfoot>
         </table>
     </div>