diff --git a/web/css/person-project.css b/web/css/person-project.css
index 71c9e1fdbfbce080b452360360a336789c96131c..f141aca6f00c420b03c52f637d23f85d89d67762 100644
--- a/web/css/person-project.css
+++ b/web/css/person-project.css
@@ -236,7 +236,7 @@ h5{
text-decoration: underline;
font-size:18px;
position:absolute;
- left:1050px;
+ left:900px;
}
.files-li{
@@ -253,7 +253,7 @@ h5{
text-decoration: underline;
font-size:18px;
position:absolute;
- left:1050px;
+ left:900px;
}
.clear{
diff --git a/web/js/Admin/load-candidate.js b/web/js/Admin/load-candidate.js
index 1c329afdbdf830576de08c0c445dbd70ec94b140..6cc000665372fb760b6baba62eb359fae2f6a8c4 100644
--- a/web/js/Admin/load-candidate.js
+++ b/web/js/Admin/load-candidate.js
@@ -1,21 +1,20 @@
$(function(){
-
- console.log("listen click event");
+ // console.log("listen click event");
$('.candidate').on('click', function(){
- console.log("start to load candidate list");
+ // console.log("start to load candidate list");
// alert("this button");
// var value = $(this).attr("value");
// alert("this project id:" + value);
- $('#privacyContent').html("");
+ $('#page-wrapper').html("");
$.ajax({
url : '/webpage/privacy/privacy-candidate.html', // 这里是静态页的地址
async : false,
type : 'GET', // 静态页用get方法，否则服务器会抛出405错误
success : function(data) {
- $('#privacyContent').append(data);
+ $('#page-wrapper').append(data);
}
});
});
diff --git a/web/js/Admin/load-privacy-list.js b/web/js/Admin/load-privacy-list.js
index 7e89c7a8e2b4ec6444367911c26766fab1d51669..f1b0e18c7c64bffc28aacbf29bcaf66f7ed01574 100644
--- a/web/js/Admin/load-privacy-list.js
+++ b/web/js/Admin/load-privacy-list.js
@@ -1,15 +1,16 @@
$(function(){
- console.log("listen click event");
+ // console.log("listen click event");
$('#backLink').on('click', function(){
- console.log("start to load privacy list");
- $('#privacyCandidates').html("");
+ // console.log("start to load privacy list");
+ console.log("hahahahaha");
+ $('#page-wrapper').html("");
$.ajax({
url : '/webpage/privacy/privacy-list.html', // 这里是静态页的地址
async : false,
type : 'GET', // 静态页用get方法，否则服务器会抛出405错误
success : function(data) {
- $('#privacyCandidates').append(data);
+ $('#page-wrapper').append(data);
}
});
});
diff --git a/web/js/Award/awards_admin.js b/web/js/Award/awards_admin.js
index 7fd8796c91ce7be789bad7f21cd77f0c731a0c57..6ce7987260ce43accb05d1ca94c324e8a4df72c4 100644
--- a/web/js/Award/awards_admin.js
+++ b/web/js/Award/awards_admin.js
@@ -155,11 +155,11 @@ function addAward(){
alert("Add Award Success !");
window.location.href="admin.html";
} else{
- alert("insert failed");
+ alert("Insert Failed");
}
},
error : function(msg) {
- alert("add award failed");
+ alert("Add Award Failed");
console.log(msg)
}
});
@@ -201,11 +201,11 @@ function deleteAward(id){
$('#awardLists').html("");
getAwards();
} else{
- alert("delete failed");
+ alert("Delete Failed");
}
},
error : function(msg) {
- alert("delete award failed");
+ alert("Delete Award Failed");
console.log(msg)
}
});
diff --git a/web/js/Experience/admin-background.js b/web/js/Experience/admin-background.js
index 20853905069db04bd96b389e74e76e261079ef40..3b91b501ede7b4c0eeb08c0d1818aafce7651b3d 100644
--- a/web/js/Experience/admin-background.js
+++ b/web/js/Experience/admin-background.js
@@ -379,7 +379,7 @@ function editExps(){
}
},
error : function(msg) {
- alert("edit award" +i+" failed");
+ alert("edit experience" +i+" failed");
console.log(msg)
}
});
@@ -423,7 +423,7 @@ function editEdus(){
}
},
error : function(msg) {
- alert("edit award" +i+" failed");
+ alert("edit education" +i+" failed");
console.log(msg)
}
});
diff --git a/web/js/Project/add_new_project.js b/web/js/Project/add_new_project.js
index b3946bd755bc706c7dde1d5eeee499d836c4acff..57349a65b5c53d568308f656ca8084844d5d023a 100644
--- a/web/js/Project/add_new_project.js
+++ b/web/js/Project/add_new_project.js
@@ -154,7 +154,7 @@ function classifyFiles(url){
var index = url.lastIndexOf(".");
var ext = url.substr(index+1);
- alert(url + ext)
+ // alert(url + ext)
console.log(ext + " " + ext.length);
diff --git a/web/webpage/admin-related/admin-account.html b/web/webpage/admin-related/admin-account.html
index d7a54e23b04f843b213b9edec60614265cf53272..acb00da70b67a6572f096e1dc6a9e9cc899c6261 100644
--- a/web/webpage/admin-related/admin-account.html
+++ b/web/webpage/admin-related/admin-account.html
@@ -23,7 +23,6 @@
<script src="/datepicker/dist/js/bootstrap-datepicker.js"></script>
-
</head>
<body>
<div class="content-main">
@@ -48,7 +47,7 @@
</a>
<div class="user-title">
<form id="upload-form" enctype="multipart/form-data">
- <button class="btn btn-danger" type="button" style="height: 35px;" onClick="$('input[id=uploadImg]').click();">Please Select</button>
+ <button class="btn btn-primary" type="button" style="height: 35px;" onClick="$('input[id=uploadImg]').click();">Please Select</button>
<input class="hidden" id="uploadImg" name="avatar_file" type="file">
</form>
<a id="submitModify" class="btn btn-default" href="#" role="button">Submit</a>
@@ -73,13 +72,10 @@
<span class="input-group-addon">
<i class="fa fa-envelope-o"></i>
</span>
- <input id="myemail" class="form-control1" type="text" placeholder="Please enter your Email Address">
+ <input id="myemail" class="form-control1" type="text" placeholder="Please enter your Email Address" disabled="disabled">
</div>
</div>
<div class="col-sm-2">
- <a class="btn-add launch-modal" href="#" data-modal-id="change-email">
- <button type="submit" class="btn btn-default">Change</button>
- </a>
</div>
</div>
diff --git a/web/webpage/privacy/privacy-candidate.html b/web/webpage/privacy/privacy-candidate.html
index 3f3c0259810b003bd0502c405da1bf5be6bedc19..c81ca73b9aa3fcb5be61ab81253df70c0c370ab5 100644
--- a/web/webpage/privacy/privacy-candidate.html
+++ b/web/webpage/privacy/privacy-candidate.html
@@ -25,7 +25,7 @@
<script src="/js/Privacy/privacy_set.js"></script>
<script src="/js/Privacy/request.js"></script>
- <script src="js/jquery-confirm.js"></script>
+ <script src="/js/jquery-confirm.js"></script>
<script>
$(function(){
diff --git a/web/webpage/project-related/add.html b/web/webpage/project-related/add.html
index 8bc145a62be6268c0de2e7808b6d229e9ff6fa51..94a66830dd940692e795c5375682da26995d7784 100644
--- a/web/webpage/project-related/add.html
+++ b/web/webpage/project-related/add.html
@@ -95,16 +95,16 @@
</form>
</div>
</div>
- <div class="row container text-left" style="margin-top: 20px;">
- <button class="btn btn-primary" id="btn">Acquire Project Content</button>
- </div>
+ <!--<div class="row container text-left" style="margin-top: 20px;">-->
+ <!--<button class="btn btn-primary" id="btn">Acquire Project Content</button>-->
+ <!--</div>-->
</div>
</div>
</div>
</div>
<div class="layui-col-md3" id="right-card">
<div class="layui-card">
- <div class="layui-card-header">Classification <a id="refreshCate"><i class="fa fa-refresh"></i></a></div>
+ <div class="layui-card-header">Classification <a id="refreshCate"></a></div>
<div class="layui-card-body" id="tags">
<input class="layui-input" list="projecttags" type="text" id="enterTags" placeholder="Please Enter Your Project Tags"
autocomplete="off" width：100%>
@@ -117,9 +117,7 @@
<div class="layui-card">
<div class="layui-card-header">
<p><span>Files</span>
- <button id="addRemoveCover" style="float: right;display: inline-block;margin-top: 10px;"
- class="layui-btn layui-btn-xs layui-btn-primary"><i class="fa fa-times"></i>
- </button>
+
</p>
</div>
<div class="layui-card-body">
diff --git a/web/webpage/project-related/editor.html b/web/webpage/project-related/editor.html
index fbdb51f1cfe6e62ee89202e65f11c79bbef61ff9..f7d992162b0591eacec04d113b7a52b95bc8b4a9 100644
--- a/web/webpage/project-related/editor.html
+++ b/web/webpage/project-related/editor.html
@@ -93,16 +93,16 @@
</form>
</div>
</div>
- <div class="row container text-left" style="margin-top: 20px;">
- <button class="btn btn-primary" id="btn">Acquire Project Content</button>
- </div>
+ <!--<div class="row container text-left" style="margin-top: 20px;">-->
+ <!--<button class="btn btn-primary" id="btn">Acquire Project Content</button>-->
+ <!--</div>-->
</div>
</div>
</div>
</div>
<div class="layui-col-md3" id="right-card">
<div class="layui-card">
- <div class="layui-card-header">Classification <a id="refreshCate"><i class="fa fa-refresh"></i></a></div>
+ <div class="layui-card-header">Classification <a id="refreshCate"></a></div>
<div class="layui-card-body" id="editTags">
<input class="layui-input" list="editorProjecttags" type="text" id="enterTags" placeholder="Please Enter Your Project Tags"
autocomplete="off" width：100%>
@@ -115,9 +115,9 @@
<div class="layui-card">
<div class="layui-card-header">
<p><span>Files</span>
- <button id="addRemoveCover" style="float: right;display: inline-block;margin-top: 10px;"
- class="layui-btn layui-btn-xs layui-btn-primary"><i class="fa fa-times"></i>
- </button>
+ <!--<button id="addRemoveCover" style="float: right;display: inline-block;margin-top: 10px;"-->
+ <!--class="layui-btn layui-btn-xs layui-btn-primary"><i class="fa fa-times"></i>-->
+ <!--</button>-->
</p>
</div>
<div class="layui-card-body">