feat(ZMS-1629): adjust calldisplay templates

zmsadmin/js/block/calldisplay/config/index.js

@@ -345,9 +345,10 @@ class CallDisplayConfigView extends Component {
                                 { name: '4-8 Aufrufe, nur Zahlen | Tür', value: 'rawdoor4-8' },
                                 { name: '6-18 Aufrufe | Tür', value: 'raw18door' },
                                 { name: '6-18 Aufrufe | Platz', value: 'raw18platz' },
-                                { name: '10 Aufrufe | Platz', value: 'default_platz' },
-                                { name: '10 Aufrufe | Tür', value: 'default_tuer' },
-                                { name: '10 Aufrufe | Raum', value: 'default_raum' }
+                                { name: '10 Aufrufe | Schalter (engl. counter)', value: 'default_counter' },
+                                { name: '10 Aufrufe | Platz (engl. site)', value: 'default_platz' },
+                                { name: '10 Aufrufe | Tür (engl. door)', value: 'default_tuer' },
+                                { name: '10 Aufrufe | Raum (engl. room)', value: 'default_raum' }
                             ]}
                             value={this.state.template}
                             onChange={onTemplateStatusChange} />

zmscalldisplay/scss/block/aufrufanzeige.scss

@@ -42,7 +42,7 @@
 .aufrufanzeige .wartende_aktuell
 {
     font-size:2.4em;
-    font-family: Arial, sans-serif;
+    font-family: Roboto Condensed, Arial, sans-serif;
     font-weight:bold;
     text-align:center;
     width:275px;
@@ -54,7 +54,7 @@
 .aufrufanzeige .wartende_aktuell #wartende
 {
     font-size:52px;
-    font-family: Arial, sans-serif;
+    font-family: Roboto Condensed, Arial, sans-serif;
     font-weight:bold;
     margin-top:3px;
     background:$white;
@@ -63,7 +63,7 @@
 .aufrufanzeige .wartezeit_aktuell
 {
     font-size:2.4em;
-    font-family: Arial, sans-serif;
+    font-family: Roboto Condensed, Arial, sans-serif;
     font-weight:bold;
     text-align:center;
     width:275px;
@@ -76,7 +76,7 @@
 .aufrufanzeige .wartezeit_aktuell #wartezeit
 {
     font-size:35px;
-    font-family: Arial, sans-serif;
+    font-family: Roboto Condensed, Arial, sans-serif;
     font-weight:bold;
     margin-top:3px;
     background:$backgroundLight;
@@ -100,7 +100,7 @@
 .aufrufanzeige .aufrufanzeige_Datum
 {
     font-size:24px;
-    font-family: Arial, sans-serif;
+    font-family: Roboto Condensed, Arial, sans-serif;
     font-weight:bold;
     position:absolute;
     text-align:center;
@@ -117,7 +117,7 @@
 .aufrufanzeige .aufrufanzeige_text
 {
     font-size:2em;
-    font-family: Arial, sans-serif;
+    font-family: Roboto Condensed, Arial, sans-serif;
     font-weight:normal;
     line-height:26px;
     padding: 18px 0 0 6px;

zmscalldisplay/scss/settings.scss

@@ -19,7 +19,7 @@ $pageMaxHeight:					1080px;
 $contentMaxWidth:               800px;
 
 // Fonts
-$base-font-family:				Arial, sans-serif;
+$base-font-family:				Roboto Condensed, Arial, sans-serif;
 $base-font-size:				10px;
 
 $alert-font-size:				12px;

zmscalldisplay/templates/block/default/head.twig

@@ -10,5 +10,24 @@
     <meta charset="UTF-8" />
     <link rel="stylesheet" type="text/css" href="{{ includeUrl() }}/_css/calldisplay.css?version={{ currentVersion() }}">
 
+    <style>
+        @font-face {
+            font-family: Roboto Condensed;
+            font-style: normal;
+            font-weight: 400;
+            font-display: swap;
+            src: url("./fonts/roboto-condensed/roboto-condensed-v19-latin-regular.tff");
+            src: local(""), url("./fonts/roboto-condensed/roboto-condensed-v19-latin-regular.tff?=#iefix") format("embedded-opentype"), url("./fonts/roboto-condensed/roboto-condensed-v19-latin-regular.woff2") format("woff2"), url("./fonts/roboto-condensed/roboto-condensed-v19-latin-regular.woff") format("woff"), url("./fonts/roboto-condensed/roboto-condensed-v19-latin-regular.ttf") format("truetype"), url("./fonts/roboto-condensed/roboto-condensed-v19-latin-regular.svg#RobotoCondensed") format("svg")
+        }
+
+        @font-face {
+            font-family: Roboto Condensed;
+            font-style: normal;
+            font-weight: 700;
+            font-display: swap;
+            src: url("./fonts/roboto-condensed/roboto-condensed-v19-latin-700.tff");
+            src: local(""), url("./fonts/roboto-condensed/roboto-condensed-v19-latin-700.tff?=#iefix") format("embedded-opentype"), url("./fonts/roboto-condensed/roboto-condensed-v19-latin-700.woff2") format("woff2"), url("./fonts/roboto-condensed/roboto-condensed-v19-latin-700.woff") format("woff"), url("./fonts/roboto-condensed/roboto-condensed-v19-latin-700.ttf") format("truetype"), url("./fonts/roboto-condensed/roboto-condensed-v19-latin-700.svg#RobotoCondensed") format("svg")
+        }
+    </style>
 </head>
 {% endblock %}

zmscalldisplay/templates/layout/main.twig

@@ -1,5 +1,4 @@
 {% use "block/default/head.twig" %}
-{% use "block/default/devhint.twig" %}
 {% use "block/header/pageheader.twig" %}
 {% use "block/footer/footer.twig" %}
 
@@ -10,9 +9,6 @@
     {% endblock %}
     <body class="hiddencursor locale_{{ currentLang() }}{% block customizedClass %}{% endblock %}" id="{% block pageid %}{% endblock %}" type="{% block pagetype %}{% endblock %}">
         {% if getSystemStatus('ZMS_ENV') in ["dev", "stage"] %}
-            {% block devhint %}
-            	{{ parent() }}
-            {% endblock %}
             {% endif %}
             {% block pageheader %}
             	{{ parent() }}

zmscalldisplay/templates/page/customized/default_counter.twig

@@ -0,0 +1,38 @@
+{% extends "page/customized/base.twig" %}
+
+{% block content %}
+    {% set skipAll = 1 %}
+    {% set skipClock = 0 %}
+    {% set skipClients = 0 %}
+    {% set skipTime = 0 %}
+    {{ parent() }}
+{% endblock %}
+
+{% block tableLayoutSettings %}
+<script type="text/javascript">
+// Allow multiple columns
+window.bo.zmscalldisplay.tableLayout.multiColumns = 2;
+// Maximum rows per column
+window.bo.zmscalldisplay.tableLayout.maxResults = 10;
+// Label on left side of table
+window.bo.zmscalldisplay.tableLayout.head.left = 'Nummer';
+window.bo.zmscalldisplay.tableLayout.head.left_en = 'Number';
+// Label on right side of table
+window.bo.zmscalldisplay.tableLayout.head.right = 'Schalter';
+window.bo.zmscalldisplay.tableLayout.head.right_en = 'Counter';
+// Time in seconds to show a new number highlighted
+window.bo.zmscalldisplay.queue.timeUntilOld = 60;
+// Time in seconds to reload waiting info
+window.bo.zmscalldisplay.queue.timeWaitingInfo = 20;
+// called=ohne Abholer; pickup=nur Abholer
+//window.bo.zmscalldisplay.queue.status = 'called';
+// On true show "123" instead of "123a" for room/place
+window.bo.zmscalldisplay.queue.showOnlyNumeric = false;
+// Seconds to reload table
+window.bo.zmscalldisplay.reloadInterval = 5;
+{% if displayNumber %}
+window.bo.zmscalldisplay.display = {{ displayNumber }};
+{% endif %}
+</script>
+{% endblock %}
+