From db2cf2097aa59023fa4368931fdab63c028bcb52 Mon Sep 17 00:00:00 2001 From: hohoTT <609029365@qq.com> Date: Mon, 14 Sep 2015 11:37:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=B9=E4=B8=8B=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E7=9A=84=E5=87=BD=E6=95=B0=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- account/views.py | 2 +- oj/urls.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/account/views.py b/account/views.py index 4aa326a9..28de0a01 100644 --- a/account/views.py +++ b/account/views.py @@ -43,7 +43,7 @@ def logout(request): return http.HttpResponseRedirect("/") -def page_jump(request): +def index_page(request): if not request.user.is_authenticated(): return render(request, "oj/index.html") diff --git a/oj/urls.py b/oj/urls.py index eda20bb0..009ad211 100644 --- a/oj/urls.py +++ b/oj/urls.py @@ -26,7 +26,7 @@ from contest_submission.views import contest_problem_my_submissions_list_page urlpatterns = [ url(r'^install/$', "install.views.install"), - url("^$", "account.views.page_jump", name="page_jump_api"), + url("^$", "account.views.index_page", name="index_page_api"), url(r'^docs/', include('rest_framework_swagger.urls')), url(r'^admin/$', TemplateView.as_view(template_name="admin/admin.html"), name="admin_spa_page"), url(r'^admin/contest/$', TemplateView.as_view(template_name="admin/contest/add_contest.html"), From 32a07d55a1238d438ee141ec0cfa4ea2925836ea Mon Sep 17 00:00:00 2001 From: hohoTT <609029365@qq.com> Date: Mon, 14 Sep 2015 12:21:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oj/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oj/urls.py b/oj/urls.py index 009ad211..dbc91dd0 100644 --- a/oj/urls.py +++ b/oj/urls.py @@ -26,7 +26,7 @@ from contest_submission.views import contest_problem_my_submissions_list_page urlpatterns = [ url(r'^install/$', "install.views.install"), - url("^$", "account.views.index_page", name="index_page_api"), + url("^$", "account.views.index_page", name="index_page"), url(r'^docs/', include('rest_framework_swagger.urls')), url(r'^admin/$', TemplateView.as_view(template_name="admin/admin.html"), name="admin_spa_page"), url(r'^admin/contest/$', TemplateView.as_view(template_name="admin/contest/add_contest.html"), From 903a36f43da76f9f571cd28a587c32ed8d06d70f Mon Sep 17 00:00:00 2001 From: hohoTT <609029365@qq.com> Date: Wed, 16 Sep 2015 21:57:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AF=8F=E4=B8=AA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/src/oj/account/change_password.html | 3 +++ template/src/oj/account/login.html | 3 +++ template/src/oj/account/register.html | 3 +++ template/src/oj/announcement/announcement.html | 4 +++- template/src/oj/contest/contest_index.html | 4 +++- template/src/oj/contest/contest_list.html | 3 +++ template/src/oj/contest/contest_problem.html | 4 +++- template/src/oj/contest/contest_problems_list.html | 3 +++ template/src/oj/contest/contest_rank.html | 3 +++ template/src/oj/contest/my_submission.html | 3 +++ template/src/oj/contest/my_submissions_list.html | 4 +++- template/src/oj/contest/no_contest_permission.html | 4 +++- template/src/oj/contest/submissions_list.html | 4 +++- template/src/oj/group/group.html | 4 +++- template/src/oj/group/group_list.html | 3 +++ template/src/oj/group/my_application.html | 4 +++- template/src/oj/group/my_application_list.html | 4 +++- template/src/oj/problem/my_submission.html | 3 +++ template/src/oj/problem/my_submissions_list.html | 4 +++- template/src/oj/problem/problem.html | 4 +++- template/src/oj/problem/problem_list.html | 3 +++ template/src/oj/submission/my_submissions_list.html | 4 +++- template/src/oj_base.html | 7 +++++-- 23 files changed, 71 insertions(+), 14 deletions(-) diff --git a/template/src/oj/account/change_password.html b/template/src/oj/account/change_password.html index ab9200db..05f5a10f 100644 --- a/template/src/oj/account/change_password.html +++ b/template/src/oj/account/change_password.html @@ -1,4 +1,7 @@ {% extends "oj_base.html" %} +{% block title %} + 用户修改密码 +{% endblock %} {% block body %}
diff --git a/template/src/oj/account/login.html b/template/src/oj/account/login.html index 5777fd3f..351cd27f 100644 --- a/template/src/oj/account/login.html +++ b/template/src/oj/account/login.html @@ -1,4 +1,7 @@ {% extends "oj_base.html" %} +{% block title %} + 用户登录 +{% endblock %} {% block body %}
diff --git a/template/src/oj/account/register.html b/template/src/oj/account/register.html index ef242fb4..2750122e 100644 --- a/template/src/oj/account/register.html +++ b/template/src/oj/account/register.html @@ -1,4 +1,7 @@ {% extends "oj_base.html" %} +{% block title %} + 用户注册 +{% endblock %} {% block body %}
diff --git a/template/src/oj/announcement/announcement.html b/template/src/oj/announcement/announcement.html index c2f84300..2ce84a19 100644 --- a/template/src/oj/announcement/announcement.html +++ b/template/src/oj/announcement/announcement.html @@ -1,5 +1,7 @@ {% extends "oj_base.html" %} - +{% block title %} + {{ announcement.title }} +{% endblock %} {% block body %}

{{ announcement.title }}

diff --git a/template/src/oj/contest/contest_index.html b/template/src/oj/contest/contest_index.html index 7d32910f..7b977a03 100644 --- a/template/src/oj/contest/contest_index.html +++ b/template/src/oj/contest/contest_index.html @@ -1,5 +1,7 @@ {% extends 'oj_base.html' %} - +{% block title %} + {{ contest.title }} +{% endblock %} {% block body %}