Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit a50645ef7f11 · 2023-09-20T19:43:18.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/js/src/gis_data_editor.ts b/js/src/gis_data_editor.ts
@@ -146,30 +146,15 @@ function loadGISEditor (value, field, type, inputName) {
 }
 
 function openGISEditorInternal () {
-    // Center the popup
-    var windowWidth = document.documentElement.clientWidth;
-    var windowHeight = document.documentElement.clientHeight;
-    var popupWidth = windowWidth * 0.9;
-    var popupHeight = windowHeight * 0.9;
-    var popupOffsetTop = windowHeight / 2 - popupHeight / 2;
-    var popupOffsetLeft = windowWidth / 2 - popupWidth / 2;
-
-    var $gisEditor = $('#gis_editor');
-    var $background = $('#popup_background');
-
-    $gisEditor.css({ 'top': popupOffsetTop, 'left': popupOffsetLeft, 'width': popupWidth, 'height': popupHeight });
-    $background.css({ 'opacity': '0.7' });
-
-    $gisEditor.append(
-        '<div id="gis_data_editor">' +
-        '<img class="ajaxIcon" id="loadingMonitorIcon" src="' +
-        window.themeImagePath + 'ajax_clock_small.gif" alt="">' +
-        '</div>'
-    );
-
-    // Make it appear
-    $background.fadeIn('fast');
-    $gisEditor.fadeIn('fast');
+    $('#popup_background').fadeIn('fast');
+    $('#gis_editor')
+        .append(
+            '<div id="gis_data_editor">' +
+            '<img class="ajaxIcon" id="loadingMonitorIcon" src="' +
+            window.themeImagePath + 'ajax_clock_small.gif" alt="">' +
+            '</div>'
+        )
+        .fadeIn('fast');
 }
 
 /**
diff --git a/public/themes/bootstrap/scss/_common.scss b/public/themes/bootstrap/scss/_common.scss
@@ -800,6 +800,7 @@ select.invalid_value,
   top: 0;
   left: 0;
   background: $black;
+  opacity: 0.7;
   z-index: 1000;
   overflow: hidden;
 }
diff --git a/public/themes/bootstrap/scss/_gis.scss b/public/themes/bootstrap/scss/_gis.scss
@@ -8,6 +8,11 @@ a.close_gis_editor {
 #gis_editor {
   display: none;
   position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  padding: 40px;
   z-index: 1001;
   overflow-y: auto;
   overflow-x: hidden;
@@ -19,6 +24,8 @@ a.close_gis_editor {
 
 #gis_data_textarea {
   height: 6em;
+  resize: vertical;
+  width: 100%;
 }
 
 #gis_data_editor {
diff --git a/public/themes/metro/scss/_common.scss b/public/themes/metro/scss/_common.scss
@@ -1088,6 +1088,7 @@ input {
   top: 0;
   left: 0;
   background: #000;
+  opacity: 0.7;
   z-index: 1000;
   overflow: hidden;
 }
diff --git a/public/themes/metro/scss/_gis.scss b/public/themes/metro/scss/_gis.scss
diff --git a/public/themes/metro/scss/theme.scss b/public/themes/metro/scss/theme.scss
@@ -4,7 +4,7 @@
 @import "root";
 @import "common";
 @import "enum-editor";
-@import "gis";
+@import "../../bootstrap/scss/gis";
 @import "navigation";
 @import "designer";
 @import "codemirror";
diff --git a/public/themes/original/scss/_common.scss b/public/themes/original/scss/_common.scss
@@ -796,6 +796,7 @@ select.invalid_value,
   top: 0;
   left: 0;
   background: #000;
+  opacity: 0.7;
   z-index: 1000;
   overflow: hidden;
 }
diff --git a/public/themes/original/scss/theme.scss b/public/themes/original/scss/theme.scss
@@ -2,7 +2,7 @@
 @import "../../bootstrap/scss/bootstrap";
 @import "common";
 @import "../../pmahomme/scss/enum-editor";
-@import "../../pmahomme/scss/gis";
+@import "../../bootstrap/scss/gis";
 @import "navigation";
 @import "../../pmahomme/scss/designer";
 @import "../../pmahomme/scss/codemirror";
diff --git a/public/themes/pmahomme/scss/_common.scss b/public/themes/pmahomme/scss/_common.scss
@@ -995,6 +995,7 @@ input#import_merge {
   top: 0;
   left: 0;
   background: #000;
+  opacity: 0.7;
   z-index: 1000;
   overflow: hidden;
 }
diff --git a/public/themes/pmahomme/scss/_gis.scss b/public/themes/pmahomme/scss/_gis.scss
diff --git a/public/themes/pmahomme/scss/theme.scss b/public/themes/pmahomme/scss/theme.scss
@@ -2,7 +2,7 @@
 @import "../../bootstrap/scss/bootstrap";
 @import "common";
 @import "enum-editor";
-@import "gis";
+@import "../../bootstrap/scss/gis";
 @import "navigation";
 @import "designer";
 @import "codemirror";
diff --git a/templates/gis_data_editor_form.twig b/templates/gis_data_editor_form.twig
@@ -219,7 +219,7 @@
             <p>
                 {% trans 'Choose "GeomFromText" from the "Function" column and paste the string below into the "Value" field.' %}
             </p>
-            <textarea id="gis_data_textarea" cols="95" rows="5">{{ result }}</textarea>
+            <textarea id="gis_data_textarea" rows="5">{{ result }}</textarea>
         </div>
     </div>
 </form>

Original file line number	Diff line number	Diff line change
`@@ -800,6 +800,7 @@ select.invalid_value,`
`800`	`800`	`top: 0;`
`801`	`801`	`left: 0;`
`802`	`802`	`background: $black;`
	`803`	`+ opacity: 0.7;`
`803`	`804`	`z-index: 1000;`
`804`	`805`	`overflow: hidden;`
`805`	`806`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1088,6 +1088,7 @@ input {`
`1088`	`1088`	`top: 0;`
`1089`	`1089`	`left: 0;`
`1090`	`1090`	`background: #000;`
	`1091`	`+ opacity: 0.7;`
`1091`	`1092`	`z-index: 1000;`
`1092`	`1093`	`overflow: hidden;`
`1093`	`1094`	`}`
Original file line number	Diff line number	Diff line change
`@@ -796,6 +796,7 @@ select.invalid_value,`
`796`	`796`	`top: 0;`
`797`	`797`	`left: 0;`
`798`	`798`	`background: #000;`
	`799`	`+ opacity: 0.7;`
`799`	`800`	`z-index: 1000;`
`800`	`801`	`overflow: hidden;`
`801`	`802`	`}`
Original file line number	Diff line number	Diff line change
`@@ -995,6 +995,7 @@ input#import_merge {`
`995`	`995`	`top: 0;`
`996`	`996`	`left: 0;`
`997`	`997`	`background: #000;`
	`998`	`+ opacity: 0.7;`
`998`	`999`	`z-index: 1000;`
`999`	`1000`	`overflow: hidden;`
`1000`	`1001`	`}`