Merge branch 'cherry-pick-e2292598' into 'develop'

注释掉：“CEIEC All Rights Reserved，CEIEC ©”；

See merge request K18_NTCS_WEB/NTC!37

6 files changed, 22 insertions, 21 deletions

diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp
index 9825f5486..85c81911a 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp
+++ b/src/main/webapp/WEB-INF/views/home.jsp
@@ -176,7 +176,7 @@ function searchForm() {
 			search_txt = search_txt.substring(search_txt.lastIndexOf('_'));

 			$("#menu"+search_txt+" >a").trigger('click');

 		}else {

-			alert('未找到该菜单！');

+			alert('The menu was not found!');

 		} 

 }

 

@@ -219,9 +219,9 @@ function refreshCache(cacheName){
 		async:false,

 		success:function(data,textStatus){

 			if(data=="success"){

-				alert("缓存清理成功");

+				alert("Cache Cleaning Successful!");

 			}else{

-				alert("缓存清理失败");

+				alert("Cache Cleanup Failure!");

 			}

 		}

 	})

@@ -517,7 +517,7 @@ background:#3d3d3d;
 	<!-- BEGIN FOOTER -->

 	<div class="page-footer" style="position: fixed;right: 0;left: 0;z-index: 1030;">

 		<div class="page-footer-inner">

-			CEIEC All Rights Reserved，CEIEC &copy;

+			<!--CEIEC All Rights Reserved，CEIEC &copy;-->

 		</div>

 		<div class="scroll-to-top">

 			<i class="icon-arrow-up"></i>

diff --git a/src/main/webapp/WEB-INF/views/home.jsp.bak b/src/main/webapp/WEB-INF/views/home.jsp.bak
index 2a4c6448f..869c5d272 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp.bak
+++ b/src/main/webapp/WEB-INF/views/home.jsp.bak
@@ -62,9 +62,9 @@
 		

 	  //  console(window.frames['mainFrame'].location);

 	    // if(window.frames['mainFrame'].location.search("/dynamicIndex/")!=-1){

-	    	//关闭菜单 

+	    	//关闭菜单

 	     	//$('.page-sidebar .sidebar-toggler').click();

-	    	//f11全屏  

+	    	//f11全屏

 	    	//fullScreen();

 	 	//}

 	     

@@ -176,7 +176,7 @@ function searchForm() {
 			search_txt = search_txt.substring(search_txt.lastIndexOf('_'));

 			$("#menu"+search_txt+" >a").trigger('click');

 		}else {

-			alert('未找到该菜单！');

+			alert('The menu was not found!');

 		} 

 }

 

@@ -219,9 +219,9 @@ function refreshCache(cacheName){
 		async:false,

 		success:function(data,textStatus){

 			if(data=="success"){

-				alert("缓存清理成功");

+				alert("Cache Cleaning Successful!");

 			}else{

-				alert("缓存清理失败");

+				alert("Cache Cleanup Failure!");

 			}

 		}

 	})

@@ -384,7 +384,7 @@ background:#3d3d3d;
                          	</span>

                          </a>

                      </li>

-                     <!-- 系统语言 -->

+                      <!-- 系统语言 -->

 				     <li class="dropdown  dropdown-user" id="language">

 				     	

 				     	 

@@ -516,7 +516,7 @@ background:#3d3d3d;
 	<!-- BEGIN FOOTER -->

 	<div class="page-footer" style="position: fixed;right: 0;left: 0;z-index: 1030;">

 		<div class="page-footer-inner">

-			CEIEC All Rights Reserved，CEIEC &copy;

+			<!--CEIEC All Rights Reserved，CEIEC &copy;-->

 		</div>

 		<div class="scroll-to-top">

 			<i class="icon-arrow-up"></i>

@@ -559,7 +559,7 @@ background:#3d3d3d;
 		    }

 		}

 	//window.onload = function() {

-	//	fullScreen();//直接执行onclick中的函数就行

+	//	fullScreen();//直接执行onclick中的函数就行

 	//}

 	</script>

 </body>

diff --git a/src/main/webapp/WEB-INF/views/home.jsp.new b/src/main/webapp/WEB-INF/views/home.jsp.new
index aa81d17b6..278168446 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp.new
+++ b/src/main/webapp/WEB-INF/views/home.jsp.new
@@ -186,8 +186,9 @@ function searchForm() {
 		if(search_txt.indexOf('_')!=-1){

 			search_txt = search_txt.substring(search_txt.lastIndexOf('_'));

 			$("#menu"+search_txt+" >a").trigger('click');

-		}else {

-			alert('未找到该菜单！');

+		}else {		

+			alert('The menu was not found!');

+			//alert('未找到该菜单！');

 		} 

 }

 

@@ -230,9 +231,9 @@ function refreshCache(cacheName){
 		async:false,

 		success:function(data,textStatus){

 			if(data=="success"){

-				alert("缓存清理成功");

+				alert("Cache Cleaning Successful!");

 			}else{

-				alert("缓存清理失败");

+				alert("Cache Cleanup Failure!");

 			}

 		}

 	})

@@ -547,7 +548,7 @@ background:#3d3d3d;
 	<!-- BEGIN FOOTER -->

 	<div class="page-footer" style="position: fixed;right: 0;left: 0;z-index: 1030;">

 		<div class="page-footer-inner">

-			CEIEC All Rights Reserved，CEIEC &copy;

+			<!--CEIEC All Rights Reserved，CEIEC &copy;-->

 		</div>

 		<div class="scroll-to-top">

 			<i class="icon-arrow-up"></i>

diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp
index b203598b3..a028e7e27 100644
--- a/src/main/webapp/WEB-INF/views/login.jsp
+++ b/src/main/webapp/WEB-INF/views/login.jsp
@@ -166,7 +166,7 @@
 				</div><!-- /.row -->

 		</div><!-- /.main-container -->

 		<div class="foot">

-			<span>CEIEC All Rights Reserved, CEIEC © </span>

+			<span><!--CEIEC All Rights Reserved，CEIEC &copy;--> </span>

 		</div>

 		<script src="${pageContext.request.contextPath}/static/global/plugins/jquery.min.js" type="text/javascript"></script>

         <script src="${pageContext.request.contextPath}/static/global/plugins/js.cookie.min.js" type="text/javascript"></script>

diff --git a/src/main/webapp/WEB-INF/views/login.jsp.bak b/src/main/webapp/WEB-INF/views/login.jsp.bak
index a609d2567..98b34c877 100644
--- a/src/main/webapp/WEB-INF/views/login.jsp.bak
+++ b/src/main/webapp/WEB-INF/views/login.jsp.bak
@@ -91,7 +91,7 @@
         

         		

          <div class="page-footer-custom"> 

-         		CEIEC All Rights Reserved，CEIEC &copy;

+         		<!--CEIEC All Rights Reserved，CEIEC &copy;-->

            		<%-- Copyright &copy; 2015-${fns:getStringProperty('copyrightYear','2015')} <a href="${pageContext.request.contextPath}">${fns:getStringProperty('productName','NIS')}</a> - Powered By <a href="${pageContext.request.contextPath}" target="_blank">NIS</a> ${fns:getStringProperty('version','1.0.0')} --%>

          </div>

          

diff --git a/src/main/webapp/WEB-INF/views/login.jsp_new b/src/main/webapp/WEB-INF/views/login.jsp_new
index 124a385bc..36d0586df 100644
--- a/src/main/webapp/WEB-INF/views/login.jsp_new
+++ b/src/main/webapp/WEB-INF/views/login.jsp_new
@@ -183,7 +183,7 @@
 				</div><!-- /.row -->

 		</div><!-- /.main-container -->

 		<div class="foot">

-			<span>CEIEC All Rights Reserved, CEIEC © </span>

+			<span><!--CEIEC All Rights Reserved，CEIEC &copy;--></span>

 		</div>

 	 <!--[if lt IE 9]>

 <script src="${pageContext.request.contextPath}/static/global/plugins/respond.min.js"></script>

@@ -561,7 +561,7 @@
 

 		<script type="text/javascript">

 		var fullflag = false;

-	// 全屏代码

+	// 鍏ㄥ睆浠ｇ爜

 	function fullScreen() {

 		if(fullflag){

 			exitFullScreen();