From 87000358933f8f91f6c3109785fbab0485a19d41 Mon Sep 17 00:00:00 2001
From: partisan <none@noone.no>
Date: Sun, 5 Jan 2025 20:27:13 +0100
Subject: [PATCH] fixed 'no more results' text
---
files.go | 2 +-
forums.go | 3 ++-
static/css/style.css | 7 +++++--
templates/files.html | 8 +++++---
templates/forums.html | 7 +++++--
templates/images.html | 7 +++++--
templates/text.html | 7 +++++--
templates/videos.html | 11 ++++++++---
video.go | 1 +
9 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/files.go b/files.go
index 1755143..d0c1ff1 100755
--- a/files.go
+++ b/files.go
@@ -56,7 +56,7 @@ func handleFileSearch(w http.ResponseWriter, settings UserSettings, query string
"Category": "all",
"Sort": "seed",
"Page": page,
- "HasPrevPage": page > 1,
+ "HasPrevPage": page >= 1,
"HasNextPage": len(combinedResults) > 0,
"LanguageOptions": languageOptions,
"CurrentLang": settings.SearchLanguage,
diff --git a/forums.go b/forums.go
index 973c070..bd57e55 100755
--- a/forums.go
+++ b/forums.go
@@ -118,7 +118,8 @@ func handleForumsSearch(w http.ResponseWriter, settings UserSettings, query stri
"Page": page,
"Fetched": fmt.Sprintf("%.2f %s", elapsedTime.Seconds(), Translate("seconds")), // Time for fetching results
"HasPrevPage": page > 1,
- "HasNextPage": len(results) == 25, // Assuming 25 results per page
+ "HasNextPage": len(results) >= 25,
+ "NoResults": len(results) == 0,
"LanguageOptions": languageOptions,
"CurrentLang": settings.SearchLanguage,
"Theme": settings.Theme,
diff --git a/static/css/style.css b/static/css/style.css
index 32ad383..e4b1cd6 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -1158,17 +1158,20 @@ p {
border-radius: 8px;
position: relative;
border: 1px solid var(--snip-border);
- margin-left: 175px;
color: var(--fg);
width: 530px;
padding: 15px;
margin-bottom: 627px;
- margin-top: -20px;
+ margin-top: 20px;
font-size: 14px;
line-height: 1.58;
letter-spacing: normal;
}
+.no-results-found-offset {
+ margin-left: 175px;
+}
+
/* MAP */
.message {
diff --git a/templates/files.html b/templates/files.html
index a47bf4e..ff35355 100755
--- a/templates/files.html
+++ b/templates/files.html
@@ -173,12 +173,14 @@
{{ end }}
</form>
</div>
- {{ else }}
- <div class="no-results-found">
+ {{else if .NoResults}}
+ <div class="no-results-found no-results-found-offset">
{{ translate "no_results_found" .Query }}<br>
{{ translate "suggest_rephrase" }}
</div>
- {{ end }}
+ {{else}}
+ <div class="no-results-found no-results-found-offset">{{ translate "no_more_results" }}</div>
+ {{end}}
<script defer src="/static/js/autocomplete.js"></script>
<script defer src="/static/js/minimenu.js"></script>
<script>
diff --git a/templates/forums.html b/templates/forums.html
index 7b9d6dd..1476537 100755
--- a/templates/forums.html
+++ b/templates/forums.html
@@ -143,9 +143,12 @@
<br>
{{end}}
{{else if .NoResults}}
- <div class="no-results">{{ translate "no_results" .Query }}</div>
+ <div class="no-results-found">
+ {{ translate "no_results_found" .Query }}<br>
+ {{ translate "suggest_rephrase" }}
+ </div>
{{else}}
- <div class="no-more-results">{{ translate "no_more_results" }}</div>
+ <div class="no-results-found">{{ translate "no_more_results" }}</div>
{{end}}
</div>
<div class="message-bottom-left" id="message-bottom-left">
diff --git a/templates/images.html b/templates/images.html
index 1bb91b7..fa6df07 100755
--- a/templates/images.html
+++ b/templates/images.html
@@ -226,9 +226,12 @@
</div>
</noscript>
{{ else if .NoResults }}
- <div class="no-results">{{ translate "no_results" .Query }}</div>
+ <div class="no-results-found no-results-found-offset">
+ {{ translate "no_results_found" .Query }}<br>
+ {{ translate "suggest_rephrase" }}
+ </div>
{{ else }}
- <div class="no-more-results">{{ translate "no_more_results" }}</div>
+ <div class="no-results-found no-results-found-offset">{{ translate "no_more_results" }}</div>
{{ end }}
</div>
<div class="message-bottom-left" id="message-bottom-left">
diff --git a/templates/text.html b/templates/text.html
index 1cbccc2..58da2af 100755
--- a/templates/text.html
+++ b/templates/text.html
@@ -144,9 +144,12 @@
<br>
{{end}}
{{else if .NoResults}}
- <div class="no-results">{{ translate "no_results" .Query }}</div>
+ <div class="no-results-found">
+ {{ translate "no_results_found" .Query }}<br>
+ {{ translate "suggest_rephrase" }}
+ </div>
{{else}}
- <div class="no-more-results">{{ translate "no_more_results" }}</div>
+ <div class="no-results-found">{{ translate "no_more_results" }}</div>
{{end}}
</div>
<div class="message-bottom-left" id="message-bottom-left">
diff --git a/templates/videos.html b/templates/videos.html
index 15188ac..8cc21de 100644
--- a/templates/videos.html
+++ b/templates/videos.html
@@ -141,9 +141,14 @@
</div>
</div>
{{ end }}
- {{ else }}
- <div class="no-results">{{ translate "no_results" .Query }}</div>
- {{ end }}
+ {{else if .NoResults}}
+ <div class="no-results-found no-results-found-offset">
+ {{ translate "no_results_found" .Query }}<br>
+ {{ translate "suggest_rephrase" }}
+ </div>
+ {{else}}
+ <div class="no-results-found no-results-found-offset">{{ translate "no_more_results" }}</div>
+ {{end}}
<div class="prev-next prev-img" id="prev-next">
<form action="/search" method="get">
<input type="hidden" name="q" value="{{ .Query }}">
diff --git a/video.go b/video.go
index c2be338..3120367 100644
--- a/video.go
+++ b/video.go
@@ -170,6 +170,7 @@ func handleVideoSearch(w http.ResponseWriter, settings UserSettings, query strin
"Page": page,
"HasPrevPage": page > 1,
"HasNextPage": len(results) > 0,
+ "NoResults": len(results) == 0,
"LanguageOptions": languageOptions,
"CurrentLang": settings.SearchLanguage,
"Theme": settings.Theme,