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

Jump to bottom

ZBUG-3008: Loop while trying to connect in modern version from tablet/mobile phone #729

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
+5 −4
Open

ZBUG-3008: Loop while trying to connect in modern version from tablet/mobile phone #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f58464
ZBUG-3008: client set to modern instead of standard
lavegupta Sep 9, 2022
9f012b2
ZBUG-3008:Fixed review comments
lavegupta Sep 9, 2022
bea4d6b
ZBUG-3008: Added condition check to hide version block in tablet
lavegupta Sep 9, 2022
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
6 changes: 3 additions & 3 deletions WebRoot/public/launchZCS.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,16 +322,16 @@
splSwitch.style.visibility = 'hidden';
}
}
function switchToStandardClient() {
document.location = window.appContextPath + "/?client=standard";
function switchToModernClient() {
document.location = window.appContextPath + "/?client=modern";
}
killSplashScreenSwitch();
<c:set var="enforceMinDisplay" value="${requestScope.authResult.prefs.zimbraPrefAdvancedClientEnforceMinDisplay[0]}"/>
<c:if test="${param.client ne 'advanced'}">
enforceMinDisplay = ${enforceMinDisplay ne 'FALSE'};
unsupported = (screen && (screen.width <= 800 && screen.height <= 600) && !${isOfflineMode}) || (AjxEnv.isSafari && !AjxEnv.isSafari4up);
silentsakky marked this conversation as resolved.
Show resolved Hide resolved
if (enforceMinDisplay && unsupported) {
switchToStandardClient();
switchToModernClient();
}
delete enforceMinDisplay;
delete unsupported;
Expand Down
3 changes: 2 additions & 1 deletion WebRoot/public/login.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
|| (ua.isOsBlackBerry)
|| (ua.isOsAndroid)
|| (ua.isIos))}"/>
<c:set var="tabletSupported" value="${ua.isTouchiPad || ua.isTablet}"/>
<c:set var="totpAuthRequired" value="false"/>
<c:set var="trimmedUserName" value="${fn:trim(param.username)}"/>
<%--'virtualacctdomain' param is set only for external virtual accounts--%>
Expand Down Expand Up @@ -696,7 +697,7 @@ if (application.getInitParameter("offlineMode") != null) {
<hr/>
</div>
<div>
<c:if test="${!(mobileSupported && modernSupported)}">
<c:if test="${!((mobileSupported || tabletSupported) && modernSupported)}">
<div class="versionBlock">
<label for="client"><fmt:message key="versionHeaderLabel"/></label>
<div style="position: relative;">
Expand Down