diff --git a/static/src/css/admin.css b/static/src/css/admin.css index 6a613e7c..7f8cd068 100644 --- a/static/src/css/admin.css +++ b/static/src/css/admin.css @@ -2,7 +2,6 @@ @import url("bootstrap/todc-bootstrap.min.css"); @import url("codeMirror/codemirror.css"); @import url("simditor/simditor.css"); -@import url("webuploader/webuploader.css"); @import url("datetime_picker/bootstrap-datetimepicker.css"); @import url("tagEditor/jquery.tag-editor.css"); @import url("global.css"); diff --git a/static/src/css/global.css b/static/src/css/global.css index 478683ce..1d3bda37 100644 --- a/static/src/css/global.css +++ b/static/src/css/global.css @@ -1,3 +1,4 @@ +@import url("webuploader/webuploader.css"); @font-face{ font-family: 'source_code_pro'; font-weight: 400; diff --git a/static/src/js/app/oj/account/avatar.js b/static/src/js/app/oj/account/avatar.js index 4780e266..3673904f 100644 --- a/static/src/js/app/oj/account/avatar.js +++ b/static/src/js/app/oj/account/avatar.js @@ -1,5 +1,11 @@ -require(["jquery", "bsAlert", "csrfToken"], function ($, bsAlert, csrfTokenHeader) { +require(["jquery", "bsAlert", "csrfToken", "uploader"], function ($, bsAlert, csrfTokenHeader, uploader) { var avatar = ""; + var avatarUploader = uploader("#avatarUploader", "/", + {title: 'Images', extensions: 'gif,jpg,jpeg,bmp,png', mimeTypes: 'image/*'}, + function (file, response) { + //todo + }); + function changeAvatar(event) { avatar = $(event.target).attr('src'); @@ -27,7 +33,7 @@ require(["jquery", "bsAlert", "csrfToken"], function ($, bsAlert, csrfTokenHeade } }, error: function () { - bsAlert("额 好像出错了,请刷新页面重试。如还有问题,请填写页面导航栏上的反馈。") + bsAlert("好像出错了,请刷新页面重试。") } }); diff --git a/static/src/js/components/testCaseUploader.js b/static/src/js/components/testCaseUploader.js index 907eba7b..26cdeec7 100644 --- a/static/src/js/components/testCaseUploader.js +++ b/static/src/js/components/testCaseUploader.js @@ -62,6 +62,7 @@ define("testCaseUploader", ["avalon", "uploader", "bsAlert", "jquery"], function $ready: function(vm, el){ el.msRetain = true; var testCaseUploader = uploader("#testCaseFileSelector", "/api/admin/test_case_upload/", + {title: 'testcase zip', extensions: 'zip', mimeTypes: 'application/zip'}, function (file, response) { if (response.code) { bsAlert(response.data); diff --git a/static/src/js/utils/uploader.js b/static/src/js/utils/uploader.js index e6d3817a..1fc22a8e 100644 --- a/static/src/js/utils/uploader.js +++ b/static/src/js/utils/uploader.js @@ -1,5 +1,5 @@ define("uploader", ["webUploader", "csrfToken"], function (webuploader, csrfTokenHeader) { - function uploader(selector, server, onSuccess, uploadProgress) { + function uploader(selector, server, accept, onSuccess, uploadProgress) { var Webuploader = webuploader.create({ auto: true, // swf文件路径 @@ -12,11 +12,7 @@ define("uploader", ["webUploader", "csrfToken"], function (webuploader, csrfToke // 不压缩image, 默认如果是jpeg,文件上传前会压缩一把再上传! resize: false, uploadBeforeSend: csrfTokenHeader, - accept: { - title: 'testcase zip', - extensions: 'zip', - mimeTypes: 'application/zip' - } + accept: accept }); Webuploader.on("uploadBeforeSend", csrfTokenHeader); Webuploader.on("uploadSuccess", onSuccess); diff --git a/template/src/oj/account/avatar.html b/template/src/oj/account/avatar.html index 25a6d17f..6b044603 100644 --- a/template/src/oj/account/avatar.html +++ b/template/src/oj/account/avatar.html @@ -18,9 +18,9 @@
-
+

选择已有头像

{% for i in "aaaaaaaaaaaaaaaaaaaa" %} @@ -38,11 +38,15 @@ style="height: 100px;width: 150px"> 水果头像由coding.net提供。
-
- -
+
+

上传自定义头像

+
选择头像
+
+ +
+
{% endblock %}