官网新闻中心和升级公告缩显调整

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

@@ -202,7 +202,7 @@
 						<div class="newsNav">
 							<#list content.getTaxonomys() as tax>
 								<#if tax.slug == "companyDynamic">
-									<@jp.taxonomys module="news">
+									<@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>

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

@@ -1,4 +1,13 @@
 <#include "_layout.html"/>
+
+<#macro script>
+    /*$(document).ready(function() {
+    var content = $('.version-list p');
+    var contentDetail = content.text().slice(0,108)+'...';
+    content.text(contentDetail);
+    })*/
+</#macro>
+
 <#macro css>
     #banner {
     background: #1c863c;
@@ -158,6 +167,17 @@
     font-size: 14px;
     color:#787878;
     text-align: left;
+
+    overflow: hidden;
+    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;
     }
 </#macro>
 <@layout>

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

@@ -16,13 +16,18 @@ $(document).ready(function() {
 			me.parent().removeClass("thumbnail-news");
 		}
 	});
-	var title = $('.news-detail h3');
+	/*var title = $('.news-detail h3>a');
 	var titleDetail = title.text().slice(0,52)+'...';
-	title.text(titleDetail);
+	if (title.text().length>52){
+		title.text(titleDetail);
+	}else{
+		title.text();
+	}
 	var content = $('.news-detail p');
-	var contentDetail = content.text().slice(0,108)+'...';
-	content.text(contentDetail);
-});
+	var contentDetail = content.text().slice(0,100)+'...';
+	content.text(contentDetail);*/
+
+	});
 </#macro>
 <#macro css>
 </#macro>
@@ -210,6 +215,16 @@ $(document).ready(function() {
 		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;
@@ -221,6 +236,16 @@ $(document).ready(function() {
         font-size: 14px;
         color: #787878;
         margin: 20px 0 30px 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;
@@ -255,7 +280,7 @@ $(document).ready(function() {
 					</div>
 					<div class="allNews">
 						<div class="newsNav">
-							<@jp.taxonomys module="news">
+							<@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>
@@ -342,16 +367,16 @@ $(document).ready(function() {
 
 						</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" 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>-->
-					<!--</div>-->
-					<!--</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" 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>
+					</div>
+					</div>
 					</@jp.contentPage>
 					</div>
 					<!--<@jp.contentPage>-->

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

@@ -1,4 +1,13 @@
 <#include "_layout.html"/>
+
+<#macro script>
+    /*$(document).ready(function() {
+        var content = $('.version-list p');
+        var contentDetail = content.text().slice(0,108)+'...';
+        content.text(contentDetail);
+    })*/
+</#macro>
+
 <#macro css>
     #banner {
     background: #1c863c;
@@ -159,6 +168,17 @@
     font-size: 14px;
     color:#787878;
     text-align: left;
+
+    overflow: hidden;
+    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;
     }
 </#macro>
 <@layout>