Browse Source

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

albertshaw 8 years ago
parent
commit
edda29f59b

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

@@ -31,34 +31,11 @@
 			</div>
 		</div>
 	</div>
-	<div id="myCarousel" class="carousel slide">
-		<!-- 轮播(Carousel)指标 -->
-		<ol class="carousel-indicators">
-			<li data-target="#myCarousel" data-slide-to="0" class="active"></li>
-			<li data-target="#myCarousel" data-slide-to="1"></li>
-			<li data-target="#myCarousel" data-slide-to="2"></li>
-		</ol>
-		<!-- 轮播(Carousel)项目 -->
-		<div class="carousel-inner">
 			<div class="item active">
-				<img th:src="${portalHost + '/img/slide_img_1.png'}"
+				<img th:src="${portalHost + '/img/activity_index_banner.jpg'}"
 					alt="First slide">
 			</div>
-			<div class="item">
-				<img th:src="${portalHost + '/img/slide_img_1.png'}"
-					alt="Second slide">
-			</div>
-			<div class="item">
-				<img th:src="${portalHost + '/img/slide_img_1.png'}"
-					alt="Third slide">
-			</div>
-		</div>
-		<!-- 轮播(Carousel)导航 -->
-		<a class="carousel-control left" href="#myCarousel" data-slide="prev"><span
-			class="glyphicon glyphicon-chevron-left"></span></a> <a
-			class="carousel-control right" href="#myCarousel" data-slide="next"><span
-			class="glyphicon glyphicon-chevron-right"></span></a>
-	</div>
+
 	<div class="container active_info">
 		<div class="div_title">
 			<img th:src="${portalHost + '/img/active_info_ioc.png'}">

+ 3 - 27
src/main/webapp/WEB-INF/views/portal/international/internationalIndex.html

@@ -24,33 +24,9 @@
 			</div>
 		</div>
 	</div>
-	<div id="myCarousel" class="carousel slide">
-		<!-- 轮播(Carousel)指标 -->
-		<ol class="carousel-indicators">
-			<li data-target="#myCarousel" data-slide-to="0" class="active"></li>
-			<li data-target="#myCarousel" data-slide-to="1"></li>
-			<li data-target="#myCarousel" data-slide-to="2"></li>
-		</ol>
-		<!-- 轮播(Carousel)项目 -->
-		<div class="carousel-inner">
-			<div class="item active">
-				<img th:src="${portalHost + '/img/slide_img_1.png'}"
-					alt="First slide">
-			</div>
-			<div class="item">
-				<img th:src="${portalHost + '/img/slide_img_1.png'}"
-					alt="Second slide">
-			</div>
-			<div class="item">
-				<img th:src="${portalHost + '/img/slide_img_1.png'}"
-					alt="Third slide">
-			</div>
-		</div>
-		<!-- 轮播(Carousel)导航 -->
-		<a class="carousel-control left" href="#myCarousel" data-slide="prev"><span
-			class="glyphicon glyphicon-chevron-left"></span></a> <a
-			class="carousel-control right" href="#myCarousel" data-slide="next"><span
-			class="glyphicon glyphicon-chevron-right"></span></a>
+	<div class="item active">
+		<img th:src="${portalHost + '/img/international_banner.jpg'}"
+			alt="First slide">
 	</div>
 
 	<div class="container technology">

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


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


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


+ 5 - 5
src/main/webapp/WEB-INF/views/portal/ipr/service.html

@@ -23,8 +23,8 @@
 					<li class="active"><a
 						th:href="${basePath + '/portal/ipr/service.html'}">知识产权服务</a></li>
 					<li><a th:href="${basePath + '/portal/ipr/apply.html'}">知识产权申请</a></li>
-					<li><a href="#">专利运营与布局</a></li>
-					<li><a href="#">知识产权贯标</a></li>
+					<li><a th:href="${basePath + '/portal/ipr/patentOperation.html'}">专利运营与布局</a></li>
+					<li><a th:href="${basePath + '/portal/ipr/iso.html'}">知识产权贯标</a></li>
 				</ul>
 			</div>
 			<div class="col-md-1 search">
@@ -43,15 +43,15 @@
 		<!-- 轮播(Carousel)项目 -->
 		<div class="carousel-inner">
 			<div class="item active">
-				<img th:src="${portalHost + '/img/slide_img_1.png'}"
+				<img th:src="${portalHost + '/img/ipr_service_banner_1.jpg'}"
 					alt="First slide">
 			</div>
 			<div class="item">
-				<img th:src="${portalHost + '/img/slide_img_1.png'}"
+				<img th:src="${portalHost + '/img/ipr_service_banner_2.jpg'}"
 					alt="Second slide">
 			</div>
 			<div class="item">
-				<img th:src="${portalHost + '/img/slide_img_1.png'}"
+				<img th:src="${portalHost + '/img/ipr_service_banner_3.jpg'}"
 					alt="Third slide">
 			</div>
 		</div>

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


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