Handle both Bootstrap2 and Bootstrap5 versions accoding to CSS_FRAMEW…

…ORK=BOOTSTRAP5
3liz · Sep 23, 2024 · 40cad6d · 40cad6d
1 parent 25c4163
commit 40cad6d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/lizmap_server/get_feature_info.py b/lizmap_server/get_feature_info.py
@@ -80,7 +80,13 @@ def append_maptip(cls, string: str, layer_name: str, feature_id: Union[str, int]
 
     @classmethod
     def feature_list_to_replace(
-            cls, cfg: dict, project: QgsProject, relation_manager: QgsRelationManager, xml: str) -> List[Result]:
+            cls,
+            cfg: dict,
+            project: QgsProject,
+            relation_manager: QgsRelationManager,
+            xml: str,
+            bootstrap_5: bool
+    ) -> List[Result]:
         """ Parse the XML and check for each layer according to the Lizmap CFG file. """
         features = []
         for layer_name, feature_id in GetFeatureInfoFilter.parse_xml(xml):
@@ -120,7 +126,8 @@ def feature_list_to_replace(
             root = config.invisibleRootContainer()
 
             # Need to eval the html_content
-            html_content = Tooltip.create_popup_node_item_from_form(layer, root, 0, [], '', relation_manager)
+            html_content = Tooltip.create_popup_node_item_from_form(
+                layer, root, 0, [], '', relation_manager, bootstrap_5)
             html_content = Tooltip.create_popup(html_content)
 
             # Maybe we can avoid the CSS on all features ?
@@ -175,9 +182,11 @@ def responseComplete(self):
 
         xml = request.body().data().decode("utf-8")
 
+        bootstrap_5 = params.get('CSS_FRAMEWORK', '').upper() == 'BOOTSTRAP5'
+
         # noinspection PyBroadException
         try:
-            features = self.feature_list_to_replace(cfg, project, relation_manager, xml)
+            features = self.feature_list_to_replace(cfg, project, relation_manager, xml, bootstrap_5)
         except Exception as e:
             if to_bool(os.getenv("CI")):
                 logger.log_exception(e)

diff --git a/lizmap_server/tooltip.py b/lizmap_server/tooltip.py
@@ -60,6 +60,7 @@ def create_popup_node_item_from_form(
             headers: list,
             html: str,
             relation_manager: QgsRelationManager,
+            bootstrap_5: bool = False,
             ) -> str:
         regex = re.compile(r"[^a-zA-Z0-9_]", re.IGNORECASE)
         a = ''
@@ -173,9 +174,22 @@ def create_popup_node_item_from_form(
                 if visibility and not active:
                     active = visibility
                 h += '\n' + SPACES
-                h += (
-                    '<li class="nav-item"><button class="nav-link {}" data-bs-toggle="tab" data-bs-target="#popup_dd_[% $id %]_{}">{}</button></li>'
-                ).format(active, regex.sub('_', node.name()), node.name())
+                id_tab = regex.sub('_', node.name())
+                if bootstrap_5:
+                    h += (
+                        f'<li class="nav-item">'
+                        f'<button class="nav-link {active}" data-bs-toggle="tab" '
+                        f'data-bs-target="#popup_dd_[% $id %]_{id_tab}">'
+                        f'{node.name()}'
+                        f'</button>'
+                        f'</li>'
+                    )
+                else:
+                    h += (
+                        f'<li class="{active}">'
+                        f'<a href="#popup_dd_[% $id %]_{id_tab}" data-toggle="tab">{node.name()}</a>'
+                        f'</li>'
+                    )
                 headers.append(h)
 
             if lvl > 1:
@@ -190,7 +204,8 @@ def create_popup_node_item_from_form(
 
             level += 1
             for n in node.children():
-                h = Tooltip.create_popup_node_item_from_form(layer, n, level, headers, html, relation_manager)
+                h = Tooltip.create_popup_node_item_from_form(
+                    layer, n, level, headers, html, relation_manager, bootstrap_5)
                 # If it is not root children, add html
                 if lvl > 0:
                     a += h