Merge pull request #12 from nboisteault/update_release_3_4

Update for Lizmap web client release 3.4
3liz · Dec 21, 2020 · a2bcd28 · a2bcd28
2 parents c52e2b2 + 0d99b8c
commit a2bcd28
Show file tree

Hide file tree

Showing 7 changed files with 310 additions and 407 deletions.
diff --git a/mapBuilder/classes/mapBuilderView.listener.php b/mapBuilder/classes/mapBuilderView.listener.php
@@ -55,6 +55,7 @@ function onmainviewGetMaps ($event) {
                 'map_builder',
                 $access,
                 $description,
+                '',
                 'EPSG:3857',
                 $extent,
                 jUrl::get('mapBuilder~default:index'),

diff --git a/mapBuilder/controllers/default.classic.php b/mapBuilder/controllers/default.classic.php
@@ -31,7 +31,7 @@ function index() {
 
         $rep->metaViewport = 'initial-scale=1.0, user-scalable=no, width=device-width, shrink-to-fit=no';
         // Assets
-        $rep->addCSSLink(jApp::urlBasePath().'css/main.css');
+        $rep->addCSSLink(jApp::urlBasePath().'assets/css/main.css');
         $rep->addCSSLink(jApp::urlBasePath().'mapBuilder/css/fontawesome-free-web/css/all.min.css');
         $rep->addCSSLink(jApp::urlBasePath().'mapBuilder/css/bootstrap.min.css');
         $rep->addCSSLink(jApp::urlBasePath().'mapBuilder/css/main.css');

diff --git a/mapBuilder/module.xml b/mapBuilder/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="http://jelix.org/ns/module/1.0">
     <info id="mapBuilder3liz.com" name="mapBuilder" createdate="2018-10-03">
-        <version date="2020-08-18">1.1.6</version>
+        <version date="2020-12-21">2.0.0</version>
         <label lang="en_US">mapBuilder</label>
         <description lang="en_US">Jelix module for Lizmap, which adds a map builder based on every repositories</description>
         <license>Mozilla Public License 2.0</license>
@@ -10,6 +10,6 @@
         <homepageURL>https://3liz.com</homepageURL>
     </info>
     <dependencies>
-        <module name="lizmap" minversion="3.2.0" maxversion="3.3.*"/>
+        <module name="lizmap" minversion="3.4.0" maxversion="3.4.*"/>
     </dependencies>
 </module>
diff --git a/mapBuilder/templates/main.tpl b/mapBuilder/templates/main.tpl
@@ -142,7 +142,7 @@
           <tr>
             <td></td>
             <td class="changeOrder" title="{@mapBuilder~default.selection.order.change@}"></td>
-            <td class="deleteLayerButton" title="{@view~map.selectiontool.toolbar.action.type.minus@}"></td>
+            <td class="deleteLayerButton" title="{@view~dictionnary.selectiontool.toolbar.action.type.minus@}"></td>
             <td class="toggleVisibilityButton" title="{@view~dictionnary.tree.button.checkbox@}"></td>
             <td class="zoomToExtentButton" title="{@view~map.switcher.layer.zoomToExtent.title@}"></td>
             {if $attributeTableTool}