Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZCS-12939: added context path for images #796

Open
wants to merge 1 commit into
base: ZCS-12907
Choose a base branch
from
+40 −36
Open

ZCS-12939: added context path for images #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 24 additions & 20 deletions WebRoot/h/changepass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
<%@ taglib prefix="fmt" uri="com.zimbra.i18n" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

<c:if test="${pageContext.request.contextPath ne '/'}">
<c:set var="basePath" value="${pageContext.request.contextPath}"/>
</c:if>

<app:handleError>
<zm:getMailbox var="mailbox"/>
<c:set var="refreshSkin" value="${true}" scope="request"/>
Expand Down Expand Up @@ -125,8 +129,8 @@
<fmt:message key="zimbraPasswordMinLength" var="passwordMinLengthMsg">
<fmt:param value="${zimbraPasswordMinLength}"/>
</fmt:message>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="minLengthCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="minLengthCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="minLengthCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="minLengthCheckImg" style="display: none;"/>
${passwordMinLengthMsg}
</li>
</c:if>
Expand All @@ -135,8 +139,8 @@
<fmt:message key="zimbraPasswordMinUpperCaseChars" var="minUpperCaseCharsMsg">
<fmt:param value="${zimbraPasswordMinUpperCaseChars}"/>
</fmt:message>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="minUpperCaseCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="minUpperCaseCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="minUpperCaseCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="minUpperCaseCheckImg" style="display: none;"/>
${minUpperCaseCharsMsg}
</li>
</c:if>
Expand All @@ -145,8 +149,8 @@
<fmt:message key="zimbraPasswordMinLowerCaseChars" var="minLowerCaseCharsMsg">
<fmt:param value="${zimbraPasswordMinLowerCaseChars}"/>
</fmt:message>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="minLowerCaseCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="minLowerCaseCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="minLowerCaseCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="minLowerCaseCheckImg" style="display: none;"/>
${minLowerCaseCharsMsg}
</li>
</c:if>
Expand All @@ -155,8 +159,8 @@
<fmt:message key="zimbraPasswordMinPunctuationChars" var="minPunctuationCharsMsg">
<fmt:param value="${zimbraPasswordMinPunctuationChars}"/>
</fmt:message>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="minPunctuationCharsCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="minPunctuationCharsCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="minPunctuationCharsCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="minPunctuationCharsCheckImg" style="display: none;"/>
${minPunctuationCharsMsg}
</li>
</c:if>
Expand All @@ -165,8 +169,8 @@
<fmt:message key="zimbraPasswordMinNumericChars" var="minNumericCharsMsg">
<fmt:param value="${zimbraPasswordMinNumericChars}"/>
</fmt:message>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="minNumericCharsCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="minNumericCharsCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="minNumericCharsCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="minNumericCharsCheckImg" style="display: none;"/>
${minNumericCharsMsg}
</li>
</c:if>
Expand All @@ -175,16 +179,16 @@
<fmt:message key="zimbraPasswordMinDigitsOrPuncs" var="minDigitsOrPuncsMsg">
<fmt:param value="${zimbraPasswordMinDigitsOrPuncs}"/>
</fmt:message>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="minDigitsOrPuncsCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="minDigitsOrPuncsCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="minDigitsOrPuncsCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="minDigitsOrPuncsCheckImg" style="display: none;"/>
${minDigitsOrPuncsMsg}
</li>
</c:if>
<c:if test="${!zm:boolean(zimbraPasswordAllowUsername)}">
<li>
<fmt:message key="zimbraPasswordAllowUsername" var="allowUsernameMsg"></fmt:message>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="allowUsernameCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="allowUsernameCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="allowUsernameCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="allowUsernameCheckImg" style="display: none;"/>
${allowUsernameMsg}
</li>
</c:if>
Expand All @@ -193,16 +197,16 @@
<fmt:message key="zimbraPasswordEnforceHistory" var="enforceHistoryMsg">
<fmt:param value="${zimbraPasswordEnforceHistory}"/>
</fmt:message>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="enforceHistoryCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="enforceHistoryCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="enforceHistoryCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="enforceHistoryCheckImg" style="display: none;"/>
${enforceHistoryMsg}
</li>
</c:if>
<c:if test="${zm:boolean(zimbraPasswordBlockCommonEnabled)}">
<li>
<fmt:message key="zimbraPasswordBlockCommonEnabled" var="blockCommonMsg"></fmt:message>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="blockCommonCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="blockCommonCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="blockCommonCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="blockCommonCheckImg" style="display: none;"/>
${blockCommonMsg}
</li>
</c:if>
Expand All @@ -217,8 +221,8 @@
<ul class="passwordRuleList">
<li>
<fmt:message var="zimbraPasswordMustMatchMsg" key="zimbraPasswordMustMatch"/>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="mustMatchCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="mustMatchCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="mustMatchCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="mustMatchCheckImg" style="display: none;"/>
${zimbraPasswordMustMatchMsg}
</li>
</ul>
Expand Down
32 changes: 16 additions & 16 deletions WebRoot/public/login.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,62 +625,62 @@ if (application.getInitParameter("offlineMode") != null) {
<ul class="passwordRuleList">
<c:if test="${zimbraPasswordMinLength ne 0}">
<li>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="minLengthCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="minLengthCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="minLengthCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="minLengthCheckImg" style="display: none;"/>
<fmt:message key="zimbraPasswordMinLength">
<fmt:param value="${zimbraPasswordMinLength}"/>
</fmt:message>
</li>
</c:if>
<c:if test="${zimbraPasswordMinUpperCaseChars ne 0}">
<li>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="minUpperCaseCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="minUpperCaseCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="minUpperCaseCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="minUpperCaseCheckImg" style="display: none;"/>
<fmt:message key="zimbraPasswordMinUpperCaseChars">
<fmt:param value="${zimbraPasswordMinUpperCaseChars}"/>
</fmt:message>
</li>
</c:if>
<c:if test="${zimbraPasswordMinLowerCaseChars ne 0}">
<li>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="minLowerCaseCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="minLowerCaseCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="minLowerCaseCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="minLowerCaseCheckImg" style="display: none;"/>
<fmt:message key="zimbraPasswordMinLowerCaseChars">
<fmt:param value="${zimbraPasswordMinLowerCaseChars}"/>
</fmt:message>
</li>
</c:if>
<c:if test="${zimbraPasswordMinPunctuationChars ne 0}">
<li>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="minPunctuationCharsCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="minPunctuationCharsCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="minPunctuationCharsCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="minPunctuationCharsCheckImg" style="display: none;"/>
<fmt:message key="zimbraPasswordMinPunctuationChars">
<fmt:param value="${zimbraPasswordMinPunctuationChars}"/>
</fmt:message>
</li>
</c:if>
<c:if test="${zimbraPasswordMinNumericChars ne 0}">
<li>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="minNumericCharsCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="minNumericCharsCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="minNumericCharsCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="minNumericCharsCheckImg" style="display: none;"/>
<fmt:message key="zimbraPasswordMinNumericChars">
<fmt:param value="${zimbraPasswordMinNumericChars}"/>
</fmt:message>
</li>
</c:if>
<c:if test="${zimbraPasswordMinDigitsOrPuncs ne 0}">
<li>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="minDigitsOrPuncsCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="minDigitsOrPuncsCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="minDigitsOrPuncsCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="minDigitsOrPuncsCheckImg" style="display: none;"/>
<fmt:message key="zimbraPasswordMinDigitsOrPuncs">
<fmt:param value="${zimbraPasswordMinDigitsOrPuncs}"/>
</fmt:message>
</li>
</c:if>
<c:if test="${zm:boolean(!zimbraPasswordAllowUsername)}">
<li>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="allowUsernameCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="allowUsernameCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="allowUsernameCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="allowUsernameCheckImg" style="display: none;"/>
<fmt:message key="zimbraPasswordAllowUsername"></fmt:message>
</li>
</c:if>
Expand All @@ -693,8 +693,8 @@ if (application.getInitParameter("offlineMode") != null) {
</div>
<ul class="passwordRuleList">
<li>
<img src="/img/zimbra/ImgCloseGrayModern.png" id="mustMatchCloseImg" style="display: inline;"/>
<img src="/img/zimbra/ImgCheckModern.png" id="mustMatchCheckImg" style="display: none;"/>
<img src="${basePath}/img/zimbra/ImgCloseGrayModern.png" id="mustMatchCloseImg" style="display: inline;"/>
<img src="${basePath}/img/zimbra/ImgCheckModern.png" id="mustMatchCheckImg" style="display: none;"/>
<fmt:message key="zimbraPasswordMustMatch"/>
</li>
</ul>
Expand Down