Merge remote-tracking branch 'origin/developer' into developer

src/main/webapp/WEB-INF/views/modules/sys/sysIndex.jsp

@@ -250,7 +250,7 @@
 				</div>
 			</div>
 		    <div id="footer" class="row-fluid">
-				Copyright &copy; ${fns:getConfig('copyrightYear')} ${fns:getConfig('productName')} ${fns:getConfig('version')}
+				Copyright &copy; 2014 - <span id="copyrightYear"></span> ${fns:getConfig('productName')} ${fns:getConfig('version')}
 			</div>
 		</div>
 	</div>
@@ -281,6 +281,11 @@
 		function openCloseClickCallBack(b){
 			$.fn.jerichoTab.resize();
 		} // </c:if>
+
+		$(function () {
+			let date = new Date()
+			$('#copyrightYear').text( date.getFullYear())
+		})
 	</script>
 	<script src="${ctxStatic}/common/wsize.min.js" type="text/javascript"></script>
 </body>

src/main/webapp/WEB-INF/views/modules/sys/sysIndex2.jsp

@@ -118,7 +118,7 @@
 						$("#notifyNum,#notifyNum2").hide()
 					}
 				}); */
-			} 
+			}
 			getNotifyNum(); //<c:if test="${oaNotifyRemindInterval ne '' && oaNotifyRemindInterval ne '0'}">
 			setInterval(getNotifyNum, ${oaNotifyRemindInterval}); //</c:if>
 		});
@@ -207,7 +207,7 @@
 	    </div>
 	    <div class="container-fluid">
 			<div id="content" class="row-fluid">
-				<div id="left"><%-- 
+				<div id="left"><%--
 					<iframe id="menuFrame" name="menuFrame" src="" style="overflow:visible;" scrolling="yes" frameborder="no" width="100%" height="650"></iframe> --%>
 				</div>
 				<div id="openClose" class="close">&nbsp;</div>
@@ -216,11 +216,11 @@
 				</div>
 			</div>
 		    <div id="footer" class="row-fluid">
-	            Copyright &copy; ${fns:getConfig('copyrightYear')} ${fns:getConfig('productName')} ${fns:getConfig('version')}
+	            Copyright &copy; 2014 - <span id="copyrightYear"></span> ${fns:getConfig('productName')} ${fns:getConfig('version')}
 			</div>
 		</div>
 	</div>
-	<script type="text/javascript"> 
+	<script type="text/javascript">
 		var leftWidth = 160; // 左侧窗口大小
 		var tabTitleHeight = 33; // 页签的高度
 		var htmlObj = $("html"), mainObj = $("#main");
@@ -232,7 +232,7 @@
 			htmlObj.css({"overflow-x":strs[1] < minWidth ? "auto" : "hidden", "overflow-y":strs[0] < minHeight ? "auto" : "hidden"});
 			mainObj.css("width",strs[1] < minWidth ? minWidth - 10 : "auto");
 			frameObj.height((strs[0] < minHeight ? minHeight : strs[0]) - headerObj.height() - footerObj.height() - (strs[1] < minWidth ? 42 : 28));
-			$("#openClose").height($("#openClose").height() - 5);// <c:if test="${cookie.tabmode.value eq '1'}"> 
+			$("#openClose").height($("#openClose").height() - 5);// <c:if test="${cookie.tabmode.value eq '1'}">
 			$(".jericho_tab iframe").height($("#right").height() - tabTitleHeight); // </c:if>
 			wSizeWidth();
 		}
@@ -243,11 +243,15 @@
 			}else{
 				$("#right").width("100%");
 			}
-		}// <c:if test="${cookie.tabmode.value eq '1'}"> 
+		}// <c:if test="${cookie.tabmode.value eq '1'}">
 		function openCloseClickCallBack(b){
 			$.fn.jerichoTab.resize();
 		} // </c:if>
+		$(function () {
+			let date = new Date()
+			$('#copyrightYear').text( date.getFullYear())
+		})
 	</script>
 	<script src="${ctxStatic}/common/wsize.min.js" type="text/javascript"></script>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/sys/sysLogin.jsp

@@ -212,9 +212,15 @@
     </div>
 </form>
 <div class="footer">
-    Copyright &copy; ${fns:getConfig('copyrightYear')} ${fns:getConfig('productName')} ${fns:getConfig('version')}
+    Copyright &copy; 2014 - <span id="copyrightYear"></span> ${fns:getConfig('productName')} ${fns:getConfig('version')}
 </div>
 <script src="${ctxStatic}/flash/zoom.min.js" type="text/javascript"></script>
 <script src="${ctxStatic}/slideVerify/slideVerify.js" type="text/javascript"></script>
+<script>
+    $(function () {
+        let date = new Date()
+        $('#copyrightYear').text( date.getFullYear())
+    })
+</script>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/sys/sysLogin2.jsp

@@ -31,7 +31,7 @@
 				errorLabelContainer: "#messageBox",
 				errorPlacement: function(error, element) {
 					error.appendTo($("#loginError").parent());
-				} 
+				}
 			});
 			$(window).resize();
 		});
@@ -78,8 +78,14 @@
 		</div>
 	</form>
 	<div class="footer">
-		Copyright &copy; ${fns:getConfig('copyrightYear')} ${fns:getConfig('productName')} ${fns:getConfig('version')}
+		Copyright &copy; 2014 - <span id="copyrightYear"></span> ${fns:getConfig('productName')} ${fns:getConfig('version')}
 	</div>
 	<script src="${ctxStatic}/flash/zoom.min.js" type="text/javascript"></script>
+	<script>
+		$(function () {
+			let date = new Date()
+			$('#copyrightYear').text( date.getFullYear())
+		})
+	</script>
 </body>
-</html>
+</html>