From 17f10f262bca1c4309c506cca1a3f10ea608c47a Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Tue, 8 Sep 2015 20:05:19 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=90=8E=E5=8F=B0-=E5=89=8D=E7=AB=AF]?=
 =?UTF-8?q?=E4=B8=BB=E8=A6=81=E4=BF=AE=E6=94=B9=E4=BA=86=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=AF=94=E8=B5=9B=E5=92=8C=E4=BF=AE=E6=94=B9=E6=AF=94=E8=B5=9B?=
 =?UTF-8?q?=E7=9A=84=E9=83=A8=E5=88=86,=E5=8E=BB=E6=8E=89=E6=AF=94?=
 =?UTF-8?q?=E8=B5=9B=E7=BB=93=E6=9D=9F=E5=89=8D=E5=BC=80=E6=94=BE=E6=8E=92?=
 =?UTF-8?q?=E5=90=8D=E8=BF=99=E4=B8=80=E9=80=89=E9=A1=B9,=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B0=81=E6=A6=9C=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/app/admin/contest/addContest.js |  7 ++---
 .../src/js/app/admin/contest/contestList.js   |  8 +++---
 template/src/admin/contest/add_contest.html   | 28 ++++++++-----------
 template/src/admin/contest/contest_list.html  | 25 ++++++-----------
 4 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/static/src/js/app/admin/contest/addContest.js b/static/src/js/app/admin/contest/addContest.js
index a87e4e2..e1c8b54 100644
--- a/static/src/js/app/admin/contest/addContest.js
+++ b/static/src/js/app/admin/contest/addContest.js
@@ -2,7 +2,6 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
         "validator"],
     function ($, avalon, editor, uploader, bsAlert, csrfTokenHeader) {
 
-        //avalon.vmodels.add_contest = null;
         $("#add-contest-form").validator().on('submit', function (e) {
             if (!e.isDefaultPrevented()){
                 e.preventDefault();
@@ -11,7 +10,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
                     description: vm.description,
                     mode: vm.mode,
                     contest_type: 0,
-                    show_rank: vm.showRank,
+                    hide_rank: vm.hideRank,
                     show_user_submission: vm.showSubmission,
                     start_time: vm.startTime,
                     end_time: vm.endTime,
@@ -52,7 +51,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
                                 vm.endTime        = "";
                                 vm.password       = "";
                                 vm.mode           = "";
-                                vm.showRank       = false;
+                                vm.hideRank       = 0;
                                 vm.showSubmission = false;
                                 vm.group          = "-1";
                                 vm.groupList      = [];
@@ -81,7 +80,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
             endTime: "",
             password: "",
             mode: "",
-            showRank: false,
+            hideRank: 0,
             showSubmission: false,
             group: "-1",
             groupList: [],
diff --git a/static/src/js/app/admin/contest/contestList.js b/static/src/js/app/admin/contest/contestList.js
index c920cd6..cabf4d0 100644
--- a/static/src/js/app/admin/contest/contestList.js
+++ b/static/src/js/app/admin/contest/contestList.js
@@ -11,7 +11,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
                     description:          vm.editDescription,
                     mode:                 vm.editMode,
                     contest_type:         0,
-                    show_rank:            vm.editShowRank,
+                    hide_rank:            vm.editHideRank,
                     show_user_submission: vm.editShowSubmission,
                     start_time:           vm.editStartTime,
                     end_time:             vm.editEndTime,
@@ -84,7 +84,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
         vm.editStartTime= "";
         vm.editEndTime= "";
         vm.editMode= "";
-        vm.editShowRank= false;
+        vm.editHideRank= 0;
         vm.editShowSubmission= false;
         vm.editProblemList= [];
         vm.editVisible= false;
@@ -113,7 +113,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
             editStartTime: "",
             editEndTime: "",
             editMode: "",
-            editShowRank: false,
+            editHideRank: false,
             editShowSubmission: false,
             editProblemList: [],
             editVisible: false,
@@ -178,7 +178,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
                         vm.group = "0";
                         vm.addGroup()//vm.editChoseGroupList = [0]; id 0 is for the group of everyone~
                     }
-                    vm.editShowRank = vm.contestList[contestId-1].show_rank;
+                    vm.editHideRank = vm.contestList[contestId-1].Hide_rank;
                     vm.editShowSubmission = vm.contestList[contestId-1].show_user_submission;
                     editor("#editor").setValue(vm.contestList[contestId-1].description);
                     vm.editingProblemContestIndex = 0;
diff --git a/template/src/admin/contest/add_contest.html b/template/src/admin/contest/add_contest.html
index 4dd8c96..9ea2b5f 100644
--- a/template/src/admin/contest/add_contest.html
+++ b/template/src/admin/contest/add_contest.html
@@ -7,7 +7,7 @@
             <div class="col-md-12">
                 <div class="form-group">
                     <input type="text" name="name" class="form-control" ms-duplex="title"
-                           data-error="请填写比赛名称(名称不能超过50个字)" ms-attr-readonly="contestCreated" required>
+                           data-error="请填写比赛名称(名称不能超过50个字)" required>
 
                     <div class="help-block with-errors"></div>
                 </div>
@@ -21,21 +21,26 @@
                     <p class="error-info" ms-visible="description==''">请填写比赛描述</p>
                 </div>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-4">
                 <label>开始时间</label>
                 <div class="form-group">
                     <input type="text" class="form-control" name="start_time" id="contest_start_time"
                            ms-duplex="startTime" data-error="请填写比赛开始时间" required>
-
                     <div class="help-block with-errors"></div>
                 </div>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-4">
                 <label>结束时间</label>
                 <div class="form-group">
                     <input type="text" class="form-control" name="end_time" id="contest_end_time"
                            ms-duplex="endTime" data-error="请填写比赛结束时间" required>
-
+                    <div class="help-block with-errors"></div>
+                </div>
+            </div>
+            <div class="col-md-3">
+                <label>封榜时间(结束前/min)</label>
+                <div class="form-group">
+                    <input class="form-control" type="text" ms-duplex="hideRank" data-error="请填写封榜时间" required>
                     <div class="help-block with-errors"></div>
                 </div>
             </div>
@@ -57,20 +62,8 @@
             <div class="col-md-12">
                 <div ms-repeat="choseGroupList" class="group-tag" ms-click="removeGroup($index)">{{el.name}}</div>
             </div>
-            <div class="col-md-3">
-                <label>封榜时间(结束前/min)</label>
-            </div>
             <div class="col-md-3">
                 <label>排名方式</label>
-            </div>
-            <div class="col-md-6">
-                <label>是否公开提交记录</label>
-            </div>
-            <div class="col-md-3">
-                <input class="form-control" type="number" name="hideRank" ms-duplex="hideRank" data-error="请填写封榜时间" required>
-                <div class="help-block with-errors"></div>
-            </div>
-            <div class="col-md-3">
                 <div class="form-group">
                     <label><input type="radio" name="mode" ms-duplex-string="mode" value="0">
                         <small>ACM</small>
@@ -81,6 +74,7 @@
                 </div>
             </div>
             <div class="col-md-6">
+                <label>是否公开提交记录</label>
                 <div class="form-group">
                     <label class="text"><input type="checkbox" ms-duplex-checked="showSubmission">
                         <small>允许查看提交记录</small>
diff --git a/template/src/admin/contest/contest_list.html b/template/src/admin/contest/contest_list.html
index fc17ed0..99c54fe 100644
--- a/template/src/admin/contest/contest_list.html
+++ b/template/src/admin/contest/contest_list.html
@@ -66,7 +66,7 @@
                     <p class="error-info" ms-visible="editDescription==''" >请填写比赛描述</p>
                 </div>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-4">
                 <label>开始时间</label>
 
                 <div class="form-group">
@@ -76,7 +76,7 @@
                     <div class="help-block with-errors"></div>
                 </div>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-4">
                 <label>结束时间</label>
 
                 <div class="form-group">
@@ -86,6 +86,13 @@
                     <div class="help-block with-errors"></div>
                 </div>
             </div>
+            <div class="col-md-3">
+                <label>封榜时间(结束前/min)</label>
+                <div class="form-group">
+                    <input class="form-control" ms-duplex="editHideRank" type="number" data-error="请填写封榜时间" required>
+                    <div class="help-block with-errors"></div>
+                </div>
+            </div>
             <div class="col-md-6">
                 <label>允许参加的用户</label>
 
@@ -103,20 +110,6 @@
             <div class="col-md-12">
                 <div ms-repeat="choseGroupList" class="group-tag" ms-click="removeGroup($index)">{{el.name}}</div>
             </div>
-            <div class="col-md-6">
-
-            </div>
-            <div class="col-md-3">
-
-            </div>
-            <div class="col-md-3">
-
-            </div>
-            <div class="col-md-3">
-                <label>封榜时间(结束前/min)</label>
-                <input class="form-control" name="hideRank" ms-duplex="hideRank" type="number" data-error="请填写封榜时间" required>
-                <div class="help-block with-errors"></div>
-            </div>
             <div class="col-md-3">
                 <label>排名方式</label>