Signed-off-by: Loui Chang <[email protected]>
---
web/html/css/arch.css | 11 ++-------
web/template/pkg_search_form.php | 40 +++++++++++++++----------------------
2 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/web/html/css/arch.css b/web/html/css/arch.css
index 37997c0..499660e 100644
--- a/web/html/css/arch.css
+++ b/web/html/css/arch.css
@@ -452,15 +452,10 @@ textarea.vLargeTextField {
border-collapse: separate;
border-spacing: 0 15px;
}
-#search_box {
- margin: 5px;
- text-align: center;
+#advanced-search li {
font-size: 11px;
-}
-#advanced li {
- background-color: #f3f3f3;
list-style: none;
display: inline;
- padding: 15px;
+ padding-right: 15px;
text-decoration: none;
-}
\ No newline at end of file
+}
diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php
index 289f8b4..90feb37 100644
--- a/web/template/pkg_search_form.php
+++ b/web/template/pkg_search_form.php
@@ -1,23 +1,21 @@
<?php include_once('pkgfuncs.inc') ?>
+<div class='pgbox'>
<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>
-</tr>
-<tr>
- <td class='boxSoft'>
- <div id="search_box" class="blue">
- <label><?php print __("Keywords"); ?></label>
- <input type='text' name='K' size='20' value="<?php
print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); ?>"
maxlength='35' />
- <?php if (!$_GET['detail']): ?><input type='submit'
style='width:80px' class='button' name='do_Search' value='<?php print __("Go");
?>' /><?php endif; ?>
- <a href="?<?php print mkurl('detail=' .
(($_GET['detail']) ? 0 : 1) ) ?>">Advanced</a>
- <?php if ($_GET['detail']): ?>
- <div id="advanced">
+<div class='pgboxtitle' align='right'>
+ <span class='f3'><?php print __("Search Criteria"); ?></span>
+ <input type='text' name='K' size='30' value="<?php print
stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); ?>"
maxlength='35' />
+ <input type='submit' style='width:80px' class='button' name='do_Search'
value='<?php print __("Go"); ?>' />
+ <?php if (!empty($_GET['detail'])): ?>
+ <input type='submit' style='width:80px' class='button'
name='do_Orphans' value='<?php print __("Orphans"); ?>' />
+
+<?php endif; ?>
+ <a href="?<?php print mkurl('detail=' . ((!empty($_GET['detail'])) ? 0
: 1) ) ?>">Advanced</a>
+</div>
+
+<input type='hidden' name='O' value='0' />
+ <?php if (!empty($_GET['detail'])): ?>
+ <div id="advanced-search" class="blue">
<input type="hidden" name="detail" value="1" />
<ul>
<li>
@@ -123,14 +121,8 @@
</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>
</form>
+</div>
<br />
--
1.6.1
