Jonathan Starck 3 年 前
コミット
522f839f11
3 ファイル変更67 行追加17 行削除
  1. 46 2
      config/config.js
  2. 4 1
      css/custom.css
  3. 17 14
      css/custom.less

+ 46 - 2
config/config.js

@@ -29,6 +29,9 @@ let config = {
                         { name: 'calendar', position: "middle_center", carouselId: "1" }
                     ],
                     "Slide 2": [
+                        { name: 'clock', position: "top_left", carouselId: "1" },
+                        { name: 'MMM-SimpleLogo', position: "top_right", carouselId: "1" },
+                        { name: 'calendar', position: "middle_center", carouselId: "2" }
                     ]
                 }
 
@@ -59,7 +62,7 @@ let config = {
         {
             module: "calendar",
             header: "Tagesübersicht",
-            classes: "dailyoverview",
+            classes: "daily-overview",
             position: "middle_center",
             config: {
                 carouselId: "1",
@@ -123,10 +126,51 @@ let config = {
                     }
                 ]
             }
-        }
+        },
         /*
             !!SECTION
         */
+       /*
+            SECTION - Slide 2
+        */
+            {
+                module: "calendar",
+                header: "MZ 21/83-1",
+                classes: "rtw-overview",
+                position: "middle_center",
+                config: {
+                    carouselId: "2",
+                    tableClass: "large wachenaufgaben",
+                    fetchInterval: 600000, /* 600000 */
+                    maxTitleLength: 50,
+                    displaySymbol: true,
+                    showLocation: false,
+                    maxTitleLines: 1,
+                    maximumEntries: 9,
+                    maximumNumberOfDays: 1,
+                    calendars: [
+                        {
+                            /* Fahrzeug 21/83-1 */
+                            url: 'https://nc.x0p.it/remote.php/dav/public-calendars/exdmis8xiZc54mn3?export',
+                            symbolClass: 'rtw-symbol',
+                            titleClass: 'rtw-title',
+                            timeClass: 'rtw-time',
+                            symbol: 'truck-medical'
+                        },
+                        {
+                            /* RW21 ToDo */
+                            url: 'https://nc.x0p.it/remote.php/dav/public-calendars/ZMGgBLGn52oATzDw?export',
+                            symbolClass: 'todo-symbol',
+                            titleClass: 'todo-title',
+                            timeClass: 'todotime',
+                            symbol: 'clipboard-list-check'
+                        }
+                    ]
+                }
+            }
+       /*
+            !!SECTION
+        */
     ]
 }
 

+ 4 - 1
css/custom.css

@@ -51,7 +51,10 @@ div.calendar table.wachenaufgaben tr td.symbol span.fa {
 div.calendar table.wachenaufgaben tr td.time {
   font-size: 90%;
 }
-div.dailyoverview header.module-header {
+div.daily-overview header.module-header,
+div.rtw-overview header.module-header,
+div.nktw-overview header.module-header,
+div.ktw-overview header.module-header {
   color: #fff;
   font-size: 2.5em !important;
   padding: 0.2em;

+ 17 - 14
css/custom.less

@@ -34,24 +34,24 @@ div.calendar {
     table.wachenaufgaben {
         font-size: 2.5em !important;
         border-collapse: collapse;
-    
+
         tr {
             opacity: 1 !important;
             font-size: 100% !important;
-    
+
             td {
                 font-size: 100% !important;
                 text-align: left;
                 border-bottom: 5px solid #999 !important;
                 padding: 0.2em;
-    
+
                 &.symbol {
                     display: table-cell;
                     color: #fff;
                     padding-right: 0;
                     min-width: 1.2em;
                     max-width: 1.2em;
-    
+
                     span {
                         &.fa {
                             font-family: 'Font Awesome 6 Pro';
@@ -59,7 +59,8 @@ div.calendar {
                         }
                     }
                 }
-                &.time{
+
+                &.time {
                     font-size: 90%;
                 }
             }
@@ -67,13 +68,15 @@ div.calendar {
     }
 }
 
-div.dailyoverview {
-  header {
-      &.module-header {
-        color: #fff;
-        font-size: 2.5em !important;
-        padding: 0.2em;
-        border-bottom: 5px solid #999 !important;
-      }
-  }  
+div {
+    &.daily-overview, &.rtw-overview, &.nktw-overview, &.ktw-overview {
+        header {
+            &.module-header {
+                color: #fff;
+                font-size: 2.5em !important;
+                padding: 0.2em;
+                border-bottom: 5px solid #999 !important;
+            }
+        }
+    }
 }