diff --git a/web/js/Project/project_display.js b/web/js/Project/project_display.js index 8fb932003a0707cdb9952a3bce01cd5812d28b26..c529133276b5cd4bd5b1045310040c08e26de2ea 100644 --- a/web/js/Project/project_display.js +++ b/web/js/Project/project_display.js @@ -80,7 +80,7 @@ function loadMyProjectByTag(projectTag){ }); } -//加载(可看)project到列表 +//加载(自己的)project到列表 function loadMyProject(data){ $("#myProjectList").append('<tr>\n' + ' <td class="proj-title">'+data.projectname+'</td>\n' + @@ -94,7 +94,7 @@ function loadMyProject(data){ ' </tr>'); } -//加载(已批准)project到列表 +//加载(已批准或公开)project到列表 function loadApprovedProject(data){ $("#myProjectList").append('<tr>\n' + ' <td class="proj-title">'+data.projectname+'</td>\n' + @@ -122,6 +122,42 @@ function loadRequestedProject(data){ ' </tr>'); } +//加载未登录时的列表(主要为了点击details按钮进行登录提示) +function loadUnloginProject(data){ + $("#myProjectList").append('<tr>\n' + + ' <td class="proj-title">'+data.projectname+'</td>\n' + + ' <td class="proj-tag" id="project-tag'+data.projectid+'">\n' + + ' </td>\n' + + ' <td class="proj-de">\n' + + ' <a href="#">\n' + + ' <button class="request" onclick="confirmLogin()">Details</button>\n' + + ' </a>\n' + + ' </td>\n' + + ' </tr>'); +} + +function confirmLogin(){ + $.confirm({ + title: 'You need login to see details', + content: 'Are You Sure Going Back And Login?\n', + icon: 'fa fa-warning', + theme: 'white', + buttons: { + ok: { + text: "ok", + btnClass: 'btn-primary', + keys: ['enter'], + action: function() { + window.location.href="index.html"; + } + }, + cancel: function(){ + console.log('the user clicked cancel'); + } + } + }); +} + //获取指定project的所有tag function loadMyProjectTags(projectId, user){ $.ajax({ @@ -197,24 +233,32 @@ function getOthersProjectList(){ ' </div>'); } else{ loadOthersTagFilterBtn(); - for(x in data){ - var visibility = data[x].visibility; - if(visibility == 2){ - loadApprovedProject(data[x]); - loadMyProjectTags(data[x].projectid, otheruserId); - } else if(visibility == 1){ - if(containsCurrentUser(data[x].visibleto)){ + if(strcookie==null || strcookie.length==0){ + for(x in data){ + var visibility = data[x].visibility; + if(visibility==2 || visibility==1){ + loadUnloginProject(data[x]); + loadMyProjectTags(data[x].projectid, otheruserId); + } + } + } else{ + for(x in data){ + var visibility = data[x].visibility; + if(visibility == 2){ loadApprovedProject(data[x]); - } else{ - loadRequestedProject(data[x]); - loadRequestModal(data[x]); + loadMyProjectTags(data[x].projectid, otheruserId); + } else if(visibility == 1){ + if(containsCurrentUser(data[x].visibleto)){ + loadApprovedProject(data[x]); + } else{ + loadRequestedProject(data[x]); + loadRequestModal(data[x]); + } + loadMyProjectTags(data[x].projectid, otheruserId); } - loadMyProjectTags(data[x].projectid, otheruserId); } } } - - }, error : function(msg) { alert("get other projects failed"); diff --git a/web/js/login_registerScripts.js b/web/js/login_registerScripts.js index 6746db2bc6582ac09a1756bfaa1d59e99576158c..ab74741b5f0e4c791770569b1dbc391c6a74d418 100644 --- a/web/js/login_registerScripts.js +++ b/web/js/login_registerScripts.js @@ -121,7 +121,7 @@ function register(){ function checkLoginState(){ var strcookie = document.cookie; - if(strcookie == ""){ + if(strcookie==null || strcookie.length==0){ //alert("no login"); $("#loginbtn").show(); $("#logout").hide(); diff --git a/web/other-person.html b/web/other-person.html index 758f48602a30ff779072481927fe3746772d7971..a0b3f3e1874121a48af583b2d595f7c9d09baab8 100644 --- a/web/other-person.html +++ b/web/other-person.html @@ -7,6 +7,7 @@ <link href="css/person-bootstrap.css" rel="stylesheet"> <link href="font-awesome/css/font-awesome.min.css" rel="stylesheet"> <link href='http://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'> + <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.3.0/jquery-confirm.min.css"> <link href="css/person-style.css" rel="stylesheet"> <script src="js/jquery.min.js"> </script> <script src="js/bootstrap.min.js"> </script> @@ -279,6 +280,7 @@ <!-- Global javascript --> <script src="js/jquery.min.js"></script> <script src="js/bootstrap.bundle.min.js"></script> +<script src="js/jquery-confirm.js"></script> <script src="js/Personal-Page/loading_personal_info_to_other.js"></script> <script src="js/Experience/show_experience_to_otherperson.js"></script> @@ -288,6 +290,7 @@ <script src="js/Privacy/request.js"></script> + <script> $(document).ready(function(){ getOthersAwards();