From 3505a98ab0245d0743487f780ba619d9bd8a8223 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Sat, 7 Nov 2015 14:00:32 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=AF=94=E8=B5=9B=E6=8E=92=E5=90=8D?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89=E7=BB=93=E6=9E=9C=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E4=B9=9F=E6=98=BE=E7=A4=BA=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/src/oj/contest/contest_rank.html | 33 ++++++++++++----------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/template/src/oj/contest/contest_rank.html b/template/src/oj/contest/contest_rank.html index 0236365e..25d2735a 100644 --- a/template/src/oj/contest/contest_rank.html +++ b/template/src/oj/contest/contest_rank.html @@ -72,24 +72,27 @@ onchange="if(this.checked){location.href=location.href + '&auto_refresh=true'}else{location.href=location.href=location.href.replace('&auto_refresh=true', '')}"> 自动刷新 + 上一页 + + {% endif %} + {% if paging_info.next_page %} + + {% endif %} + + {% else %}

还没有结果

+ + 自动刷新 {% endif %} From 3ceb1ed8a4e01f44311495c2ceeb50cc4a80f9d6 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Sat, 7 Nov 2015 18:06:40 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/src/js/build.js | 1 + 1 file changed, 1 insertion(+) diff --git a/static/src/js/build.js b/static/src/js/build.js index 9d2a3129..07a6c74a 100644 --- a/static/src/js/build.js +++ b/static/src/js/build.js @@ -26,6 +26,7 @@ // ------ admin web 组件 ---------- pager: "components/pager", editorComponent: "components/editorComponent", + testCaseUploader: "components/testCaseUploader", // ------ 下面写的都不要直接用，而是使用上面的封装版本 ------ //富文本编辑器simditor -> editor From 5a73abc2e536cc49e953d4d432c9af7e966a59fd Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Sun, 8 Nov 2015 22:57:25 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=A2=98=E7=9B=AE?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=85=AC=E5=BC=80=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/src/admin/contest/contest_list.html | 148 ------------------- template/src/admin/contest/problem_list.html | 2 +- 2 files changed, 1 insertion(+), 149 deletions(-) diff --git a/template/src/admin/contest/contest_list.html b/template/src/admin/contest/contest_list.html index 829f6b23..1781eacd 100644 --- a/template/src/admin/contest/contest_list.html +++ b/template/src/admin/contest/contest_list.html @@ -41,153 +41,5 @@ - - - diff --git a/template/src/admin/contest/problem_list.html b/template/src/admin/contest/problem_list.html index 0fb852ac..a59bb6c0 100644 --- a/template/src/admin/contest/problem_list.html +++ b/template/src/admin/contest/problem_list.html @@ -27,7 +27,7 @@ {{ el.total_accepted_number }}/{{ el.total_submit_number }} - + From 1942662a5600ff0144558bf5eabf9530b563b975 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Sun, 8 Nov 2015 23:05:02 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=88=9B=E5=BB=BA=20UserProfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- account/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/account/views.py b/account/views.py index 5b75ce90..a8f37673 100644 --- a/account/views.py +++ b/account/views.py @@ -17,7 +17,7 @@ from utils.captcha import Captcha from mail.tasks import send_email from .decorators import login_required -from .models import User +from .models import User, UserProfile from .serializers import (UserLoginSerializer, UsernameCheckSerializer, UserRegisterSerializer, UserChangePasswordSerializer, EmailCheckSerializer, UserSerializer, EditUserSerializer, @@ -96,6 +96,7 @@ class UserRegisterAPIView(APIView): email=data["email"]) user.set_password(data["password"]) user.save() + UserProfile.objects.create(user=user) return success_response(u"注册成功！") else: return serializer_invalid_response(serializer) From b000469d2a5b28ce14f634c72b2f59cab61b2125 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Sun, 8 Nov 2015 23:15:03 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8E=92=E5=90=8D?= =?UTF-8?q?=EF=BC=9B=E5=88=A4=E6=96=AD=E6=9C=89=E6=97=A0=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/src/oj/account/user_index.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/template/src/oj/account/user_index.html b/template/src/oj/account/user_index.html index 5ab6e449..566a5f59 100644 --- a/template/src/oj/account/user_index.html +++ b/template/src/oj/account/user_index.html @@ -19,7 +19,9 @@ {% endifequal %} -

{{ user.userprofile.mood }}

+ {% if user.userprofile.mood %} +

{{ user.userprofile.mood }}

+ {% endif %}
@@ -61,15 +63,17 @@ {{ user.create_time }}

+ +
{{ user.userprofile.accepted_number }} AC
-
+
{{ user.userprofile.submissions_number }} Submissions
From 7375fc4b3fd61b760e27cfdfe7d2b0a2f1bfd2e4 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Sun, 8 Nov 2015 23:15:20 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/src/oj/account/settings.html | 115 +++++++++++++------------- 1 file changed, 57 insertions(+), 58 deletions(-) diff --git a/template/src/oj/account/settings.html b/template/src/oj/account/settings.html index 6f88512e..ec645ab5 100644 --- a/template/src/oj/account/settings.html +++ b/template/src/oj/account/settings.html @@ -13,67 +13,66 @@
  • 修改密码
    • -
    - -
    -
    -
    -
    -
    - +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    -
    -
    - +
    + + -
    -
    -
    -
    - -
    -
    -
    - -
    -
    -
    -
    +
    +
    +
    + + -
    - - -
    -
    -
    - - -
    -
    -
    - - -
    -
    -
    - -
    -
    -
    +
    +
    +
    + + -
    - -
    - -
    +
    +
    +
    + + +
    +
    +
    + +
    + +
    + +
    {% endblock %}