Signed-off-by: Callan Barrett --- web/html/css/arch.css | 13 ++- web/html/css/fonts.css | 10 +- web/template/pkg_search_form.php | 300 +++++++++++++++---------------------- 3 files changed, 139 insertions(+), 184 deletions(-) diff --git a/web/html/css/arch.css b/web/html/css/arch.css index bc629e8..37997c0 100644 --- a/web/html/css/arch.css +++ b/web/html/css/arch.css @@ -452,4 +452,15 @@ textarea.vLargeTextField { border-collapse: separate; border-spacing: 0 15px; } - +#search_box { + margin: 5px; + text-align: center; + font-size: 11px; +} +#advanced li { + background-color: #f3f3f3; + list-style: none; + display: inline; + padding: 15px; + text-decoration: none; +} \ No newline at end of file diff --git a/web/html/css/fonts.css b/web/html/css/fonts.css index bf5268f..de70d76 100644 --- a/web/html/css/fonts.css +++ b/web/html/css/fonts.css @@ -61,11 +61,11 @@ span.warning /* Content Text */ font-size: 12px; } /* Font Attribute Change (#6c83b0)*/ -span.blue { color: #6c83b0; } -span.white { color: #fff; } -span.black { color: #000; } -span.green { color: #6db06d; } -span.link +.blue { color: #6c83b0; } +.white { color: #fff; } +.black { color: #000; } +.green { color: #6db06d; } +.link { color: #6c83b0; font-weight: bold; diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index f74e736..edc8b38 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -1,188 +1,132 @@ <form action='packages.php' method='get'> <input type='hidden' name='O' value='0'> - <center> - <table cellspacing='3' class='boxSoft'> <tr> - <td class='boxSoftTitle' align='right'> - <span class='f3'><?php print __("Search Criteria"); ?></span> - </td> + <td class='boxSoftTitle' align='right'> + <span class='f3'><?php print __("Search Criteria"); ?></span> + </td> </tr> <tr> - <td class='boxSoft'> - <table style='width: 100%' align='center'> - <tr> - <td align='right'> - <span class='f5'> - <span class='blue'> - <?php print __("Location"); ?> - </span> - </span> - <br /> - <select name='L'> - <option value=0><?php print __("Any"); ?></option> -<?php -while (list($id, $loc) = each($locs)) { - if (intval($_REQUEST["L"]) == $id) { -?> - <option value="<?php print $id; ?>" selected="selected"><?php print $loc; ?></option> -<?php } else { ?> - <option value="<?php print $id; ?>"><?php print $loc; ?></option> -<?php - } -} -?> - </select> - </td> - <td align='right'> - <span class='f5'> - <span class='blue'> - <?php print __("Category"); ?> - </span> - </span> - <br /> - <select name='C'> - <option value='0'><?php print __("Any"); ?></option> -<?php -while (list($id, $cat) = each($cats)) { - if (intval($_REQUEST["C"]) == $id) { -?> - <option value="<?php print $id ?>" selected="selected"><?php print $cat; ?></option> -<?php } else { ?> - <option value="<?php print $id ?>"><?php print $cat; ?></option> -<?php - } -} -?> - </select> - </td> - <td align='right'> - <span class='f5'> - <span class='blue'> - <?php print __("Keywords"); ?> - </span> - </span> - <br /> - - </td> - <td align='right'> - <span class='f5'> - <span class='blue'> - <?php print __("Search by"); ?> - </span> - </span> - <br /> - <select name='SeB'> -<?php -$searchby = array('nd' => 'Name' - ,'m' => 'Maintainer' - ,'s' => 'Submitter' - ); - -foreach ($searchby as $k => $v) { - if ($_REQUEST['SeB'] == $k) { -?> - <option value="<?php print $k; ?>" selected="selected"><?php print __($v); ?></option> -<?php } else { ?> - <option value="<?php print $k; ?>"><?php print __($v); ?></option> -<?php - } -} -?> - </select> - </td> - <td align='right'> - <span class='f5'> - <span class='blue'> - <?php print __("Sort by"); ?> - </span> - </span> - <br /> - <select name='SB'> -<?php -$sortby = array('n' => 'Name' - ,'c' => 'Category' - ,'l' => 'Location' - ,'v' => 'Votes' - ,'m' => 'Maintainer' - ,'a' => 'Age' - ); - -foreach ($sortby as $k => $v) { - if ($_REQUEST['SB'] == $k) { -?> - <option value='<?php print $k; ?>' selected="selected"><?php print __($v); ?></option> -<?php } else { ?> - <option value='<?php print $k; ?>'><?php print __($v); ?></option> -<?php - } -} -?> - </select> - </td> - <td align='right'> - <span class='f5'> - <span class='blue'> - <?php print __("Sort order"); ?> - </span> - </span> - <br /> - <select name='SO'> -<?php -$orderby = array('a' => 'Ascending' - ,'d' => 'Descending' - ); - -foreach ($orderby as $k => $v) { - if ($_REQUEST['SO'] == $k) { -?> - <option value='<?php print $k; ?>' selected="selected"><?php print __($v); ?></option> -<?php } else { ?> - <option value='<?php print $k; ?>'><?php print __($v); ?></option> -<?php - } -} -?> - </select> - </td> - <td align='right'> - <span class='f5'> - <span class='blue'> - <?php print __("Per page"); ?> - </span> - </span> - <br /> - <select name='PP'> -<?php -$pages = array(25, 50, 75, 100); -foreach ($pages as $i) { - if ($PP == $i) { -?> - <option value="<?php print $i; ?>" selected="selected"><?php print $i; ?></option> -<?php } else { ?> - <option value="<?php print $i; ?>"><?php print $i; ?></option> -<?php - } -} -?> - </select> - </td> - </tr> - </table> - <center> - <table> - <tr> - <td align='right' valign='bottom'> - <input type='submit' style='width:80px' class='button' name='do_Search' value='<?php print __("Go"); ?>' /> - </td> - <td align='right' valign='bottom'> - <input type='submit' style='width:80px' class='button' name='do_Orphans' value='<?php print __("Orphans"); ?>' /> - </td> - </tr> - </table> - </center> - </td> + <td class='boxSoft'> + <div id="search_box" class="blue"> + <label><?php print __("Keywords"); ?></label> + + <?php if (!$_GET['detail']): ?><input type='submit' style='width:80px' class='button' name='do_Search' value='<?php print __("Go"); ?>' /><?php endif; ?> + <a href="packages.php?<?php print mkurl('detail=' . (($_GET['detail']) ? 0 : 1) ) ?>">Advanced</a> + <?php if ($_GET['detail']): ?> + <div id="advanced"> + <input type="hidden" name="detail" value="1" /> + <ul> + <li> + <label><?php print __("Location"); ?></label> + <select name='L'> + <option value=0><?php print __("Any"); ?></option> + <?php + while (list($id, $loc) = each($locs)): + if (intval($_REQUEST["L"]) == $id): + ?> + <option value="<?php print $id; ?>" selected="selected"><?php print $loc; ?></option> + <?php else: ?> + <option value="<?php print $id; ?>"><?php print $loc; ?></option> + <?php + endif; + endwhile; + ?> + </select> + </li> + <li> + <label><?php print __("Category"); ?></label> + <select name='C'> + <option value='0'><?php print __("Any"); ?></option> + <?php + while (list($id, $cat) = each($cats)): + if (intval($_REQUEST["C"]) == $id): + ?> + <option value="<?php print $id ?>" selected="selected"><?php print $cat; ?></option> + <?php else: ?> + <option value="<?php print $id ?>"><?php print $cat; ?></option> + <?php + endif; + endwhile; + ?> + </select> + </li> + <li> + <label><?php print __("Search by"); ?></label> + <select name='SeB'> + <?php + $searchby = array('nd' => 'Name', 'm' => 'Maintainer', 's' => 'Submitter'); + foreach ($searchby as $k => $v): + if ($_REQUEST['SeB'] == $k): + ?> + <option value="<?php print $k; ?>" selected="selected"><?php print __($v); ?></option> + <?php else: ?> + <option value="<?php print $k; ?>"><?php print __($v); ?></option> + <?php + endif; + endforeach; + ?> + </select> + </li> + <li> + <label><?php print __("Sort by"); ?></label> + <select name='SB'> + <?php + $sortby = array('n' => 'Name', 'c' => 'Category', 'l' => 'Location', 'v' => 'Votes', 'm' => 'Maintainer', 'a' => 'Age'); + foreach ($sortby as $k => $v): + if ($_REQUEST['SB'] == $k): + ?> + <option value='<?php print $k; ?>' selected="selected"><?php print __($v); ?></option> + <?php else: ?> + <option value='<?php print $k; ?>'><?php print __($v); ?></option> + <?php + endif; + endforeach; + ?> + </select> + </li> + <li> + <label><?php print __("Sort order"); ?></label> + <select name='SO'> + <?php + $orderby = array('a' => 'Ascending', 'd' => 'Descending'); + foreach ($orderby as $k => $v): + if ($_REQUEST['SO'] == $k): + ?> + <option value='<?php print $k; ?>' selected="selected"><?php print __($v); ?></option> + <?php else: ?> + <option value='<?php print $k; ?>'><?php print __($v); ?></option> + <?php + endif; + endforeach; + ?> + </select> + </li> + <li> + <label><?php print __("Per page"); ?></label> + <select name='PP'> + <?php + $pages = array(25, 50, 75, 100); + foreach ($pages as $i): + if ($PP == $i): + ?> + <option value="<?php print $i; ?>" selected="selected"><?php print $i; ?></option> + <?php else: ?> + <option value="<?php print $i; ?>"><?php print $i; ?></option> + <?php + endif; + endforeach; + ?> + </select> + </li> + </ul> + <input type='submit' style='width:80px' class='button' name='do_Search' value='<?php print __("Go"); ?>' /> + <input type='submit' style='width:80px' class='button' name='do_Orphans' value='<?php print __("Orphans"); ?>' /> + </div> + <?php endif; ?> + </div> + </td> </tr> </table> </center> -- 1.6.0.2