merge virusdefender-dev -> dev-s

static/src/js/app/oj/account/settings.js

@@ -1,3 +1,41 @@
-/**
- * Created by uzi on 11/7/15.
- */
+require(["jquery", "bsAlert", "csrfToken", "validator"], function ($, bsAlert, csrfTokenHeader) {
+    $('form').validator().on('submit', function (e) {
+        if (!e.isDefaultPrevented()) {
+            var phone = $("#phone").val();
+            var hduoj_username = $("#hduoj_username").val();
+            var bestcoder_username = $("#bestcoder_username").val();
+            var codeforces_username = $("#codeforces_username").val();
+            var blog = $("#blog").val();
+            var mood = $("#mood").val();
+
+            $.ajax({
+                beforeSend: csrfTokenHeader,
+                url: "/api/account/userprofile/",
+                data: {
+                    phone: phone,
+                    hduoj_username: hduoj_username,
+                    bestcoder_username: bestcoder_username,
+                    codeforces_username: codeforces_username,
+                    blog: blog,
+                    mood: mood
+                },
+                dataType: "json",
+                method: "put",
+                success: function (data) {
+                    if (!data.code) {
+                        bsAlert("修改成功");
+                    }
+                    else{
+                        bsAlert(data.data);
+                    }
+                },
+                error: function () {
+                    bsAlert("额 好像出错了，请刷新页面重试。如还有问题，请填写页面导航栏上的反馈。")
+                }
+
+            });
+            return false;
+        }
+    });
+});
+

static/src/js/build.js

@@ -75,6 +75,7 @@
         groupDetail_20_pack: "app/admin/group/groupDetail",
         editContest_21_pack: "app/admin/contest/editContest",
         group_22_pack: "app/admin/group/group",
+        settings_23_pack: "app/oj/account/settings"
     },
     shim: {
             avalon: {
@@ -159,7 +160,10 @@
         },
         {
             name: "group_22_pack"
-        }
+        },
+        {
+            name: "settings_23_pack"
+        },
     ],
     optimizeCss: "standard",
 })

static/src/js/config.js

@@ -77,6 +77,7 @@ var require = {
         groupDetail_20_pack: "app/admin/group/groupDetail",
         editContest_21_pack: "app/admin/contest/editContest",
         group_22_pack: "app/admin/group/group",
+        settings_23_pack: "app/oj/account/settings"
     },
     shim: {
             avalon: {