Skip to content

Commit fce8d7d

Browse files
authored
Revert "Refactor UI/UX design for improved user experience"
1 parent 7d8c0ed commit fce8d7d

23 files changed

+62
-256
lines changed
File renamed without changes.

engines/ahmia/hidden_service.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ function get_hidden_service_results($query)
3030

3131
function print_hidden_service_results($results)
3232
{
33-
echo "<div class=\"result-container-inner\">";
3433
echo "<div class=\"text-result-container\">";
3534

3635
foreach($results as $result)

engines/bittorrent/merge.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ function get_merged_torrent_results($query)
7373

7474
function print_merged_torrent_results($results)
7575
{
76-
echo "<div class=\"result-container-inner\">";
7776
echo "<div class=\"text-result-container\">";
7877

7978
if (!empty($results))

engines/brave/video.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ function get_video_results($query)
3838

3939
function print_video_results($results)
4040
{
41-
echo "<div class=\"result-container-inner\">";
4241
echo "<div class=\"text-result-container\">";
4342

4443
foreach($results as $result)
@@ -51,15 +50,12 @@ function print_video_results($results)
5150
$thumbnail = $result["thumbnail"];
5251

5352
echo "<div class=\"text-result-wrapper\">";
54-
echo "<a class=\"video-link\" href=\"$url\">";
55-
echo "<div class=\"video-thumbnail\">";
56-
echo "<img class=\"video-img\" src=\"image_proxy.php?url=$thumbnail\">";
57-
echo "</div>";
58-
echo "<div class=\"video-properties\">";
53+
echo "<a href=\"$url\">";
5954
echo "$base_url";
6055
echo "<h2>$title</h2>";
56+
echo "<img class=\"video-img\" src=\"image_proxy.php?url=$thumbnail\">";
57+
echo "<br>";
6158
echo "<span>$date - $views</span>";
62-
echo "</div>";
6359
echo "</a>";
6460
echo "</div>";
6561
}

engines/google/text.php

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -140,26 +140,20 @@ function print_text_results($results)
140140
$response = $special["special_response"]["response"];
141141
$source = $special["special_response"]["source"];
142142

143-
echo "<div class=\"special-result-container\">";
143+
echo "<p class=\"special-result-container\">";
144144
if (array_key_exists("image", $special["special_response"]))
145145
{
146146
$image_url = $special["special_response"]["image"];
147147
echo "<img src=\"image_proxy.php?url=$image_url\">";
148148
}
149-
150-
echo "<div class=\"special-result-container-inner\">";
151-
149+
echo $response;
152150
if ($source)
153151
echo "<a href=\"$source\" target=\"_blank\">$source</a>";
154-
echo "<p>$response</p>";
155-
156-
echo "</div>";
152+
echo "</p>";
157153

158154
array_shift($results);
159155
}
160156

161-
echo "</div>";
162-
echo "<div class=\"result-container-inner\">";
163157
echo "<div class=\"text-result-container\">";
164158

165159
foreach($results as $result)

engines/qwant/image.php

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ function get_image_results($query, $page)
4242

4343
function print_image_results($results)
4444
{
45-
echo "<div class=\"result-container-inner\">";
4645
echo "<div class=\"image-result-container\">";
4746

4847
foreach($results as $result)
@@ -51,20 +50,8 @@ function print_image_results($results)
5150
$alt = $result["alt"];
5251
$url = $result["url"];
5352

54-
$parsed_url = parse_url($url);
55-
$host = $parsed_url['host'];
56-
57-
// Extract the domain name from the host
58-
$url_trunc = preg_replace('/^www\./', '', $host);
59-
6053
echo "<a title=\"$alt\" href=\"$url\" target=\"_blank\">";
61-
echo "<div class=\"image-wrapper\">";
6254
echo "<img src=\"image_proxy.php?url=$thumbnail\">";
63-
echo "</div>";
64-
echo "<span class=\"image-properties\">";
65-
echo "<span class=\"image-url\">$url_trunc</span>";
66-
echo "<h4 class=\"image-title\">$alt</h4>";
67-
echo "</span>";
6855
echo "</a>";
6956
}
7057

index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<body>
66
<form class="search-container" action="search.php" method="get" autocomplete="off">
77
<h1>Libre<span class="X">X</span></h1>
8-
<input placeholder="Search..." type="text" name="q" autofocus/>
8+
<input type="text" name="q" autofocus/>
99
<input type="hidden" name="p" value="0"/>
1010
<input type="hidden" name="t" value="0"/>
1111
<input type="submit" class="hide"/>

misc/header.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<link rel="stylesheet" type="text/css" href="static/css/styles.css"/>
99
<link title="LibreX search" type="application/opensearchdescription+xml" href="/opensearch.xml?method=POST" rel="search"/>
1010
<link rel="stylesheet" type="text/css" href="<?php
11-
echo "static/css/themes/";
11+
echo "static/css/";
1212
if (isset($_COOKIE["theme"]) || isset($_REQUEST["theme"]))
1313
echo htmlspecialchars((isset($_COOKIE["theme"]) ? $_COOKIE["theme"] : $_REQUEST["theme"]) . ".css");
1414
else
File renamed without changes.

search.php

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
$config = require "config.php";
5252
require "misc/tools.php";
5353

54-
echo "<div class=\"result-container\" data-type=\"$type\">";
5554

5655
$page = isset($_REQUEST["p"]) ? (int) $_REQUEST["p"] : 0;
5756

@@ -65,22 +64,22 @@
6564
check_ddg_bang($query);
6665
require "engines/google/text.php";
6766
$results = get_text_results($query, $page);
68-
print_text_results($results);
6967
print_elapsed_time($start_time);
68+
print_text_results($results);
7069
break;
7170

7271
case 1:
7372
require "engines/qwant/image.php";
7473
$results = get_image_results($query_encoded, $page);
75-
print_image_results($results);
7674
print_elapsed_time($start_time);
75+
print_image_results($results);
7776
break;
7877

7978
case 2:
8079
require "engines/brave/video.php";
8180
$results = get_video_results($query_encoded);
82-
print_video_results($results);
8381
print_elapsed_time($start_time);
82+
print_video_results($results);
8483
break;
8584

8685
case 3:
@@ -90,8 +89,8 @@
9089
{
9190
require "engines/bittorrent/merge.php";
9291
$results = get_merged_torrent_results($query_encoded);
93-
print_merged_torrent_results($results);
9492
print_elapsed_time($start_time);
93+
print_merged_torrent_results($results);
9594
}
9695
break;
9796

@@ -102,8 +101,8 @@
102101
{
103102
require "engines/ahmia/hidden_service.php";
104103
$results = get_hidden_service_results($query_encoded);
105-
print_hidden_service_results($results);
106104
print_elapsed_time($start_time);
105+
print_hidden_service_results($results);
107106
}
108107
break;
109108

@@ -131,11 +130,8 @@
131130

132131
print_next_page_button("&gt;", $page + 10, $query, $type);
133132

134-
echo "</div>"; // .next-page-button-wrapper
133+
echo "</div>";
135134
}
136-
137-
echo "</div>"; // .result-container-inner (text.php->print_x_results)
138-
echo "</div>"; // .result-container
139135
?>
140136

141137
<?php require "misc/footer.php"; ?>

0 commit comments

Comments
 (0)