Merge branch '2024.11'

tine-groupware · Nov 25, 2024 · fd8f96c · fd8f96c
2 parents dc1bdcb + fcf909d
commit fd8f96c
Show file tree

Hide file tree

Showing 2 changed files with 128 additions and 442 deletions.
diff --git a/etc/tine20/conf.d/floorplan.inc.php.dist b/etc/tine20/conf.d/floorplan.inc.php.dist
@@ -1,84 +1,28 @@
 <?php
-
 return [
-    'floorplans' => [[
-        'name' => '2. OG',
-        'image' => '../../../docs/images/Calendar/Floorplans/second_floor.svg',
+    'floorplans' =>  [[
+        'name' => 'Demo Floor',
+        'image' => 'https://tine-docu.s3web.rz1.metaways.net/images/Calendar/Floorplans/demo_floor.svg',
         'resources' => [[
             'eventSaveLocation' => 'RESOURCE_CAL',
-            'resourceName' => 'og_2_table_1',
+            'resourceName' => 'demo_table_1',
             'resourceDisplayName' => 'Table 1',
-            'polygon' => [[ [677, 88], [677, 120], [742, 120], [742, 88]]] // or path
+            'polygon' => [[[663, 334], [663, 498], [746, 498], [746, 334]]] // or path
         ],[
             'eventSaveLocation' => 'RESOURCE_CAL',
-            'resourceName' => 'og_2_table_2',
+            'resourceName' => 'demo_table_2',
             'resourceDisplayName' => 'Table 2',
-            'polygon' => [[[677, 124], [677, 156], [742, 156], [742, 124]]]
+            'polygon' => [[[571, 334], [571, 498], [654, 498], [654, 334]]]
         ],[
             'eventSaveLocation' => 'RESOURCE_CAL',
-            'resourceName' => 'og_2_table_3',
+            'resourceName' => 'demo_table_3',
             'resourceDisplayName' => 'Table 3',
-            'polygon' => [[[677, 210], [677, 243], [742, 243], [742, 210]]]
+            'polygon' => [[[321, 334], [321, 498], [404, 498], [404, 334]]]
         ],[
             'eventSaveLocation' => 'RESOURCE_CAL',
-            'resourceName' => 'og_2_table_4',
+            'resourceName' => 'demo_table_4',
             'resourceDisplayName' => 'Table 4',
-            'polygon' => [[[677, 246], [677, 279], [742, 279], [742, 246]]]
-        ],[
-            'eventSaveLocation' => 'RESOURCE_CAL',
-            'resourceName' => 'og_2_table_5',
-            'resourceDisplayName' => 'Table 5',
-            'polygon' => [[[677, 327], [677, 359], [742, 359], [742, 327]]]
-        ],[
-            'eventSaveLocation' => 'RESOURCE_CAL',
-            'resourceName' => 'og_2_table_6',
-            'resourceDisplayName' => 'Table 6',
-            'polygon' => [[[677, 363], [677, 395], [742, 395], [742, 363]]]
-        ],[
-            'eventSaveLocation' => 'RESOURCE_CAL',
-            'resourceName' => 'og_2_table_7',
-            'resourceDisplayName' => 'Table 7',
-            'polygon' => [[[677, 471], [677, 504], [742, 504], [742, 471]]]
-        ],[
-            'eventSaveLocation' => 'RESOURCE_CAL',
-            'resourceName' => 'og_2_table_8',
-            'resourceDisplayName' => 'Table 8',
-            'polygon' => [[[677, 507], [677, 540], [742, 540], [742, 507]]]
-        ]],
-        'referenceImageDim' => [[1000, 1353]]
-    ],[
-        'name' => 'EG',
-        'image' => '../../../docs/images/Calendar/Floorplans/basement.svg',
-        'resources' => [[
-            'eventSaveLocation' => 'RESOURCE_CAL',
-            'resourceName' => 'eg_table_1',
-            'resourceDisplayName' => 'Table 1',
-            'polygon' => [[[677, 246], [677, 279], [742, 279], [742, 246]]] // or path
-        ],[
-            'eventSaveLocation' => 'RESOURCE_CAL',
-            'resourceName' => 'eg_table_2',
-            'resourceDisplayName' => 'Table 2',
-            'polygon' => [[[677, 282], [677, 315], [742, 315], [742, 282]]]
-        ],[
-            'eventSaveLocation' => 'RESOURCE_CAL',
-            'resourceName' => 'eg_table_3',
-            'resourceDisplayName' => 'Table 3',
-            'polygon' => [[[677, 393], [677, 425], [742, 425], [742, 393]]]
-        ],[
-            'eventSaveLocation' => 'RESOURCE_CAL',
-            'resourceName' => 'eg_table_4',
-            'resourceDisplayName' => 'Table 4',
-            'polygon' => [[[677, 429], [677, 461], [742, 461], [742, 429]]]
-        ],[
-            'eventSaveLocation' => 'RESOURCE_CAL',
-            'resourceName' => 'eg_table_5',
-            'resourceDisplayName' => 'Table 5',
-            'polygon' => [[[677, 554], [677, 586], [742, 586], [742, 554]]]
-        ],[
-            'eventSaveLocation' => 'RESOURCE_CAL',
-            'resourceName' => 'eg_table_6',
-            'resourceDisplayName' => 'Table 6',
-            'polygon' => [[[677, 590], [677, 622], [742, 622], [742, 590]]]
+            'polygon' => [[[229, 334], [229, 498], [312, 498], [312, 334]]]
         ]],
         'referenceImageDim' => [[1000, 1000]]
     ]]