From f63f5c0df217a6518732dbf0cab1bc9eab13d315 Mon Sep 17 00:00:00 2001
From: chiguangxu <chiguangxu@iiesoft.com>
Date: Tue, 6 Feb 2018 19:25:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=A0=B7=E5=BC=8F=E7=BA=A0?=
 =?UTF-8?q?=E6=AD=A3=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=B8=A4=E4=B8=AA=E5=9E=82?=
 =?UTF-8?q?=E7=9B=B4=E6=BB=9A=E5=8A=A8=E6=9D=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/include/header.jsp    |  2 +
 .../webapp/WEB-INF/views/cfg/requestList.jsp  |  6 +-
 src/main/webapp/WEB-INF/views/home.jsp        |  2 +-
 src/main/webapp/static/global/css/page.css    | 85 +++++++++++++++++++
 .../static/layouts/layout/css/layout.css      |  2 +-
 5 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 src/main/webapp/static/global/css/page.css

diff --git a/src/main/webapp/WEB-INF/include/header.jsp b/src/main/webapp/WEB-INF/include/header.jsp
index aef074d49..28c53b828 100644
--- a/src/main/webapp/WEB-INF/include/header.jsp
+++ b/src/main/webapp/WEB-INF/include/header.jsp
@@ -26,6 +26,8 @@
 <link href="${pageContext.request.contextPath}/static/layouts/layout/css/themes/default.css" rel="stylesheet" type="text/css" id="style_color" />
 <link href="${pageContext.request.contextPath}/static/layouts/layout/css/custom.css" rel="stylesheet" type="text/css" />
 
+<link href="${pageContext.request.contextPath}/static/global/css/page.css" rel="stylesheet" type="text/css" />
+
 
 <!--[if lt IE 9]>
 <script src="${pageContext.request.contextPath}/static/global/plugins/respond.min.js"></script>
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
index 40c30b262..860114798 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -15,6 +15,10 @@
 			onClick="javascript:window.location='${ctx}/cfg/request/form'"><spring:message code="add_request"></spring:message></button>
 	</div>
 	
+	<h3 class="page-title">
+		来函管理 
+	</h3>
+	
 	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet box blue">
@@ -128,7 +132,7 @@
 					
 							</tbody>
 						</table>
-						<div class="pagination">${page}</div>	
+						<div class="page">${page}</div>	
 					</div>
 			</div>
 		</div>
diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp
index b549bef96..6a56d70e9 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp
+++ b/src/main/webapp/WEB-INF/views/home.jsp
@@ -199,7 +199,7 @@
                          </a>
                         
                          <ul class="dropdown-menu">
-                    	   <li class="hide"><a href="${pageContext.request.contextPath}/language?language=zh_CN">&nbsp;简体中文&nbsp;</a></li>
+                    	   <li><a href="${pageContext.request.contextPath}/language?language=zh_CN">&nbsp;简体中文&nbsp;</a></li>
                            <li><a href="${pageContext.request.contextPath}/language?language=en">&nbsp;English&nbsp;</a></li>
 						   <li><a href="${pageContext.request.contextPath}/language?language=ru">&nbsp;русский язык&nbsp;</a></li>
                          </ul>
diff --git a/src/main/webapp/static/global/css/page.css b/src/main/webapp/static/global/css/page.css
new file mode 100644
index 000000000..51f999fca
--- /dev/null
+++ b/src/main/webapp/static/global/css/page.css
@@ -0,0 +1,85 @@
+
+.page {
+
+}
+.page ul {
+	display: block;
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+.page ul > li {
+  display: inline;
+}
+
+.page ul > li > a,
+.page ul > li > span {
+  float: left;
+  padding: 4px 12px;
+  line-height: 20px;
+  text-decoration: none;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
+  border-left-width: 0;
+}
+
+.page ul > li > a:hover,
+.page ul > li > a:focus,
+.page ul > .active > a,
+.page ul > .active > span {
+  background-color: #f5f5f5;
+}
+
+.page ul > .active > a,
+.page ul > .active > span {
+  color: #999999;
+  cursor: default;
+}
+
+.page ul > .disabled > span,
+.page ul > .disabled > a,
+.page ul > .disabled > a:hover,
+.page ul > .disabled > a:focus {
+  color: #999999;
+  cursor: default;
+  background-color: transparent;
+}
+
+.page ul > li:first-child > a,
+.page ul > li:first-child > span {
+  border-left-width: 1px;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.page ul > li:last-child > a,
+.page ul > li:last-child > span {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.page-centered {
+  text-align: center;
+}
+
+.page-right {
+  text-align: right;
+}
+
+.page .controls a{border:0;}
+.page .controls input{
+	border: 1px solid #ddd;
+	color:#999;
+	width:30px;
+	padding:0;
+	margin:-3px 0 0 0;
+	text-align:center;
+}
\ No newline at end of file
diff --git a/src/main/webapp/static/layouts/layout/css/layout.css b/src/main/webapp/static/layouts/layout/css/layout.css
index 1b2620b1b..aa94c85dd 100644
--- a/src/main/webapp/static/layouts/layout/css/layout.css
+++ b/src/main/webapp/static/layouts/layout/css/layout.css
@@ -1611,7 +1611,7 @@
  background-color:#fff
 }
 .page-content .row {
-	margin-bottom: 10px;
+
 }
 
 .page-container-bg-solid .page-content {