Merge remote-tracking branch 'origin/develop' into develop

mapbender · Jun 26, 2024 · 6a38c49 · 6a38c49
2 parents 3088277 + 84955cb
commit 6a38c49
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/application/config/MapbenderPrintBundle/images/legendpage_image.png b/application/config/MapbenderPrintBundle/images/legendpage_image.png
diff --git a/application/config/applications/mapbender_mobile.yaml b/application/config/applications/mapbender_mobile.yaml
@@ -140,6 +140,7 @@ parameters:
                         label: false
                         icon: iconInfoActive
                         target: imprint
+                        screenType: desktop
 
                     help-button:
                         title: mb.core.aboutdialog.tag.help
@@ -243,6 +244,7 @@ parameters:
                         </p>
                         </p>"
                         classes: html-element-inline
+                        screenType: desktop
 
                     help:
                         title: mb.core.aboutdialog.tag.help

diff --git a/application/config/applications/mapbender_user.yaml b/application/config/applications/mapbender_user.yaml
@@ -30,6 +30,8 @@ parameters:
                     generate_button_menu: false # true/false
                     menu_label: NULL # NULL or text
             layersets:
+                main:
+                    selected: true
                 themes:
                     selected: true
                     mapbender_users:
@@ -233,7 +235,7 @@ parameters:
                 content:
                     map:
                         class: Mapbender\CoreBundle\Element\Map
-                        layersets: [themes,background themes]
+                        layersets: [themes,main,background themes]
                         srs: EPSG:3857
                         extents:
                             start: [772933.16,6566826.23,806786.66,6582317.62]

diff --git a/application/config/applications/mapbender_user_basic.yaml b/application/config/applications/mapbender_user_basic.yaml
@@ -1,13 +1,24 @@
 parameters:
     applications:
         mapbender_user_basic:
-            title: Mapbender Basic Demo
+            title: Mapbender Demo Basic
             screenshot: screenshot.png
             description: Mapbender demo application with no sidepane, floating search and custom css showing many elements in action
             published: true
             persistentView: false
             template:  Mapbender\CoreBundle\Template\Fullscreen
-            custom_css: null
+            custom_css: |
+                .toolBar.top {
+                    border-bottom: 3px solid #279ddc;
+                }
+                .popup {
+                    border-radius: 10px;
+                }
+                .popupHead {
+                    border-bottom: solid 1px #b9BABC;
+                    margin: 0 20px 20px 20px;
+                    padding: 20px 0 10px 0;
+                }
             regionProperties:
               - name: toolbar
                 properties:
@@ -30,6 +41,8 @@ parameters:
                     generate_button_menu: false # true/false
                     menu_label: NULL # NULL or text
             layersets:
+                main:
+                    selected: true
                 themes:
                     selected: true
                     mapbender_users:
@@ -247,7 +260,7 @@ parameters:
                 content:
                     map:
                         class: Mapbender\CoreBundle\Element\Map
-                        layersets: [themes,conferences,background themes]
+                        layersets: [themes,conferences,main,background themes]
                         srs: EPSG:3857
                         extents:
                             start: [34384.65,5623672.86,2601107.71,7807351.79]