Browse Source

添加favicon浏览器小标,修改专家信息页面(大面积修改)

luyanan 8 years ago
parent
commit
f53cc864fe

+ 1 - 0
src/main/webapp/account-set.html

5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7
<title>科袖-账号设置(个人信息)</title>
7
<title>科袖-账号设置(个人信息)</title>
8
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
8
<link href="css/bootstrap.min.css" rel="stylesheet">
9
<link href="css/bootstrap.min.css" rel="stylesheet">
9
<link rel="stylesheet" href="css/reset.css" />
10
<link rel="stylesheet" href="css/reset.css" />
10
<link type="text/css" href="css/index.css" rel="stylesheet">
11
<link type="text/css" href="css/index.css" rel="stylesheet">

+ 1 - 0
src/main/webapp/auth.html

6
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
7
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8
<title>科袖-我的工作台</title>
8
<title>科袖-我的工作台</title>
9
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
9
<link type="text/css" href="css/bootstrap.min.css" rel="stylesheet">
10
<link type="text/css" href="css/bootstrap.min.css" rel="stylesheet">
10
<link type="text/css" href="css/reset.css" rel="stylesheet">
11
<link type="text/css" href="css/reset.css" rel="stylesheet">
11
<link type="text/css" href="css/common.css" rel="stylesheet">
12
<link type="text/css" href="css/common.css" rel="stylesheet">

+ 1 - 1
src/main/webapp/bind-mail.html

8

8

9
<meta http-equiv="X-UA-Compatible" content="IE=edge">
9
<meta http-equiv="X-UA-Compatible" content="IE=edge">
10
<title>科袖-邮箱验证</title>
10
<title>科袖-邮箱验证</title>
11

11
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
12
<link rel="stylesheet" href="css/reset.css" />
12
<link rel="stylesheet" href="css/reset.css" />
13
<link type="text/css" href="css/login.css" rel="stylesheet">
13
<link type="text/css" href="css/login.css" rel="stylesheet">
14
<link type="text/css" href="css/common.css" rel="stylesheet">
14
<link type="text/css" href="css/common.css" rel="stylesheet">

+ 7 - 5
src/main/webapp/css/common.css

12
.h1Font{font-size:20px;} /*标题*/
12
.h1Font{font-size:20px;} /*标题*/
13
.h2Font{font-size:18px;} 
13
.h2Font{font-size:18px;} 
14
.h3Font{font-size:16px;} 
14
.h3Font{font-size:16px;} 
15
.h4Font{font-size:14px;} 
16
.h5Font{font-size:13px;} 
17
.h6Font{font-size:12px;} 
18

15
.h4Font{font-size:14px; line-height:26px; color:#333;} 
16
.h5Font{font-size:14px; line-height:22px; color:#666;} 
17
.h6Font{font-size:13px;color:#888;margin-left:8px;} 
18
.pIndent{text-indent:0.5em;}
19
/* .h4tit{ color:#078DEF;} */
20
.paddingSpace{ padding:4px 0;}
19
/*圆角*/
21
/*圆角*/
20
/*头像、资源圆角*/
22
/*头像、资源圆角*/
21
.headRadius{border-radius: 4px;}
23
.headRadius{border-radius: 4px;}
63

65

64
.myWorkspace{font-size: 14px;line-height:40px; text-align: center;float: left; margin-top: 10px;color: #fff;}
66
.myWorkspace{font-size: 14px;line-height:40px; text-align: center;float: left; margin-top: 10px;color: #fff;}
65
/*主体部分*/
67
/*主体部分*/
66
#container{ min-width:1050px; background:#fff;overflow: hidden;}
68
#container{ min-width:1050px;min-height:90%; background:#fff;overflow: hidden;}
67

69

68
/*footer部分*/
70
/*footer部分*/
69
#footer{ min-width:1050px;background:#ff9900;clear: both;height:100px;border-top: 1px solid #ebebeb; position: relative; z-index: 1001; text-align:center;}
71
#footer{ min-width:1050px;background:#ff9900;clear: both;height:100px;border-top: 1px solid #ebebeb; position: relative; z-index: 1001; text-align:center;}

+ 9 - 2
src/main/webapp/css/index.css

24
.sear-btn{ width:140px; height:41px; background:#ff9900; border-radius: 0 6px 6px 0; float:left; cursor:pointer;font-size:16px;line-height:40px; color:#fff; text-align:center; }
24
.sear-btn{ width:140px; height:41px; background:#ff9900; border-radius: 0 6px 6px 0; float:left; cursor:pointer;font-size:16px;line-height:40px; color:#fff; text-align:center; }
25
/*寻找专家流程*/
25
/*寻找专家流程*/
26
.process{ width:806px; height:205px; margin:auto;}
26
.process{ width:806px; height:205px; margin:auto;}
27
.process1{ height:144px; float:left; margin-top:40px;}
27
.process1{width:126px; height:144px; float:left; margin-top:40px;}
28
.process-icon1{ display:block; width:71px; height:64px; background:url(../images/steps01.png) no-repeat; margin:auto;}
28
.process-icon1{ display:block; width:71px; height:64px; background:url(../images/steps01.png) no-repeat; margin:auto;}
29
.process-icon2{ display:block; width:67px; height:64px; background:url(../images/steps02.png) no-repeat; margin:auto;}
29
.process-icon2{ display:block; width:67px; height:64px; background:url(../images/steps02.png) no-repeat; margin:auto;}
30
.process-icon3{ display:block; width:67px; height:64px; background:url(../images/steps03.png) no-repeat; margin:auto;}
30
.process-icon3{ display:block; width:67px; height:64px; background:url(../images/steps03.png) no-repeat; margin:auto;}
105
.named{display:block;font-size:18px; color:#333; float:left;}
105
.named{display:block;font-size:18px; color:#333; float:left;}
106
.named:hover,.named:focus,.named:active{color:#333; text-decoration:none;}
106
.named:hover,.named:focus,.named:active{color:#333; text-decoration:none;}
107
.modify{ display:block; width:16px; height:16px; background:url(../images/onauth.png) center center no-repeat; background-size:100% 100%; float:left; margin:4px;}
107
.modify{ display:block; width:16px; height:16px; background:url(../images/onauth.png) center center no-repeat; background-size:100% 100%; float:left; margin:4px;}
108
.position{ clear:both;font-size:16px;  color:#666; }
108
.position{ clear:both;font-size:16px;  color:#777; }
109
.science{font-size:14px; color:#999;}
109
.science{font-size:14px; color:#999;}
110
.ellipsisbox p{text-overflow:ellipsis; overflow:hidden; white-space:nowrap;}
110
.ellipsisbox p{text-overflow:ellipsis; overflow:hidden; white-space:nowrap;}
111
.industry,.address{font-size:14px; color:#999;  }
111
.industry,.address{font-size:14px; color:#999;  }
112

113
.proModify{width: 20px;height: 20px;margin: 14px 4px;}
114
.proEdit{margin: 12px 6px;}
115
.proName{font-size:20px; line-height:46px;}
116
.proPosition{font-size:18px; line-height:34px;}
117
.proScience{font-size:16px; line-height:34px;}
118
.proAddress{font-size:16px; line-height:30px;}
112
/*资源简介*/
119
/*资源简介*/
113
.remess{ cursor:pointer;}
120
.remess{ cursor:pointer;}
114
.resourcephoto{width:100px;height:100px;margin:20px;float:left;overflow:hidden; }
121
.resourcephoto{width:100px;height:100px;margin:20px;float:left;overflow:hidden; }

+ 1 - 0
src/main/webapp/download.html

5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7
<title>科袖APP下载页</title>
7
<title>科袖APP下载页</title>
8
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
8
<link href="css/bootstrap.min.css" rel="stylesheet">
9
<link href="css/bootstrap.min.css" rel="stylesheet">
9
<link rel="stylesheet" href="css/reset.css" />
10
<link rel="stylesheet" href="css/reset.css" />
10
<link type="text/css" href="css/common.css" rel="stylesheet">
11
<link type="text/css" href="css/common.css" rel="stylesheet">

BIN
src/main/webapp/images/favicon.png


+ 3 - 1
src/main/webapp/index.html

5
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
5
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
6
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
7
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8
<title>科袖网搭建企业与专家的桥梁</title>
8
<title>科袖网 - 搭建企业与专家的桥梁</title>
9
<link rel="shortcut icon" href="images/favicon.png"/>
10
<!-- <link rel="Bookmark" href="images/favicon.png" /> -->
9
<link href="css/bootstrap.min.css" rel="stylesheet">
11
<link href="css/bootstrap.min.css" rel="stylesheet">
10
<link rel="stylesheet" href="css/reset.css" />
12
<link rel="stylesheet" href="css/reset.css" />
11
<link type="text/css" href="css/index.css" rel="stylesheet">
13
<link type="text/css" href="css/index.css" rel="stylesheet">

+ 1 - 1
src/main/webapp/information-add.html

8

8

9
<meta http-equiv="X-UA-Compatible" content="IE=edge">
9
<meta http-equiv="X-UA-Compatible" content="IE=edge">
10
<title>科袖-基本信息</title>
10
<title>科袖-基本信息</title>
11

11
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
12
<link rel="stylesheet" href="css/reset.css" />
12
<link rel="stylesheet" href="css/reset.css" />
13
<link type="text/css" href="css/index.css" rel="stylesheet">
13
<link type="text/css" href="css/index.css" rel="stylesheet">
14
<link type="text/css" href="css/login.css" rel="stylesheet">
14
<link type="text/css" href="css/login.css" rel="stylesheet">

+ 10 - 5
src/main/webapp/information-brow.html

5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7
<title>科袖-浏览专家信息</title>
7
<title>科袖-浏览专家信息</title>
8
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
8
<link href="css/bootstrap.min.css" rel="stylesheet">
9
<link href="css/bootstrap.min.css" rel="stylesheet">
9
<link rel="stylesheet" href="css/reset.css" />
10
<link rel="stylesheet" href="css/reset.css" />
10
<link rel="stylesheet" type="text/css" href="css/style.css" />
11
<link rel="stylesheet" type="text/css" href="css/style.css" />
57
			<div class="head-left headRadius"><a><img id="headImage"></a></div>	
58
			<div class="head-left headRadius"><a><img id="headImage"></a></div>	
58
			<div class="head-center">
59
			<div class="head-center">
59
				<div class="infor-browse">
60
				<div class="infor-browse">
60
					<a class="named" id="nameS" style="font-size:20px;"></a><a class="modify"></a>
61
					<div class="position"><span id="office"></span ><span id="titleS"></span ></div>				
62
					<div class="science"><span id="industryS"></span ><span id="orgNameS"></span ></div>			
63
					<div class="address" id="address"></div>					
61
					<a class="named proName" id="nameS"></a><a class="modify proModify"></a>
62
					<div class="position proPosition"><span id="office"></span ><span id="titleS"></span ></div>				
63
					<div class="science proScience"><span id="industryS"></span ><span id="orgNameS"></span ></div>			
64
					<div class="address proAddress" id="address"></div>					
64
				</div>
65
				</div>
65
				<div class="coulstbtn floatL" id="conbtn" style="position: absolute;bottom: 20px;"><span>咨询</span></div>
66
				<div class="coulstbtn floatL" id="conbtn" style="position: absolute;bottom: 20px;"><span>咨询</span></div>
66
			</div>
67
			</div>
147
					<div class="right-title"><span>项目经历</span>    </div>
148
					<div class="right-title"><span>项目经历</span>    </div>
148
					<div class="infor-browse">
149
					<div class="infor-browse">
149
						<ul class="edu-about edu-infor" id="projectShow">
150
						<ul class="edu-about edu-infor" id="projectShow">
150
							
151
							<!-- <li class="paddingSpace">
152
								<div class="h4Font h4tit">著作名称<small class="h6Font"> 2016.09 - 2016.09</small></div>
153
								<div class="h5Font pIndent">xiangximianshu 纤细面熟xiangxixiangximianshu 纤细面熟miansxiangximianshu 纤细面熟huxiaxiangximianshu 纤细面熟ngximianshu 纤细面熟 纤细面熟</div>
154
							</li> -->
151
						</ul>
155
						</ul>
152
					</div>
156
					</div>
153
				</div>
157
				</div>
156
					<div class="right-title"><span>著作、论文、文章</span>    </div>
160
					<div class="right-title"><span>著作、论文、文章</span>    </div>
157
					<div class="infor-browse">
161
					<div class="infor-browse">
158
						<ul class="edu-about edu-infor" id="paperShow">
162
						<ul class="edu-about edu-infor" id="paperShow">
163
							
159
						</ul>
164
						</ul>
160
					</div>
165
					</div>
161
				</div>
166
				</div>

+ 7 - 6
src/main/webapp/information.html

6
		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6
		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
7
		<meta http-equiv="X-UA-Compatible" content="IE=edge">
7
		<meta http-equiv="X-UA-Compatible" content="IE=edge">
8
		<title>科袖-修改专家信息</title>
8
		<title>科袖-修改专家信息</title>
9
		<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
9
		<link href="css/bootstrap.min.css" rel="stylesheet">
10
		<link href="css/bootstrap.min.css" rel="stylesheet">
10
		<link rel="stylesheet" href="css/reset.css" />
11
		<link rel="stylesheet" href="css/reset.css" />
11
		<link type="text/css" href="css/common.css" rel="stylesheet">
12
		<link type="text/css" href="css/common.css" rel="stylesheet">
57
					</div>
58
					</div>
58
					<div class="head-center">
59
					<div class="head-center">
59
						<div class="infor-browse" style="padding:10px;">
60
						<div class="infor-browse" style="padding:10px;">
60
							<a class="named" id="nameS" style="font-size:20px;"></a>
61
							<a href="#" class="modify"></a>
62
							<a class="edit" style=" margin:4px 6px;"></a>
63
							<div class="position"><span id="office"></span ><span id="titleS"></span ></div>				
64
		                    <div class="science"><span id="industryS"></span ><span id="orgNameS"></span ></div>			
65
		                    <div class="address" id="address"></div>
61
							<a class="named proName" id="nameS"></a>
62
							<a href="#" class="modify proModify"></a>
63
							<a class="edit proEdit"></a>
64
							<div class="position proPosition"><span id="office"></span ><span id="titleS"></span ></div>				
65
		                    <div class="science proScience"><span id="industryS"></span ><span id="orgNameS"></span ></div>			
66
		                    <div class="address proAddress" id="address"></div>
66
	                    </div>
67
	                    </div>
67
	                   <!--个人信息修改-->
68
	                   <!--个人信息修改-->
68
	                   <div class="modifybox" style="margin:0;padding:10px;">
69
	                   <div class="modifybox" style="margin:0;padding:10px;">

+ 49 - 21
src/main/webapp/js/information.brow.js

66
			var eduBgShow = function(data) {
66
			var eduBgShow = function(data) {
67
67
68
				if(data.length>0){
68
				if(data.length>0){
69
					for (var i = 0; i < data.length; i++) {
70
71
						var showHtml = "<li>";
69
					for (var i = 0; i < data.length; i++) {						
70
						var showHtml = '<li><div class="h4Font h4tit">';
72
						if(typeof(data[i].school) !== "undefined"){
71
						if(typeof(data[i].school) !== "undefined"){
73
							showHtml += data[i].school;
72
							showHtml += data[i].school;
74
						}else{
73
						}else{
75
							showHtml += "";
74
							showHtml += "";
76
						}
75
						}
77
						showHtml += "-";
78
						if(typeof(data[i].college) !== "undefined"){
76
						if(typeof(data[i].college) !== "undefined"){
79
							
77
							
80
							showHtml += data[i].college;
78
							showHtml += " - "+ data[i].college;
81
						}else{
79
						}else{
82
							showHtml += "";
80
							showHtml += "";
83
						}
81
						}
84
						showHtml += "-";
85
						if(typeof(data[i].major) !== "undefined"){
82
						if(typeof(data[i].major) !== "undefined"){
86
							
83
							
87
							showHtml += data[i].major;
84
							showHtml +=  " - "+ data[i].major;
88
						}else{
85
						}else{
89
							showHtml += "";
86
							showHtml += "";
90
						}
87
						}
91
						showHtml += "-";
92
						if(typeof(data[i].degree) !== "undefined"){
88
						if(typeof(data[i].degree) !== "undefined"){
93
							
89
							
94
							showHtml += data[i].degree;
90
							showHtml +=" - "+ data[i].degree;
95
						}else{
91
						}else{
96
							showHtml += "";
92
							showHtml += "";
97
						}
93
						}
98
						showHtml += "-";
99
						if(typeof(data[i].year) !== "undefined"){
94
						if(typeof(data[i].year) !== "undefined"){
100
							
95
							
101
							showHtml += data[i].year;
96
							showHtml += '<small class="h6Font">' + data[i].year + '</small>';
102
						}else{
97
						}else{
103
							showHtml += "";
98
							showHtml += "";
104
						}
99
						}
105
						showHtml += "</li>";
100
						showHtml += "</div></li>";
106
						 $("#eduBgShow").append(showHtml);
101
						 $("#eduBgShow").append(showHtml);
107
						// $("#eduBgShow").append("<li>"+data[i].school+"-"+data[i].college+"-"+data[i].major+"-"+data[i].degree+"-"+data[i].year+"</li>");
102
						// $("#eduBgShow").append("<li>"+data[i].school+"-"+data[i].college+"-"+data[i].major+"-"+data[i].degree+"-"+data[i].year+"</li>");
108
						
103
						
113
			var timeJobShow = function(data) {
108
			var timeJobShow = function(data) {
114
109
115
				if(data.length>0){
110
				if(data.length>0){
116
					for (var i = 0; i < data.length; i++) {
117
						$("#timeJobShow").append("<li>"+data[i].company+"-"+data[i].title+"-"+data[i].startMonth+"-"+data[i].stopMonth+"</li>");
111
					for (var i = 0; i < data.length; i++) {	
112
						if(!data[i].startMonth){
113
							data[i].startMonth='';
114
						}else {
115
							data[i].startMonth= data[i].startMonth.substr(0,4)+"-"+data[i].startMonth.substr(4,6);
116
						}
117
						if(!data[i].stopMonth){
118
							data[i].stopMonth='';
119
						}else {
120
							data[i].stopMonth= data[i].stopMonth.substr(0,4)+"-"+data[i].stopMonth.substr(4,6);
121
						}
122
						var JobHtml='<li>';
123
						JobHtml +='<div class="h4Font h4tit">'+ data[i].company+'-'+data[i].title +'<small class="h6Font">'+ data[i].startMonth +' - '+ data[i].stopMonth +'</small></div>';
124
						JobHtml +='</li>';
125
						
126
						$("#timeJobShow").append(JobHtml);
118
					}
127
					}
119
				}
128
				}
120
			}
129
			}
123
				if(data.length>0){
132
				if(data.length>0){
124
					for (var i = 0; i < data.length; i++) {
133
					for (var i = 0; i < data.length; i++) {
125
						if(!data[i].descp){
134
						if(!data[i].descp){
126
							
127
							data[i].descp="";
135
							data[i].descp="";
128
						}
136
						}
129
						if(!data[i].startMonth){
137
						if(!data[i].startMonth){
130
							data[i].startMonth='';
138
							data[i].startMonth='';
131
						}else {
139
						}else {
132
							data[i].startMonth=data[i].startMonth.substr(0,4)+"-"+data[i].startMonth.substr(4,6)
140
							data[i].startMonth= data[i].startMonth.substr(0,4)+"-"+data[i].startMonth.substr(4,6);
133
						}
141
						}
134
						if(!data[i].stopMonth){
142
						if(!data[i].stopMonth){
135
							data[i].stopMonth='';
143
							data[i].stopMonth='';
136
						}else {
144
						}else {
137
							data[i].stopMonth=data[i].stopMonth.substr(0,4)+"-"+data[i].stopMonth.substr(4,6)
145
							data[i].stopMonth= data[i].stopMonth.substr(0,4)+"-"+data[i].stopMonth.substr(4,6);
138
						}
146
						}
139
						$("#projectShow").append("<li>"+data[i].name+'-'+data[i].descp+'-'+data[i].startMonth+'-'+data[i].stopMonth+"</span></li>");
147
						var projectHtml='<li class="paddingSpace">';
148
						projectHtml +='<div class="h4Font h4tit">'+ data[i].name +'<small class="h6Font">'+ data[i].startMonth +' - '+ data[i].stopMonth +'</small></div>';
149
						projectHtml +='<div class="h5Font pIndent">'+ data[i].descp +'</div>';
150
						projectHtml +='</li>';
151
						
152
						$("#projectShow").append(projectHtml);
140
					}  
153
					}  
141
				}
154
				}
142
			}
155
			}
153
						if(!data[i].url) {
166
						if(!data[i].url) {
154
							data[i].url="";
167
							data[i].url="";
155
						}
168
						}
156
						$("#paperShow").append("<li>"+data[i].year+'-'+data[i].name+'-'+data[i].descp+"</li>");
169
						var paperHtml='<li class="paddingSpace">';
170
						paperHtml +='<div class="h4Font h4tit">'+ data[i].name +'<small class="h6Font">'+ data[i].year +'</small></div>';
171
						paperHtml +='<div class="h5Font pIndent">'+ data[i].descp +'</div>';
172
						paperHtml +='</li>';
173
						
174
						$("#paperShow").append(paperHtml);
157
						
175
						
158
					}
176
					}
159
				}
177
				}
171
						if(!data[i].url) {
189
						if(!data[i].url) {
172
							data[i].url="";
190
							data[i].url="";
173
						}
191
						}
174
						$("#patentShow").append("<li>"+data[i].year+'-'+data[i].name+'-'+data[i].descp+"</li>");
192
						var patentHtml='<li class="paddingSpace">';
193
						patentHtml +='<div class="h4Font h4tit">'+ data[i].name +'<small class="h6Font">'+ data[i].year +'</small></div>';
194
						patentHtml +='<div class="h5Font pIndent">'+ data[i].descp +'</div>';
195
						patentHtml +='</li>';
196
197
						$("#patentShow").append(patentHtml);
175
						
198
						
176
					}
199
					}
177
				}
200
				}
186
						if(!data[i].descp) {
209
						if(!data[i].descp) {
187
							data[i].descp="";
210
							data[i].descp="";
188
						}
211
						}
189
						$("#honorShow").append("<li>"+data[i].year+'-'+data[i].name+'-'+data[i].descp+"</li>");
212
						var honorHtml='<li class="paddingSpace">';
213
						honorHtml +='<div class="h4Font h4tit">'+ data[i].name +'<small class="h6Font">'+ data[i].year +'</small></div>';
214
						honorHtml +='<div class="h5Font pIndent">'+ data[i].descp +'</div>';
215
						honorHtml +='</li>';
216
						
217
						$("#honorShow").append(honorHtml);
190
						
218
						
191
					}
219
					}
192
				}
220
				}

+ 22 - 13
src/main/webapp/js/information.js

57
						if(!data[i].degree) {
57
						if(!data[i].degree) {
58
							data[i].degree="";
58
							data[i].degree="";
59
						}
59
						}
60
						var string = '<li>'
61
							string+=' <div class="listdata edudata"><i class="listpoint"></i>'+data[i].school+'-'+data[i].college+'-'+data[i].major+'-'+data[i].degree+''+data[i].year+'<em class="exitlist inforedu"></em></div>'
60
						var string = '<li class="paddingSpace">'
61
							string+=' <div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+data[i].school+'-'+data[i].college+'-'+data[i].major+'-'+data[i].degree+'<small class="h6Font">'+data[i].year+'</small><em class="exitlist inforedu"></em></div>'
62
							string += '<div class="modifybox">'
62
							string += '<div class="modifybox">'
63
							string += '<form class="txtExpForm">'
63
							string += '<form class="txtExpForm">'
64
							string += '<div class="infor edu">'
64
							string += '<div class="infor edu">'
148
						}else {
148
						}else {
149
							data[i].stopMonth=data[i].stopMonth.substr(0,4)+"-"+data[i].stopMonth.substr(4,6)
149
							data[i].stopMonth=data[i].stopMonth.substr(0,4)+"-"+data[i].stopMonth.substr(4,6)
150
						}
150
						}
151
						var string = '<li class="listnone">'
152
							string+=' <div class="listdata edudata"><i class="listpoint"></i>'+data[i].company+'-'+data[i].title+''+data[i].startMonth+'-'+data[i].stopMonth+'<em class="exitlist inforedu"></em></div>'
151
						var string = '<li class="paddingSpace listnone">'
152
							string+=' <div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+data[i].company+'-'+data[i].title+'<small class="h6Font">'+data[i].startMonth+'  '+data[i].stopMonth+'</small><em class="exitlist inforedu"></em></div>'
153
							string += '<div class="modifybox">'
153
							string += '<div class="modifybox">'
154
							string += '<form class="txtExpForm">'
154
							string += '<form class="txtExpForm">'
155
							string += '<div class="infor edu">'
155
							string += '<div class="infor edu">'
217
						}else {
217
						}else {
218
							data[i].stopMonth=data[i].stopMonth.substr(0,4)+"-"+data[i].stopMonth.substr(4,6)
218
							data[i].stopMonth=data[i].stopMonth.substr(0,4)+"-"+data[i].stopMonth.substr(4,6)
219
						}
219
						}
220
						var string = '<li class="listnone">'
221
							string+=' <div class="listdata edudata"><i class="listpoint"></i>'+data[i].name+'-'+data[i].descp+'-'+data[i].startMonth+'-'+data[i].stopMonth+'<em class="exitlist inforedu"></em></div>'
220
						var string = '<li class="paddingSpace listnone">'
221
							string+='<div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+ data[i].name +'<small class="h6Font">'+ data[i].startMonth +'  '+ data[i].stopMonth +'</small><em class="exitlist inforedu"></em></div>';
222
							string+='<div class="listdata h5Font pIndent">'+ data[i].descp +'</div>';
223
							//string+=' <div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+data[i].name+'-'+data[i].descp+'-'+data[i].startMonth+'-'+data[i].stopMonth+'<em class="exitlist inforedu"></em></div>'
222
							string += '<div class="modifybox">'
224
							string += '<div class="modifybox">'
223
							string += '<form class="txtExpForm">'
225
							string += '<form class="txtExpForm">'
224
							string += '<div class="infor edu">'
226
							string += '<div class="infor edu">'
282
						if(!data[i].url) {
284
						if(!data[i].url) {
283
							data[i].url="";
285
							data[i].url="";
284
						}
286
						}
285
						var string = '<li class="listnone">'
286
							string+=' <div class="listdata edudata"><i class="listpoint"></i>'+data[i].year+'-'+data[i].name+'-'+data[i].descp+'<em class="exitlist inforedu"></em></div>'
287
							
288
						var string = '<li class="paddingSpace listnone">'
289
							string+='<div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+ data[i].name +'<small class="h6Font">'+ data[i].year +'</small><em class="exitlist inforedu"></em></div>';
290
							string+='<div class="listdata h5Font pIndent">'+ data[i].descp +'</div>';
291
							//string+=' <div class="listdata edudata"><i class="listpoint"></i>'+data[i].year+'-'+data[i].name+'-'+data[i].descp+'<em class="exitlist inforedu"></em></div>'
287
							string += '<div class="modifybox">'
292
							string += '<div class="modifybox">'
288
							string += '<form class="txtExpForm">'
293
							string += '<form class="txtExpForm">'
289
							string += '<div class="infor edu">'
294
							string += '<div class="infor edu">'
332
						if(!data[i].url) {
337
						if(!data[i].url) {
333
							data[i].url="";
338
							data[i].url="";
334
						}
339
						}
335
						var string = '<li class="listnone">'
336
							string+=' <div class="listdata edudata"><i class="listpoint"></i>'+data[i].year+'-'+data[i].name+'-'+data[i].descp+'<em class="exitlist inforedu"></em></div>'
340
						var string = '<li class="paddingSpace listnone">'
341
							//string+=' <div class="listdata edudata"><i class="listpoint"></i>'+data[i].year+'-'+data[i].name+'-'+data[i].descp+'<em class="exitlist inforedu"></em></div>'
342
							string+='<div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+ data[i].name +'<small class="h6Font">'+ data[i].year +'</small><em class="exitlist inforedu"></em></div>';
343
							string+='<div class="listdata h5Font pIndent">'+ data[i].descp +'</div>';
337
							string += '<div class="modifybox">'
344
							string += '<div class="modifybox">'
338
							string += '<form class="txtExpForm">'
345
							string += '<form class="txtExpForm">'
339
							string += '<div class="infor edu">'
346
							string += '<div class="infor edu">'
382
						if(!data[i].descp) {
389
						if(!data[i].descp) {
383
							data[i].descp="";
390
							data[i].descp="";
384
						}
391
						}
385
						var string = '<li class="listnone">'
386
							string+=' <div class="listdata edudata"><i class="listpoint"></i>'+data[i].year+'-'+data[i].name+'-'+data[i].descp+'<em class="exitlist inforedu"></em></div>'
392
						var string = '<li class="paddingSpace listnone">'
393
							//string+=' <div class="listdata edudata"><i class="listpoint"></i>'+data[i].year+'-'+data[i].name+'-'+data[i].descp+'<em class="exitlist inforedu"></em></div>'
394
							string+='<div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+ data[i].name +'<small class="h6Font">'+ data[i].year +'</small><em class="exitlist inforedu"></em></div>';
395
							string+='<div class="listdata h5Font pIndent">'+ data[i].descp +'</div>';
387
							string += '<div class="modifybox">'
396
							string += '<div class="modifybox">'
388
							string += '<form class="txtExpForm">'
397
							string += '<form class="txtExpForm">'
389
							string += '<div class="infor edu">'
398
							string += '<div class="infor edu">'
1347
//著作论文 文章 
1356
//著作论文 文章 
1348

1357

1349
var papFil=function(select){
1358
var papFil=function(select){
1350
	var string = '<li class="listnone1" style="display:none; >'
1359
	var string = '<li class="listnone1" style="display:none;" >'
1351
		string += '<div class="modifybox" style="display:block;">'
1360
		string += '<div class="modifybox" style="display:block;">'
1352
		string += '<form class="txtExpForm">'
1361
		string += '<form class="txtExpForm">'
1353
		string += '<div class="infor edu">'
1362
		string += '<div class="infor edu">'

+ 2 - 2
src/main/webapp/login-email-find01.html

7
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
7
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
8

8

9
<meta http-equiv="X-UA-Compatible" content="IE=edge">
9
<meta http-equiv="X-UA-Compatible" content="IE=edge">
10
<title>科袖-密码找回-邮箱</title>
11

10
<title>找回密码 - 科袖网</title>
11
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
12
<link rel="stylesheet" href="css/reset.css" />
12
<link rel="stylesheet" href="css/reset.css" />
13
<link type="text/css" href="css/login.css" rel="stylesheet">
13
<link type="text/css" href="css/login.css" rel="stylesheet">
14
</head>
14
</head>

+ 2 - 1
src/main/webapp/login-email-find02.html

4
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
4
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7
<title>科袖-密码找回-邮箱</title>
7
<title>找回密码 - 科袖网</title>
8
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
8
<link rel="stylesheet" href="css/reset.css" />
9
<link rel="stylesheet" href="css/reset.css" />
9
<link type="text/css" href="css/login.css" rel="stylesheet">
10
<link type="text/css" href="css/login.css" rel="stylesheet">
10
</head>
11
</head>

+ 2 - 2
src/main/webapp/login-email-find03.html

7
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
7
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
8

8

9
<meta http-equiv="X-UA-Compatible" content="IE=edge">
9
<meta http-equiv="X-UA-Compatible" content="IE=edge">
10
<title>科袖-密码找回-邮箱</title>
11

10
<title>找回密码 - 科袖网</title>
11
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
12
<link rel="stylesheet" href="css/reset.css" />
12
<link rel="stylesheet" href="css/reset.css" />
13
<link type="text/css" href="css/login.css" rel="stylesheet">
13
<link type="text/css" href="css/login.css" rel="stylesheet">
14

14


+ 1 - 1
src/main/webapp/login-first.html

8

8

9
<meta http-equiv="X-UA-Compatible" content="IE=edge">
9
<meta http-equiv="X-UA-Compatible" content="IE=edge">
10
<title>科袖-首次登录</title>
10
<title>科袖-首次登录</title>
11

11
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
12
<link rel="stylesheet" href="css/reset.css" />
12
<link rel="stylesheet" href="css/reset.css" />
13
<link type="text/css" href="css/login.css" rel="stylesheet">
13
<link type="text/css" href="css/login.css" rel="stylesheet">
14
</head>
14
</head>

+ 1 - 0
src/main/webapp/login-invite-code.html

5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7
<title>科袖-登录-通过手机和邀请码登录</title>
7
<title>科袖-登录-通过手机和邀请码登录</title>
8
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
8
<link rel="stylesheet" href="css/reset.css" />
9
<link rel="stylesheet" href="css/reset.css" />
9
<link type="text/css" href="css/login.css" rel="stylesheet">
10
<link type="text/css" href="css/login.css" rel="stylesheet">
10
</head>
11
</head>

+ 2 - 2
src/main/webapp/login-phone-find01.html

7
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
7
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
8

8

9
<meta http-equiv="X-UA-Compatible" content="IE=edge">
9
<meta http-equiv="X-UA-Compatible" content="IE=edge">
10
<title>科袖-密码找回-手机</title>
11

10
<title>找回密码 - 科袖网</title>
11
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
12
<link rel="stylesheet" href="css/reset.css" />
12
<link rel="stylesheet" href="css/reset.css" />
13
<link type="text/css" href="css/login.css" rel="stylesheet">
13
<link type="text/css" href="css/login.css" rel="stylesheet">
14
</head>
14
</head>

+ 2 - 2
src/main/webapp/login-phone-find02.html

7
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
7
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
8

8

9
<meta http-equiv="X-UA-Compatible" content="IE=edge">
9
<meta http-equiv="X-UA-Compatible" content="IE=edge">
10
<title>科袖-密码找回-手机</title>
11

10
<title>找回密码 - 科袖网</title>
11
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
12
<link rel="stylesheet" href="css/reset.css" />
12
<link rel="stylesheet" href="css/reset.css" />
13
<link type="text/css" href="css/login.css" rel="stylesheet">
13
<link type="text/css" href="css/login.css" rel="stylesheet">
14
</head>
14
</head>

+ 2 - 2
src/main/webapp/login.html

4
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
4
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7
<title>科袖-登录-通过已验证手机或邮箱登录</title>
8

7
<title>科袖网 - 搭建企业与专家的桥梁</title>
8
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
9
<link rel="stylesheet" href="css/reset.css" />
9
<link rel="stylesheet" href="css/reset.css" />
10
<link type="text/css" href="css/login.css" rel="stylesheet">
10
<link type="text/css" href="css/login.css" rel="stylesheet">
11
</head>
11
</head>

+ 1 - 0
src/main/webapp/organization-brow.html

5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7
<title>科袖-浏览机构信息</title>
7
<title>科袖-浏览机构信息</title>
8
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
8
<link href="css/bootstrap.min.css" rel="stylesheet">
9
<link href="css/bootstrap.min.css" rel="stylesheet">
9
<link rel="stylesheet" href="css/reset.css" />
10
<link rel="stylesheet" href="css/reset.css" />
10
<link type="text/css" href="css/index.css" rel="stylesheet">
11
<link type="text/css" href="css/index.css" rel="stylesheet">

+ 1 - 0
src/main/webapp/photo-set.html

7
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8

8

9
<title>头像上传</title>
9
<title>头像上传</title>
10
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
10
<link href="css/reset.css" rel="stylesheet" type="text/css" />
11
<link href="css/reset.css" rel="stylesheet" type="text/css" />
11
<link href="css/basic.css" rel="stylesheet" type="text/css" />
12
<link href="css/basic.css" rel="stylesheet" type="text/css" />
12
<link href="css/jquery.Jcrop.css" rel="stylesheet" type="text/css" />
13
<link href="css/jquery.Jcrop.css" rel="stylesheet" type="text/css" />

+ 1 - 1
src/main/webapp/privacy.html

9

9

10
<meta http-equiv="X-UA-Compatible" content="IE=edge">
10
<meta http-equiv="X-UA-Compatible" content="IE=edge">
11
<title>科袖用户协议</title>
11
<title>科袖用户协议</title>
12

12
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
13
<link rel="stylesheet" href="css/reset.css" />
13
<link rel="stylesheet" href="css/reset.css" />
14
<link type="text/css" href="css/common.css" rel="stylesheet">
14
<link type="text/css" href="css/common.css" rel="stylesheet">
15
<style>
15
<style>

+ 2 - 2
src/main/webapp/register.html

4
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
4
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7
<title>科袖-登录-通过已验证手机或邮箱登录</title>
8

7
<title>科袖网 - 搭建企业与专家的桥梁</title>
8
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
9
<link rel="stylesheet" href="css/reset.css" />
9
<link rel="stylesheet" href="css/reset.css" />
10
<link type="text/css" href="css/login.css" rel="stylesheet">
10
<link type="text/css" href="css/login.css" rel="stylesheet">
11

11


+ 2 - 1
src/main/webapp/search.html

4
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
4
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7
<title>科袖-搜索页</title>
7
<title>找专家,搜资源 - 科袖网</title>
8
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
8
<link href="css/bootstrap.min.css" rel="stylesheet">
9
<link href="css/bootstrap.min.css" rel="stylesheet">
9
<link rel="stylesheet" href="css/reset.css" />
10
<link rel="stylesheet" href="css/reset.css" />
10
<link type="text/css" href="css/index.css" rel="stylesheet">
11
<link type="text/css" href="css/index.css" rel="stylesheet">

+ 9 - 8
src/main/webapp/workspaces.html

5
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
5
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
6
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
7
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8
<title>科袖-我的工作台</title>
9
<style>			
10
#startbox .span,#evastarbox2 .addStar,#showAllAssess .addStar{
11
	background: url(../images/evastar.png) 0 1px no-repeat;
12
	}
13
	#commbox .span{background: url(../images/evastar.png) 0 1px no-repeat;}
14
	</style>	
8
<title>我的工作台 - 科袖网</title>
9

10
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />	
15
<link type="text/css" href="css/bootstrap.min.css" rel="stylesheet">
11
<link type="text/css" href="css/bootstrap.min.css" rel="stylesheet">
16
<link type="text/css" href="css/webuploader/webuploader.css" rel="stylesheet">
12
<link type="text/css" href="css/webuploader/webuploader.css" rel="stylesheet">
17
<link type="text/css" href="css/reset.css" rel="stylesheet" />
13
<link type="text/css" href="css/reset.css" rel="stylesheet" />
20
<link type="text/css" href="css/workspace.css" rel="stylesheet">
16
<link type="text/css" href="css/workspace.css" rel="stylesheet">
21
<link type="text/css" href="css/popup.css" rel="stylesheet">
17
<link type="text/css" href="css/popup.css" rel="stylesheet">
22
<link type="text/css" href="css/newsciresource.css" rel="stylesheet">
18
<link type="text/css" href="css/newsciresource.css" rel="stylesheet">
23

19
<style>			
20
#startbox .span,#evastarbox2 .addStar,#showAllAssess .addStar{
21
	background: url(../images/evastar.png) 0 1px no-repeat;
22
	}
23
	#commbox .span{background: url(../images/evastar.png) 0 1px no-repeat;}
24
	</style>
24
</head>
25
</head>
25

26

26
<body>
27
<body>