Merge branch 'dev' into hohoTT-dev

Conflicts: template/src/oj/submission/my_submissions_list.html
2024-09-21 00:13:18 +00:00 · 2015-08-31 14:36:28 +08:00 · 2015-08-31 14:36:28 +08:00 · 93974f03b7
commit 93974f03b7
parent 2252107a80 55fac52c33
15 changed files with 300 additions and 79 deletions
--- a/contest/views.py
+++ b/contest/views.py
@ -337,7 +337,7 @@ def contest_list_page(request, page=1):
    # 搜索的情况
    keyword = request.GET.get("keyword", None)
    if keyword:
-        contests = contests.filter(title__contains=keyword)
+        contests = contests.filter(Q(title__contains=keyword) | Q(description__contains=keyword))

    # 筛选我能参加的比赛
    join = request.GET.get("join", None)
--- a/group/tests.py
+++ b/group/tests.py
@ -8,6 +8,8 @@ from rest_framework.test import APITestCase, APIClient
 from account.models import User, REGULAR_USER, ADMIN, SUPER_ADMIN
 from group.models import Group, UserGroupRelation, JoinGroupRequest

+from django.test import TestCase, Client
+

 class GroupAPITest(APITestCase):
    pass
@ -254,3 +256,28 @@ class JoinGroupRequestAdminAPITest(APITestCase):
        response = self.client.put(self.url, data=data)
        self.assertEqual(response.data, {"code": 1, "data": u"加入失败，已经在本小组内"})

+
+class ProblemListPageTest(TestCase):
+    def setUp(self):
+        self.client = Client()
+        self.url = reverse('group_list_page')
+        self.url = reverse('problem_list_page', kwargs={"page": 1})
+        self.user = User.objects.create(username="test", admin_type=SUPER_ADMIN)
+        self.user.set_password("testaa")
+        self.user.save()
+        self.group = Group.objects.create(name="group1",
+                                            description="description1",
+                                            # 0是公开 1是需要申请后加入 2是不允许任何人加入
+                                            join_group_setting = 1,
+                                            admin=User.objects.get(username="test"))
+
+    def get_group_list_page_successful(self):
+        self.client.login(username="test", password="testaa")
+        response = self.client.get(self.url)
+        self.assertEqual(response.status_coed, 200)
+
+    def get_group_list_page_successful_with_keyword(self):
+        self.client.login(username="test", password="testaa")
+        response = self.client.get(self.url+"?keyword=gro")
+        self.assertEqual(response.status_coed, 200)
+
--- a/group/views.py
+++ b/group/views.py
@ -4,7 +4,7 @@ from django.db import IntegrityError

 from rest_framework.views import APIView

-from utils.shortcuts import error_response, serializer_invalid_response, success_response, paginate
+from utils.shortcuts import error_response, serializer_invalid_response, success_response, paginate, error_page
 from account.models import REGULAR_USER, ADMIN, SUPER_ADMIN
 from account.decorators import login_required

@ -13,6 +13,9 @@ from .serializers import (CreateGroupSerializer, EditGroupSerializer,
                          CreateJoinGroupRequestSerializer, GroupSerializer,
                          GroupMemberSerializer, EditGroupMemberSerializer,
                          JoinGroupRequestSerializer, PutJoinGroupRequestSerializer)
+from announcement.models import Announcement
+from django.core.paginator import Paginator
+from django.db.models import Q


 class GroupAPIViewBase(object):
@ -26,7 +29,7 @@ class GroupAPIViewBase(object):
        else:
            group = Group.objects.get(id=group_id, visible=True, admin=request.user)
        return group
-        
+
    def get_groups(self, request):
        """
        如果是超级管理员，就返回全部的小组
@ -113,8 +116,8 @@ class GroupAdminAPIView(APIView, GroupAPIViewBase):
            elif request.GET.get("admin_id", None):
                groups = groups.filter(admin__id=request.GET["admin_id"])
            return paginate(request, groups, GroupSerializer)
-            
-            
+
+
 class GroupMemberAdminAPIView(APIView, GroupAPIViewBase):
    def get(self, request):
        """
@ -129,9 +132,9 @@ class GroupMemberAdminAPIView(APIView, GroupAPIViewBase):
            group = self.get_group(request, group_id)
        except Group.DoesNotExist:
            return error_response(u"小组不存在")
-        
+
        return paginate(request, UserGroupRelation.objects.filter(group=group), GroupMemberSerializer)
-    
+
    def put(self, request):
        """
        删除小组成员的api接口
@ -190,7 +193,7 @@ class JoinGroupAPIView(APIView):
                return error_response(u"该小组不允许任何人加入")
        else:
            return serializer_invalid_response(serializer)
-    
+
    def get(self, request):
        """
        搜索小组的api，需要传递keyword参数
@ -244,3 +247,39 @@ class JoinGroupRequestAdminAPIView(APIView, GroupAPIViewBase):

        else:
            return serializer_invalid_response(serializer)
+
+@login_required
+def group_list_page(request, page=1):
+    # 右侧的公告列表
+    announcements = Announcement.objects.filter(is_global=True, visible=True).order_by("-create_time")
+
+    groups = Group.objects.filter(visible=True, join_group_setting__lte=2)
+    # 搜索的情况
+    keyword = request.GET.get("keyword", None)
+    if keyword:
+        groups = groups.filter(Q(name__contains=keyword) | Q(description__contains=keyword))
+
+    paginator = Paginator(groups, 20)
+    try:
+        current_page = paginator.page(int(page))
+    except Exception:
+        return error_page(request, u"不存在的页码")
+
+    previous_page = next_page = None
+
+    try:
+        previous_page = current_page.previous_page_number()
+    except Exception:
+        pass
+    next_page = None
+    try:
+        next_page = current_page.next_page_number()
+    except Exception:
+        pass
+
+    return render(request, "oj/group/group_list.html", {
+        "groups": groups, "announcements": announcements,
+        "contests": current_page, "page": int(page),
+        "previous_page": previous_page, "next_page": next_page,
+        "keyword": keyword, "announcements": announcements,
+    })
--- a/oj/urls.py
+++ b/oj/urls.py
@ -100,6 +100,9 @@ urlpatterns = [
    url(r'^submissions/$', "submission.views.my_submission_list_page", name="my_submission_list_page"),
    url(r'^submissions/(?P<page>\d+)/$', "submission.views.my_submission_list_page", name="my_submission_list_page"),

-    url(r'^contest/(?P<contest_id>\d+)/rank/$', "contest.views.contest_rank_page", name="contest_rank_page")
+    url(r'^contest/(?P<contest_id>\d+)/rank/$', "contest.views.contest_rank_page", name="contest_rank_page"),
+
+    url(r'^groups/$', "group.views.group_list_page", name="group_list_page"),
+    url(r'^groups/(?P<page>\d+)/$', "group.views.group_list_page", name="group_list_page")

 ]
--- a/problem/views.py
+++ b/problem/views.py
@ -222,7 +222,7 @@ def problem_list_page(request, page=1):
    # 搜索的情况
    keyword = request.GET.get("keyword", None)
    if keyword:
-        problems = problems.filter(title__contains=keyword)
+        problems = problems.filter(Q(title__contains=keyword) | Q(description__contains=keyword))

    # 按照标签筛选
    tag_text = request.GET.get("tag", None)
--- a/static/src/js/app/admin/contest/contestList.js
+++ b/static/src/js/app/admin/contest/contestList.js
@ -149,8 +149,16 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
                    vm.editingContestId = contestId;
                    vm.editTitle     = vm.contestList[contestId-1].title;
                    vm.editPassword  = vm.contestList[contestId-1].password;
-                    vm.editStartTime = vm.contestList[contestId-1].start_time.substring(0,16).replace("T"," ");
-                    vm.editEndTime   = vm.contestList[contestId-1].end_time.substring(0,16).replace("T"," ");
+                    //var startTime = new Date(), endTime = new Date();
+                    //startTime.setFullYear(parseInt(vm.contestList[contestId-1].start_time.substring(0,4)))
+                    //startTime.setMonth(parseInt(vm.contestList[contestId-1].start_time.substring(5,7)))
+                    //startTime.setDate(parseInt(vm.contestList[contestId-1].start_time.substring(8,10)))
+                    //startTime.setHours(parseInt(vm.contestList[contestId-1].start_time.substring(11,13)))
+                    //startTime.setMinutes(parseInt(vm.contestList[contestId-1].start_time.substring(14,16)))
+                    //startTime = new Date(startTime + 8 * 60 * 60 * 1000)
+
+                    vm.editStartTime = add8Hours(vm.contestList[contestId-1].start_time);
+                    vm.editEndTime   = add8Hours(vm.contestList[contestId-1].end_time);//.substring(0,16).replace("T"," ");
                    vm.editMode      = vm.contestList[contestId-1].mode;
                    vm.editVisible      = vm.contestList[contestId-1].visible;
                    if (vm.contestList[contestId-1].contest_type == 0) { //contest type == 0, contest in group
@ -291,6 +299,40 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
                }
            });
        }
+
+        function add8Hours(UtcString) {
+            console.log(UtcString);
+            var M = [31, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+            /*time.setFullYear(parseInt(UtcString.substring(0,4)))
+            time.setMonth(parseInt(UtcString.substring(5,7)))
+            time.setDate(parseInt(UtcString.substring(8,10)))
+            time.setHours(parseInt(UtcString.substring(11,13)))
+            time.setMinutes(parseInt(UtcString.substring(14,16)))
+            time = new Date(time + 8 * 60 * 60 * 1000)*/
+            var year   =UtcString.substring(0,4);
+            var month  =UtcString.substring(5,7);
+            var day    =UtcString.substring(8,10);
+            var hour   =parseInt(UtcString.substring(11,13)) + 8;
+            var minute = UtcString.substring(14,16);
+            if (hour > 23) {
+                hour -= 24; day = parseInt(day)+1; month = parseInt(month);
+                if (month == 2) if (!(year%400)||(!(year%4)&&year%100)) M[2] = 29;
+                if (day > M[month]) {
+                    day = 1;
+                    month = parseInt(month)+1;
+                    if (month > 12) {
+                        year=parseInt(year)+1; month = 1;
+                    }
+                }
+                month = month.toString();
+                day = day.toString();
+                if (month.length==1) month = "0"+month;
+                if (day.length==1)   day   = "0"+day;
+            }
+            hour = hour.toString();
+            if (hour.length==1)      hour="0"+hour;
+            return year+"-"+month+"-"+day+" "+hour+":"+minute;
+        }
        // Get group list
        $.ajax({  // Get current user type
            url: "/api/user/",
--- a/submission/tests.py
+++ b/submission/tests.py
@ -18,7 +18,6 @@ class SubmissionsListPageTest(TestCase):
        self.user.set_password("666666")
        self.user.save()
        self.user2.save()
-        # self.client.login(username="gogoing", password="666666")
        self.submission = Submission.objects.create(user_id=self.user.id,
                                                    language=1,
                                                    code='#include "stdio.h"\nint main(){\n\treturn 0;\n}',
--- a/submission/views.py
+++ b/submission/views.py
@ -138,7 +138,7 @@ def my_submission_list_page(request, page=1):
    """
    我的所有提交的列表页
    """
-    submissions = Submission.objects.filter(user_id=request.user.id). \
+    submissions = Submission.objects.filter(user_id=request.user.id, contest_id__isnull=True). \
        values("id", "result", "create_time", "accepted_answer_time", "language").order_by("-create_time")
    language = request.GET.get("language", None)
    filter = None
--- a/template/src/admin/contest/contest_list.html
+++ b/template/src/admin/contest/contest_list.html
@ -173,7 +173,7 @@
                <td>{{ el.sort_index }}</td>
                <td>{{ el.title }}</td>
                <td ms-visible="editMode=='2'">{{ el.score}}</td>
-                <td>{{ getYesOrNo(el.visible) }}</td>
+                <td ms-text="el.visible?'可见':'不可见'"></td>
                <td>{{ el.create_time|date("yyyy-MM-dd HH:mm:ss") }}</td>
                <td>
                    <a href="javascript:void(0)" class="btn-sm btn-info"
--- a/template/src/admin/problem/problem_list.html
+++ b/template/src/admin/problem/problem_list.html
@ -26,7 +26,7 @@
            <td>{{ el.title }}</td>
            <td>{{ el.create_time|date("yyyy-MM-dd HH:mm:ss")}}</td>
            <td>{{ el.created_by.username }}</td>
-            <td ms-text="el.visible?'可见':'不可见'">{{ getYesOrNo(el.visible) }}</td>
+            <td ms-text="el.visible?'可见':'不可见'"></td>
            <td>{{ el.total_accepted_number }}/{{ el.total_submit_number }}</td>
            <td>
                <button class="btn-sm btn-info" ms-click="showEditProblemPage(el.id)">编辑</button>
--- a/template/src/oj/group/group_list.html
+++ b/template/src/oj/group/group_list.html
@ -0,0 +1,71 @@
+{% extends "oj_base.html" %}
+{% block body %}
+    {% load problem %}
+    <div class="container main">
+        <div class="row">
+            <div class="col-md-9 col-lg-9">
+                <div class="row">
+                    <div class="right">
+                        <form class="form-inline" method="get">
+                            <div class="form-group-sm">
+                                <input name="keyword" class="form-control" placeholder="请输入关键词">
+                                <input type="submit" value="搜索" class="btn btn-primary">
+                            </div>
+                        </form>
+                    </div>
+                </div>
+                <div>
+                    <table class="table table-striped">
+                        <thead>
+                        <tr>
+                            <th>#</th>
+                            <th>名称</th>
+                            <th>加入方式</th>
+                            <th>创建者</th>
+                            <th>创建时间</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {% for item in groups %}
+                            <tr>
+                                <th scope="row"><a href="/group/{{ item.id }}/" target="_blank">{{ item.id }}</a></th>
+                                <td><a href="/group/{{ item.id }}/" target="_blank">{{ item.name }}</a></td>
+                                <td>
+                                    {% if item.join_group_setting %}
+                                        需要申请
+                                    {% else %}
+                                        无需申请
+                                    {% endif %}
+                                </td>
+                                <td>{{ item.admin }}</td>
+                                <td>{{ item.create_time }}</td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                    <nav>
+                        <ul class="pager">
+                            {% if previous_page %}
+                                <li class="previous"><a
+                                        href="/groups/{{ previous_page }}/{% if keyword %}?keyword={{ keyword }}{% endif %}">
+                                    <span aria-hidden="true">&larr;</span> 上一页</a>
+                                </li>
+                            {% endif %}
+                            {% if next_page %}
+                                <li class="next">
+                                    <a href="/groups/{{ next_page }}/{% if keyword %}?keyword={{ keyword }}{% endif %}">
+                                        下一页 <span aria-hidden="true">&rarr;</span>
+                                    </a>
+                                </li>
+                            {% endif %}
+                        </ul>
+                    </nav>
+                </div>
+            </div>
+
+            <div class="col-md-3 col-lg-3">
+                {% include "oj/announcement/_announcement_panel.html" %}
+            </div>
+        </div>
+    </div>
+{% endblock %}
--- a/template/src/oj/index.html
+++ b/template/src/oj/index.html
@ -8,64 +8,71 @@
    <link rel="stylesheet" type="text/css" href="/static/css/fullpage/jquery.fullPage.css">
    <style>
        html, textarea, input, option, select, button {
-            font: 1em "Helvetica Neue", Helvetica, "Lantinghei SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", "STHeiti", "WenQuanYi Micro Hei", SimSun, sans-serif;
-            color: #FFF;
+        font: 1em "Helvetica Neue", Helvetica, "Lantinghei SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑",
+        "STHeiti", "WenQuanYi Micro Hei", SimSun, sans-serif;
+        color: #FFF;
        }

        a {
-            text-decoration: none;
-            color: #FFF;
+        text-decoration: none;
+        color: #FFF;
        }

        #header {
-            position: fixed;
-            height: 30px;
-            display: block;
-            width: 100%;
-            background: transparent;
-            z-index: 10;
-            padding: 20px 20px 0 20px;
+        position: fixed;
+        height: 30px;
+        display: block;
+        width: 100%;
+        background: transparent;
+        z-index: 10;
+        padding: 20px 20px 0 20px;
        }

        #name {
-            font-size: 45px;
-            margin-right: 20px;
+        font-size: 45px;
+        margin-right: 20px;
        }

+        #nav-left{
+        display: inline;
+        position:relative;
+        float: right;
+        margin-right: 28px;
+        }
        .section {
-            position: relative;
+        position: relative;
        }

        .section h1 {
-            font-size: 60px;
+        font-size: 60px;
        }

        .section h3 {
-            font-size: 30px;
-            font-weight: normal;
+        font-size: 30px;
+        font-weight: normal;
        }

        .bottom-pointer {
-            top: auto;
-            bottom: 20px;
-            position: absolute;
-            left: 48%;
+        top: auto;
+        bottom: 20px;
+        position: absolute;
+        left: 48%;
        }

        .index-section-text {
-            position: absolute;
-            top: 30%;
-            width: 100%;
-            text-align: center;
+        position: absolute;
+        top: 30%;
+        width: 100%;
+        text-align: center;
        }

        .section-text {
-            text-align: center;
+        text-align: center;
        }

        .icon {
-            max-height: 300px;
-            max-width: 300px;
+        max-height: 300px;
+        max-width: 300px;
        }

    </style>
@ -84,13 +91,34 @@
                loopBottom: true
            });
        });
+
+
    </script>

 </head>
 <body>
 <div id="header">
    <span id="name">qduoj</span>
-    <a href="/problems/">题目</a>&nbsp;&nbsp;<a href="/contests/">比赛</a>&nbsp;&nbsp;<a href="#">小组</a>
+    <a href="/problems/">题目</a>&nbsp;&nbsp;
+    <a href="/submissions/">提交</a>&nbsp;&nbsp;
+    <a href="/contests/">比赛</a>&nbsp;&nbsp;
+    <a href="/groups/">小组</a>&nbsp;&nbsp;
+    <a href="/about/">关于</a>&nbsp;&nbsp;
+    <div id="nav-left">
+        {% if request.user.is_authenticated %}
+        <a href="#">{{ request.user.username }}</a>
+        <a href="/logout/">退出</a>
+        {% else %}
+        <a href="/login/">
+            登录
+        </a>
+        <a href="/register/">
+            注册
+        </a>
+        {% endif %}
+    </div>
+
+
 </div>

 <div id="fullpage">
--- a/template/src/oj/problem/my_submissions_list.html
+++ b/template/src/oj/problem/my_submissions_list.html
@ -17,17 +17,19 @@
            <tr class="" success>
                <th>#</th>
                <th>提交时间</th>
-                <th>结果</th>
-                <th>运行时间</th>
                <th>语言</th>
+                <th>运行时间</th>
+                <th>结果</th>
            </tr>
            </thead>
            <tbody>
            {% for item in submissions %}
-                <tr class="{{ item.result|translate_result_class }}">
+                <tr>
                    <th scope="row"><a href="/submission/{{ item.id }}/">{{ forloop.counter }}</a></th>
                    <td>{{ item.create_time }}</td>
-                    <td>{{ item.result|translate_result }}</td>
+                    <td>
+                        {{ item.language|translate_language }}
+                    </td>
                    <td>
                        {% if item.accepted_answer_time %}
                            {{ item.accepted_answer_time }}ms
@ -35,8 +37,8 @@
                            --
                        {% endif %}
                    </td>
-                    <td>
-                        {{ item.language|translate_language }}
+                    <td class="alert-{{ item.result|translate_result_class }}">
+                        <strong>{{ item.result|translate_result }}</strong>
                    </td>
                </tr>
            {% endfor %}
--- a/template/src/oj/submission/my_submissions_list.html
+++ b/template/src/oj/submission/my_submissions_list.html
@ -4,37 +4,43 @@
 {% load submission %}
 <div class="container main">
    <div class="col-md-9 col-lg-9">
-        <table class="table table-bordered">
+        <table class="table table-striped">
            <thead>
            <tr>
                <th>#</th>
                <th>提交时间</th>
-                <th><div class="dropdown">
-                    <a href="#" class="dropdown-toggle" id="resultFilter" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                        结果<span class="caret"></span>
-                    </a>
-                    <ul class="dropdown-menu" aria-labelledby="resultFilter">
-                        <li><a href="/submissions/?result=0">Accepted</a></li>
-                        <li><a href="/submissions/?result=6">Wrong Answer</a></li>
-                        <li><a href="/submissions/?result=1">Runtime Error</a></li>
-                        <li><a href="/submissions/?result=2">Time Limit Exceeded</a></li>
-                        <li><a href="/submissions/?result=3">Memory Limit Exceeded</a></li>
-                        <li><a href="/submissions/?result=4">Compile Error</a></li>
-                        <li><a href="/submissions/?result=5">Format Error</a></li>
-                        <li><a href="/submissions/">取消筛选</a></li>
-                    </ul></div>
+                <th>
+                    <div class="dropdown">
+                        <a href="#" class="dropdown-toggle" id="languageFilter" data-toggle="dropdown"
+                           aria-haspopup="true" aria-expanded="true">
+                            语言<span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu" aria-labelledby="languageFilter">
+                            <li><a href="/submissions/?language=1">C</a></li>
+                            <li><a href="/submissions/?language=2">C++</a></li>
+                            <li><a href="/submissions/?language=3">Java</a></li>
+                            <li><a href="/submissions/">取消筛选</a></li>
+                        </ul>
+                    </div>
                </th>
                <th>运行时间</th>
-                <th><div class="dropdown">
-                    <a href="#" class="dropdown-toggle" id="languageFilter" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                        语言<span class="caret"></span>
-                    </a>
-                    <ul class="dropdown-menu" aria-labelledby="languageFilter">
-                        <li><a href="/submissions/?language=1">C</a></li>
-                        <li><a href="/submissions/?language=2">C++</a></li>
-                        <li><a href="/submissions/?language=3">Java</a></li>
-                        <li><a href="/submissions/">取消筛选</a></li>
-                    </ul></div>
+                <th>
+                    <div class="dropdown">
+                        <a href="#" class="dropdown-toggle" id="resultFilter" data-toggle="dropdown"
+                           aria-haspopup="true" aria-expanded="true">
+                            结果<span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu" aria-labelledby="resultFilter">
+                            <li><a href="/submissions/?result=0">Accepted</a></li>
+                            <li><a href="/submissions/?result=6">Wrong Answer</a></li>
+                            <li><a href="/submissions/?result=1">Runtime Error</a></li>
+                            <li><a href="/submissions/?result=2">Time Limit Exceeded</a></li>
+                            <li><a href="/submissions/?result=3">Memory Limit Exceeded</a></li>
+                            <li><a href="/submissions/?result=4">Compile Error</a></li>
+                            <li><a href="/submissions/?result=5">Format Error</a></li>
+                            <li><a href="/submissions/">取消筛选</a></li>
+                        </ul>
+                    </div>
                </th>
            </tr>
            </thead>
@ -44,7 +50,9 @@
                <th scope="row"><a href="/submission/{{ item.id }}/" id="id_{{ forloop.counter }}">
                    {{ forloop.counter |add:start_id }}</a></th>
                <td>{{ item.create_time }}</td>
-                <td>{{ item.result|translate_result }}</td>
+                <td>
+                    {{ item.language|translate_language }}
+                </td>
                <td>
                    {% if item.accepted_answer_time %}
                    {{ item.accepted_answer_time }}ms
@ -52,9 +60,10 @@
                    --
                    {% endif %}
                </td>
-                <td>
-                    {{ item.language|translate_language }}
+                <td class="alert-{{ item.result|translate_result_class }}">
+                    <strong>{{ item.result|translate_result }}</strong>
                </td>
+
            </tr>
            {% endfor %}

--- a/template/src/oj_base.html
+++ b/template/src/oj_base.html
@ -45,6 +45,7 @@
                <li><a href="/problems/">题目</a></li>
                <li><a href="/submissions/">提交</a></li>
                <li><a href="/contests/">比赛</a></li>
+                <li><a href="/groups/">小组</a></li>
                <li><a href="/about/">关于</a></li>
            </ul>
            {% if request.user.is_authenticated %}