From 99fbb6dfaabadd7d1d6ae8724044208c6300a58e Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Mon, 10 Aug 2015 14:47:06 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=E6=B7=BB=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=AD=97=E6=AE=B5=EF=BC=8C=E9=9A=BE=E5=BA=A6?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=87=E7=AD=BE=EF=BC=8C=E6=98=AF=E5=90=A6=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=81=20=20[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/js/app/admin/problem/add_problem.js   | 23 ++++++++++-
 template/admin/problem/add_problem.html       | 39 +++++++++++++------
 2 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/static/src/js/app/admin/problem/add_problem.js b/static/src/js/app/admin/problem/add_problem.js
index c60fd23..015af05 100644
--- a/static/src/js/app/admin/problem/add_problem.js
+++ b/static/src/js/app/admin/problem/add_problem.js
@@ -1,4 +1,4 @@
-require(["jquery", "avalon", "editor", "uploader", "validation"],
+require(["jquery", "avalon", "editor", "uploader", "tagEditor", "validation"],
     function ($, avalon, editor, uploader) {
         avalon.vmodels.add_problem = null;
         $("#add-problem-form")
@@ -69,7 +69,7 @@ require(["jquery", "avalon", "editor", "uploader", "validation"],
             });
         var problemDiscription = editor("#problemDescription");
         var testCaseUploader = uploader("#testCaseFile", "/admin/api/testCase");//{
-
+        var hinteditor = editor("#hint");
         /*auto: true,
          swf: '/static/js/lib/webuploader/Uploader.swf',
          server: 'http://webuploader.duapp.com/server/fileupload.php',
@@ -80,6 +80,7 @@ require(["jquery", "avalon", "editor", "uploader", "validation"],
          mimeTypes: 'zip/*'
          }*/
         // });
+        $("#tags").tagEditor();
         var vm = avalon.define({
             $id: "add_problem",
             title: "",
@@ -87,6 +88,19 @@ require(["jquery", "avalon", "editor", "uploader", "validation"],
             cpu: 0,
             memory: 0,
             samples: [],
+            hint: "",
+            visible: false,
+            difficulty: 0,
+            tags: [],
+            tag: "",
+            checkTag: function () {
+                alert("11");
+                if (event.keyCode == 13)
+                {
+                    alert("You press the enter key!");
+                    return false;
+                }
+            },
             add_sample: function () {
                 vm.samples.push({input: "", output: "", "visible": true});
             },
@@ -104,5 +118,10 @@ require(["jquery", "avalon", "editor", "uploader", "validation"],
                 return "展开";
             }
         });
+        function checkTags(e)
+        {
+            e.preventDefault();
+        }
+        //$("#tag").bind("keydown", checkTags(evevt));
         avalon.scan();
     });
\ No newline at end of file
diff --git a/template/admin/problem/add_problem.html b/template/admin/problem/add_problem.html
index 1da56a9..029fae8 100644
--- a/template/admin/problem/add_problem.html
+++ b/template/admin/problem/add_problem.html
@@ -10,22 +10,36 @@
                 <textarea id="problemDescription" placeholder="这里输入内容" autofocus ms-duplex="description"></textarea>
                 <small ms-visible="description==''" style="color:red">请填写题目描述</small>
             </div>
-            <div class="col-md-6">
-                <label>cpu</label>
+            <div class="form-group">
+                <label>提示</label>
+                <textarea id="hint" placeholder="这里输入内容" autofocus ms-duplex="hint"></textarea>
             </div>
-            <div class="col-md-6">
-                <label>内存</label>
-            </div>
-            <div class="col-md-6">
-                <div class="form-group">
-                    <input type="text" name="cpu" class="form-control" ms-duplex="cpu">
+
+            <div class="col-md-3">
+                <div class="form-group"><label>cpu</label>
+                    <input type="number" name="cpu" class="form-control" ms-duplex="cpu">
                 </div>
             </div>
-            <div class="col-md-6">
-                <div class="form-group">
-                    <input type="text" name="memory" class="form-control" ms-duplex="memory">
+            <div class="col-md-3">
+                <div class="form-group"><label>内存</label>
+                    <input type="number" name="memory" class="form-control" ms-duplex="memory">
                 </div>
             </div>
+            <div class="col-md-3">
+                <div class="form-group"><label>难度</label>
+                    <input type="number" name="difficulty" class="form-control" ms-duplex="difficulty">
+                </div>
+            </div>
+            <div class="col-md-3 form-group">
+                <label>前台是否可见</label><br>
+                <label><input type="checkbox" ms-duplex-checked="visible">
+                    <small> 可见</small>
+                </label>
+            </div>
+            <div id="tag" class="col-md-12">
+                <label>标签</label><br>
+                <input type="text" id="tags">
+            </div>
             <div class="col-md-12">
                 <label>样例</label>
                 <a href="javascript:void(0)" class="btn btn-primary btn-sm" ms-click="add_sample()">添加</a>
@@ -75,4 +89,5 @@
     </form>
 </div>
 
-<script src="/static/js/app/admin/problem/add_problem.js"></script>
\ No newline at end of file
+<script src="/static/js/app/admin/problem/add_problem.js"></script>
+<link href="/static/css/tagEditor/jquery.tag-editor.css" rel="stylesheet">
\ No newline at end of file