Merge pull request #318 from laughing0li/master

add tips to popup window AUS-4075
AuScope · Dec 14, 2023 · e14b010 · e14b010
2 parents 4d839fb + ae26759
commit e14b010
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/src/app/menupanel/layerpanel/layerpanel.component.ts b/src/app/menupanel/layerpanel/layerpanel.component.ts
@@ -237,6 +237,9 @@ export class LayerPanelComponent implements OnInit {
                 }
               }
             }
+            Object.keys(me.layerGroups).forEach(group => {
+              me.layerGroups[group].sort((a, b) => a.name.localeCompare(b.name));
+            });
           });
       });
 

diff --git a/src/app/modalwindow/modalwindow.scss b/src/app/modalwindow/modalwindow.scss
@@ -201,3 +201,11 @@ div.modal-card-size .btn {
     max-height: 400px;
     background-color: rgb(8, 0, 255) !important;
 }
+
+.tip-info {
+    margin-left: 15px;
+    font-size: x-small;
+    text-align: right;
+    color: #AAA;
+    max-width: 200px;
+}
diff --git a/src/app/modalwindow/querier/querier.modal.component.html b/src/app/modalwindow/querier/querier.modal.component.html
@@ -3,6 +3,8 @@
 <div cdkDrag cdkDragRootElement=".modal-content" #childElement cdkDragBoundary="body">
 <div class="modal-header" cdkDragHandle>
 	<h1 class="page-header">Feature Information</h1>
+	<p class="tip-info">Tip: Drag the "Feature Information" header to move this window. Resize by dragging the bottom right corner.
+	</p>
 </div>
 <div class="modal-body">
 

diff --git a/src/app/modalwindow/querier/querier.modal.component.ts b/src/app/modalwindow/querier/querier.modal.component.ts
@@ -103,10 +103,10 @@ export class QuerierModalComponent  implements OnInit, AfterViewInit {
     this.renderer.setStyle(parentElement, 'resize', 'both');
     this.renderer.setStyle(parentElement, 'overflow', 'auto');
     this.renderer.setStyle(parentElement, 'width', '500px');
-    this.renderer.setStyle(parentElement, 'min-height', '400px');
+    // this.renderer.setStyle(parentElement, 'min-height', '400px');
     this.renderer.setStyle(parentElement, 'min-width', '400px');
     this.renderer.setStyle(parentElement, 'left', left/2 + 'px');
-    this.renderer.setStyle(parentElement, 'height', height*0.8  + 'px');
+    // this.renderer.setStyle(parentElement, 'height', height*0.8  + 'px');
   }
 
   ngOnInit() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -237,6 +237,9 @@ export class LayerPanelComponent implements OnInit { @@
                     }
                   }
                 }
+                Object.keys(me.layerGroups).forEach(group => {
+                  me.layerGroups[group].sort((a, b) => a.name.localeCompare(b.name));
+                });
               });
           });
@@ Expand Down @@