Explorar o código

新增第三方登录页面、更新日语文案

ting.yin %!s(int64=5) %!d(string=hai) anos
pai
achega
ec423912e1

+ 36 - 0
stmms-web/src/main/webapp/WEB-INF/views/modules/open/error.jsp

@@ -0,0 +1,36 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<html>
+<head>
+    <title>第三方登录</title>
+    <%@include file="/WEB-INF/views/include/head.jsp" %>
+    <meta name="decorator" content="default"/>
+    <link rel="stylesheet" href="${ctxStatic}/common/open.css">
+    <script type="text/javascript">
+        $(document).ready(function () {
+            if (self.frameElement && self.frameElement.tagName == "IFRAME") {
+                parent.location.reload();
+            }
+            load();
+        });
+    </script>
+</head>
+<body>
+<div class="flexbox">
+  <div class="cont cl">
+   <div class="sd">
+    <div class="logo"><img src="${ctxStatic}/images/<c:if test="${indexLogo ==null||indexLogo =='' }">logo@2x.png</c:if><c:if test="${indexLogo !=null }">${indexLogo }</c:if>"/></div>
+       <p>Copyright &#169武汉启明软件 2012-2014</p>
+   </div>
+   <div class="mn">
+     <div class="info">
+     	<div class="icon"><img src="${ctxStatic}/images/error-large.png"/></div>
+        <h2>登录错误信息</h2>
+        <p>信息错误,请返回重新填写</p>
+        <div class="open-btn"><a class="grey" href="${ctx}/open/marker/list">返回</a></div>
+     </div>
+   </div>
+  </div>
+</div>
+</body>
+</html>

+ 46 - 0
stmms-web/src/main/webapp/WEB-INF/views/modules/open/marker-list.jsp

@@ -0,0 +1,46 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<html>
+<head>
+    <title>第三方登录</title>
+    <meta name="decorator" content="default"/>
+    <%@include file="/WEB-INF/views/include/head.jsp" %>
+    <link rel="stylesheet" href="${ctxStatic}/common/open.css">
+    <script type="text/javascript">
+        $(document).ready(function () {
+            if (self.frameElement && self.frameElement.tagName == "IFRAME") {
+                parent.location.reload();
+            }
+            load();
+        });
+    </script>
+</head>
+<body>
+<div class="flexbox">
+  <div class="cont cl">
+   <div class="sd">
+    <div class="logo"><img src="${ctxStatic}/images/<c:if test="${indexLogo ==null||indexLogo =='' }">logo@2x.png</c:if><c:if test="${indexLogo !=null }">${indexLogo }</c:if>"/></div>
+       <p>Copyright &#169武汉启明软件 2012-2014</p>
+   </div>
+   <div class="mn">
+     <div class="optionbox">
+      <h1>第三方登录</h1>
+      <form action="${ctx}/open/marker/select" method="post" role="form">
+        <div class="option">
+        <select name="markerId" id="markerId">
+        <c:forEach items="${markerList}" var="marker">
+          <option value="${marker.id }">${marker.loginName }</option>
+        </c:forEach>
+        </select>
+        </div>
+        <div style="display:none;">
+        <div class="tips"><em class="error">错误提示</em></div>
+        <div class="open-btn"><a class="opacity" href="">确认</a><a class="grey" href="${ctx}/open/marker/list">返回</a></div>
+        </div>
+      </form>
+     </div>
+   </div>
+  </div>
+</div>
+</body>
+</html>

+ 248 - 0
stmms-web/src/main/webapp/static/common/open.css

@@ -0,0 +1,248 @@
+/*common*/
+* {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+	outline: none;
+	-webkit-tap-highlight-color: transparent;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	font-family: "微软雅黑";
+}
+html, body {
+	height: 100%;
+	color: #1B2C5F;
+	overflow-x: hidden;
+}
+body {
+	background: url(../images/bg.jpg) no-repeat 0 30% #F0F3FF fixed;
+	background-size: cover;
+}
+a {
+	text-decoration: none;
+}
+input {
+	font-family: "微软雅黑";
+	outline: none;
+	vertical-align: top;
+}
+.ellipsis {
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+}
+::-webkit-input-placeholder {
+    color:    #B4B7C3;
+}
+:-moz-placeholder {
+   color:    #B4B7C3;
+}
+::-moz-placeholder {
+   color:    #B4B7C3;
+}
+:-ms-input-placeholder {
+   color:    #B4B7C3;
+}
+.cl:after {
+	content: ".";
+	display: block;
+	height: 0;
+	clear: both;
+	visibility: hidden;
+}
+.cl {
+	zoom: 1;
+}
+/*flexbox*/
+.flexbox {
+	width: 100%;
+	height: 100%;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: -ms-flexbox;
+	display: flex;
+	
+	-webkit-box-pack: center;
+	-ms-flex-pack: center;
+	-webkit-justify-content: center;
+	justify-content: center;
+	
+	-webkit-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+}
+.cont {
+	width: 820px;
+	height: 548px;
+	overflow: hidden;
+	background: rgba(255,255,255,.75);
+	-moz-box-shadow: 0px 15px 15px 0px rgba(203,205,211,0.3);
+	-webkit-box-shadow: 0px 15px 15px 0px rgba(203,205,211,0.3);
+	box-shadow: 0px 15px 15px 0px rgba(203,205,211,0.3);
+	padding-left: 220px;
+}
+.cont .sd {
+	position: relative;
+	float: left;
+	width: 220px;
+	height: 548px;
+	overflow: hidden;
+	margin-left: -220px;
+	padding: 38px;
+	background: #142862 url(../images/openbg.png) no-repeat 0 0;
+}
+.cont .sd .logo img {
+	width: 130px;
+}
+.cont .sd p {
+	position: absolute;
+	left: 38px;
+	bottom: 38px;
+	line-height: 22px;
+	font-size: 13px;
+	font-size: 700;
+	color: rgba(255,255,255,.50);
+}
+.cont .mn {
+	float: left;
+	width: 100%;
+	height: 540px;
+	padding: 80px 130px;
+}
+/*optionbox*/
+.optionbox {
+	position: relative;
+}
+.optionbox h1 {
+	height: 38px;
+	line-height: 38px;
+	overflow: hidden;
+	text-align: center;
+	font-size: 26px;
+	color: #1B2C5F;
+}
+.optionbox form {
+	padding-top: 20px;
+}
+.option {
+	position: relative;
+	width: 340px;
+	height: 48px;
+	border: 1px solid #E2E5EB;
+	-moz-border-radius: 8px;
+	-webkit-border-radius: 8px;
+	border-radius: 8px;
+	-webkit-box-shadow: none;
+	box-shadow: none;
+	transition: none!important;
+	margin-top: 20px;
+}
+.option:hover {
+	border: 1px solid #E2E5EB;
+	-webkit-box-shadow: 0px 10px 15px 0px rgba(203,205,211,.1);
+	-moz-box-shadow: 0px 10px 15px 0px rgba(203,205,211,.1);
+	box-shadow: 0px 10px 15px 0px rgba(203,205,211,.1);
+}
+.option select {
+	border: 0;
+	outline: 0;
+	background: none;
+	width: 100%;
+	height: 48px;
+	line-height: 48px;
+	color: #1B2C5F;
+	font-weight: bold;
+	appearance: none;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+	padding-left: 20px;
+}
+.option:after {
+	 content: "";
+	 width: 29px;
+	 height: 48px;
+	 background: url(../images/arrow-down.png) no-repeat 0 0;
+	 position: absolute;
+	 top: 0;
+	 right: 0;
+	 pointer-events: none;
+}
+
+/*tips*/
+.optionbox .tips {
+	position: absolute;
+	left: 0;
+	bottom: 94px;
+	line-height: 16px;
+	overflow: hidden;
+	font-size: 12px;
+}
+.optionbox .tips em.error {
+	font-style: normal;
+	color: #FF5F5F;
+	padding-left: 28px;
+	background: url(../images/error.png) no-repeat 0 50%;
+}
+/*btn*/
+ .open-btn {
+	text-align: center;
+	padding-top: 72px;
+}
+.open-btn a {
+	display: inline-block;
+	width: 160px;
+	height: 54px;
+	line-height: 54px;
+	overflow: hidden;
+	letter-spacing: 3px;
+	font-size: 18px;
+	font-weight: 700;
+	color: #FFF;
+	border: 0; 
+	background: #66ADE8;
+	background-image:-webkit-linear-gradient(to right, #88D3FC, #66ADE8); 
+	background-image:linear-gradient(to right, #88D3FC, #66ADE8); 
+	-moz-border-radius: 30px;
+	-webkit-border-radius: 30px;
+	border-radius: 30px;
+}
+.optionbox .open-btn a{
+	width: 120px;
+}
+.open-btn a.grey {
+	background: #E2E5EC;
+	margin-left: 20px;
+}
+.open-btn a.opacity:hover {
+	-moz-box-shadow: 0px 10px 20px 0px rgba(119,192,242,.4);
+	-webkit-box-shadow: 0px 10px 20px 0px rgba(119,192,242,.4);
+	box-shadow: 0px 10px 20px 0px rgba(119,192,242,.4);
+}
+.open-btn a.grey:hover {
+	background: #D6DAE4;
+}
+
+/*info*/
+.info {
+	padding-top: 24px;
+	text-align: center;
+}
+.info h2{
+	padding-top: 30px;
+	font-size: 20px;
+}
+.info p{
+	padding-top: 10px;
+	color: #B2B7C3;
+}
+.info .open-btn {
+	padding-top: 120px;
+}
+.info .open-btn a {
+	width: 120px;
+	height: 44px;
+	line-height: 44px;
+	font-size: 16px;
+}
+

+ 3 - 3
stmms-web/src/main/webapp/static/i18n/messages_ja.properties

@@ -1,5 +1,5 @@
 #login
-user.login.title=\u81ea\u52d5\u63a1\u70b9\u30b7\u30b9\u30c6\u30e0
+user.login.title=\u30c7\u30b8\u30bf\u30eb\u63a1\u70b9\u30b7\u30b9\u30c6\u30e0\u3078\u30ed\u30b0\u30a4\u30f3
 user.login.admin=\u7ba1\u7406\u8005\u767b\u9332
 user.login.marker=\u63a1\u70b9\u8005\u767b\u9332
 user.login.name=\u30e6\u30fc\u30b6\u30fc\u540d
@@ -100,10 +100,10 @@ mark.board.pass=\u30b9\u30ad\u30c3\u30d7
 mark.board.choose.result=\u63a1\u70b9
 mark.board.keyboard=\u30ad\u30fc\u30dc\u30fc\u30c9\u63a1\u70b9 >>
 mark.board.mouse=<< \u30de\u30a6\u30b9\u63a1\u70b9
-mark.board.interval=\u70b9\u6570\u306e\u6700\u5c0f\u9593\u9694\u8a2d\u5b9a
+mark.board.interval=\u6700\u5c0f\u9593\u9694\u8a2d\u5b9a
 mark.board.score=\u70b9\u6570
 mark.board.back=\u623b\u308b
-mark.board.clear.question=\u90e8\u5206\u63a1\u70b9\u306e\u524a\u9664
+mark.board.clear.question=\u90e8\u5206\u63a1\u70b9\u524a\u9664
 mark.board.clear=\u5168\u63a1\u70b9\u306e\u524a\u9664
 mark.board.question.not.mark=\u672a\u63a1\u70b9\u306e\u554f\u984c\u304c\u3042\u308a\u307e\u3059
 mark.board.confirm=,\u63d0\u51fa\u3057\u307e\u3059\u304b\uff1f

BIN=BIN
stmms-web/src/main/webapp/static/images/arrow-down.png


BIN=BIN
stmms-web/src/main/webapp/static/images/error-large.png


BIN=BIN
stmms-web/src/main/webapp/static/images/icon.png


BIN=BIN
stmms-web/src/main/webapp/static/images/openbg.png