Merge pull request #235 from yayoiukai/master

moved group delete buttom to group list page

Author: yayoiukai

groups/templates/groups/group.html

@@ -11,7 +11,7 @@ <h3>Your Groups</h3>
                 <ul>
                 {% for group in groups %}
                     <li>
-                    <h4>Group name: <a href="../edit_group/{{group.id}}"> {{ group.group_name }}</a></h4>
+                    <h4>Group name: <a href="../edit_group/{{group.id}}"> {{ group.group_name }}</a><a href="../delete_group/{{group.id}}"><button class="btn btn-sm btn-danger">Delete</button></a></h4>
                     <ul>Creation time: {{group.creation_time}}
                     <form action="{% url 'groups:group_process' %}" method="post" enctype="multipart/form-data">
                     {% csrf_token %}

groups/templates/groups/group_edit.html

@@ -12,8 +12,6 @@ <h3>Group Name: {{group.group_name}} </h3>
                 <input name='old_name' type="hidden" value="{{ group.group_name }}">
                 <input name='new_name' type="text" default="{{ group.group_name }}">
                 <button type="search" class="btn btn-sm btn-warning">Rename</button>
-                <span> </span>
-                <a href="../delete_group/{{group.id}}"><button class="btn btn-sm btn-danger">Delete</button></a>
              </form>
             </div>
             <h4>Files in this group: </h4>