Websites/staging.slackware.uk
1
0
Fork 0
Code Releases Wiki Activity

Update search layout and CSS.

Browse source
This commit is contained in:
Darren 'Tadgy' Austin 2024-09-04 19:55:20 +01:00
commit c0e75b6b6a
3 changed files with 95 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

39
html/dark.css
View file

@ -121,6 +121,10 @@ td {
border: 1px;
border-color: #555555;
border-style: solid;
margin-left: 5px;
padding-left: 5px;
padding-right: 5px;
vertical-align: middle;
width: 500px;
}
@ -163,9 +167,15 @@ td {
width: 100%;
}
#bwbar img {
height: 12px;
width: 804px;
}
#copyright {
font-size: 10px;
text-align: center;
align-self: center;
margin-left: 0;
margin-right: auto;
}
#donatebuttons {
@ -176,6 +186,14 @@ td {
margin-top: 20px;
}
#footer {
display: grid;
column-gap: 50px;
font-size: 12px;
grid-template-columns: auto auto;
margin-top: 10px;
}
#headingbox {
margin-left: auto;
margin-right: auto;
@ -207,6 +225,10 @@ td {
width: 100%;
}
#logo img {
width: 100%;
}
#motd {
column-gap: 40px;
display: grid;
@ -223,6 +245,19 @@ td {
width: 90%;
}
#poweredby {
align-items: center;
display: flex;
margin-left: auto;
margin-right: 0;
text-align: right;
}
#poweredby img {
margin-left: 5px;
margin-right: 5px;
}
#search {
align-content: center;
align-self: end;

39
html/light.css
View file

@ -121,6 +121,10 @@ td {
border: 1px;
border-color: #000000;
border-style: solid;
margin-left: 5px;
padding-left: 5px;
padding-right: 5px;
vertical-align: middle;
width: 500px;
}
@ -163,9 +167,15 @@ td {
width: 100%;
}
#bwbar img {
height: 12px;
width: 804px;
}
#copyright {
font-size: 10px;
text-align: center;
align-self: center;
margin-left: 0;
margin-right: auto;
}
#donatebuttons {
@ -176,6 +186,14 @@ td {
margin-top: 20px;
}
#footer {
display: grid;
column-gap: 50px;
font-size: 12px;
grid-template-columns: auto auto;
margin-top: 10px;
}
#headingbox {
margin-left: auto;
margin-right: auto;
@ -207,6 +225,10 @@ td {
width: 100%;
}
#logo img {
width: 100%;
}
#motd {
column-gap: 40px;
display: grid;
@ -223,6 +245,19 @@ td {
width: 90%;
}
#poweredby {
align-items: center;
display: flex;
margin-left: auto;
margin-right: 0;
text-align: right;
}
#poweredby img {
margin-left: 5px;
margin-right: 5px;
}
#search {
align-content: center;
align-self: end;

41
html/search.shtml
View file

@ -3,21 +3,15 @@
/* Output an error box */
function writeerror (string $message, bool $link) {
?>
<div class="box boxmargins" id="headingbox">
<div id="headingtext">
<span class="heading bold">Search Error</span><br><br>
<span class="subheading"><?php print ($message); ?></span>
<?php
print ('<div class="box boxmargins" id="headingbox">');
print (' <div id="headingtext">');
print (' <span class="heading bold">Search Error</span><br><br>');
print (' <span class="subheading">' . $message . '</span>');
if ($link == true) {
?>
<br><br>Click <a href="//<?php print ("$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"); ?>" title="Retry search">here</a> to retry your search.
<?php
print (' <br><br>Click <a href="//' . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"] . '" title="Retry search">here</a> to retry your search.');
}
?>
</div>
</div>
<?php
print (' </div>');
print ('</div>');
}
/* Construct the url */
@ -27,15 +21,15 @@
$url = "http://";
}
$url .= $_SERVER["HTTP_HOST"] . "/cgi-bin/searchapi.cgi?";
if (isset ($_GET[l])) {
if (isset ($_GET["l"])) {
$url .= "l=" . urlencode ($_GET["l"]) . "&";
}
if (isset ($_GET[p])) {
if (isset ($_GET["p"])) {
$url .= "p=" . urlencode ($_GET["p"]) . "&";
} else {
$url .= "p=%2F&";
}
if (isset ($_GET[q])) {
if (isset ($_GET["q"])) {
$url .= "q=" . urlencode ($_GET["q"]);
} else {
$url .= "q=";
@ -57,10 +51,17 @@
Searches may contain multiple terms, include globs (<code>man 7 <a href="https://man7.org/linux/man-pages/man7/glob.7.html" title="glob man pageg">glob</a></code>)<br>
and descend down from the current directory.<br><br>
<span class="bold">Adjust search:</span>
<div style="display: flex; justify-content: center;">
<!-- <div style="Xdisplay: flex; Xjustify-content: center;"> -->
<div>
<!-- <div style="text-align: right; justify-content: center;"> -->
<div style="text-align: right;">
<form action="/search">
<span class="bold">Search path:</span>
<!-- <span class="bold" style="text-align: right; justify-content: center;">Search path:</span>
<input class="searchinput searchresultsinput" title="Search Path" type="text" name="p" value="<?php print ($_GET["p"]); ?>" autocomplete="on" required><br>
<span class="bold">Search query:</span>
<input class="searchinput searchresultsinput" title="Search Query" type="text" name="q" value="<?php print ($_GET["q"]); ?>" autocomplete="on" required>
<input type="submit" hidden> -->
<span class="bold" style="text-align: right;">Search path:</span>
<input class="searchinput searchresultsinput" title="Search Path" type="text" name="p" value="<?php print ($_GET["p"]); ?>" autocomplete="on" required><br>
<span class="bold">Search query:</span>
<input class="searchinput searchresultsinput" title="Search Query" type="text" name="q" value="<?php print ($_GET["q"]); ?>" autocomplete="on" required>
@ -83,10 +84,10 @@
$type = strtok ($result_line, " ");
$entry = strtok ("\0");
if ($type == "f" || $type == "l" || $type == "o") {
print ("&bull; <a href=\"$entry\" title=\"View $entry\">$entry</a><br>");
print ('&bull; <a href="' . $entry . '" title="View $entry">' . $entry . '</a><br>');
$count++;
} elseif ($type == "d") {
print ("&bull; <a href=\"$entry\" title=\"Directory $entry\">$entry</a>&nbsp;(<a href=\"/search?l=$_GET[l]&p=$entry&q=" . urlencode ($_GET[q]) . "\" title=\"Repeat search in this directory\">Repeat search in this directory</a>)<br>");
print ('&bull; <a href="' . $entry . '" title="Directory ' . $entry . '">' . $entry . '</a>&nbsp;(<a href="/search?l=' . $_GET["l"] . '&p=' . urlencode ($entry) . '&q=' . urlencode ($_GET["q"]) . '" title="Repeat search in this directory">Repeat search in this directory</a>)<br>');
$count++;
}
}