新闻中心先切回到老版本

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/content_news.html

@@ -74,170 +74,35 @@
 .content .content-toggle p a:hover{
 	cursor: pointer;
 	color: #3e3e3e;
-}
-	/*导航*/
-.breadcrumb-ol li{
-	color: #1e1e1e;
-	height: 68px;
-	line-height: 68px;
-}
-.breadcrumb-ol li a{
-	color: #1e1e1e;
-}
-/*公司动态行业新闻*/
-.hots_news{
-	float: left;
-	margin-top: -30px;
-}
-.allNews{
-	width: 790px;
-	float: left;
-	margin-left: 60px;
-	margin-top: -18px;
-}
-.allNews .newsNav{
-	width: 790px;
-	height: 35px;
-	margin-top: -10px;
-	cursor: pointer;
-}
-.allNews .newsNav .news-item{
-	width: 210px;
-	position: relative;
-	float: left;
-}
-.allNews div.news-item em{
-	display: inline-block;
-	width: 6px;
-	height: 30px;
-	font-style: normal;
-	background: #dcdcdc;
-}
-.allNews div.active em{
-	background: #408eff;
-}
-.allNews div.news-item span{
-	margin-left: 20px;
-	font-size: 24px;
-	font-style: normal;
-	color: #787878;
-	position: absolute;
-	top: -2px;
-	left: 6px;
-}
-.allNews div.active span{
-	color: #1e1e1e;
-}
-.allNews .trade-news h3{
-	font-size: 24px;
-	font-weight: bold;
-	color: #323232;
-	text-align:left;
-	margin: 20px 0;
-}
-.allNews .trade-news p{
-	font-size: 14px;
-	color: #626262;
-	text-indent: 2em;
-	margin: 32px 0;
-}
-.allNews .trade-news h5{
-	font-size: 16px;
-	color: #323232;
-	text-align: left;
-	margin: 32px 0;
-}
-	/*banner图*/
-#banner {
-	background: url("${CTPATH}/images/question/banner.jpg") no-repeat;
-	padding: 88px 0;
-	color: #fff;
-	background-size:100% 100%;
-	margin-top: -1px;
-}
-.banner .container{
-	text-align: center;
-	width: 1190px;
-	margin: 0 auto;
-}
-.banner h3 {
-	font-size: 60px;
-	color: #fff;
-	font-weight: bold;
-}
-.banner .news {
-	width: 250px;
-	height: 50px;
-	font-size: 18px;
-	color: #fff;
-	font-weight: normal;
-	line-height: 50px;
-	border: 1px solid #fff;
-	text-align: center;
-	margin: auto;
-	margin-top: 40px;
 }
 </style>
-<section id="banner" class="banner">
-	<div class="container">
-		<h3>新闻中心</h3>
-		<div class="news">NEWS INFORMATION</div>
-	</div>
-</section>
 <section id="main">
 	<div class="container" style="background: #fff;">
 		<div class="section-item">
 			<ol class="breadcrumb-ol" disabled="breadcrumb">
-				<li>当前位置:</li>
 				<li><a href="${CPATH}/">首页</a></li>&nbsp;>&nbsp;
-				<li><a href="">关于我们</a></li>&nbsp;>&nbsp;
-				<li>新闻中心</li>
+				<li><a href="${CPATH}/news">新闻中心</a></li>&nbsp;>&nbsp;
+				<li>${content.title!}</li>
 			</ol>
+			<h3>新闻中心</h3>
 			<div class="content" style="padding: 15px 0 50px;">
 				<div class="row">
-					<div class="hots_news">
+					<div class="col-md-3">
 						<#include "_hot_news.html"/>
 					</div>
-					<div class="allNews">
-						<div class="newsNav">
-							<#list content.getTaxonomys() as tax>
-								<#if tax.slug == "companyDynamic">
-									<@jp.taxonomys module="news" orderBy="title asc">
-									<#list taxonomys as taxonomy>
-										<#if taxonomy.title == "公司动态">
-											<div class="news-item active"><em></em><span><a href="${taxonomy.url!}">公司动态</a></span></div>
-										</#if>
-										<#if taxonomy.title == "行业新闻">
-											<div class="news-item "><em></em><span><a href="${taxonomy.url!}">行业新闻</a></span></div>
-										</#if>
-									</#list>
-									</@jp.taxonomys>
-								<#elseif tax.slug == "tradeNews">
-									<@jp.taxonomys module="news" orderBy="title asc">
-									<#list taxonomys as taxonomy>
-										<#if taxonomy.title == "公司动态">
-											<div class="news-item "><em></em><span><a href="${taxonomy.url!}">公司动态</a></span></div>
-										</#if>
-										<#if taxonomy.title == "行业新闻">
-											<div class="news-item active"><em></em><span><a href="${taxonomy.url!}">行业新闻</a></span></div>
-										</#if>
-									</#list>
-									</@jp.taxonomys>
-								</#if>
-							</#list>
-						</div>
-						<!--公司动态-->
-						<div class="company-dynamic"></div>
-						<!--行业新闻-->
-						<div class="trade-news">
-							<h3> ${content.title}</h3>
-							<div class="info">
-								<span class="text-num"><img src="${CTPATH}/images/question/read.png" style="margin-left: 15px;"/> ${content.view_count!'0'}</span>
-								<span class="pull-left text-num">${(content.created?string("yyyy-MM-dd"))!''}</span>
-							</div>
-							<dev>
-								${content.text!}
-							</dev>
+					<div class="col-md-9">
+						<h3>${content.title!}</h3>
+						<p>
+							<span class="text-muted">时间 ${(content.created?string("yyyy-MM-dd HH:mm:ss"))!''}</span>
+							<span class="pull-right text-num">
+								<i class="fa fa-eye" style="margin-left: 15px;"></i> ${content.view_count!'0'}
+								<!-- <i class="fa fa-thumbs-o-up" style="margin-left: 15px;"></i> ${content.vote_up!'0'}
+								<i class="fa fa-commenting-o" style="margin-left: 15px;"></i> ${content.comment_count!'0'} -->
+							</span>
+						</p>
+						<hr>
+						<div class="news-text">
+							${content.text!}
 						</div>
 						<div class="content-toggle">
 							<p class="p-toggle">
@@ -251,7 +116,7 @@
 								</@jp.next>
 							</p>
 						</div>
-					<!--</div>-->
+					</div>
 				</div>
 			</div>
 		</div>

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/page_version.html

@@ -1,245 +0,0 @@
-<#include "_layout.html"/>
-<#macro css>
-    #banner {
-    background: #1c863c;
-    padding: 88px 0;
-    height: 440px;
-    color: #fff;
-    background-size:100% 100%;
-    }
-    .banner .container{
-    text-align: center;
-    width: 1190px;
-    }
-    .banner .text-info{
-    margin-top: 75px;
-    float: left;
-    text-align: left;
-    }
-    .banner .text-info h3 {
-    font-size: 48px;
-    color: #fff;
-    font-weight: bold;
-    }
-    .banner .text-info h4 {
-    margin-top: 34px;
-    font-size: 24px;
-    color: #fff;
-    font-weight: bold;
-    line-height: 30px;
-    }
-    .banner img{
-    float: right;
-    margin-top: -280px;
-    }
-    /*section-main*/
-    #main {
-    width: 100%;
-    text-align: center;
-    margin: 0 auto;
-    text-align: center;
-    }
-    .section-item .content {
-    display: inline-block;
-    width: 1190px;
-    text-align: center;
-    overflow: hidden;
-    }
-    .breadcrumbs .content{
-    text-align: left;
-    }
-    .breadcrumbs ul{
-    overflow: hidden;
-    display: inline-block;
-    text-align: left;
-    }
-    .breadcrumbs ul li{
-    float: left;
-    margin-right: 5px;
-    height: 68px;
-    line-height: 68px;
-    }
-    .breadcrumbs ul li a{
-    color: #1b1b1b;
-    }
-    .section-item h3{
-    font-size: 24px;
-    color: #1b1b1b;
-    padding-top: 50px;
-    }
-    .version h3{
-    font-size: 18px;
-    font-weight: bold;
-    color: #3c54ca;
-    padding-top: 0;
-    }
-    .version .content p{
-    font-size: 14px;
-    color: #787878;
-    margin: 15px 0;
-    }
-    .section1 h3{
-    padding-top: 0;
-    }
-    .section-item .content .left-txt{
-    width: 550px;
-    text-align: left;
-    }
-    .section-item .content .left-txt li{
-    font-size: 14px;
-    margin-bottom: 34px;
-    text-align: left;
-    }
-    .section-item .content .left-txt li a{
-    color: #1e1e1e;
-    }
-    .section-item .content .right-img{
-    float: right;
-    width: 500px;
-    }
-    .section2 {
-    background: #f8f8f8;
-    }
-    .section2 .content .detail{
-    border-bottom: 1px solid #dcdcdc;
-    padding-bottom: 100px;
-    }
-    .section2 .content .detail:last-child{
-    border-bottom: none;
-    }
-    .section2 .content .left-txt h4{
-    margin: 40px 0;
-    font-size: 18px;
-    color: #1e1e1e;
-    }
-    .section2 .content .left-txt p{
-    margin: 30px 0 50px 0;
-    font-size: 14px;
-    color: #1e1e1e;
-    text-indent: 2em;
-    }
-    .section3 .content{
-    margin-bottom: 85px;
-    }
-    .section3 h3{
-    padding: 10px 0 30px 0;
-    }
-    .section3 .content .version-list{
-    margin-bottom: 20px;
-    padding: 10px;
-    width: 1140px;
-    height: 120px;
-    border:1px solid #dcdcdc;
-    }
-    .section3 .content .version-list:hover{
-    border: 1px solid #226ea2;
-    cursor: pointer ;
-    }
-    .section3 .content .version-list:hover p{
-    color: #464646;
-    }
-    .section3 .content .version-list div{
-    text-align: left;
-    }
-    .section3 .content .version-list div span{
-    font-weight: bold;
-    font-size: 14px;
-    color:#205cca;
-    margin-right: 20px;
-    }
-    .section3 .content .version-list div em{
-    font-style: normal;
-    font-size: 14px;
-    color:#787878;
-    }
-    .section3 .content .version-list p{
-    margin: 20px 0 10px 0;
-    padding: 0 50px;
-    font-size: 14px;
-    color:#787878;
-    line-height: 30px;
-    text-align: left;
-    overflow: hidden;
-    word-break: break-all;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -moz-box-orient: vertical;
-    -moz-line-clamp: 2;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    -o-box-orient: vertical;
-    -o-line-clamp: 2;
-    }
-</#macro>
-<@layout>
-<section id="banner" class="banner">
-    <div class="container">
-        <div class="text-info">
-            <h3>升级公告</h3>
-            <h4>UPDATE ANNOUNCEMENT</h4>
-        </div>
-        <img src="${CTPATH}/images/question/pic3.png" alt="">
-    </div>
-</section>
-<!-- main 主内容 -->
-<section id="main" class="clearfix">
-    <div class="section-item breadcrumbs">
-        <div class="content">
-            <ul>
-                <li><a>当前位置:</a></li>
-                <li><a href="${CPATH}/">首页&nbsp;&gt;</a></li>
-                <li><a href="">服务中心&nbsp;&gt;</a></li>
-                <li><a>升级公告</a></li>
-            </ul>
-        </div>
-    </div>
-    <div class="section-item version">
-        <div class="content">
-            <h3>系统版本 UAS1.2</h3>
-            <p>2017-06-17</p>
-        </div>
-    </div>
-    <div class="section-item section1">
-        <h3>升级概要</h3>
-        <div class="content">
-            <div class="left-txt">
-                <ul>
-                    <li><a href="">1、能否跨域使用？</a></li>
-                </ul>
-            </div>
-        </div>
-    </div>
-    <div class="section-item section2">
-        <h3>升级详情</h3>
-        <div class="content">
-            <div class="detail">
-                <div class="left-txt">
-                    <h4>1、库存新增成本核算功能，更能精准化和合理管理存货的库存成本和发出成本。</h4>
-                    <p>更加精准化管理库存新增成本核算功能，更能精准化和合理管理存货的库存成本和发出成本库存新增成本核算功能，更能精准化和合理管理存货的库存成本和发出成本库存新增成本核算功能，更能精准化和合理管理存货的库存成本和发出成本</p>
-                </div>
-                <div class="right-img">
-                    <img src="" alt="">
-                </div>
-            </div>
-            <div class="detail">
-                <div class="left-txt">
-                    <h4>1、库存新增成本核算功能，更能精准化和合理管理存货的库存成本和发出成本。</h4>
-                    <p>更加精准化管理库存新增成本核算功能，更能精准化和合理管理存货的库存成本和发出成本库存新增成本核算功能，更能精准化和合理管理存货的库存成本和发出成本库存新增成本核算功能，更能精准化和合理管理存货的库存成本和发出成本</p>
-                </div>
-                <div class="right-img">
-                    <img src="" alt="">
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="section-item section3">
-        <h3>历史版本</h3>
-        <div class="content">
-            <div class="version-list">
-                <div><span>UAS管理系统 1.1版本</span><em>2017-02-01</em></div>
-                <p>1、库存新增成本核算功能，更能精准化和合理管理存货的库存成本和发出成本加精准化管理库存新增成本。2、核算功能，更能精准化和合理管理存货的库存成本和发出成.3、库存新增成本核算功能，更能精准化和合理管理存货的库存成本和发出成本加精准化管理库存新增成本。4、核算功能，更能精准化和合理管理存货的库</p>
-            </div>
-        </div>
-    </div>
-</section>
-</@layout>

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/taxonomy_news.html

@@ -16,53 +16,12 @@ $(document).ready(function() {
 			me.parent().removeClass("thumbnail-news");
 		}
 	});
-	/*var title = $('.news-detail h3>a');
-	var titleDetail = title.text().slice(0,52)+'...';
-	if (title.text().length>52){
-		title.text(titleDetail);
-	}else{
-		title.text();
-	}
-	var content = $('.news-detail p');
-	var contentDetail = content.text().slice(0,100)+'...';
-	content.text(contentDetail);*/
-
-	});
+});
 </#macro>
 <#macro css>
 </#macro>
 <@layout>
 <style>
-	#banner {
-		background: url("${CTPATH}/images/question/banner1.jpg") no-repeat;
-		padding: 88px 0;
-		color: #fff;
-		background-size:100% 100%;
-		margin-top: -1px;
-	}
-	.banner .container{
-		text-align: center;
-		width: 1190px;
-		margin: 0 auto;
-	}
-	.banner h3 {
-		font-size: 60px;
-		color: #fff;
-		font-weight: bold;
-	}
-	.banner .news {
-		width: 250px;
-		height: 50px;
-		font-size: 18px;
-		color: #fff;
-		font-weight: normal;
-		line-height: 50px;
-		border: 1px solid #fff;
-		text-align: center;
-		margin: auto;
-		margin-top: 40px;
-	}
-
 .section-item{
 	width: 1190px;
 }
@@ -92,8 +51,7 @@ $(document).ready(function() {
 }
 
 .thumbnail-width img {
-	max-width: 200px;
-	max-height: 160px;
+	max-width: 160px;
 }
 
 .thumbnail-height {
@@ -112,269 +70,59 @@ $(document).ready(function() {
 	opacity: 0;
 	overflow: hidden;
 }
-	.breadcrumb-ol ul{
-		list-style: none;
-	}
-	.breadcrumb-ol li{
-		color: #1e1e1e;
-		height: 68px;
-		line-height: 68px;
-	}
-	.breadcrumb-ol li a{
-		color: #1e1e1e;
-	}
-
-	/*公司动态行业新闻*/
-	.hots_news{
-		float: left;
-		margin-top: -30px;
-        width: 300px;
-	}
-	.allNews{
-		width: 790px;
-		float: left;
-		margin-left: 100px;
-		margin-top: -18px;
-	}
-	.allNews .tradeNews .news-time {
-		position: relative;
-	}
-	p.years{
-		font-size: 36px;
-		color: #626262;
-		font-weight: bold;
-		margin: 80px 0 22px 0;
-	}
-	.tradeNews{
-		overflow: hidden;
-		margin-top: 50px;
-	}
-	.allNews .newsNav{
-		height: 35px;
-		width: 790px;
-		margin-top: -10px;
-		cursor: pointer;
-	}
-	.allNews .newsNav .news-item{
-		width: 210px;
-		position: relative;
-		float: left;
-	}
-	.allNews div.news-item em{
-		display: inline-block;
-		width: 6px;
-		height: 30px;
-		font-style: normal;
-		background: #dcdcdc;
-	}
-	.allNews div.active em{
-		background: #408eff;
-	}
-	.allNews div.news-item span{
-		margin-left: 20px;
-		font-size: 24px;
-		font-style: normal;
-		color: #787878;
-		position: absolute;
-		top: -2px;
-		left: 6px;
-	}
-	.allNews div.active span{
-		color: #1e1e1e;
-	}
-	.allNews .news-time{
-		float: left;
-		width: 90px;
-		height: 100px;
-		background: #626262;
-	}
-	.allNews .news-time>div{
-		position: absolute;
-		top: 15px;
-		left: 25px;
-		color: #fff;
-		font-weight: bold;
-	}
-	.allNews .news-time h3{
-		font-size: 30px;
-	}
-	.allNews .news-time h4{
-		font-size: 20px;
-		margin-top: 10px;
-	}
-	.allNews .thumbnail-img{
-		float: left;
-		margin-right: 40px;
-		line-height: 23px;
-		width: 200px;
-		height: 170px;
-	}
-	.allNews .news-detail{
-		width: 460px;
-		float: left;
-	}
-	.allNews .news-detail h3{
-		width: 460px;
-		overflow: hidden;
-        line-height: 23px;
-		font-size: 18px;
-		font-weight: bold;
-		color: #323232;
-
-		word-break: break-all;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-moz-box-orient: vertical;
-		-moz-line-clamp: 2;
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 2;
-		-o-box-orient: vertical;
-		-o-line-clamp: 2;
-	}
-	.allNews .news-detail h3 a{
-		color: #323232;
-	}
-	.allNews .news-detail p{
-        width: 460px;
-        overflow: hidden;
-        line-height: 23px;
-        font-size: 14px;
-        color: #787878;
-        margin: 20px 0 20px 0;
-		word-break: break-all;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-moz-box-orient: vertical;
-		-moz-line-clamp: 3;
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 3;
-		-o-box-orient: vertical;
-		-o-line-clamp: 3;
-    }
-	.tradeNews:hover{
-		cursor: pointer;
-	}
-	.tradeNews:hover .news-time{
-		background: #408eff;
-	}
-	.tradeNews:hover .news-detail h3 a{
-		color: #2867c2;
-	}
 </style>
-<section id="banner" class="banner">
-	<div class="container">
-		<h3>新闻中心</h3>
-		<div class="news">NEWS INFORMATION</div>
-	</div>
-</section>
 <section id="main">
 	<div class="container" style="background: #fff;">
 		<div class="section-item">
 			<ol class="breadcrumb-ol" disabled="breadcrumb">
-				<li>当前位置:</li>
 				<li><a href="${CPATH}/">首页</a></li>&nbsp;>&nbsp;
-				<li><a href="about">关于我们</a></li>&nbsp;>&nbsp;
 				<li>新闻中心</li>
 			</ol>
-			<!--<h3>新闻中心</h3>-->
+			<h3>新闻中心</h3>
 			<div class="content" style="padding: 15px 0 50px;">
-				<div class="hots_news">
-					<#include "_hot_news.html"/>
-				</div>
-				<div class="allNews">
-					<div class="newsNav">
-						<@jp.taxonomys module="news" orderBy="title asc">
-						<#list taxonomys as taxonomy>
-							<#if taxonomy.title == "公司动态">
-								<div class="news-item <#if ((REQUEST.requestURI?contains(taxonomy.slug)) == (taxonomy.url?contains(taxonomy.slug)))>active</#if>"><em></em><span><a href="${taxonomy.url!}">公司动态</a></span></div>
-							</#if>
-							<#if taxonomy.title == "行业新闻">
-								<div class="news-item <#if ((REQUEST.requestURI?contains(taxonomy.slug)) == (taxonomy.url?contains(taxonomy.slug)))>active</#if>"><em></em><span><a href="${taxonomy.url!}">行业新闻</a></span></div>
-							</#if>
-						</#list>
-						</@jp.taxonomys>
+				<div class="row">
+					<div class="col-md-3">
+						<#include "_hot_news.html"/>
 					</div>
-					<@jp.contentPage pageSize="10" orderBy="created desc">
-					<!--行业新闻-->
-					<div class="trade-news">
-						<#list page.getList() as content>
-							<div class="tradeNews">
-								<div class="news-time">
-									<div>
-										<h3>${(content.created?string("dd"))!''}</h3>
-										<h4>
-											<#if content.created?string("MM") ??>
-												<#switch content.created?string("MM")>
-												  <#case "01">
-													  Jan
-												      <#break>
-												  <#case "02">
-													  Feb
-												      <#break>
-												  <#case "03">
-													  Mar
-											          <#break>
-												  <#case "04">
-													  Apr
-											          <#break>
-												  <#case "05">
-													  May
-											          <#break>
-												  <#case "06">
-													  June
-											          <#break>
-												  <#case "07">
-													  July
-												      <#break>
-												  <#case "08">
-													  Aug
-												       <#break>
-												  <#case "09">
-													  Sept
-											          <#break>
-												  <#case "10">
-													  Oct
-											          <#break>
-												  <#case "11">
-													  Nov
-											          <#break>
-												  <#case "12">
-													  Dec
-											          <#break>
-												</#switch>
-											</#if>
-										</h4>
+					<@jp.contentPage>
+					<div class="col-md-9">
+						<h4><span class="label label-primary">新</span> 新闻资讯</h4>
+						<hr />
+						<div class="news">
+							<#list page.getList() as content>
+							<div class="new">
+								<div style="width: 120px;">
+									<div class="thumbnail-news">
+										<img class="content-thumbnail" src="${content.thumbnail!(CTPATH+'/images/artitle_img_no.jpg')}" alt="新闻缩略图"/>
 									</div>
 								</div>
-								<div class="thumbnail-img">
-										<img class="content-thumbnail" src="${content.thumbnail!(CTPATH+'/images/artitle_img_no.jpg')}" alt="">
-								</div>
-								<div class="news-detail">
-									<h3><a href="${content.url!}">${content.title!}</a></h3>
+								<div>
+									<h5><a href="${content.url!}">${content.title!}</a></h5>
 									<p>${content.summary!}</p>
-									<span class="pull-left text-num"><img src="${CTPATH}/images/question/read.png" style="padding-right: 10px;"/>${content.view_count!'0'}</span>
+									<div class="text-muted">
+										<span class="pull-left">${(content.created?string("yyyy-MM-dd HH:mm"))!''} </span>
+										<span class="pull-right text-num">
+											<i class="fa fa-eye" style="margin-left: 15px;"></i> ${content.view_count!'0'}
+											<!-- <i class="fa fa-thumbs-o-up" style="margin-left: 15px;"></i> ${content.vote_up!'0'}
+											<i class="fa fa-commenting-o" style="margin-left: 15px;"></i> ${content.comment_count!'0'} -->
+										</span>
+									</div>
 								</div>
 							</div>
-
-							<#if content_has_next>
-								<#if contents[content_index+1].created?string("yy") != content.created?string("yy")>
-									<!--年份分割线-->
-									<p class="years">${contents[content_index+1].created?string("yy")}年</p>
-								</#if>
-							</#if>
-						</#list>
-						<div style="padding: 15px;margin: 30px 0 70px 0;">
+							</#list>
+						</div>
+						<div style="padding: 15px;">
 							<span class="pull-left" style="line-height: 30px;">共 <span class="text-mun">${page.totalRow!'0'}</span> 条</span>
 							<div class="btn-group btn-group-sm pull-right" style="display: inline-block;">
-								<a type="button" <#if page.isFirstPage()> disabled="disabled"</#if> class="btn btn-default" href="${CPATH}/news-${taxonomy.slug!}"><i class="fa fa-angle-double-left"></i> 首页</a>
-								<a type="button" <#if page.isFirstPage()> disabled="disabled"</#if> class="btn btn-default" href="${CPATH}/news-${taxonomy.slug!}-${page.pageNumber - 1}">&lt; 上一页</a>
+								<a type="button" <#if page.isFirstPage()> disabled="disabled"</#if> class="btn btn-default" href="${CPATH}/news"><i class="fa fa-angle-double-left"></i> 首页</a>
+								<a type="button" <#if page.isFirstPage()> disabled="disabled"</#if> class="btn btn-default" href="${CPATH}/news-${page.pageNumber - 1}">&lt; 上一页</a>
 								<a type="button" disabled="disabled" class="btn btn-default">第 <span class="text-mun">${page.pageNumber!'0'}</span> 页</a>
-								<a type="button" <#if page.isLastPage()> disabled="disabled"</#if> class="btn btn-default" href="${CPATH}/news-${taxonomy.slug!}-${page.pageNumber + 1}">下一页 &gt;</a>
-								<a type="button" <#if page.isLastPage()> disabled="disabled"</#if> class="btn btn-default" href="${CPATH}/news-${taxonomy.slug!}-${page.totalPage!'0'}">尾页 <i class="fa fa-angle-double-right"></i></a>
+								<a type="button" <#if page.isLastPage()> disabled="disabled"</#if> class="btn btn-default" href="${CPATH}/news-${page.pageNumber + 1}">下一页 &gt;</a>
+								<a type="button" <#if page.isLastPage()> disabled="disabled"</#if> class="btn btn-default" href="${CPATH}/news-${page.totalPage!'0'}">尾页 <i class="fa fa-angle-double-right"></i></a>
 							</div>
 						</div>
 					</div>
-				</@jp.contentPage>
+					</@jp.contentPage >
 				</div>
 			</div>
 		</div>