mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
pkg_search_results: replace blind-table with floating divs
* I tried to remove errors in the sgml-structure
e.g.: <div>
<?php if (foo) { ?>
</div>
<?php } ?>
* I did not remove or add code (except the <table> and <div> stuff, of cause).
I only changed the order of the html/php-tags.
* The bottom and top of the script are now properly indented.
I did not indent the middle part (table of search results) because that would
render the diff completely useless.
Signed-off-by: PyroPeter <abi1789@googlemail.com>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
PyroPeter
Lukas Fleischer
parent
1fdecbd5a4
commit
346e82716b
3 changed files with 72 additions and 61 deletions
|
|
@ -284,6 +284,21 @@ blockquote.code {
|
|||
color: #333;
|
||||
font-size: .95em;
|
||||
}
|
||||
.pkg_search_results_footer {
|
||||
overflow: auto;
|
||||
}
|
||||
.pkg_search_results_footer .legend_and_actions {
|
||||
float: left;
|
||||
}
|
||||
.pkg_search_results_footer .legend {
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
.pkg_search_results_footer .page_links {
|
||||
float: right;
|
||||
margin: 0 0;
|
||||
padding: 0 0;
|
||||
}
|
||||
|
||||
|
||||
/* AUR Styles */
|
||||
.pgbox {
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ td.data2 {
|
|||
padding-left: .3em;
|
||||
text-align: left;
|
||||
}
|
||||
#legend span {
|
||||
.legend span {
|
||||
padding: 1px;
|
||||
margin-left: .3em;
|
||||
border: solid 1px #888;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,16 @@
|
|||
<form action='packages.php?<?php echo htmlentities($_SERVER['QUERY_STRING']) ?>' method='post'>
|
||||
<div class="pgbox">
|
||||
<?php if (!$result) { ?>
|
||||
<div class='pgboxbody'><?php print __("Error retrieving package list.") ?></div>
|
||||
<div class='pgboxbody'><?php print __("Error retrieving package list.") ?></div>
|
||||
<?php } elseif ($total == 0) { ?>
|
||||
<div class='pgboxbody'><?php print __("No packages matched your search criteria.") ?></div>
|
||||
<div class='pgboxbody'><?php print __("No packages matched your search criteria.") ?></div>
|
||||
<?php } else { ?>
|
||||
<div class="pgboxtitle">
|
||||
<span class='f3'><?php print __("Package Listing") ?></span>
|
||||
</div>
|
||||
<form action='packages.php?<?php echo htmlentities($_SERVER['QUERY_STRING']) ?>' method='post'>
|
||||
<div class="pgbox">
|
||||
<div class="pgboxtitle">
|
||||
<span class='f3'><?php print __("Package Listing") ?></span>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<table width='100%' cellspacing='0' cellpadding='2'>
|
||||
<tr>
|
||||
|
|
@ -79,59 +82,52 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) {
|
|||
<?php } ?>
|
||||
|
||||
</table>
|
||||
</div>
|
||||
</div> <!-- .pgbox ??! -->
|
||||
|
||||
|
||||
<div class="pgbox">
|
||||
<table width='100%'>
|
||||
<tr>
|
||||
<td align='left'>
|
||||
<div id="legend">
|
||||
<span class='f3'><?php echo __('Legend') ?></span>
|
||||
<span class="outofdate"><?php print __('Out of Date') ?></span>
|
||||
</div>
|
||||
<?php if ($SID): ?>
|
||||
<div>
|
||||
<select name='action'>
|
||||
<option><?php print __("Actions") ?></option>
|
||||
<option value='do_Flag'><?php print __("Flag Out-of-date") ?></option>
|
||||
<option value='do_UnFlag'><?php print __("Unflag Out-of-date") ?></option>
|
||||
<option value='do_Adopt'><?php print __("Adopt Packages") ?></option>
|
||||
<option value='do_Disown'><?php print __("Disown Packages") ?></option>
|
||||
<?php if ($atype == "Trusted User" || $atype == "Developer"): ?>
|
||||
<option value='do_Delete'><?php print __("Delete Packages") ?></option>
|
||||
<?php endif; ?>
|
||||
<option value='do_Notify'><?php print __("Notify") ?></option>
|
||||
<option value='do_UnNotify'><?php print __("UnNotify") ?></option>
|
||||
</select>
|
||||
<?php if ($atype == "Trusted User" || $atype == "Developer"): ?>
|
||||
<input type='checkbox' name='confirm_Delete' value='1' /> <?php print __("Confirm") ?>
|
||||
<?php endif; ?>
|
||||
<input type='submit' class='button' style='width: 80px' value='<?php print __("Go") ?>' />
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
|
||||
<td align='right'>
|
||||
<div class="f4 blue">
|
||||
<?php print __("Showing results %s - %s of %s", $first, $last, $total) ?>
|
||||
</div>
|
||||
<div class="page_nav">
|
||||
<?php foreach($templ_pages as $pagenr => $pagestart) { ?>
|
||||
<?php if ($pagestart === false) { ?>
|
||||
<?php echo $pagenr ?>
|
||||
<?php } else if ($pagestart + 1 == $first) { ?>
|
||||
<span class="page_sel"><?php echo $pagenr ?></span>
|
||||
<?php } else { ?>
|
||||
<a class="page_num" href="packages.php?<?php print mkurl('O=' . ( $pagestart)) ?>"><?php echo $pagenr ?></a>
|
||||
<div class="pgbox pkg_search_results_footer">
|
||||
<div class="legend_and_actions">
|
||||
<div class="legend">
|
||||
<span class='f3'><?php echo __('Legend') ?></span>
|
||||
<span class="outofdate"><?php print __('Out of Date') ?></span>
|
||||
</div>
|
||||
<?php if ($SID): ?>
|
||||
<div>
|
||||
<select name='action'>
|
||||
<option><?php print __("Actions") ?></option>
|
||||
<option value='do_Flag'><?php print __("Flag Out-of-date") ?></option>
|
||||
<option value='do_UnFlag'><?php print __("Unflag Out-of-date") ?></option>
|
||||
<option value='do_Adopt'><?php print __("Adopt Packages") ?></option>
|
||||
<option value='do_Disown'><?php print __("Disown Packages") ?></option>
|
||||
<?php if ($atype == "Trusted User" || $atype == "Developer"): ?>
|
||||
<option value='do_Delete'><?php print __("Delete Packages") ?></option>
|
||||
<?php endif; ?>
|
||||
<option value='do_Notify'><?php print __("Notify") ?></option>
|
||||
<option value='do_UnNotify'><?php print __("UnNotify") ?></option>
|
||||
</select>
|
||||
<?php if ($atype == "Trusted User" || $atype == "Developer"): ?>
|
||||
<input type='checkbox' name='confirm_Delete' value='1' /> <?php print __("Confirm") ?>
|
||||
<?php endif; ?>
|
||||
<input type='submit' class='button' style='width: 80px' value='<?php print __("Go") ?>' />
|
||||
</div>
|
||||
<?php endif; # if ($SID) ?>
|
||||
</div> <!-- .legend_and_actions -->
|
||||
<div class="page_links">
|
||||
<div class="f4 blue">
|
||||
<?php print __("Showing results %s - %s of %s", $first, $last, $total) ?>
|
||||
</div>
|
||||
<div class="page_nav">
|
||||
<?php foreach($templ_pages as $pagenr => $pagestart) { ?>
|
||||
<?php if ($pagestart === false) { ?>
|
||||
<?php echo $pagenr ?>
|
||||
<?php } else if ($pagestart + 1 == $first) { ?>
|
||||
<span class="page_sel"><?php echo $pagenr ?></span>
|
||||
<?php } else { ?>
|
||||
<a class="page_num" href="packages.php?<?php print mkurl('O=' . ( $pagestart)) ?>"><?php echo $pagenr ?></a>
|
||||
<?php } ?>
|
||||
<?php } ?>
|
||||
<?php } ?>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<?php } ?>
|
||||
</table>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</div> <!-- .page_links -->
|
||||
</div> <!-- .pgbox .pkg_search_results_footer -->
|
||||
</form>
|
||||
<?php } # search was successful and returned multiple results ?>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue