发展历程调整导航下外边距

升级公告历史版本说明做超过两行隐藏内容
新闻中心预览图片大小的调整，底部分页的调整

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

@@ -141,10 +141,10 @@
     <div class="section-item breadcrumbs">
         <div class="content">
             <ul>
-                <li><a href="">当前位置:</a></li>
-                <li><a href="">首页&nbsp;&gt;</a></li>
+                <li><a>当前位置:</a></li>
+                <li><a href="${CPATH}/">首页&nbsp;&gt;</a></li>
                 <li><a href="">服务中心&nbsp;&gt;</a></li>
-                <li><a href="">演示文档</a></li>
+                <li><a>演示文档</a></li>
             </ul>
         </div>
     </div>

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

@@ -177,6 +177,12 @@ $(document).ready(function() {
 	margin-top: 40px;
 	}
 	/*导航*/
+	.breadcrumb-ol{
+	margin-bottom: 0;
+	}
+	.breadcrumb-ol ul{
+	list-style: none;
+	}
 	.breadcrumb-ol li{
 	color: #1e1e1e;
 	height: 68px;
@@ -185,7 +191,6 @@ $(document).ready(function() {
 	.breadcrumb-ol li a{
 	color: #1e1e1e;
 	}
-
 	.main-content{
 	background: url("${CTPATH}/images/question/pic5.jpg") no-repeat;
 	padding: 88px 0;
@@ -255,12 +260,6 @@ $(document).ready(function() {
 	width: 280px;
 	height: auto;
 	}
-	<!--.main-content .container .course .pop p:first-child{-->
-	<!--margin-top: 4px;-->
-	<!--}-->
-	<!--.main-content .container .course .pop p:last-child{-->
-	<!--margin-top: -7px;-->
-	<!--}-->
 	.main-content .container .course2 {
 	top: 465px;
 	left: 290px;

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

@@ -92,7 +92,8 @@ $(document).ready(function() {
 }
 
 .thumbnail-width img {
-	max-width: 160px;
+	max-width: 200px;
+	max-height: 160px;
 }
 
 .thumbnail-height {
@@ -111,6 +112,9 @@ $(document).ready(function() {
 	opacity: 0;
 	overflow: hidden;
 }
+	.breadcrumb-ol ul{
+		list-style: none;
+	}
 	.breadcrumb-ol li{
 		color: #1e1e1e;
 		height: 68px;
@@ -124,6 +128,7 @@ $(document).ready(function() {
 	.hots_news{
 		float: left;
 		margin-top: -30px;
+        width: 300px;
 	}
 	.allNews{
 		width: 790px;
@@ -236,7 +241,6 @@ $(document).ready(function() {
         font-size: 14px;
         color: #787878;
         margin: 20px 0 30px 0;
-
 		word-break: break-all;
 		text-overflow: ellipsis;
 		display: -webkit-box;
@@ -269,153 +273,108 @@ $(document).ready(function() {
 			<ol class="breadcrumb-ol" disabled="breadcrumb">
 				<li>当前位置:</li>
 				<li><a href="${CPATH}/">首页</a></li>&nbsp;>&nbsp;
-				<li><a href="">关于我们</a></li>&nbsp;>&nbsp;
+				<li><a href="about">关于我们</a></li>&nbsp;>&nbsp;
 				<li>新闻中心</li>
 			</ol>
 			<!--<h3>新闻中心</h3>-->
 			<div class="content" style="padding: 15px 0 50px;">
-				<div class="row">
-					<div class="hots_news">
-						<#include "_hot_news.html"/>
+				<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>
-					<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>
-
 					<@jp.contentPage pageSize="6" orderBy="created desc">
-						<!--公司动态-->
-						<div class="company-dynamic"></div>
-						<!--行业新闻-->
-						<div class="trade-news">
-
-							<#list page.getList() as content>
-								<div class="tradeNews">
-									<div class="news-time">
-										<div>
-											<h3>${(content.created?string("yy"))!''}</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>
-										</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>
-										<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="trade-news">
+						<#list page.getList() as content>
+							<div class="tradeNews">
+								<div class="news-time">
+									<div>
+										<h3>${(content.created?string("yy"))!''}</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>
 									</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>
+									<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>
+							</div>
 
-                                <#if content_has_next>
-                                    <#if contents[content_index+1].created?string("mm") != content.created?string("mm")>
-                                        <!--年份分割线-->
-                                        <p class="years">${contents[content_index+1].created?string("mm")}年</p>
-                                    </#if>
-                                </#if>
-							</#list>
-
+							<#if content_has_next>
+								<#if contents[content_index+1].created?string("mm") != content.created?string("mm")>
+									<!--年份分割线-->
+									<p class="years">${contents[content_index+1].created?string("mm")}年</p>
+								</#if>
+							</#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>
+							<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"><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-${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 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>-->
-					<!--<div class="col-md-9">-->
-						<!--<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>-->
-									<!--<h5><a href="${content.url!}">${content.title!}</a></h5>-->
-									<!--<p>${content.summary!}</p>-->
-									<!--<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'}-->
-											<!--&lt;!&ndash; <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'} &ndash;&gt;-->
-										<!--</span>-->
-									<!--</div>-->
-								<!--</div>-->
-							<!--</div>-->
-							<!--</#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"><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-${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>

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

@@ -125,10 +125,10 @@
     <div class="section-item breadcrumbs">
         <div class="content">
             <ul>
-                <li><a href="">当前位置:</a></li>
-                <li><a href="">首页&nbsp;&gt;</a></li>
+                <li><a>当前位置:</a></li>
+                <li><a href="${CPATH}/">首页&nbsp;&gt;</a></li>
                 <li><a href="">服务中心&nbsp;&gt;</a></li>
-                <li><a href="">常见问题</a></li>
+                <li><a>常见问题</a></li>
             </ul>
         </div>
     </div>

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

@@ -167,18 +167,18 @@
     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: 3;
+    -moz-line-clamp: 2;
     -webkit-box-orient: vertical;
-    -webkit-line-clamp: 3;
+    -webkit-line-clamp: 2;
     -o-box-orient: vertical;
-    -o-line-clamp: 3;
+    -o-line-clamp: 2;
     }
 </#macro>
 <@layout>
@@ -196,10 +196,10 @@
     <div class="section-item breadcrumbs">
         <div class="content">
             <ul>
-                <li><a href="">当前位置:</a></li>
-                <li><a href="">首页&nbsp;&gt;</a></li>
+                <li><a>当前位置:</a></li>
+                <li><a href="${CPATH}/">首页&nbsp;&gt;</a></li>
                 <li><a href="">服务中心&nbsp;&gt;</a></li>
-                <li><a href="">常见问题</a></li>
+                <li><a>升级公告</a></li>
             </ul>
         </div>
     </div>