From 1f5846417b1440c3ce59c911ad9b0fec17e52a44 Mon Sep 17 00:00:00 2001
From: Lave Gupta <lavegupta@live.in>
Date: Fri, 9 Sep 2022 18:54:17 +0530
Subject: [PATCH 1/3] ZBUG-3008: client set to modern instead of standard

---
 WebRoot/public/launchZCS.jsp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WebRoot/public/launchZCS.jsp b/WebRoot/public/launchZCS.jsp
index dc36cc26b1..e3906b4048 100644
--- a/WebRoot/public/launchZCS.jsp
+++ b/WebRoot/public/launchZCS.jsp
@@ -323,13 +323,13 @@
         }
     }
 	function switchToStandardClient() {
-		document.location = window.appContextPath + "/?client=standard";
+		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);
+		unsupported = (screen && (screen.width <= 800 && screen.height <= 600)) || (AjxEnv.isSafari && !AjxEnv.isSafari4up);
 		if (enforceMinDisplay && unsupported) {
 			switchToStandardClient();
 		}

From 9f012b262d3a01f61858c21e10c99d639c7a1134 Mon Sep 17 00:00:00 2001
From: Lave Gupta <lavegupta@live.in>
Date: Fri, 9 Sep 2022 19:59:39 +0530
Subject: [PATCH 2/3] ZBUG-3008:Fixed review comments

---
 WebRoot/public/launchZCS.jsp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WebRoot/public/launchZCS.jsp b/WebRoot/public/launchZCS.jsp
index e3906b4048..0326c40bf5 100644
--- a/WebRoot/public/launchZCS.jsp
+++ b/WebRoot/public/launchZCS.jsp
@@ -322,16 +322,16 @@
             splSwitch.style.visibility = 'hidden';
         }
     }
-	function switchToStandardClient() {
+	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)) || (AjxEnv.isSafari && !AjxEnv.isSafari4up);
+		unsupported = (screen && (screen.width <= 800 && screen.height <= 600) && !${isOfflineMode}) || (AjxEnv.isSafari && !AjxEnv.isSafari4up);
 		if (enforceMinDisplay && unsupported) {
-			switchToStandardClient();
+			switchToModernClient();
 		}
 		delete enforceMinDisplay;
 		delete unsupported;

From bea4d6bb706ad3b52af3ca32b212ca35fe50d507 Mon Sep 17 00:00:00 2001
From: Lave Gupta <lavegupta@live.in>
Date: Fri, 9 Sep 2022 22:56:17 +0530
Subject: [PATCH 3/3] ZBUG-3008: Added condition check to hide version block in
 tablet

---
 WebRoot/public/login.jsp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WebRoot/public/login.jsp b/WebRoot/public/login.jsp
index 20ed5a7b5a..20b2824998 100644
--- a/WebRoot/public/login.jsp
+++ b/WebRoot/public/login.jsp
@@ -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--%>
@@ -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;">