Remove duplicated template

Ghirensics · Dec 2, 2015 · a474a8b · a474a8b
1 parent bfe6200
commit a474a8b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 98 deletions.
diff --git a/templates/admin/show_user.html b/templates/admin/show_user.html
diff --git a/templates/users/profile.html b/templates/users/profile.html
@@ -6,6 +6,11 @@
             <li>
                 <span class="glyphicon glyphicon-home gi-0x"></span><a href="/">Dashboard</a>
             </li>
+            {% if admin_mode %}
+                <li>
+                    <a href="{% url "users.views.admin_list_users" %}"><span class="glyphicon glyphicon-lock gi-0x"></span> Administration</a>
+                </li>
+            {% endif %}
             <li class="active">
                 {{ user.username }}'s profile
             </li>
@@ -38,6 +43,11 @@ <h1>{{ user.username }}'s profile</h1>
                             <div class="header-information">
                                 API key: {{ user.api_key }}
                             </div>
+                            {% if admin_mode %}
+                                <div class="header-information">
+                                    <a href="{% url "users.views.admin_show_activity" user.id %}">Show user activity</a>
+                                </div>
+                            {% endif %}
                         </div>
                         <div class="col-lg-5 col-md-12 col-sm-12 col-xs-12 profile-stats">
                             <div class="row">

diff --git a/users/views.py b/users/views.py
@@ -81,8 +81,8 @@ def admin_show_user(request, user_id):
 
     user = get_object_or_404(Profile, pk=user_id)
 
-    return render_to_response("admin/show_user.html",
-                              {"user": user},
+    return render_to_response("users/profile.html",
+                              {"user": user, "admin_mode": True},
                               context_instance=RequestContext(request))
 
 @login_required