Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT

yee 8 years ago
parent
commit
396789461a

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

@@ -19,7 +19,7 @@
 <body>
   <th:block th:fragment="{topNav}">
       <div class="container">
-        <div class="lt">欢迎进入科技认知计算交易平台</div>
+        <div class="lt">欢迎进入科技认知计算交易平台 - 公测版</div>
         <div class="rt" th:if="${!isLogin}">
           <a th:href="${basePath + '/user/login.html'}" class="login">登录</a>
           <a th:href="${basePath + '/user/signIn.html'}">注册</a>

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

@@ -30,6 +30,7 @@
 				<div th:replace="common::subMenu"></div>
 			</div>
 		</div>
+		<div class="secondary_navigation"></div>
 	</div>
 			<div class="item active">
 				<img th:src="${portalHost + '/img/activity_index_banner.jpg'}"

+ 1 - 0
src/main/webapp/WEB-INF/views/portal/entrepreneurship/entrepreneurshipIndex.html

@@ -28,6 +28,7 @@
 				<div th:replace="common::subMenu"></div>
 			</div>
 		</div>
+		<div class="secondary_navigation"></div>
 	</div>
 	<div id="myCarousel" class="carousel slide">
 		<!-- 轮播(Carousel)指标 -->

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


+ 1 - 0
src/main/webapp/WEB-INF/views/portal/international/internationalIndex.html

@@ -23,6 +23,7 @@
 				<div th:replace="common::subMenu"></div>
 			</div>
 		</div>
+		<div class="secondary_navigation"></div>
 	</div>
 	<div class="item active">
 		<img th:src="${portalHost + '/img/international_banner.jpg'}"

+ 2 - 2
src/main/webapp/WEB-INF/views/portal/news/newsIndex.html

@@ -258,8 +258,8 @@
 	<footer>
 		<div th:replace="common::copyright"></div>
 	</footer>
-	<script type="text/javascript" src="${portalHost + '/vendors.js'}"></script>
-	<script type="text/javascript" src="${portalHost + '/news/newsIndex.js'}"></script>
+	<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+	<script type="text/javascript" th:src="${portalHost + '/news/newsIndex.js'}"></script>
 </body>
 
 </html>

+ 1 - 0
src/main/webapp/WEB-INF/views/portal/scienceTechnology/bigShot.html

@@ -28,6 +28,7 @@
 				<div th:replace="common::subMenu"></div>
 			</div>
 		</div>
+		<div class="secondary_navigation"></div>
 	</div>
 
 	<div class="container star">

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