add login judge on other person's project details

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,6 +233,15 @@ function getOthersProjectList(){
                     '        </div>');
             } else{
                 loadOthersTagFilterBtn();
+                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){
@@ -213,8 +258,7 @@ function getOthersProjectList(){
                         }
                     }
                 }
-
-
+            }
         },
         error : function(msg) {
             alert("get other projects failed");

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();

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();