From e8a3e262f0c129e02f08a2b1ba15bcbb9a733d51 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 25 六月 2021 16:34:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/index.xhtml | 38 +++++++++++++++-----------------------
1 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/index.xhtml b/src/main/webapp/index.xhtml
index 215e753..815e1c9 100644
--- a/src/main/webapp/index.xhtml
+++ b/src/main/webapp/index.xhtml
@@ -19,7 +19,7 @@
<p:panelGrid styleClass="header">
<p:row>
<p:column styleClass="header-logo">
- <p:graphicImage value="/resources/images/logo.png"></p:graphicImage>
+ <p:graphicImage value="/resources/images/${institute.name}logo.png" style="width: 80px;height: 80px"></p:graphicImage>
</p:column>
<p:column styleClass="header-title">
<p:outputLabel value="${institute.name}"></p:outputLabel>
@@ -39,21 +39,17 @@
resizable="false" width="420">
<h:form id="dialogFormPassword">
<p:panelGrid columns="1" styleClass="content">
- <p:outputLabel value="账号"></p:outputLabel>
- <p:inputText value="#{userMngController.username}" maxlength="100"
- required="true" requiredMessage="请输入原密码"></p:inputText>
-
<p:outputLabel value="原密码"></p:outputLabel>
<p:password value="#{userMngController.oriPassword}" maxlength="100"
- required="true" requiredMessage="请输入原密码"></p:password>
+ required="true" requiredMessage="请输入原密码" autocomplete="off"></p:password>
- <p:outputLabel value="新密码"></p:outputLabel>
+ <p:outputLabel value="新密码(必须是8位以上且包含大小写和特殊字符)"></p:outputLabel>
<p:password value="#{userMngController.newPassword}" maxlength="100"
- required="true" requiredMessage="请输入新密码"></p:password>
+ required="true" requiredMessage="请输入新密码" autocomplete="off"></p:password>
<p:outputLabel value="确认密码"></p:outputLabel>
<p:password value="#{userMngController.newPasswordSecond}" maxlength="100"
- required="true" requiredMessage="请输入确认密码"></p:password>
+ required="true" requiredMessage="请输入确认密码" autocomplete="off"></p:password>
</p:panelGrid>
<p:panel styleClass="btn">
<p:commandButton value="修改" actionListener="#{userMngController.updatePasswordAction}"
@@ -70,21 +66,17 @@
closable="false">
<h:form id="changeFormPassword">
<p:panelGrid columns="1" styleClass="content">
- <p:outputLabel value="账号"></p:outputLabel>
- <p:inputText value="#{menuController.userName}" maxlength="100"
- readonly="true"></p:inputText>
-
<p:outputLabel value="原密码"></p:outputLabel>
<p:password value="#{userMngController.oriPassword}" maxlength="100"
- required="true" requiredMessage="请输入原密码"></p:password>
+ required="true" requiredMessage="请输入原密码" autocomplete="off"></p:password>
- <p:outputLabel value="新密码"></p:outputLabel>
+ <p:outputLabel value="新密码(必须是8位以上且包含大小写和特殊字符)"></p:outputLabel>
<p:password value="#{userMngController.newPassword}" maxlength="100"
- required="true" requiredMessage="请输入新密码"></p:password>
+ required="true" requiredMessage="请输入新密码" autocomplete="off"></p:password>
<p:outputLabel value="确认密码"></p:outputLabel>
<p:password value="#{userMngController.newPasswordSecond}" maxlength="100"
- required="true" requiredMessage="请输入确认密码"></p:password>
+ required="true" requiredMessage="请输入确认密码" autocomplete="off"></p:password>
</p:panelGrid>
<p:panel styleClass="btn">
<p:commandButton value="修改" actionListener="#{userMngController.updatePasswordAction}"
@@ -95,12 +87,12 @@
</h:form>
</p:dialog>
<script>
- console.log($('#northForm\\:ischange').val())
- if($('#northForm\\:ischange').val() == 0){
- $("#changePassword").hide();
- }else {
- $("#changePassword").show();
- }
+ // console.log($('#northForm\\:ischange').val())
+ // if($('#northForm\\:ischange').val() == 0){
+ // $("#changePassword").hide();
+ // }else {
+ // $("#changePassword").show();
+ // }
</script>
</ui:define>
--
Gitblit v1.9.2