Skip to content

The Unified and Autonomous Development Platform

Adjust quicksearch height automatically

robin shenf45d85f7c83d
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.html
index ca799496b3..67ec0331c0 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.html
@@ -31,11 +31,6 @@
</ul>
</wicket:enclosure>
<div wicket:id="noMatches" class="no-matches"><i class="fa fa-info-circle"></i> No any matches</div>
- <ul wicket:id="help" class="help">
- <li>Type to search</li>
- <li>Use <i class="fa fa-long-arrow-up"></i><i class="fa fa-long-arrow-down"></i> to navigate in the result</li>
- <li>Hit <i class="fa fa-level-down fa-rotate-90"></i> to select</li>
- </ul>
</div>
</div>
</div>
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.java
index 3e87a1b5cf..422ca10f53 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.java
@@ -210,8 +210,16 @@ public abstract class QuickSearchPanel extends Panel {
}
private void newSearchResult(@Nullable AjaxRequestTarget target) {
- WebMarkupContainer result = new WebMarkupContainer("result");
- result.setOutputMarkupId(true);
+ WebMarkupContainer result = new WebMarkupContainer("result") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!StringUtils.isBlank(searchInput));
+ }
+
+ };
+ result.setOutputMarkupPlaceholderTag(true);
result.add(new ListView<QueryHit>("symbolHits", new AbstractReadOnlyModel<List<QueryHit>>() {
@@ -302,16 +310,6 @@ public abstract class QuickSearchPanel extends Panel {
});
- result.add(new WebMarkupContainer("help") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(StringUtils.isBlank(searchInput) && symbolHits.isEmpty());
- }
-
- });
-
if (target != null) {
replace(result);
target.add(result);
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/quick-search.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/quick-search.css
index 16686ec39f..e253f5db4d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/quick-search.css
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/quick-search.css
@@ -14,3 +14,4 @@
font-size: 16px;
color: #666;
}
+