Skip to content

GitLab

Commit b6aced96 authored by Lukas Fleischer's avatar Lukas Fleischer
Browse files

pkg_search_results.php: Split out package results box 



Do not print the wrapper div container when calling pkg_search_page().
Signed-off-by: Lukas Fleischer's avatarLukas Fleischer <lfleischer@archlinux.org>
parent 3b4c6e72
Hide whitespace changes
Inline Side-by-side
web/html/packages.php
View file @ b6aced96
...@@ -98,11 +98,13 @@ if (isset($pkgid)) { ...@@ -98,11 +98,13 @@ if (isset($pkgid)) {
$_GET['SB'] = 'p'; $_GET['SB'] = 'p';
$_GET['SO'] = 'd'; $_GET['SO'] = 'd';
} }
echo '<div id="pkglist-results" class="box">';
if (isset($_COOKIE["AURSID"])) { if (isset($_COOKIE["AURSID"])) {
pkg_search_page($_GET, true, $_COOKIE["AURSID"]); pkg_search_page($_GET, true, $_COOKIE["AURSID"]);
} else { } else {
pkg_search_page($_GET, true); pkg_search_page($_GET, true);
} }
echo '</div>';
} }
html_footer(AURWEB_VERSION); html_footer(AURWEB_VERSION);
......
web/template/pkg_search_results.php
View file @ b6aced96
<?php <?php
if (!$result): ?> if (!$result): ?>
<div class="box"><p><?= __("Error retrieving package list.") ?></p></div> <p><?= __("Error retrieving package list.") ?></p>
<?php elseif ($total == 0): ?> <?php elseif ($total == 0): ?>
<div class="box"><p><?= __("No packages matched your search criteria.") ?></p></div> <p><?= __("No packages matched your search criteria.") ?></p>
<?php else: ?> <?php else: ?>
<div id="pkglist-results" class="box"> <?php if ($show_headers): ?>
<?php if ($show_headers): ?> <div class="pkglist-stats">
<div class="pkglist-stats"> <p>
<p> <?= _n('%d package found.', '%d packages found.', $total) ?>
<?= _n('%d package found.', '%d packages found.', $total) ?> <?= __('Page %d of %d.', $current, $pages) ?>
<?= __('Page %d of %d.', $current, $pages) ?> </p>
</p> <?php if (count($templ_pages) > 1): ?>
<?php if (count($templ_pages) > 1): ?> <p class="pkglist-nav">
<p class="pkglist-nav"> <?php foreach ($templ_pages as $pagenr => $pagestart): ?>
<?php foreach ($templ_pages as $pagenr => $pagestart): ?> <?php if ($pagestart === false): ?>
<?php if ($pagestart === false): ?> <span class="page"><?= $pagenr ?></span>
<span class="page"><?= $pagenr ?></span> <?php elseif ($pagestart + 1 == $first): ?>
<?php elseif ($pagestart + 1 == $first): ?> <span class="page"><?= $pagenr ?></span>
<span class="page"><?= $pagenr ?></span> <?php else: ?>
<?php else: ?> <a class="page" href="<?= get_uri('/packages/'); ?>?<?= mkurl('O=' . $pagestart) ?>"><?= $pagenr ?></a>
<a class="page" href="<?= get_uri('/packages/'); ?>?<?= mkurl('O=' . $pagestart) ?>"><?= $pagenr ?></a> <?php endif; ?>
<?php endif; ?> <?php endforeach; ?>
<?php endforeach; ?> </p>
</p>
<?php endif; ?>
</div>
<?php endif; ?> <?php endif; ?>
</div>
<?php endif; ?>
<form id="pkglist-results-form" method="post" action="<?= get_uri('/pkgbase/'); ?>?<?= htmlentities($_SERVER['QUERY_STRING']) ?>"> <form id="pkglist-results-form" method="post" action="<?= get_uri('/pkgbase/'); ?>?<?= htmlentities($_SERVER['QUERY_STRING']) ?>">
<table class="results"> <table class="results">
<thead> <thead>
<tr> <tr>
<?php if ($SID && $show_headers): ?> <?php if ($SID && $show_headers): ?>
<th>&nbsp;</th> <th>&nbsp;</th>
<?php endif; ?> <?php endif; ?>
<th><a href="?<?= mkurl('SB=n&SO=' . $SO_next) ?>"><?= __("Name") ?></a></th> <th><a href="?<?= mkurl('SB=n&SO=' . $SO_next) ?>"><?= __("Name") ?></a></th>
<th><?= __("Version") ?></th> <th><?= __("Version") ?></th>
<th><a href="?<?= mkurl('SB=v&SO=' . $SO_next) ?>"><?= __("Votes") ?></a></th> <th><a href="?<?= mkurl('SB=v&SO=' . $SO_next) ?>"><?= __("Votes") ?></a></th>
<th><a href="?<?= mkurl('SB=p&SO=' . $SO_next) ?>"><?= __("Popularity") ?></a><span title="<?= __('Popularity is calculated as the sum of all votes with each vote being weighted with a factor of %.2f per day since its creation.', 0.98) ?>" class="hover-help"><sup>?</sup></span></th> <th><a href="?<?= mkurl('SB=p&SO=' . $SO_next) ?>"><?= __("Popularity") ?></a><span title="<?= __('Popularity is calculated as the sum of all votes with each vote being weighted with a factor of %.2f per day since its creation.', 0.98) ?>" class="hover-help"><sup>?</sup></span></th>
<?php if ($SID): ?> <?php if ($SID): ?>
<th><a href="?<?= mkurl('SB=w&SO=' . $SO_next) ?>"><?= __("Voted") ?></a></th> <th><a href="?<?= mkurl('SB=w&SO=' . $SO_next) ?>"><?= __("Voted") ?></a></th>
<th><a href="?<?= mkurl('SB=o&SO=' . $SO_next) ?>"><?= __("Notify") ?></a></th> <th><a href="?<?= mkurl('SB=o&SO=' . $SO_next) ?>"><?= __("Notify") ?></a></th>
<?php endif; ?> <?php endif; ?>
<th><?= __("Description") ?></th> <th><?= __("Description") ?></th>
<th><a href="?<?= mkurl('SB=m&SO=' . $SO_next) ?>"><?= __("Maintainer") ?></a></th> <th><a href="?<?= mkurl('SB=m&SO=' . $SO_next) ?>"><?= __("Maintainer") ?></a></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php while (list($indx, $row) = each($searchresults)): ?> <?php while (list($indx, $row) = each($searchresults)): ?>
<tr class="<?= ($indx % 2 == 0) ? 'odd' : 'even' ?>"> <tr class="<?= ($indx % 2 == 0) ? 'odd' : 'even' ?>">
...@@ -84,53 +83,52 @@ if (!$result): ?> ...@@ -84,53 +83,52 @@ if (!$result): ?>
</tr> </tr>
<?php endwhile; ?> <?php endwhile; ?>
</tbody> </tbody>
</table> </table>
<?php if ($show_headers): ?> <?php if ($show_headers): ?>
<div class="pkglist-stats"> <div class="pkglist-stats">
<p> <p>
<?= _n('%d package found.', '%d packages found.', $total) ?> <?= _n('%d package found.', '%d packages found.', $total) ?>
<?= __('Page %d of %d.', $current, $pages) ?> <?= __('Page %d of %d.', $current, $pages) ?>
</p> </p>
<?php if (count($templ_pages) > 1): ?> <?php if (count($templ_pages) > 1): ?>
<p class="pkglist-nav"> <p class="pkglist-nav">
<?php foreach ($templ_pages as $pagenr => $pagestart): ?> <?php foreach ($templ_pages as $pagenr => $pagestart): ?>
<?php if ($pagestart === false): ?> <?php if ($pagestart === false): ?>
<span class="page"><?= $pagenr ?></span> <span class="page"><?= $pagenr ?></span>
<?php elseif ($pagestart + 1 == $first): ?> <?php elseif ($pagestart + 1 == $first): ?>
<span class="page"><?= $pagenr ?></span> <span class="page"><?= $pagenr ?></span>
<?php else: ?> <?php else: ?>
<a class="page" href="<?= get_uri('/packages/'); ?>?<?= mkurl('O=' . $pagestart) ?>"><?= $pagenr ?></a> <a class="page" href="<?= get_uri('/packages/'); ?>?<?= mkurl('O=' . $pagestart) ?>"><?= $pagenr ?></a>
<?php endif; ?> <?php endif; ?>
<?php endforeach; ?> <?php endforeach; ?>
</p> </p>
<?php endif; ?> <?php endif; ?>
</div> </div>
<?php if ($SID): ?> <?php if ($SID): ?>
<p> <p>
<select name="action"> <select name="action">
<option><?= __("Actions") ?></option> <option><?= __("Actions") ?></option>
<option value="do_UnFlag"><?= __("Unflag Out-of-date") ?></option> <option value="do_UnFlag"><?= __("Unflag Out-of-date") ?></option>
<option value="do_Adopt"><?= __("Adopt Packages") ?></option> <option value="do_Adopt"><?= __("Adopt Packages") ?></option>
<option value="do_Disown"><?= __("Disown Packages") ?></option> <option value="do_Disown"><?= __("Disown Packages") ?></option>
<?php if (has_credential(CRED_PKGBASE_DELETE)): ?>
<option value="do_Delete"><?= __("Delete Packages") ?></option>
<?php endif; ?>
<option value="do_Notify"><?= __("Notify") ?></option>
<option value="do_UnNotify"><?= __("UnNotify") ?></option>
</select>
<?php if (has_credential(CRED_PKGBASE_DELETE)): ?> <?php if (has_credential(CRED_PKGBASE_DELETE)): ?>
<label for="merge_Into"><?= __("Merge into") ?></label> <option value="do_Delete"><?= __("Delete Packages") ?></option>
<input type="text" id="merge_Into" name="merge_Into" />
<?php endif; ?> <?php endif; ?>
<label class="confirmation"><input type="checkbox" name="confirm" value="1" /> <?= __("Confirm") ?></label> <option value="do_Notify"><?= __("Notify") ?></option>
<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> <option value="do_UnNotify"><?= __("UnNotify") ?></option>
<input type="submit" class="button" style="width: 80px" value="<?= __("Go") ?>" /> </select>
</p> <?php if (has_credential(CRED_PKGBASE_DELETE)): ?>
<?php endif; # if ($SID) ?> <label for="merge_Into"><?= __("Merge into") ?></label>
<?php endif; ?> <input type="text" id="merge_Into" name="merge_Into" />
</form> <?php endif; ?>
</div> <label class="confirmation"><input type="checkbox" name="confirm" value="1" /> <?= __("Confirm") ?></label>
<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
<input type="submit" class="button" style="width: 80px" value="<?= __("Go") ?>" />
</p>
<?php endif; # if ($SID) ?>
<?php endif; ?>
</form>
<?php endif; # search was successful and returned multiple results ?> <?php endif; # search was successful and returned multiple results ?>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment