Hide tablet mode on Gladys Plus + improve UX tablet mode

GladysAssistant · Oct 23, 2023 · a1291bf · a1291bf
1 parent 51a2048
commit a1291bf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
@@ -211,6 +211,7 @@
     "toggleDefineTabletMode": "Mode tablette",
     "tabletMode": {
       "description": "Le mode tablette sert à la fonctionnalité alarme. Si vous armez l'alarme, toutes les tablettes de la maison seront verrouillées et afficherons un clavier virtuel pour désactiver l'alarme.",
+      "fullScreenForce": "Si vous voulez forcer une tablette à rester en mode plein écran, vous pouvez ajouter <code>?fullscreen=force</code> à l'URL.",
       "houseLabel": "Maison",
       "tabletModeDisabled": "Mode tablette désactivé"
     },

diff --git a/front/src/routes/dashboard/DashboardPage.jsx b/front/src/routes/dashboard/DashboardPage.jsx
@@ -42,12 +42,14 @@ const DashboardPage = ({ children, ...props }) => (
                 </div>
 
                 <div class="page-options d-flex align-content-between flex-wrap">
-                  <button onClick={props.toggleDefineTabletMode} class={cx('btn btn-outline-secondary ml-2')}>
-                    <span class={style.editDashboardText}>
-                      <Text id="dashboard.toggleDefineTabletMode" />
-                    </span>{' '}
-                    <i class="fe fe-tablet" />
-                  </button>
+                  {!props.isGladysPlus && (
+                    <button onClick={props.toggleDefineTabletMode} class={cx('btn btn-outline-secondary ml-2')}>
+                      <span class={style.editDashboardText}>
+                        <Text id="dashboard.toggleDefineTabletMode" />
+                      </span>{' '}
+                      <i class="fe fe-tablet" />
+                    </button>
+                  )}
                   {!props.dashboardNotConfigured &&
                     props.browserFullScreenCompatible &&
                     !props.hideExitFullScreenButton && (

diff --git a/front/src/routes/dashboard/SetTabletMode.jsx b/front/src/routes/dashboard/SetTabletMode.jsx
@@ -1,6 +1,6 @@
 import { Component } from 'preact';
 import { connect } from 'unistore/preact';
-import { Text } from 'preact-i18n';
+import { Text, MarkupText } from 'preact-i18n';
 import cx from 'classnames';
 import mainActions from '../../actions/main';
 import style from './style.css';
@@ -110,6 +110,9 @@ class SetTabletMode extends Component {
                   ))}
               </select>
             </div>
+            <p>
+              <MarkupText id="dashboard.tabletMode.fullScreenForce" />
+            </p>
             <div className="form-group">
               <button class="btn btn-success" onClick={this.saveTabletMode}>
                 <Text id="global.save" />

diff --git a/front/src/routes/dashboard/index.js b/front/src/routes/dashboard/index.js
@@ -167,6 +167,7 @@ class Dashboard extends Component {
     super(props);
     this.props = props;
     this.state = {
+      isGladysPlus: this.props.session.gatewayClient !== undefined,
       dashboardDropdownOpened: false,
       defineTabletModeOpened: false,
       dashboardEditMode: false,