diff --git a/src/service/LoginServlet.java b/src/service/LoginServlet.java
index 6d8befcd1caf760a95d7ebca88055e2bc01648d3..24e95740657e7ac3ef094af031572eeda613e7b2 100644
--- a/src/service/LoginServlet.java
+++ b/src/service/LoginServlet.java
@@ -24,20 +24,11 @@ public class LoginServlet extends HttpServlet {
UserDAO userDAO = new UserDAO();
User user = userDAO.login(email, password);
if(user != null){
-// HttpSession session = request.getSession();
-// session.setAttribute("userId", user.getUserid());
-
Cookie useridCookie = new Cookie("userid", String.valueOf(user.getUserid()));
-// Cookie userphotoCookie = new Cookie("photo", String.valueOf(user.getPhoto()));
response.addCookie(useridCookie);
-// response.addCookie(userphotoCookie);
- //response.addCookie(usernameCookie);
-
out.print("success");
- //request.getRequestDispatcher("register.jsp").forward(request,response);
} else{
out.print("failed");
- //request.getRequestDispatcher("login.jsp").forward(request, response);
}
} else{
//logout
diff --git a/src/service/RegisterServlet.java b/src/service/RegisterServlet.java
index 26c1bc37187aaca1d89ac90134f7c6f4f383f080..923b83e183984dceb8335f38881da23920b75002 100644
--- a/src/service/RegisterServlet.java
+++ b/src/service/RegisterServlet.java
@@ -33,12 +33,9 @@ public class RegisterServlet extends HttpServlet {
if(flag){
System.out.println("signUp success");
response.getWriter().print("success");
- //request.getRequestDispatcher("login.jsp").forward(request,response);
} else{
System.out.println("signUp failed");
response.getWriter().print("failed");
- //request.setAttribute("msg", "signUp failed");
- //request.getRequestDispatcher("register.jsp").forward(request,response);
}
}
diff --git a/src/util/StringUtils.java b/src/util/StringUtils.java
index d95c52862d8cae577c81badbd7ffd5adce1f3c57..9598f2a66c43d470f8d92b4c6da94f1456e38f79 100644
--- a/src/util/StringUtils.java
+++ b/src/util/StringUtils.java
@@ -16,7 +16,7 @@ public class StringUtils {
* @return Date
*/
public static Date stringToDate(String time) {
- DateFormat format = new SimpleDateFormat("yyyy-MM-dd");//日期格式
+ DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
Date date = null;
try {
date = format.parse(time);
diff --git a/web/js/Award/awards.js b/web/js/Award/awards.js
index 79dac5c64392ae467abba5289a8b652d62cf6529..d4d382b84546a50e77ac4438022107d2ea8cd03a 100644
--- a/web/js/Award/awards.js
+++ b/web/js/Award/awards.js
@@ -58,10 +58,6 @@ function getOthersAwards(){
$("#award-display").append('<div class="empty">\n' +
' <span class="tip">Sorry, this user didn\'t fill in award information.</span>\n' +
' </div>');
- // $("#award-box").html("");
- // $("#award-box").append('<div class="empty">\n' +
- // ' <span class="tip">Sorry, this user didn\'t fill in award information.</span>\n' +
- // ' </div>');
} else{
$("#award-display").html("");
$("#award-display").append('<div class="main-award" id="award-box"></div>');
diff --git a/web/js/Award/awards_admin.js b/web/js/Award/awards_admin.js
index 71260e9b73cdf8d78219b954dff787db8779ede6..9fa86c5fa3e068f47fc48f2675d8fc29f3ee5371 100644
--- a/web/js/Award/awards_admin.js
+++ b/web/js/Award/awards_admin.js
@@ -13,7 +13,6 @@ $(function() {
});
function getAwards(){
- //var userId=$("#userId").val();
var strcookie = document.cookie;
var userIdStr = strcookie.split(";")[0];
var userId = userIdStr.split("=")[1];
@@ -144,7 +143,7 @@ function addAward(){
data: {
"type": "add",
"userId": userId,
- "infoId": 2, //暂定award的info type是2
+ "infoId": 2,
"awardName": name,
"description": description,
"awardTime": time
diff --git a/web/js/Privacy/request.js b/web/js/Privacy/request.js
index 83bab1483b86f72c5e59455814c3cb97854cbd2b..5ad7f32aa75898f4622ba10d2e89450b3e263f1f 100644
--- a/web/js/Privacy/request.js
+++ b/web/js/Privacy/request.js
@@ -36,9 +36,9 @@ function getReqeustedProjects(){
function loadCandidates(projectId){
$('#privacyContent').html("");
$.ajax({
- url : '/webpage/privacy/privacy-candidate.html', // 这里是静态页的地址
+ url : '/webpage/privacy/privacy-candidate.html',
//async : false,
- type : 'GET', // 静态页用get方法，否则服务器会抛出405错误
+ type : 'GET',
success : function(data) {
$('#privacyContent').append(data);
}
@@ -64,7 +64,6 @@ function sendRequest(projectId,userId,ownerId){
dataType: 'text',
success: function(data){
if(data == "success"){
- //alert("send success");
window.location.href="other-person.html?id="+ownerId;
} else{
alert("send failed");
@@ -90,14 +89,13 @@ function getRequests(projectId) {
success: function(data){
console.log(data);
var url = window.location.href;
- //var projectName = url.split("=")[1];
var projectName = url.split("project=")[1];
projectName = projectName.replace(/%20/g, " ");
for(var x in data){
- //radio的id名
+
var radio1 = "radio1-"+data[x].projectid+"-"+data[x].requestfrom;
var radio2 = "radio2-"+data[x].projectid+"-"+data[x].requestfrom;
- //加载请求列表
+
$("#candidateRequests").append('<li>\n' +
' <div class="req-in">\n' +
' <img src="'+data[x].photo+'" alt="" class="proj-img">\n' +
@@ -120,7 +118,7 @@ function getRequests(projectId) {
' </div>\n' +
' </div>\n' +
' </li>');
- //加载每个请求的detail内容
+
$("#requestDetail").append('<div class="modal fade" id="see-req'+data[x].requestid+'" tabindex="-1" role="dialog" aria-labelledby="modal-register-label" aria-hidden="true">\n' +
' <div class="modal-dialog">\n' +
' <div class="modal-content" >\n' +
@@ -224,9 +222,9 @@ function agreeAll(projectId){
function toProjectList(){
$('#page-wrapper').html("");
$.ajax({
- url : 'webpage/privacy/privacy-list.html', // 这里是静态页的地址
+ url : 'webpage/privacy/privacy-list.html',
async : false,
- type : 'GET', // 静态页用get方法，否则服务器会抛出405错误
+ type : 'GET',
success : function(data) {
$('#page-wrapper').append(data);
}
@@ -258,12 +256,10 @@ function submitSelections(){
keys: ['enter'],
action: function() {
if(acceptUsers.length != 0){
- //alert("accepter user: "+acceptUsers);
processRequest(projectId, acceptUsers, 2);
setVisibleTo(projectId, acceptUsers);
}
if(refuseUsers.length != 0){
- //alert("refuse user: "+refuseUsers);
processRequest(projectId, refuseUsers, 1);
}
if(projectId != -1){
@@ -276,22 +272,6 @@ function submitSelections(){
}
}
});
-
-
- // if(confirm("Sure to submit?")){
- // if(acceptUsers.length != 0){
- // //alert("accepter user: "+acceptUsers);
- // processRequest(projectId, acceptUsers, 2);
- // setVisibleTo(projectId, acceptUsers);
- // }
- // if(refuseUsers.length != 0){
- // //alert("refuse user: "+refuseUsers);
- // processRequest(projectId, refuseUsers, 1);
- // }
- // if(projectId != -1){
- // loadCandidates(projectId);
- // }
- // }
}
//Requests sent by myself
@@ -334,12 +314,11 @@ function deleteRequest(requestId){
dataType: 'text',
success: function(data){
if(data == "success"){
- //重载页面
$('#page-wrapper').html("");
$.ajax({
- url : 'webpage/privacy/privacy-my.html', // 这里是静态页的地址
+ url : 'webpage/privacy/privacy-my.html',
async : false,
- type : 'GET', // 静态页用get方法，否则服务器会抛出405错误
+ type : 'GET',
success : function(data) {
$('#page-wrapper').append(data);
}
diff --git a/web/js/Project/project_display.js b/web/js/Project/project_display.js
index 5bb5937067af769ae536eb1c4f02c2875f5bb2c6..bf5acb6f6d98c88dd065897fd58ea52c220a6c02 100644
--- a/web/js/Project/project_display.js
+++ b/web/js/Project/project_display.js
@@ -1,6 +1,6 @@
-// --这是用来展示在个人主页上的项目
+// Display projects on personal page
-//全局变量：当前登录用户的id
+//global variables: current user id
var strcookie = document.cookie;
var userId = 0;
if(strcookie.length > 0){
@@ -8,13 +8,13 @@ if(strcookie.length > 0){
userId = userIdStr.split("=")[1];
}
-//全局变量: 选中用户的id，可能为0
+//global variable: selected user id, may be 0
var url = window.location.href;
var urlArray = url.split("id=");
var otheruserId = 0;
if(urlArray.length > 1) otheruserId = urlArray[1].split("#")[0];
-//加载当前登录用户的project列表
+//load current user's project list
function getMyProjectList(){
$("#filterTagBtn").html("");
$("#myProjectList").html("");
@@ -56,7 +56,7 @@ function getMyProjectList(){
});
}
-//加载当前登录用户通过标签筛选后的列表
+//load current user's project filtered by tags
function loadMyProjectByTag(projectTag){
$("#myProjectList").html("");
$.ajax({
@@ -83,7 +83,7 @@ function loadMyProjectByTag(projectTag){
});
}
-//加载(自己的)project到列表
+//load own projects to list
function loadMyProject(data){
$("#myProjectList").append('<tr>\n' +
' <td class="proj-title">'+data.projectname+'</td>\n' +
@@ -97,7 +97,7 @@ function loadMyProject(data){
' </tr>');
}
-//加载(已批准或公开)project到列表
+//load (approved or public) projects to list
function loadApprovedProject(data){
$("#myProjectList").append('<tr>\n' +
' <td class="proj-title">'+data.projectname+'</td>\n' +
@@ -111,7 +111,7 @@ function loadApprovedProject(data){
' </tr>');
}
-//加载(需请求)project到列表
+//load (need require) projects to list
function loadRequestedProject(data){
$("#myProjectList").append('<tr>\n' +
' <td class="proj-title">'+data.projectname+'</td>\n' +
@@ -125,7 +125,7 @@ function loadRequestedProject(data){
' </tr>');
}
-//加载未登录时的列表(主要为了点击details按钮进行登录提示)
+//load project list when not login (for login alert after click details button)
function loadUnloginProject(data){
$("#myProjectList").append('<tr>\n' +
' <td class="proj-title">'+data.projectname+'</td>\n' +
@@ -161,7 +161,7 @@ function confirmLogin(){
});
}
-//获取指定project的所有tag
+//get all tags of particular project
function loadMyProjectTags(projectId, user){
$.ajax({
type: 'post',
@@ -187,7 +187,7 @@ function loadMyProjectTags(projectId, user){
});
}
-//获取我的所有筛选tag按钮
+//get all tag filter buttons of current user
function loadMyTagFilterBtn(){
$("#filterTagBtn").append('<button class="btn btn-general btn-green filter-b" onclick="getMyProjectList()">All</button>');
$.ajax({
@@ -212,11 +212,9 @@ function loadMyTagFilterBtn(){
});
}
-
-//获取别人所有权限为2(公开)和1(申请可见)的project,其中对于类型为1的项目根据是否已批准来加载details按钮
+//get all other's projects with privilege 2(public) and 1(need grant)
+//for those 1 projects, load details buttons according to whether they are permitted
function getOthersProjectList(){
- // var url = window.location.href;
- // var otheruserId = url.split("id=")[1];
$("#filterTagBtn").html("");
$("#myProjectList").html("");
$.ajax({
@@ -304,7 +302,7 @@ function loadOthersTagFilterBtn() {
});
}
-//加载别的用户通过标签筛选后的列表
+//load project list using tag filters by other user
function loadOtherProjectByTag(projectTag){
$("#myProjectList").html("");
$.ajax({
diff --git a/web/js/ToolBar/pagebar.js b/web/js/ToolBar/pagebar.js
index 2a1ead0307a67832dd8a45d01b7c7d5b42ba658d..5f0b378ed4267c76b4ffe6d4fac802584f2196f8 100644
--- a/web/js/ToolBar/pagebar.js
+++ b/web/js/ToolBar/pagebar.js
@@ -1,28 +1,24 @@
/**
- * 自定义参数
- * @param data 所有条Json数据
- * @param type 1：加载request里的project列表
- * 2: 加载当前用户发送的request列表
+ * Define parameters
+ * @param data all json data
+ * @param type 1：load project list in requests
+ * 2: load request list sent by current user
*/
loadSubPage = function(data, type){
var pageSize = 3;
var pageNum = Math.ceil(data.length/pageSize);
- // alert(pageNum);
var dataStr = JSON.stringify(data);
if(pageNum == 0){
//$("#page-bar").append('<h4>No data here</h4>');
} else{
- $("#page-bar").append('<div id="currentPage" style="display: none"></div>'); //用来存放当前页面编号
+ $("#page-bar").append('<div id="currentPage" style="display: none"></div>'); //to save current page's number
$("#page-bar").append("<li id='previousBtn' class='page-item disabled'>\n" +
" <a class='page-link' href='#' tabindex='-1' onclick='changePage("+"-1,"+dataStr+","+i+","+pageSize+","+pageNum+","+type+")'>Previous</a>\n" +
" </li>");
for(var i=1; i<=pageNum; i++){
- // $("#page-bar").append("<li class='page-item'><a class='page-link' onclick='loadParticularPage("+dataStr+","+i+","+pageSize+","+pageNum+",\""+idStr+",\""+htmlStr+"\")' href='#'>"+i+"</a></li>");
$("#page-bar").append("<li class='page-item' id='subpage"+i+"'><a class='page-link' onclick='loadParticularPage("+dataStr+","+i+","+pageSize+","+pageNum+","+type+")' href='#'>"+i+"</a></li>");
- // $("#page-bar").append('<li class="page-item">' +
- // // '<a class="page-link" href="#" onclick="test(\''+data+'\')">'+i+'</a></li>');
}
$("#page-bar").append("<li id='nextBtn' class='page-item'>\n" +
@@ -44,13 +40,11 @@ function changePage(move, dataStr, p, pageSize, pageNum, type){
function loadParticularPage(dataStr, p, pageSize, pageNum, type) {
var data = eval(dataStr);
- // //清空原先列表
- // $("#requestProjectList").html("");
- //记录当前页的标号
+ //save current page's number
$("#currentPage").html(p);
- //样式准备
+ //style preparation
if(p > 1) $("#previousBtn").attr("class", "page-item");
else $("#previousBtn").attr("class", "page-item disabled");
@@ -62,14 +56,13 @@ function loadParticularPage(dataStr, p, pageSize, pageNum, type) {
}
$("#subpage"+p).attr("class", "page-item active");
- //加载数据显示列表
var start = (parseInt(p)-1)*pageSize;
if(type == 1){
- //清空原先列表
+ //clear original list
$("#requestProjectList").html("");
for(var x=start; x<start+pageSize; x++){
- var projectId = data[x].projectid; //project id留作备用
+ var projectId = data[x].projectid;
$("#requestProjectList").append(' <li>\n' +
' <div class="req-in">\n' +
' <div class="proj-des">\n' +
diff --git a/web/js/scripts2.js b/web/js/scripts2.js
index 1ad389d009703d830b73ca7eb1ff988aa6ac2baa..484a492309e0ac324d9e39befbb4e4f7815adede 100644
--- a/web/js/scripts2.js
+++ b/web/js/scripts2.js
@@ -1,22 +1,11 @@
jQuery(document).ready(function() {
-
- // /*
- // Fullscreen background
- // */
- // $.backstretch("assets/img/backgrounds/1.jpg");
/*
Modals
*/
$('.launch-modal').on('click', function(e){
e.preventDefault();
- // var strcookie = document.cookie;
- // if(strcookie == ""){
- // $( '#' + $(this).data('modal-id') ).modal();
- // } else{
- // alert("You have already login");
- // }
$( '#' + $(this).data('modal-id') ).modal();
diff --git a/web/other-person-project.html b/web/other-person-project.html
index 9a3f140becd214bbb478a28b402571bf7e9a5604..cbd0df29eb865afce46a80a5ddbfb79d6183fe0f 100644
--- a/web/other-person-project.html
+++ b/web/other-person-project.html
@@ -69,9 +69,7 @@
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="#opfileList">Project Files</a>
</li>
- <!--<li class="nav-item">-->
- <!--<a class="nav-link js-scroll-trigger" href="other-person.html">Awards</a>-->
- <!--</li>-->
+
</ul>
</div>
</nav>
@@ -104,15 +102,7 @@
<div class="img-dis">
<div class="line">
<div id="oprow1" class="row">
- <!--<div class="col-md-4">-->
- <!--<img src="img/main_slide_1.jpg" alt="">-->
- <!--</div>-->
- <!--<div class="col-md-4">-->
- <!--<img src="img/main_slide_2.jpg" alt="">-->
- <!--</div>-->
- <!--<div class="col-md-4">-->
- <!--<img src="img/main_slide_3.jpg" alt="">-->
- <!--</div>-->
+
</div>
<div id="oprow2" class="row">
</div>
@@ -135,10 +125,6 @@
</div>
</div>
-<!-- 这是为空的样式-->
- <!--<div class="empty">-->
- <!--<span class="tip">This project doesn't have any image yet.</span>-->
- <!--</div>-->
</div>
<div id="opvideoList" class="video">
@@ -155,19 +141,6 @@
<!-- 这是有video的布局-->
<h5>Video List:</h5>
- <!--<div class="video-li">-->
- <!--<span>intro.mp4</span>-->
- <!--<a href="#">Watch this</a>-->
- <!--</div>-->
- <!--<div class="video-li">-->
- <!--<span>project_description_briefone.mp4</span>-->
- <!--<a href="#">Watch this</a>-->
- <!--</div>-->
-
-<!-- 这是video为空的布局-->
- <!--<div class="empty">-->
- <!--<span class="tip">This project doesn't have any video yet.</span>-->
- <!--</div>-->
</div>
@@ -176,19 +149,6 @@
<!-- 这是有file的布局-->
<h5>File List:</h5>
- <!--<div class="files-li">-->
- <!--<span>intro.pdf</span>-->
- <!--<a href="#">Download</a>-->
- <!--</div>-->
- <!--<div class="files-li">-->
- <!--<span>project_description_briefone.mp4</span>-->
- <!--<a href="#">Download</a>-->
- <!--</div>-->
-
-<!-- 这是file为空的布局-->
- <!--<div class="empty">-->
- <!--<span class="tip">This project doesn't have any file yet.</span>-->
- <!--</div>-->
</div>
diff --git a/web/other-person.html b/web/other-person.html
index e2389a17f1d8228b3b1d330fab96e8e191d93337..fca0169b86fa0e609dd57da22aabb5d2b940ed38 100644
--- a/web/other-person.html
+++ b/web/other-person.html
@@ -25,13 +25,7 @@
<div class="nav-right">
<div class="user-icon" id="userIcon">
-<!-- <a class="nav-link dropdown-toggle" data-toggle="" role="button" aria-haspopup="true"-->
-<!-- aria-expanded="false" href=""><i class="fa fa-user"></i></a >-->
-<!-- <ul class="dropdown-menu">-->
-<!-- <li><a class="nav-link" href="person.html">View Profile</a ></li>-->
-<!-- <li><a class="nav-link" href="admin.html">My Admin</a ></li>-->
-<!-- <li><a class="nav-link" href="#"><i class="fa fa-power-off"></i> Log Out</a ></li>-->
-<!-- </ul>-->
+
</div>
<div class="home-icon">
<a class="nav-link" href="index.html"><i class="fa fa-home"></i></a >
@@ -153,61 +147,9 @@
<div class="row top-p">
<div id="oeduExp" class="col-md-12 profile-l">
- <!--<div class="title_con"></div>-->
-
- <!--<ul class="edu">-->
- <!--<li>-->
- <!--<label>University:</label>-->
- <!--<span class="value">University of Melbourne</span>-->
- <!--</li>-->
-
- <!--<li>-->
- <!--<label>Degree:</label>-->
- <!--<span class="value">Master</span>-->
- <!--</li>-->
-
- <!--<li>-->
- <!--<label>Major:</label>-->
- <!--<span class="value">Information Technology</span>-->
- <!--</li>-->
-
- <!--<li>-->
- <!--<label>Graduation Date:</label>-->
- <!--<span class="value">30/06/2019</span>-->
- <!--</li>-->
- <!--</ul>-->
-
- <!--<div class="title_con">-->
- <!--</div>-->
-
- <!--<ul class="edu">-->
- <!--<li>-->
- <!--<label>University:</label>-->
- <!--<span class="value">University of Sydney</span>-->
- <!--</li>-->
-
- <!--<li>-->
- <!--<label>Degree:</label>-->
- <!--<span class="value">Bachelor</span>-->
- <!--</li>-->
-
- <!--<li>-->
- <!--<label>Major:</label>-->
- <!--<span class="value">Computer Science</span>-->
- <!--</li>-->
-
- <!--<li>-->
- <!--<label>Graduation Date:</label>-->
- <!--<span class="value">30/06/2016</span>-->
- <!--</li>-->
- <!--</ul>-->
</div>
</div>
- <!--<!– 这是为空的样式–>-->
- <!--<div class="empty">-->
- <!--<span class="tip">Sorry, this user didn't fill in education information.</span>-->
- <!--</div>-->
</section>
@@ -220,13 +162,7 @@
<h2 class=" text-center">Experience</h2>
<div class="mb-5 heading-border"></div>
</div>
- <!--automatically load the working experience-->
-
- <!--<!– 这是为空的样式–>-->
- <!--<div class="empty">-->
- <!--<span class="tip">Sorry, this user didn't fill in any work experience.</span>-->
- <!--</div>-->
</div>
</section>
@@ -243,7 +179,7 @@
</div>
<div class="col-md-12">
<div class="port-head-cont" id="filterTagBtn">
- <!--动态加载标签筛选按钮-->
+ <!--load tag buttons dynamically-->
</div>
</div>
</div>
@@ -256,11 +192,6 @@
</table>
</div>
- <!-- 这是为空的样式-->
-<!-- <div class="empty">-->
-<!-- <span class="tip">Sorry, this user didn't create any project item.</span>-->
-<!-- </div>-->
-
</section>
@@ -276,13 +207,9 @@
<div class="mb-5 heading-border"></div>
</div>
<div id="award-display">
- <!-- 动态加载award -->
+ <!-- load awards dynamically -->
</div>
- <!-- 这是为空的样式-->
-<!-- <div class="empty">-->
-<!-- <span class="tip">Sorry, this user didn't fill in award information.</span>-->
-<!-- </div>-->
</div>
</section>
diff --git a/web/person-project.html b/web/person-project.html
index 8d9d5b7917e21589d3f484a3474bd5d519993508..b633cadcda6f5173d0c89b5384385726d974da4d 100644
--- a/web/person-project.html
+++ b/web/person-project.html
@@ -70,12 +70,6 @@
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="#pfileList">Project Files</a>
</li>
- <!--<li class="nav-item">-->
- <!--<a class="nav-link js-scroll-trigger" href="person.html">Awards</a>-->
- <!--</li>-->
- <!--<li class="nav-item">-->
- <!--<a class="nav-link js-scroll-trigger" href="admin.html">My Admin</a>-->
- <!--</li>-->
</ul>
</div>
</nav>
@@ -108,15 +102,7 @@
<div class="img-dis">
<div class="line">
<div id="prow1" class="row">
- <!--<div class="col-md-4">-->
- <!--<img src="img/main_slide_1.jpg" alt="">-->
- <!--</div>-->
- <!--<div class="col-md-4">-->
- <!--<img src="img/main_slide_2.jpg" alt="">-->
- <!--</div>-->
- <!--<div class="col-md-4">-->
- <!--<img src="img/main_slide_3.jpg" alt="">-->
- <!--</div>-->
+
</div>
<div id="prow2" class="row">
</div>
@@ -139,19 +125,6 @@
</div>
</div>
- <!--<!– 这是为空的样式–>-->
- <!--<div class="empty-file">-->
- <!--<div class="tips">-->
- <!--<p>You don't have any image right now.</p>-->
- <!--<p>Feel free to add new image.</p>-->
- <!--</div>-->
-
- <!--<div class="add-file">-->
- <!--<a href="admin.html">-->
- <!--<i class="fa fa-plus fa-3x"></i>-->
- <!--</a>-->
- <!--</div>-->
- <!--</div>-->
</div>
<div id="pvideoList" class="video">
@@ -166,28 +139,6 @@
</div>
<h5>Video List:</h5>
- <!--<div class="video-li">-->
- <!--<span>intro.mp4</span>-->
- <!--<a href="#">Watch this</a>-->
- <!--</div>-->
- <!--<div class="video-li">-->
- <!--<span>project_description_briefone.mp4</span>-->
- <!--<a href="#">Watch this</a>-->
- <!--</div>-->
-
- <!-- 这是为空的样式-->
- <!--<div class="empty-file">-->
- <!--<div class="tips">-->
- <!--<p>You don't have any video right now.</p>-->
- <!--<p>Feel free to add new video.</p>-->
- <!--</div>-->
-
- <!--<div class="add-file">-->
- <!--<a href="admin.html">-->
- <!--<i class="fa fa-plus fa-3x"></i>-->
- <!--</a>-->
- <!--</div>-->
- <!--</div>-->
</div>
@@ -195,28 +146,7 @@
<h4>PROJECT FILES</h4>
<h5>File List:</h5>
- <!--<div class="files-li">-->
- <!--<span>intro.pdf</span>-->
- <!--<a href="#">Download</a>-->
- <!--</div>-->
- <!--<div class="files-li">-->
- <!--<span>project_description_briefone.mp4</span>-->
- <!--<a href="#">Download</a>-->
- <!--</div>-->
-
- <!-- 这是为空的样式-->
- <!--<div class="empty-file">-->
- <!--<div class="tips">-->
- <!--<p>You don't have any file right now.</p>-->
- <!--<p>Feel free to add new file.</p>-->
- <!--</div>-->
-
- <!--<div class="add-file">-->
- <!--<a href="admin.html">-->
- <!--<i class="fa fa-plus fa-3x"></i>-->
- <!--</a>-->
- <!--</div>-->
- <!--</div>-->
+
</div>
diff --git a/web/person.html b/web/person.html
index 7de3187a6d3c9a2bdad40e7fc5f9c40e7c37209c..1cb48ee12bb1642aba5186af59be6fa9a2cd8138 100644
--- a/web/person.html
+++ b/web/person.html
@@ -155,49 +155,11 @@
<div class="row top-p">
<div id="eduExp" class="col-md-12 profile-l">
-
- <!--<div class="title_con">-->
- <!--</div>-->
-
- <!--<ul class="edu">-->
- <!--<li>-->
- <!--<label>University:</label>-->
- <!--<span class="value">University of Sydney</span>-->
- <!--</li>-->
-
- <!--<li>-->
- <!--<label>Degree:</label>-->
- <!--<span class="value">Bachelor</span>-->
- <!--</li>-->
-
- <!--<li>-->
- <!--<label>Major:</label>-->
- <!--<span class="value">Computer Science</span>-->
- <!--</li>-->
-
- <!--<li>-->
- <!--<label>Graduation Date:</label>-->
- <!--<span class="value">30/06/2016</span>-->
- <!--</li>-->
- <!--</ul>-->
</div>
</div>
-<!-- 这是为空的布局-->
- <!--<div class="me-empty">-->
- <!--<div class="tips">-->
- <!--<p>You haven't fill in any education information.</p>-->
- <!--<p>Feel free to edit new information.</p>-->
- <!--</div>-->
- <!--<div class="add-file">-->
- <!--<a href="admin.html">-->
- <!--<i class="fa fa-plus fa-3x"></i>-->
- <!--</a>-->
- <!--</div>-->
- <!--</div>-->
-
</section>
<!--====================================================
@@ -209,20 +171,6 @@
<h2 class=" text-center">Experience</h2>
<div class="mb-5 heading-border"></div>
</div>
- <!--automatically load the working experience-->
-
- <!-- 这是为空的布局,需要添加到js中，位置如上 edu 所示-->
- <!--<div class="me-empty">-->
- <!--<div class="tips">-->
- <!--<p>You haven't filled in any work experience.</p>-->
- <!--<p>Feel free to edit new information.</p>-->
- <!--</div>-->
- <!--<div class="add-file">-->
- <!--<a href="admin.html">-->
- <!--<i class="fa fa-plus fa-3x"></i>-->
- <!--</a>-->
- <!--</div>-->
- <!--</div>-->
</div>
</section>
@@ -239,7 +187,7 @@
</div>
<div class="col-md-12">
<div class="port-head-cont" id="filterTagBtn">
- <!--动态加载标签筛选按钮-->
+ <!--load tag buttons dynamically-->
</div>
</div>
</div>
@@ -247,23 +195,10 @@
<div class="proj-item">
<table class="tablesaw table-striped table-hover table-bordered table" data-tablesaw-mode="columntoggle">
<tbody id="myProjectList">
- <!--动态加载project列表-->
+ <!--load project list dynamically-->
</tbody>
</table>
</div>
-
- <!-- 这是为空的布局-->
-<!-- <div class="me-empty">-->
-<!-- <div class="tips">-->
-<!-- <p>You haven't created any project item.</p>-->
-<!-- <p>Feel free to add new project.</p>-->
-<!-- </div>-->
-<!-- <div class="add-file">-->
-<!-- <a href="admin.html">-->
-<!-- <i class="fa fa-plus fa-3x"></i>-->
-<!-- </a>-->
-<!-- </div>-->
-<!-- </div>-->
</section>
@@ -279,21 +214,8 @@
<div class="mb-5 heading-border"></div>
</div>
<div id="award-display">
- <!-- 动态加载award -->
+ <!--load awards dynamically-->
</div>
-
- <!-- 这是为空的布局-->
-<!-- <div class="me-empty">-->
-<!-- <div class="tips">-->
-<!-- <p>You haven't fill in any award information.</p>-->
-<!-- <p>Feel free to edit new information.</p>-->
-<!-- </div>-->
-<!-- <div class="add-file">-->
-<!-- <a href="admin.html">-->
-<!-- <i class="fa fa-plus fa-3x"></i>-->
-<!-- </a>-->
-<!-- </div>-->
-<!-- </div>-->
</div>
</section>
@@ -305,7 +227,7 @@
PORTFOLIO MODALS
======================================================-->
<div class="portfolio-modal modal fade" id="portfolioModal" tabindex="-1" role="dialog" aria-hidden="true" >
- <!--动态生成project具体内容-->
+ <!--load details of project dynamically-->
</div>
diff --git a/web/webpage/admin-related/admin-background.html b/web/webpage/admin-related/admin-background.html
index af990f143f5b5ccbc4a0a36c4a9ffc88b4f92c7e..4923518cbde2b9ce76ca752f5b475036a10e1159 100644
--- a/web/webpage/admin-related/admin-background.html
+++ b/web/webpage/admin-related/admin-background.html
@@ -45,44 +45,7 @@
</div>
<div id="education-show" class="tab-content">
- <!--<span>Education Item 1</span>-->
- <!--<button class="delete">Delete</button>-->
- <!--<div class="tab-pane active">-->
- <!--<form class="form-horizontal">-->
- <!--<div class="form-group">-->
- <!--<label class="col-sm-2 control-label">University</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input type="text" class="form-control1">-->
- <!--</div>-->
- <!--</div>-->
-
- <!--<div class="form-group">-->
- <!--<label class="col-sm-2 control-label">Degree</label>-->
- <!--<div class="col-sm-8"><select name="selector1" class="form-control1">-->
- <!--<option>PHD</option>-->
- <!--<option>Master</option>-->
- <!--<option>Bachelor</option>-->
- <!--<option>MBA</option>-->
- <!--<option>Others</option>-->
- <!--</select></div>-->
- <!--</div>-->
-
- <!--<div class="form-group">-->
- <!--<label class="col-sm-2 control-label">Major</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input type="text" class="form-control1">-->
- <!--</div>-->
- <!--</div>-->
-
- <!--<div class="form-group">-->
- <!--<label class="col-sm-2 control-label">Graduation Date</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input type="text" class="form-control1" placeholder="DD/MM/Year">-->
- <!--</div>-->
- <!--</div>-->
-
- <!--</form>-->
- <!--</div>-->
+
</div>
<div class="panel-footer">
@@ -104,39 +67,7 @@
</div>
<div id="experience-show" class="tab-content">
- <!--<span>Work Experience Item 1</span>-->
- <!--<button class="delete">Delete</button>-->
- <!--<div class="tab-pane active">-->
- <!--<form class="form-horizontal">-->
- <!--<div class="form-group">-->
- <!--<label class="col-sm-2 control-label">Company</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input type="text" class="form-control1">-->
- <!--</div>-->
- <!--</div>-->
-
- <!--<div class="form-group">-->
- <!--<label class="col-sm-2 control-label">Job Title</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input type="text" class="form-control1">-->
- <!--</div>-->
- <!--</div>-->
-
- <!--<div class="form-group">-->
- <!--<label class="col-sm-2 control-label">Work Period</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input type="text" class="form-control1" placeholder="DD/MM/Year">-->
- <!--</div>-->
- <!--</div>-->
-
- <!--<div class="form-group mb-n">-->
- <!--<label class="col-sm-2 control-label label-input-lg">Description</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input type="text" class="form-control1 input-lg">-->
- <!--</div>-->
- <!--</div>-->
- <!--</form>-->
- <!--</div>-->
+
</div>
<div class="panel-footer">
@@ -158,7 +89,7 @@
</div>
<div class="tab-content" id="awardLists">
- <!-- 动态添加award列表 -->
+ <!-- load award list dynamically -->
</div>
<div class="panel-footer">
diff --git a/web/webpage/privacy/privacy-candidate.html b/web/webpage/privacy/privacy-candidate.html
index c81ca73b9aa3fcb5be61ab81253df70c0c370ab5..5b4029f7ecd1547367b02e7b17fe6972b09f6c2e 100644
--- a/web/webpage/privacy/privacy-candidate.html
+++ b/web/webpage/privacy/privacy-candidate.html
@@ -65,7 +65,7 @@
<h4 class="sub-title">List of Applicants</h4>
<ul class="search-listing" id="candidateRequests">
- <!--动态加载点中项目的请求列表-->
+ <!--load project list dynamically-->
</ul>
<nav aria-label="Page navigation example" class="m-t-40">
@@ -94,7 +94,7 @@
</div>
<div id="requestDetail">
- <!--动态加载请求detail弹窗-->
+ <!--load request window dynamically-->
</div>>
<script src="../../js/scripts.js"></script>
diff --git a/web/webpage/privacy/privacy-list.html b/web/webpage/privacy/privacy-list.html
index 00a67e35e7a215a15e6388209c7656a62e3100fb..a25229521f70d23c7cdf1bad68ad162b6672ac49 100644
--- a/web/webpage/privacy/privacy-list.html
+++ b/web/webpage/privacy/privacy-list.html
@@ -53,21 +53,13 @@
<h4 class="sub-title">Requests List</h4>
<ul class="search-listing" id="requestProjectList">
- <!--动态加载含有未处理请求的project-->
+ <!--load unprocessed projects dynamically -->
</ul>
<nav aria-label="Page navigation example" class="m-t-40">
<ul class="pagination" id="page-bar">
-<!-- <li class="page-item disabled">-->
-<!-- <a class="page-link" href="#" tabindex="-1">Previous</a>-->
-<!-- </li>-->
-<!-- <li class="page-item"><a class="page-link" href="#">1</a></li>-->
-<!-- <li class="page-item"><a class="page-link" href="#">2</a></li>-->
-<!-- <li class="page-item"><a class="page-link" href="#">3</a></li>-->
-<!-- <li class="page-item">-->
-<!-- <a class="page-link" href="#">Next</a>-->
-<!-- </li>-->
+
</ul>
</nav>
diff --git a/web/webpage/privacy/privacy-my.html b/web/webpage/privacy/privacy-my.html
index cdfebb2ad8493567f12d22b5ab3b9613607a60d9..cc8457efaca98996adc19db13456e7f8c9cba983 100644
--- a/web/webpage/privacy/privacy-my.html
+++ b/web/webpage/privacy/privacy-my.html
@@ -49,20 +49,12 @@
<h4 class="sub-title">All My Applications</h4>
<ul class="search-listing" id="myRequestsList">
- <!--动态加载请求列表-->
+ <!--load request list dynamically-->
</ul>
<nav aria-label="Page navigation example" class="m-t-40">
<ul class="pagination" id="page-bar">
-<!-- <li class="page-item disabled">-->
-<!-- <a class="page-link" href="#" tabindex="-1">Previous</a>-->
-<!-- </li>-->
-<!-- <li class="page-item"><a class="page-link" href="#">1</a></li>-->
-<!-- <li class="page-item"><a class="page-link" href="#">2</a></li>-->
-<!-- <li class="page-item"><a class="page-link" href="#">3</a></li>-->
-<!-- <li class="page-item">-->
-<!-- <a class="page-link" href="#">Next</a>-->
-<!-- </li>-->
+
</ul>
</nav>
</div>