albertshaw 8 years ago
parent
commit
24cd0e31b3
31 changed files with 33 additions and 342 deletions
  1. 4 0
      src/main/webapp/WEB-INF/views/common.html
  2. 0 311
      src/main/webapp/WEB-INF/views/index.html
  3. 1 1
      src/main/webapp/WEB-INF/views/portal/activity/activityIndex.html
  4. 1 1
      src/main/webapp/WEB-INF/views/portal/activity/details.html
  5. 1 1
      src/main/webapp/WEB-INF/views/portal/detail/achievementDetail.html
  6. 1 1
      src/main/webapp/WEB-INF/views/portal/detail/demandDetail.html
  7. 1 1
      src/main/webapp/WEB-INF/views/portal/entrepreneurship/entrepreneurshipIndex.html
  8. 1 1
      src/main/webapp/WEB-INF/views/portal/evaluation/index.html
  9. 1 1
      src/main/webapp/WEB-INF/views/portal/financial/financialIndex.html
  10. 1 1
      src/main/webapp/WEB-INF/views/portal/highTech/authentication.html
  11. 1 1
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/basicInfo.html
  12. 1 1
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/evaluate.html
  13. 1 1
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/financeInfo.html
  14. 1 1
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/iprInfo.html
  15. 1 1
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/rdManage.html
  16. 1 1
      src/main/webapp/WEB-INF/views/portal/index.html
  17. 1 1
      src/main/webapp/WEB-INF/views/portal/international/internationalIndex.html
  18. 1 1
      src/main/webapp/WEB-INF/views/portal/ipr/apply.html
  19. 1 1
      src/main/webapp/WEB-INF/views/portal/ipr/iso.html
  20. 1 1
      src/main/webapp/WEB-INF/views/portal/ipr/patentOperation.html
  21. 1 1
      src/main/webapp/WEB-INF/views/portal/ipr/service.html
  22. 1 1
      src/main/webapp/WEB-INF/views/portal/news.html
  23. 1 2
      src/main/webapp/WEB-INF/views/portal/news/newsDetails.html
  24. 1 2
      src/main/webapp/WEB-INF/views/portal/news/newsIndex.html
  25. 1 1
      src/main/webapp/WEB-INF/views/portal/patent.html
  26. 1 1
      src/main/webapp/WEB-INF/views/portal/scienceTechnology/bigShot.html
  27. 1 1
      src/main/webapp/WEB-INF/views/portal/scienceTechnology/lecture.html
  28. 1 1
      src/main/webapp/WEB-INF/views/portal/scienceTechnology/star.html
  29. 1 1
      src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html
  30. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html
  31. 1 1
      src/main/webapp/WEB-INF/views/portal/websiteBuild/websiteBuildIndex.html

+ 4 - 0
src/main/webapp/WEB-INF/views/common.html

@@ -38,6 +38,10 @@
       </div>
   </th:block>
   
+  <th:block th:fragment="sublogo">
+  	<a th:href="${basePath + '/portal/index.html'}"><img th:src="${portalHost + '/img/logo.png'}" /></a>
+  </th:block>
+  
   <th:block th:fragment="copyright">
 	<div onclick="window.open('http://b.qq.com/webc.htm?new=0&sid=259388822&o=阿凡提咨询&q=7', '_blank', 'height=502, width=644,toolbar=no,scrollbars=no,menubar=no,status=no');"
 	  style="line-height:1;position: fixed; right: 15px; bottom: 180px; background-color: #58a3ff; width: 60px; height: 60px; text-align: center; border-radius: 3px;">

+ 0 - 311
src/main/webapp/WEB-INF/views/index.html

@@ -1,311 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:th="http://www.thymeleaf.org"
-	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head th:replace="common::header(~{::title},~{::link})">
-	<title>首页</title>
-	<link href="//cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-	<link th:href="${staticDomain + '/portal/css/style.css'}" rel="stylesheet" />
-	<link th:href="${staticDomain + '/portal/css/index.css'}" rel="stylesheet" />
-</head>
-<body>
-	<header>
-		<div th:replace="common::{topNav}"></div>
-	</header>
-	<div class="container header_nav">
-		<div class="row clearfix">
-			<div class="col-md-12 logo">
-				<img th:src="${staticDomain + '/portal/img/logo.png'}" />
-			</div>
-
-		</div>
-		<div class="search">
-			<div class="row clearfix">
-				<div class="col-lg-8 col-md-offset-2">
-					<div class="input-group ">
-						<input type="text" class="form-control"> <span
-							class="input-group-btn">
-							<button class="btn btn-default" type="button">搜索</button>
-						</span>
-					</div>
-					<!-- /input-group -->
-				</div>
-				<div class="col-lg-8 col-md-offset-2">
-					<div class="hot">
-						<ul>
-							<li><a href="#">科技交易</a></li>
-							<li><a href="#">网上创客</a></li>
-							<li><a href="#">趣科普</a></li>
-							<li><a href="#">科技金融</a></li>
-						</ul>
-					</div>
-
-				</div>
-			</div>
-		</div>
-	</div>
-	<div class="container content">
-		<div class="row clearfix">
-			<div class="content_lt">
-				<div class="content_nav">
-					<ul id="myTab">
-						<li><a href="#tab1" data-toggle="tab">关注</a></li>
-						<li class="active"><a href="#tab2" data-toggle="tab">政策</a></li>
-						<li><a href="#tab3" data-toggle="tab">前沿</a></li>
-						<li><a href="#tab4" data-toggle="tab">明星</a></li>
-						<li><a href="#tab5" data-toggle="tab">活动</a></li>
-						<li><a href="#tab6" data-toggle="tab">VR</a></li>
-					</ul>
-
-				</div>
-
-				<div id="myTabContent" class="content_list tab-content">
-					<div id="tab1" class="tab-pane"></div>
-					<div id="tab2" class="tab-pane in active">
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>科技成果转化频发政策“红包”,甜头怎么尝</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>11:16</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>成果转化是从一种创新走向另一种创新</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>12:11</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>从“科技的春天”到“创新的春天”</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>13:26</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>专利战略在企业创新全过程中的应用</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>15:23</span>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div id="tab3" class="tab-pane">
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>NASA新一代太空望远镜 届时将看到宇宙第一光芒</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>07:56</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>满满的黑科技 推不倒的自行车</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>08:06</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>最新3D全息投影技术 为可口可乐麦当劳服务</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>09:33</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>德国科学家发明新型化合物 属无机纳米晶体结构</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>12:36</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>中国首条空中自行车道试营 体验云端行走</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>17:25</span>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div id="tab4" class="tab-pane">
-						<div class="content_info ">
-							<div class="info_img">
-								<img th:src="${staticDomain + '/portal/img/mx_img_1.png'}" />
-							</div>
-							<div class="info_txt">
-								<p>美国工程院院士,资深核能咨询顾问,美国能源部高级 顾问,美国国家研究委员会董事会能源与环境系统主席。</p>
-								<div class="source">
-									<span>中国网</span> <i class="name">钱平 | Douglas M. Chapin</i> <i>美国</i>
-									<i>能源与环境</i>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="info_img">
-								<img th:src="${staticDomain + '/portal/img/mx_img_2.png'}" />
-							</div>
-							<div class="info_txt">
-								<p>加拿大工程院院士,加拿大皇家学院院士,荣获英国国际名人传记中心颁发的的“信号处理研究及教育杰出贡献奖”。</p>
-								<div class="source">
-									<span>中国网</span> <i class="name">黄干| Kon Max Wong</i> <i>加拿大</i>
-									<i>信号处理</i>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="info_img">
-								<img th:src="${staticDomain + '/portal/img/mx_img_3.png'}" />
-							</div>
-							<div class="info_txt">
-								<p>英国皇家工程院院士,英国纽卡斯尔大学水利工程系教授,1995年获得欧洲地球物理学会金徽章奖。</p>
-								<div class="source">
-									<span>中国网</span> <i class="name">康英达|Enda O'Connell</i> <i>英
-										国</i> <i>水利工程</i>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="info_img">
-								<img th:src="${staticDomain + '/portal/img/mx_img_4.png'}" />
-							</div>
-							<div class="info_txt">
-								<p>(杂交水稻之父、首届国家最高科学奖获得者
-									袁隆平是杂交水稻研究领域的开创者和带头人,致力于杂交水稻的研究,先后成功研发出“三系法”杂交
-									水稻、“两系法”杂交水稻、超级杂交稻一期、二期,与此同时,袁隆平提出并实施“种三产四丰产工程”,运用超级杂交稻的技术成果,[3]
-									出版中、英文专著6部,发表论文60余篇。</p>
-								<div class="source">
-									<span>中国网</span> <i class="name">袁隆平</i> <i>中国</i> <i>农业</i>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div id="tab5" class="tab-pane">
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>港洽周科技交流对接会</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>09:16</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>中以美高端医疗产业高峰论坛会</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>11:15</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>2017年科技展览会</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>13:13</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>2017中国科技展-北京科博会</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>16:23</span>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div id="tab6" class="tab-pane"></div>
-				</div>
-			</div>
-			<div class="content_rt">
-				<div>
-					<h4>科技交易</h4>
-					<ul>
-						<li><a href="#">成果</a></li>
-						<li><a href="#">专家</a></li>
-						<li><a href="#">技术集群</a></li>
-						<li><a href="#">经纪人</a></li>
-						<li><a href="#">创业项目</a></li>
-						<li><a href="#">职业科技人</a></li>
-					</ul>
-				</div>
-				<div>
-					<h4>科技咨询</h4>
-					<ul>
-						<li><a href="./highTech.html">高企认定</a></li>
-						<li><a href="#">专利申请</a></li>
-						<li><a href="#">知识产权贯标</a></li>
-						<li><a href="#">ISO9001</a></li>
-						<li><a href="#">创新体系</a></li>
-					</ul>
-				</div>
-				<div>
-					<h4>科技思想</h4>
-					<ul>
-						<li><a href="#">科技明星</a></li>
-						<li><a href="#">前沿科技思想</a></li>
-					</ul>
-				</div>
-				<div>
-					<h4>科技金融</h4>
-					<ul>
-						<li><a href="#">投资机构</a></li>
-						<li><a href="#">金融项目</a></li>
-						<li><a href="#">网上创客</a></li>
-					</ul>
-				</div>
-				<div>
-					<h4>应用工具</h4>
-					<ul>
-						<li><a href="#">技术评估</a></li>
-						<li><a href="#">技术查新</a></li>
-						<li><a href="#">空间主页</a></li>
-						<li><a href="#">会员体系</a></li>
-					</ul>
-				</div>
-				<div>
-					<h4>社群百科</h4>
-					<ul>
-						<li><a href="#">科技活动</a></li>
-						<li><a href="#">技术社群</a></li>
-						<li><a href="#">科技百科</a></li>
-						<li><a href="#">趣科普</a></li>
-					</ul>
-				</div>
-				<div>
-					<h4>合作伙伴</h4>
-					<ul>
-						<li><a href="#">政府合作</a></li>
-						<li><a href="#">高校合作</a></li>
-						<li><a href="#">科研单位</a></li>
-						<li><a href="#">民间达人</a></li>
-					</ul>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div
-		onclick="javascript:window.open('http://b.qq.com/webc.htm?new=0&sid=259388822&o=阿凡提咨询&q=7', '_blank', 'height=502, width=644,toolbar=no,scrollbars=no,menubar=no,status=no');"
-		style="position: fixed; right: 20px; bottom: 20px; background-color: #58a3ff; width: 60px; height: 60px; text-align: center; border-radius: 3px;">
-		<img
-			style="cursor: pointer; position: absolute; top: 5px; left: 14px;"
-			border="0"
-			src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAANlBMVEUAAAD////////////////////////////////////////////////////////////////////xY8b8AAAAEXRSTlMAgMAwEPDgQKCQYNBQn7BwIKfc/GEAAAC0SURBVDjLndNbEoMgDAXQBEIE1Na7/81Wqh18xHz0/DGEXDIDdDLxK4SZBzLJnLBTFrqJCQca7f0uXSpEcaHnlIIbpoMFd8lt0BynHQE/A5bXYUZYtBcwTJV+FKbQE/4sKLSpCQ9iP+9kiOLZsI3ot0jwCEW4JnrDxe0KGQ9SK5gwyghbbGMIy1pkylQDbbIZINRl/8XJrFYHds83hXYBNjW+Xa48Gv9TaglNWb6rgVfv7ZIf0/Atyg0k6YwAAAAASUVORK5CYII="
-			alt="客服咨询"> <span
-			style="color: #fff; position: absolute; bottom: 5px; left: 0; width: 100%; font-size: 12px;">咨询客服</span>
-	</div>
-	<div th:replace="common::footer(~{::script})">
-		<script src="//cdn.bootcss.com/jquery/2.1.1/jquery.min.js"></script>
-		<script src="//cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-	</div>
-</body>
-</html>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/activity/activityIndex.html

@@ -24,7 +24,7 @@
 	<div class="container header_nav_detail">
 		<div class="row clearfix">
 			<div class="col-md-3 logo">
-				<img th:src="${portalHost + '/img/logo.png'}" />
+				<div th:replace="common::sublogo"></div>
 			</div>
 			<div class="col-md-8">
 				<ul class="nav_content">

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/activity/details.html

@@ -25,7 +25,7 @@
 	<div class="container header_nav_detail">
 		<div class="row clearfix">
 			<div class="col-md-3 logo">
-				<img th:src="${portalHost+ '/img/logo.png'}" />
+				<div th:replace="common::sublogo"></div>
 			</div>
 			<div class="col-md-8">
 				<ul class="nav_content">

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/detail/achievementDetail.html


+ 1 - 1
src/main/webapp/WEB-INF/views/portal/detail/demandDetail.html

@@ -28,7 +28,7 @@
 	<div class="container header_nav_detail">
 		<div class="row clearfix">
 			<div class="col-md-3 logo">
-				<img src="../../../img/logo.png" />
+				<div th:replace="common::sublogo"></div>
 			</div>
 			<div class="col-md-5">
 				<ul class="nav_content">

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/entrepreneurship/entrepreneurshipIndex.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/evaluation/index.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/financial/financialIndex.html


+ 1 - 1
src/main/webapp/WEB-INF/views/portal/highTech/authentication.html

@@ -26,7 +26,7 @@
 	<div class="container header_nav">
 		<div class="row clearfix">
 			<div class="col-md-3 logo">
-				<img th:src="${portalHost + '/img/logo.png'}" />
+				<div th:replace="common::sublogo"></div>
 			</div>
 			<div class="col-md-8">
 				<ul class="nav_content">

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/basicInfo.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/evaluate.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/financeInfo.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/iprInfo.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/rdManage.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/index.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/international/internationalIndex.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/ipr/apply.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/ipr/iso.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/ipr/patentOperation.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/ipr/service.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/news.html


File diff suppressed because it is too large
+ 1 - 2
src/main/webapp/WEB-INF/views/portal/news/newsDetails.html


File diff suppressed because it is too large
+ 1 - 2
src/main/webapp/WEB-INF/views/portal/news/newsIndex.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/patent.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/scienceTechnology/bigShot.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/scienceTechnology/lecture.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/scienceTechnology/star.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/websiteBuild/websiteBuildIndex.html