From 593690b340ee1339b53707ebda641b519197abb9 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Sun, 2 Aug 2015 09:59:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E6=A8=A1=E6=9D=BF=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=8C=96=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oj/urls.py | 6 +++--- problem/views.py | 2 +- template/admin/{ => contest}/add_contest.html | 0 template/{ => oj}/account/change_password.html | 0 template/{ => oj}/account/login.html | 0 template/{ => oj}/account/register.html | 0 template/{ => oj}/account/reset_password.html | 0 template/{ => oj}/contest/problems.html | 0 template/{utils => oj}/index.html | 0 template/{ => oj}/problem/problem.html | 0 10 files changed, 4 insertions(+), 4 deletions(-) rename template/admin/{ => contest}/add_contest.html (100%) rename template/{ => oj}/account/change_password.html (100%) rename template/{ => oj}/account/login.html (100%) rename template/{ => oj}/account/register.html (100%) rename template/{ => oj}/account/reset_password.html (100%) rename template/{ => oj}/contest/problems.html (100%) rename template/{utils => oj}/index.html (100%) rename template/{ => oj}/problem/problem.html (100%) diff --git a/oj/urls.py b/oj/urls.py index 7c7e30e3..c9b96070 100644 --- a/oj/urls.py +++ b/oj/urls.py @@ -6,14 +6,14 @@ from django.views.generic import TemplateView from account.views import UserLoginAPIView urlpatterns = [ - url("^$", TemplateView.as_view(template_name="utils/index.html"), name="index_page"), + url("^$", TemplateView.as_view(template_name="oj/index.html"), name="index_page"), url(r'^docs/', include('rest_framework_swagger.urls')), url(r'^admin/$', TemplateView.as_view(template_name="admin/index.html"), name="admin_index_page"), - url(r'^login/$', TemplateView.as_view(template_name="account/login.html"), name="user_login_page"), + url(r'^login/$', TemplateView.as_view(template_name="oj/account/login.html"), name="user_login_page"), url(r'^api/login/$', UserLoginAPIView.as_view(), name="login_api"), url(r'^api/login/$', UserLoginAPIView.as_view(), name="user_login_api"), url(r'^problem/(?P\d+)/$', "problem.views.problem_page", name="problem_page"), - url(r'^admin/contest/$', TemplateView.as_view(template_name="admin/add_contest.html"), name="add_contest_page"), + url(r'^admin/contest/$', TemplateView.as_view(template_name="admin/contest/add_contest.html"), name="add_contest_page"), ] diff --git a/problem/views.py b/problem/views.py index 7509a3c6..58fb9e6d 100644 --- a/problem/views.py +++ b/problem/views.py @@ -4,4 +4,4 @@ from django.shortcuts import render def problem_page(request, problem_id): # todo - return render(request, "problem/problem.html") + return render(request, "oj/problem/problem.html") diff --git a/template/admin/add_contest.html b/template/admin/contest/add_contest.html similarity index 100% rename from template/admin/add_contest.html rename to template/admin/contest/add_contest.html diff --git a/template/account/change_password.html b/template/oj/account/change_password.html similarity index 100% rename from template/account/change_password.html rename to template/oj/account/change_password.html diff --git a/template/account/login.html b/template/oj/account/login.html similarity index 100% rename from template/account/login.html rename to template/oj/account/login.html diff --git a/template/account/register.html b/template/oj/account/register.html similarity index 100% rename from template/account/register.html rename to template/oj/account/register.html diff --git a/template/account/reset_password.html b/template/oj/account/reset_password.html similarity index 100% rename from template/account/reset_password.html rename to template/oj/account/reset_password.html diff --git a/template/contest/problems.html b/template/oj/contest/problems.html similarity index 100% rename from template/contest/problems.html rename to template/oj/contest/problems.html diff --git a/template/utils/index.html b/template/oj/index.html similarity index 100% rename from template/utils/index.html rename to template/oj/index.html diff --git a/template/problem/problem.html b/template/oj/problem/problem.html similarity index 100% rename from template/problem/problem.html rename to template/oj/problem/problem.html