首页轮播图alt,新闻中心分页

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

@@ -495,7 +495,7 @@
 			<#list page.getList() as content>
 				<div class="item <#if content_index == 0>active</#if>">
 					<!--<img class="img-scope" src="http://10.10.100.88:9090/attachment/20170220/50e645aeaa814d9d92cadf05fc5583a4.png" alt="测试图片">-->
-					<img class="img-scope" src="${content.getMetadataByKey("img")!}" alt="测试图片">
+					<img class="img-scope" src="${content.getMetadataByKey('img')!}" alt="${content.getMetadataByKey('carousel_alt')!''}">
 					<div class="carousel-caption carousel-title">${content.getMetadataByKey("title")!''}</div>
 					<div class="carousel-caption carousel-text">${content.getMetadataByKey("text")!''}</div>
 				</div>

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

@@ -364,13 +364,18 @@
 						</#if>
 					</#list>
 					<div style="padding: 15px;margin: 30px 0 70px 0;">
-						<span class="pull-left" style="line-height: 30px;">共 <span class="text-mun">${page.totalRow!'0'}</span> 条</span>
+						<span class="pull-left" style="line-height: 30px;"></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" 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>
+							<ul class="pagination">
+								<@pagination>
+								<#list pages as pi>
+									<li class="${pi.style!}">
+										<a href="${pi.url!}">${pi.text!}</a>
+									</li>
+								</#list>
+							</@pagination>
+							<li>共 ${page.totalPage!'1'}页</li>
+							</ul>
 						</div>
 					</div>
 				</div>

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/tpl_config.xml

@@ -62,6 +62,7 @@
 		<metadata dataType="input" name="title" title="幻灯片标题"  placeholder="幻灯片图标题，大字"></metadata>
 		<metadata dataType="input" name="text" title="幻灯片文字"  placeholder="幻灯片图标题，小字"></metadata>
 		<metadata dataType="input" name="link" title="幻灯片链接"  placeholder="幻灯片对应的链接地址"></metadata>
+		<metadata dataType="input" name="carousel_alt" title="图片描述"  placeholder="幻灯片对应的alt"></metadata>
 	</module>
 	
 	<module title="发展历程 " name="events" list="发展历程" add="增加发展历程" comment="评论">