June 2008 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Refactored pkg_search_form.php
by Michael Klier 06 Jun '08

06 Jun '08

This patch refactores the pkg_search_form.php template to use less tables. It also introduces some new CSS because the way the page is structured now the currently used CSS is not 100% compatible/usable. It also reduces the number of validation errors for the search page with an empty result from 222 to 44. --- web/html/css/arch.css | 61 +++++++++++ web/template/pkg_search_form.php | 219 +++++++++++++++++--------------------- 2 files changed, 157 insertions(+), 123 deletions(-) diff --git a/web/html/css/arch.css b/web/html/css/arch.css index 92781f2..3190623 100644 --- a/web/html/css/arch.css +++ b/web/html/css/arch.css @@ -452,5 +452,66 @@ textarea.vLargeTextField { border-collapse: separate; border-spacing: 0 15px; } + +/** + * DISCLAIMER + * + * The following CSS is for the transistion in getting rid of most inline CSS + * once the transition is compele this file will be restructured and the CSS + * will be moved to the appropriate places, the new used CSS also follows a + * more semantic approach. + */ +div.aur_box { + border: 3px solid #ddd; + width: 89.5%; /* to match the old width */ + margin-left: auto; + margin-right: auto; + margin-bottom: 1em; +} + +div.aur_box div.aur_box_title { + border-bottom: 3px solid #ddd; + background-color: #f1f2f4; + text-align: left; +} + +div.aur_box div.aur_box_title span { + font-weight: bold; + padding: 1px 0 0 3px; + color: #888; + border-top: 1px solid #fff; + border-bottoM: 1px solid #fff; + display: block; +} + +div.aur_box div.aur_box_content { + padding: 0.5em; + background-color: #fff; +} + +div.aur_box div.aur_box_content table { + width: 100%; + margin-bottom: 0.5em; +} + +div.aur_box div.aur_box_content td.center { + text-align: center; +} + +div.aur_box .center_align { text-align: center; } +div.aur_box .right_align { text-align: right; } +div.aur_box .left_align { text_align: left; } + +div.aur_box form#aur_package_search input.button { + width: 80px; +} + +div.aur_box form#aur_package_search label { + text-align: right; + font-size: 11px; + color: #6c83b0; + display: block; +} + /* vim:ts=2:sw=2:et:enc=utf-8: * */ diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index 05b2da7..0b0397a 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -1,123 +1,96 @@ - - <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 echo __('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 echo __('Location'); ?> - </span></span><br /> - <select name='L'> - <option value='0'><?php echo __('Any'); ?> - -<?php - - // The search form - XXX: split into own function? - // - // FIXME: highly fugly. whoever makes this use - // less print statements gets a cookie - // FIXME: ugly html. whoever un-tables this gets - // another cookie - while (list($id, $loc) = each($locs)) { - if (intval($_REQUEST["L"]) == $id) { - print " <option value=".$id." selected> ".$loc."\n"; - } else { - print " <option value=".$id."> ".$loc."\n"; - } - } - print " </select>\n"; - print "</td>\n"; - - print "<td align='right'>\n"; - print " <span class='f5'><span class='blue'>".__("Category"); - print "</span></span><br />\n"; - print " <select name='C'>\n"; - print " <option value=0> ".__("Any")."\n"; - while (list($id, $cat) = each($cats)) { - if (intval($_REQUEST["C"]) == $id) { - print " <option value=".$id." selected> ".$cat."\n"; - } else { - print " <option value=".$id."> ".$cat."\n"; - } - } - print " </select>\n"; - print "</td>\n"; - - print "<td align='right'>\n"; - print " <span class='f5'><span class='blue'>".__("Keywords"); - print "</span></span><br />\n"; - print " <input type='text' name='K' size='20'"; - - $K = trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES)); - print " value=\"".stripslashes($K)."\" maxlength='35'>\n"; - print "</td>\n"; - - print "<td align='right'>\n"; - print " <span class='f5'><span class='blue'>".__("Search by"); - print "</span></span><br />\n"; - - print " <select name='SeB'>\n"; - # by name/description - print " <option value=nd"; - $_REQUEST["SeB"] == "nd" ? print " selected> " : print "> "; - print __("Name")."</option>\n"; - # by maintainer - print " <option value=m"; - $_REQUEST["SeB"] == "m" ? print " selected> " : print "> "; - print __("Maintainer")."</option>\n"; - print " <option value=s"; - $_REQUEST["SeB"] == "s" ? print " selected> " : print "> "; - print __("Submitter")."</option>\n"; - - print " </select>\n"; - print "</td>\n"; - - print "<td align='right'>\n"; - print " <span class='f5'><span class='blue'>".__("Per page"); - print "</span></span><br />\n"; - print " <select name='PP'>\n"; - print " <option value=25"; - $PP == 25 ? print " selected> 25\n" : print "> 25\n"; - print " <option value=50"; - $PP == 50 ? print " selected> 50\n" : print "> 50\n"; - print " <option value=75"; - $PP == 75 ? print " selected> 75\n" : print "> 75\n"; - print " <option value=100"; - $PP == 100 ? print " selected> 100\n" : print "> 100\n"; - print " </select>\n"; - print "</td>\n"; - - // Added to break put the buttons in a new line -?> - </tr></table><center><table><tr> - - <td align='right' valign='bottom'>  - <input type='submit' style='width:80px' class='button' name='do_Search' - value='<?php echo __('Go'); ?>'> - </td> - - <td align='right' valign='bottom'>  - <input type='submit' style='width:80px' class='button' name='do_Orphans' - value='<?php echo __('Orphans'); ?>'> - </td> - - </tr> - </table> - - </td> - </tr> - </table> - </center> - </form> - <br /> - + <center> + <div class="aur_box"> + + <div class="aur_box_title"> + <span><?php echo __('Search Criteria'); ?></span> + </div> + +  + <form action="packages.php" id="aur_package_search" method="get"> + <input type="hidden" name="O" value="0" /> + +  + <div class="aur_box_content"> + +  + <table cellspacing="0" cellpadding="0"> + <tr> + +  + <td class="right_align"> + <label><?php echo __('Location'); ?></label> + <select name="L"> + <option value="0"><?php echo __('Any'); ?></option> + <?php + while (list($id, $loc) = each($locs)) { + if (intval($_REQUEST['L']) == $id) { + print ' <option value="' . $id . '" selected>' . $loc . "</option>\n"; + } else { + print ' <option value="' . $id . '">' . $loc . "</option>\n"; + } + } + ?> + </select> + </td> + +  + <td class="right_align"> + <label><?php echo __('Category')?></label> + <select name="C"> + <option value="0"><?php echo __('Any')?></option> + <?php + while (list($id, $cat) = each($cats)) { + if (intval($_REQUEST['C']) == $id) { + print ' <option value="' . $id . '" selected>' . $cat . "</option>\n"; + } else { + print ' <option value="' . $id . '">' . $cat . "</option>\n"; + } + } + ?> + </select> + </td> + +  + <td class="right_align"> + <label><?php echo __('Keywords')?></label> + <input type="text" name="K" size="20" value="<?php echo stripslashes(trim(htmlspecialchars($_REQUEST['K'])))?>" maxlength="35"> + </td> + +  + <td class="right_align"> + <label><?php echo __("Search by")?></label> + <select name="SeB"> + <option value="nd" <?php if ($_REQUEST['SeB'] == "nd") print 'selected'?>><?php echo __('Name')?></option> + <option value="m" <?php if ($_REQUEST['SeB'] == "m") print 'selected'?>><?php echo __('Maintainer')?></option> + <option value="s" <?php if ($_REQUEST['SeB'] == "s") print 'selected'?>><?php echo __('Submitter')?></option> + </select> + </td> + +  + <td class="right_align"> + <label><?php echo __('Per page')?></label> + <select name="PP"> + <option value="25" <?php if ($PP == 25) print 'selected'?>>25</option> + <option value="50" <?php if ($PP == 50) print 'selected'?>>50</option> + <option value="75" <?php if ($PP == 75) print 'selected'?>>75</option> + <option value="100" <?php if ($PP == 100) print 'selected'?>>100</option> + </select> + </td> + + </tr> + </table> +  + + <div class="center_align"> + <input type="submit" class="button" name="do_Search" value="<?php echo __('Go'); ?>" /> + <input type="submit" class="button" name="do_Orphans" value="<?php echo __('Orphans'); ?>" /> + </div> + + </div> +  + + </form> +  + + </div> + </center> -- 1.4.4.4 -- Michael Klier www: http://www.chimeric.de jabber: chi(a)jabber.shipdown.de key: http://downloads.chimeric.de/chi.asc key-id: 0x8308F551

1 1

[aur-dev] [PATCH] Final fixes for pkg_search_form.php
by Michael Klier 06 Jun '08

06 Jun '08

Final fixes for aur_search_form.php - further reduces the number of validation errors for an empty search result from 44 to 28. --- web/template/pkg_search_form.php | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index 0b0397a..ce05b4f 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -24,7 +24,7 @@ <?php while (list($id, $loc) = each($locs)) { if (intval($_REQUEST['L']) == $id) { - print ' <option value="' . $id . '" selected>' . $loc . "</option>\n"; + print ' <option value="' . $id . '" selected="selected">' . $loc . "</option>\n"; } else { print ' <option value="' . $id . '">' . $loc . "</option>\n"; } @@ -41,7 +41,7 @@ <?php while (list($id, $cat) = each($cats)) { if (intval($_REQUEST['C']) == $id) { - print ' <option value="' . $id . '" selected>' . $cat . "</option>\n"; + print ' <option value="' . $id . '" selected="selected">' . $cat . "</option>\n"; } else { print ' <option value="' . $id . '">' . $cat . "</option>\n"; } @@ -53,16 +53,16 @@  <td class="right_align"> <label><?php echo __('Keywords')?></label> - <input type="text" name="K" size="20" value="<?php echo stripslashes(trim(htmlspecialchars($_REQUEST['K'])))?>" maxlength="35"> + <input type="text" name="K" size="20" value="<?php echo stripslashes(trim(htmlspecialchars($_REQUEST['K'])))?>" maxlength="35" /> </td>  <td class="right_align"> <label><?php echo __("Search by")?></label> <select name="SeB"> - <option value="nd" <?php if ($_REQUEST['SeB'] == "nd") print 'selected'?>><?php echo __('Name')?></option> - <option value="m" <?php if ($_REQUEST['SeB'] == "m") print 'selected'?>><?php echo __('Maintainer')?></option> - <option value="s" <?php if ($_REQUEST['SeB'] == "s") print 'selected'?>><?php echo __('Submitter')?></option> + <option value="nd" <?php if ($_REQUEST['SeB'] == "nd") print 'selected="selected"'?>><?php echo __('Name')?></option> + <option value="m" <?php if ($_REQUEST['SeB'] == "m") print 'selected="selected"'?>><?php echo __('Maintainer')?></option> + <option value="s" <?php if ($_REQUEST['SeB'] == "s") print 'selected="selected"'?>><?php echo __('Submitter')?></option> </select> </td> @@ -70,10 +70,10 @@ <td class="right_align"> <label><?php echo __('Per page')?></label> <select name="PP"> - <option value="25" <?php if ($PP == 25) print 'selected'?>>25</option> - <option value="50" <?php if ($PP == 50) print 'selected'?>>50</option> - <option value="75" <?php if ($PP == 75) print 'selected'?>>75</option> - <option value="100" <?php if ($PP == 100) print 'selected'?>>100</option> + <option value="25" <?php if ($PP == 25) print 'selected="selected"'?>>25</option> + <option value="50" <?php if ($PP == 50) print 'selected="selected"'?>>50</option> + <option value="75" <?php if ($PP == 75) print 'selected="selected"'?>>75</option> + <option value="100" <?php if ($PP == 100) print 'selected="selected"'?>>100</option> </select> </td> -- 1.4.4.4 -- Michael Klier www: http://www.chimeric.de jabber: chi(a)jabber.shipdown.de key: http://downloads.chimeric.de/chi.asc key-id: 0x8308F551

1 0

[aur-dev] [PATCH] Disable user package deletion
by Callan Barrett 05 Jun '08

05 Jun '08

This is coming from the thread on aur-general so it doesn't get forgotten. -- Callan Barrett

1 1

[aur-dev] [PATCH] package details link fix
by BaSh 05 Jun '08

05 Jun '08

this fix first part of bug report http://bugs.archlinux.org/task/10291 -- Andrea `BaSh` Scarpino Arch Linux Trusted User Linux User: #430842

2 1

[aur-dev] [PATCH] CSS cleanup
by Michael Klier 05 Jun '08

05 Jun '08

Hi, I've cleaned up the CSS a bit and it validates now. No changes to the current layout/visual presentation itself have been made, just fixed the whole indention and replaced some redundant things. The patch itself is against the testing branch. Hope you find it useful. Best Regards, Michael PS.: Is there some interest in getting rid of the inline CSS definitions? Signed-off-by: Michael Klier <chi(a)chimeric.de> --- web/html/css/arch.css | 474 +++++++++++++++++++++---------------------- web/html/css/containers.css | 402 +++++++++++++++++-------------------- web/html/css/fonts.css | 209 +++++++++---------- 3 files changed, 508 insertions(+), 577 deletions(-) diff --git a/web/html/css/arch.css b/web/html/css/arch.css index a01a15d..92781f2 100644 --- a/web/html/css/arch.css +++ b/web/html/css/arch.css @@ -2,107 +2,108 @@ * ul { padding: 20px; } body { min-width: 600px; - background: url("/images/titlebar.png") repeat-x top left #fbf8f1; - padding: 0 30px; - color: #555; - font-family: "DejaVu Sans", "Bitstream Vera Sans", "Lucida Grande", Arial, sans-serif; -} -/* - * Divs - */ + background: #fbf8f1 url("/images/titlebar.png") repeat-x top left; + padding: 0 30px; + color: #555; + font-family: "DejaVu Sans", "Bitstream Vera Sans", "Lucida Grande", Arial, sans-serif; +} +/* Divs */ #head_container { - height: 220px; + height: 220px; } #main_nav { position: absolute; top: 123px; right: 30px; width: 600px; - background: #333; + background-color: #333; } #sub_nav { position: absolute; top: 149px; right: 30px; min-width: 700px; - background: #1793d1; + background-color: #1793d1; } -#main_nav ul, #sub_nav ul { - list-style: none; - margin: 0; +#main_nav ul, +#sub_nav ul { + list-style: none; + margin: 0; padding: 0; } -#main_nav ul li, #sub_nav ul li { - display: block; - float: right; +#main_nav ul li, +#sub_nav ul li { + display: block; + float: right; margin: 0 3px; padding: 0; - text-align: center; - font-size: 13px; + text-align: center; + font-size: 13px; line-height: 26px; } #main_nav ul li.selected { - background: #1793d1; + background-color: #1793d1; } #sub_nav ul li.selected { - background: #333; + background-color: #333; } -#main_nav ul li a, #sub_nav ul li a { +#main_nav ul li a, +#sub_nav ul li a { display: block; padding: 0 8px; color: #fff; font-weight: bold; - text-decoration: none; + text-decoration: none; } #main_nav ul li a:hover { - background: #1793d1; + background-color: #1793d1; } #lang_login_sub { - display: block; - position: relative; - top: -30px; - margin: auto; - width: 90%; + display: block; + position: relative; + top: -30px; + margin: auto; + width: 90%; } #lang_login_sub .button { - font-size: 9px; - margin: 2px; + font-size: 9px; + margin: 2px; } #login_bar { - font-size: 10px; - display: block; - float: left; + font-size: 10px; + display: block; + float: left; } #login_bar input { - margin-right: 5px; + margin-right: 5px; } #lang_bar { - display: block; - position: relative; - float: right; + display: block; + position: relative; + float: right; } #lang_login_sub ul { - list-style: none; - padding: 0; + list-style: none; + padding: 0; } #lang_login_sub ul a { - text-decoration: none; + text-decoration: none; } #lang_login_sub ul a:hover { - text-decoration: underline; + text-decoration: underline; } #lang_login_sub ul li { - display: inline; - padding-right: 1px; - font-size: 10px; + display: inline; + padding-right: 1px; + font-size: 10px; } #updates { - font-size: small; - /*position: relative;*/ - top: 0px; - background: #E7F0F6; - border: 1px solid #92CBE8; - padding: 10px; + font-size: small; + /*position: relative;*/ + top: 0; + background-color: #e7f0f6; + border: 1px solid #92cbe8; + padding: 10px; } #ads { z-index: 0; @@ -112,10 +113,10 @@ body { } #logo { z-index: 1; - position: absolute; + position: absolute; top: 10px; left: 25px; - width: 350px; + width: 350px; } #logo h1#archtitle { text-indent: -9999px; @@ -129,344 +130,327 @@ body { height: 103px; } #devlist { - width: 80%; - padding: 10px; - margin-left: auto; - margin-right: auto; - border-top: 1px dashed black; - border-bottom: 1px dashed black; - text-align: center; + width: 80%; + padding: 10px; + margin-left: auto; + margin-right: auto; + border-top: 1px dashed #000; + border-bottom: 1px dashed #000; + text-align: center; } .clear { - clear: both; - margin: 0; - padding: 0; + clear: both; + margin: 0; + padding: 0; } .right { - float: right; - width: 320px; - padding: 0 10px 10px 0; + float: right; + width: 320px; + padding: 0 10px 10px 0; } .left { - padding: 10px; - margin: 0 360px 0 0; + padding: 10px; + margin-right: 360px; } .left p { - padding-bottom: 10px; + padding-bottom: 10px; } .box { - padding: 10px; + padding: 10px; } .greybox { - padding: 10px; - background: #f6f3dd; - border: 1px solid #d9d6c2; + padding: 10px; + background-color: #f6f3dd; + border: 1px solid #d9d6c2; } div.listing { - padding-right: 10px; + padding-right: 10px; } .error { - color: #dd0000; - font-size: small; + color: #dd0000; + font-size: small; } .foot { - clear: both; - text-align: center; - font-size: 0.75em; + clear: both; + text-align: center; + font-size: 0.75em; } #search { - float: right; - position: relative; - top: -2em; - font-size: 0.8em; + float: right; + position: relative; + top: -2em; + font-size: 0.8em; } #search input { - background: #f6f3dd; - border: 1px solid #d9d6c2; + background-color: #f6f3dd; + border: 1px solid #d9d6c2; } .smalltext { - text-align: right; - font-size: x-small; + text-align: right; + font-size: x-small; } -/* - * Headers - */ +/* Headers */ h2 { - margin: 20px 0 10px 0; + margin: 20px 0 10px 0; } h2.title { - border-bottom: 1px solid #46494d; + border-bottom: 1px solid #46494d; } h3 { - margin-bottom: 10px; + margin-bottom: 10px; } h3.title { - text-align: right; - border-bottom: 1px solid #46494d; + text-align: right; + border-bottom: 1px solid #46494d; } h4.title { - text-align: left; - border-bottom: 1px solid #46494d; + text-align: left; + border-bottom: 1px solid #46494d; } h4.news { - border-bottom: 1px dotted #0771a6; + border-bottom: 1px dotted #0771a6; margin-bottom: .25em; padding-bottom: .2em; } div.listing h4 { color: #fff; - background: #0771a6; - padding: 3px; + background-color: #0771a6; + padding: 3px; } -/* - * Paragraphs, Anchors, Images - */ +/* Paragraphs, Anchors, Images */ p { - padding-bottom: 20px; + padding-bottom: 20px; } p.news { - font-size: small; + font-size: small; } a { - color: #0771a6; + color: #0771a6; } a:hover { color: #333; } #about { - position: relative; - top: -9px; + position: relative; + top: -9px; } ol { - padding-left: 45px; + padding-left: 45px; } ul.small { - list-style: none; - font-size: x-small; + list-style: none; + font-size: x-small; } ul.links { - list-style: none; - font-size: small; - padding: 0px 0px 20px 20px; + list-style: none; + font-size: small; + padding: 0 0 20px 20px; } img { - border: none; + border: none; } hr { - border: none; - border-top: 1px solid #46494d; + border: none; + border-top: 1px solid #46494d; } -.greybox input, button, textarea, select { - background: #e1e3e6; - border: 1px solid #8faecd; +.greybox input, +button, +textarea, +select { + background-color: #e1e3e6; + border: 1px solid #8faecd; } .box input, button { - padding: 2px; - background: #c1c3f6; - font-size: x-small; - border: 1px solid #8faecd; + padding: 2px; + background-color: #c1c3f6; + font-size: x-small; + border: 1px solid #8faecd; } button#f_trigger { - background: #e1e3e6; + background-color: #e1e3e6; } -/* - * Table stuff - */ +/* Table stuff */ table.center { - margin-left: auto; - margin-right: auto; + margin-left: auto; + margin-right: auto; } table#releases { - font-size: small; - width: 100%; + font-size: small; + width: 100%; } table#releases td { - padding-right: 20px; + padding-right: 20px; } table#repolinks { - font-size: small; - width: 100%; + font-size: small; + width: 100%; } table#repolinks td { - text-align: right; + text-align: right; } table#repolinks th { - text-align: left; + text-align: left; } table#art { - text-align: center; - margin-left: auto; - margin-right: auto; + text-align: center; + margin-left: auto; + margin-right: auto; } .devpic { - vertical-align: top; - padding-right: 15px; + vertical-align: top; + padding-right: 15px; } table.deventry { - padding-bottom: 25px; + padding-bottom: 25px; } .deventry th { - text-align: left; - vertical-align: top; - white-space: nowrap; + text-align: left; + vertical-align: top; + white-space: nowrap; } .deventry td { - width: 100%; + width: 100%; } table.results { - padding: 0px; - border-collapse: collapse; + padding: 0; + border-collapse: collapse; } .results th { - background: #e1e3e6; - border-bottom: 1px solid #46494d; - border-top: 1px solid #46494d; - text-align: left; - padding-top: 0px; - padding-bottom: 0px; - padding-right: 5px; + background-color: #e1e3e6; + border-bottom: 1px solid #46494d; + border-top: 1px solid #46494d; + text-align: left; + padding: 0 5px 0 0; } .results th>a { - text-decoration: none; - color: #46494d; + text-decoration: none; + color: #46494d; } .results td { - padding-right: 5px; - vertical-align: top; - font-size: 0.8em; + padding-right: 5px; + vertical-align: top; + font-size: 0.8em; } .listing th { - font-size: small; - vertical-align: top; - text-align: left; - padding: 2px; + font-size: small; + vertical-align: top; + text-align: left; + padding: 2px; } .listing td { - font-size: small; - padding: 2px; + font-size: small; + padding: 2px; } blockquote.code { - background: #f3f3f3; - border: 1px solid #ccc; - margin-left: auto; - margin-right: auto; - white-space: nowrap; - padding: 5px; - font-family: "DejaVu Sans Mono", "Bitstream Vera Sans Mono", Courier, "Courier New", Monospace; + background-color: #f3f3f3; + border: 1px solid #ccc; + margin-left: auto; + margin-right: auto; + white-space: nowrap; + padding: 5px; + font-family: "DejaVu Sans Mono", "Bitstream Vera Sans Mono", Courier, "Courier New", Monospace; color: #333; font-size: .95em; } -/* - * Wiki Styles - */ +/* Wiki Styles */ h1.wiki { - border-bottom: 1px solid #46494d; + border-bottom: 1px solid #46494d; } div.wikifoot_l { - font-size: x-small; - text-align: left; - padding-top: 25px; + font-size: x-small; + text-align: left; + padding-top: 25px; } div.wikifoot_r { - font-size: x-small; - text-align: right; - float: right; - padding-top: 25px; + font-size: x-small; + text-align: right; + float: right; + padding-top: 25px; } .wikibody { - padding-top: 15px; + padding-top: 15px; } .wikibody ol { - padding-left: 28px; - padding-top: 0px; + padding-left: 28px; + padding-top: 0; } .wikibody ul { - padding-left: 25px; - padding-top: 0px; + padding-left: 25px; + padding-top: 0; } .wikibody dd { - padding-left: 30px; + padding-left: 30px; } .wikibody pre code { - background: #c1c3f6; - border: 1px solid #8faecd; - margin-left: auto; - margin-right: auto; - white-space: nowrap; - padding: 5px; - font-family: Courier, Courier New, Monospace; + background-color: #c1c3f6; + border: 1px solid #8faecd; + margin-left: auto; + margin-right: auto; + white-space: nowrap; + padding: 5px; + font-family: Courier, Courier New, Monospace; } .wikibody blockquote { - padding-left: 30px; + padding-left: 30px; } .wikibody td { - padding: 5px; - border: 1px solid black; + padding: 5px; + border: 1px solid #000; } - /* Used by Django's FormWrappers */ textarea.vLargeTextField { - width: 450px; - height: 250px; + width: 450px; + height: 250px; } .pkgr2 { - background-color: #eee4cb; + background-color: #eee4cb; } #maincontent { - width: 100%; - text-align: left; - clear: both; + width: 100%; + text-align: left; + clear: both; } #maincontent > table { - width: 90%; - margin-left: 5%; - margin-right: 5%; + width: 90%; + margin-left: 5%; + margin-right: 5%; } .pgbox { - width: 90%; - margin-left: 5%; - margin-right: 5%; - background-color: #ffffff; - border-width: 2px; - border-color: #dddddd; - border-style: solid; - text-align: left; - padding: 3px; + width: 90%; + margin-left: 5%; + margin-right: 5%; + background-color: #fff; + border: 2px solid #ddd; + text-align: left; + padding: 3px; } .frontpgboxbody { - padding: 10px; + padding: 10px; } .frontpgboxbody > table { - width: 100%; + width: 100%; } .boxSoftTitle { - text-align: right; + text-align: right; } - .pgboxtitle { - border-width: 2px; - border-style: solid; - border-color: #dddddd; - border-top-width: 1px; - border-top-color: #ffffff; - border-left-width: 1px; - border-left-color: #ffffff; - background-color: #f1f2f4; - text-align: left; - padding-top: 2px; - padding-bottom: 2px; - padding-right: 10px; - padding-left: 10px; -} -.pgboxbody, .pgboxbody-comment { - padding: 10px; + border: 2px solid #ddd; + border-top: 1px solid #fff; + border-left: 1px solid #fff; + background-color: #f1f2f4; + text-align: left; + padding: 2px 10px 2px 10px; +} +.pgboxbody, +.pgboxbody-comment { + padding: 10px; } .pgboxbody input { - margin-right: 10px; + margin-right: 10px; } - .pgboxbody-comment > table { - border-collapse: separate; - border-spacing: 0 15px; + border-collapse: separate; + border-spacing: 0 15px; } - +/* vim:ts=2:sw=2:et:enc=utf-8: + * */ diff --git a/web/html/css/containers.css b/web/html/css/containers.css index 569b63d..fc7458e 100644 --- a/web/html/css/containers.css +++ b/web/html/css/containers.css @@ -1,221 +1,185 @@ - body,table,td,img - { - border: 0px; - margin: 0px; - padding: 0px; - } - +body,table,td,img { + border: none; + margin: 0; + padding: 0; +} /* Main Wrapper Data Format */ - td.preHeader - { - background-color: #000; - border-bottom: 1px solid rgb( 69, 84, 113 ); - height: 16px; - text-align: right; - } - td.headerFill - { - background-color: rgb( 108, 131, 176 ); - border-bottom: 1px solid #000; - } - td.headerDisplay - { - background-color: rgb( 108, 131, 176 ); - padding-left: 16px; - } - td.mainLinks - { - background-color: #eee; - border-bottom: 1px solid #000; - height: 22px; - padding-left: 12px; - } - td.sideBar - { - background-color: #fff; - text-align: center; - vertical-align: top; - width: 150px; - } - td.sideBarGrey - { - background-color: #eee; - border-bottom: 1px solid #000; - text-align: left; - vertical-align: top; - width: 150px; - } - td.sideBarSmall - { - background-color: rgb( 108, 131, 176 ); - border-bottom: 1px solid #000; - height: 16px; - text-align: right; - width: 150px; - } - td.sideBarSmallHeader - { - background-color: rgb(108,131,176); - vertical-align: top; - height: 16px; - padding-top: 1px; - padding-bottom: 2px; - text-align: right; - width: 150px; - } - td.subLinks - { - background-color: rgb( 225, 228, 232 ); - border-right: 1px solid #000; - color: rgb( 120, 120, 120 ); - padding-left: 12px; - height: 19px; - } - td.contentDisplay - { - background-color: #ffffff; - border-right: 1px solid #000; - border-left: 1px solid #000; - border-bottom: 1px solid #000; - text-align: center; - vertical-align: top; - padding: 10; - } - - td.footerDisplay - { - background-color: #eee; - border-bottom: 1px solid #000; - text-align: center; - } - +td.preHeader { + background-color: #000; + border-bottom: 1px solid #455471; + height: 16px; + text-align: right; +} +td.headerFill { + background-color: #6c83b0; + border-bottom: 1px solid #000; +} +td.headerDisplay { + background-color: #6c83b0; + padding-left: 16px; +} +td.mainLinks { + background-color: #eee; + border-bottom: 1px solid #000; + height: 22px; + padding-left: 12px; +} +td.sideBar { + background-color: #fff; + text-align: center; + vertical-align: top; + width: 150px; +} +td.sideBarGrey { + background-color: #eee; + border-bottom: 1px solid #000; + text-align: left; + vertical-align: top; + width: 150px; +} +td.sideBarSmall { + background-color: #6c83b0; + border-bottom: 1px solid #000; + height: 16px; + text-align: right; + width: 150px; +} +td.sideBarSmallHeader { + background-color: #6c83b0; + vertical-align: top; + height: 16px; + padding-top: 1px; + padding-bottom: 2px; + text-align: right; + width: 150px; +} +td.subLinks { + background-color: #ffe4e8; + border-right: 1px solid #000; + color: #787878; + padding-left: 12px; + height: 19px; +} +td.contentDisplay { + background-color: #fff; + border: 1px solid #000; + border-top: none; + text-align: center; + vertical-align: top; + padding: 10px; +} +td.footerDisplay { + background-color: #eee; + border-bottom: 1px solid #000; + text-align: center; +} /* Containers Used Globally */ - table.boxSoft - { - width: 90%; - background-color: #ddd; - text-align: left; - } - td.boxSoft - { - background-color: #fff; - padding: 10; - text-align: left; - } - td.boxSoftColumn - { - padding-left: 16; - padding-right: 16; - text-align: justify; - vertical-align: top; - text-indent: 20px; - } - td.div - { - background-color: #eee; - width: 3px; - } - td.boxSoftTitle - { - border-bottom: 1px solid #fff; - border-top: 1px solid #fff; - background-color: rgb( 241, 242, 244 ); - padding-left: 10; - padding-top: 1; - padding-bottom: 1; - text-align: left; - } - table.boxSoftSmall - { - width: 94%; - background-color: #ddd; - } - td.boxSoftSmall - { - background-color: #fff; - text-align: center; - padding-top: 2; - padding-bottom: 2; - } - td.boxSoftSmallTitle - { - border-bottom: 1px solid #ccc; - background-color: rgb( 241, 242, 244 ); - padding-left: 10; - } - td.ss /* ss = small space */ - { - padding-left: 6px; - vertical-align: top; - } - td.display - { - border-bottom: 1px solid #000; - padding-bottom: 6px; - } - td.features - { - padding: 4px; - text-align: justify; - vertical-align:top; - } - td.formLeft - { - padding: 6px; - text-align: left; - vertical-align: top; - } - td.data1 - { - background-color: #eee; - vertical-align: top; - padding-left: .3em; - text-align: left; - } - td.data2 - { - background-color: #ddd; - vertical-align: top; - padding-left: .3em; - text-align: left; - } - .outofdate - { - background-color: #faa; - padding-left: .3em; - text-align: left; - } - td.text - { - color: #000; - font-size: 12px; - } - th - { - text-align: left; - } - th.header - { - border-bottom: #666 1px solid; - vertical-align: bottom; - } - - input,textarea,select - { - background-color: rgb(108,131,176); - font-family: monospace; - font-size: 12px; - background-color: #ccc; - border: #000000 1px solid; - color: #111111; - } - - input.button - { - background-color: #fff; - color: rgb(108,131,176); - border: 1px solid rgb(108,131,176); - font-size: 12px; - padding: 2px; - } - +table.boxSoft { + width: 90%; + background-color: #ddd; + text-align: left; +} +td.boxSoft { + background-color: #fff; + padding: 2px; + text-align: left; +} +td.boxSoftColumn { + padding-left: 16px; + padding-right: 16px; + text-align: justify; + vertical-align: top; + text-indent: 20px; +} +td.div { + background-color: #eee; + width: 3px; +} +td.boxSoftTitle { + border-bottom: 1px solid #fff; + border-top: 1px solid #fff; + background-color: #f1f2f4; + padding: 1px 0 0 3px; + text-align: left; +} +table.boxSoftSmall { + width: 94px; + background-color: #ddd; +} +td.boxSoftSmall { + background-color: #fff; + text-align: center; + padding-top: 2px; + padding-bottom: 2px; +} +td.boxSoftSmallTitle { + border-bottom: 1px solid #ccc; + background-color: #f1f2f4; + padding-left: 10px; +} +/* ss = small space */ +td.ss { + padding-left: 6px; + vertical-align: top; +} +td.display { + border-bottom: 1px solid #000; + padding-bottom: 6px; +} +td.features { + padding: 4px; + text-align: justify; + vertical-align:top; +} +td.formLeft { + padding: 6px; + text-align: left; + vertical-align: top; +} +td.data1 { + background-color: #eee; + vertical-align: top; + padding-left: .3em; + text-align: left; +} +td.data2 { + background-color: #ddd; + vertical-align: top; + padding-left: .3em; + text-align: left; +} +.outofdate { + background-color: #faa; + padding-left: .3em; + text-align: left; +} +td.text { + color: #000; + font-size: 12px; +} +th { + text-align: left; +} +th.header { + border-bottom: #666 1px solid; + vertical-align: bottom; +} +input, +textarea, +select { + background-color: #6c83b0; + font-family: monospace; + font-size: 12px; + background-color: #ccc; + border: #000 1px solid; + color: #111; +} +input.button { + background-color: #fff; + color: #6c83b0; + border: 1px solid #6c83b0; + font-size: 12px; + padding: 2px; +} +/* vim:ts=2:sw=2:et:enc=utf-8: + * */ diff --git a/web/html/css/fonts.css b/web/html/css/fonts.css index ce6301a..eb35db8 100644 --- a/web/html/css/fonts.css +++ b/web/html/css/fonts.css @@ -1,121 +1,104 @@ /* Standard Fonts */ - span /* Applicable by default in all fonts */ - { - color: #555; - font-family: Bitstream Vera Sans, Lucida Grande, Arial, sans-serif; - } - span.f1 /* Important */ - { - font-size: 20px; - letter-spacing: 1px; - } - span.f2 /* Title */ - { - font-size: 14px; - color: rgb(108, 131, 176); - font-weight: bold; - } - span.f3 /* Sub Title */ - { - color: #888; - font-size: 14px; - font-weight: bold; - } - span.f4 /* Content Text */ - { - color: #444; - font-size: 12px; - } - span.f5 /* Content Small */ - { - color: #333; - font-size: 11px; - } - span.f6 /* Red Message */ - { - color: #b06d6e; - font-size: 14px; - font-weight: bold; - } - span.f7 /* Green Message */ - { - color: #6db06d; - font-size: 14px; - font-weight: bold; - } - span.fix /* Monospace fixed-font */ - { - color: #000; - font-family: monospace, fixed, terminal; - font-size: 12px; - } - span.error /* Content Text */ - { - color: #900; - font-size: 12px; - } - span.warning /* Content Text */ - { - color: #C0C000; - font-size: 12px; - } - - +span /* Applicable by default in all fonts */ +{ + color: #555; + font-family: Bitstream Vera Sans, Lucida Grande, Arial, sans-serif; +} +span.f1 /* Important */ +{ + font-size: 20px; + letter-spacing: 1px; +} +span.f2 /* Title */ +{ + font-size: 14px; + color: #6c83b0; + font-weight: bold; +} +span.f3 /* Sub Title */ +{ + color: #888; + font-size: 14px; + font-weight: bold; + padding-right: 2px; +} +span.f4 /* Content Text */ +{ + color: #444; + font-size: 12px; +} +span.f5 /* Content Small */ +{ + color: #333; + font-size: 11px; +} +span.f6 /* Red Message */ +{ + color: #b06d6e; + font-size: 14px; + font-weight: bold; +} +span.f7 /* Green Message */ +{ + color: #6db06d; + font-size: 14px; + font-weight: bold; +} +span.fix /* Monospace fixed-font */ +{ + color: #000; + font-family: monospace, fixed, terminal; + font-size: 12px; +} +span.error /* Content Text */ +{ + color: #900; + font-size: 12px; +} +span.warning /* Content Text */ +{ + color: #c0c000; + font-size: 12px; +} /* Font Attribute Change (#6c83b0)*/ - span.blue - { - color: rgb( 108, 131, 176 ); - } - span.white - { - color: white; - } - span.black - { - color: black; - } - span.green - { - color: #6db06d; - } - span.link - { - color: rgb( 108, 131, 176 ); - font-weight: bold; - } - +span.blue { color: #6c83b0; } +span.white { color: #fff; } +span.black { color: #000; } +span.green { color: #6db06d; } +span.link +{ + color: #6c83b0; + font-weight: bold; +} /* Misc (c9d1e2) */ - span.preHeader - { - color: rgb( 201, 209, 226 ); - font-weight: bold; - font-size: 11px; - padding-right: 8px; - word-spacing: 8px; - } - span.sideBarSmallHeader - { - color: #fff; - font-weight: bold; - font-size: 11px; - padding-right: 8px; - } - +span.preHeader +{ + color: #c9d1e2; + font-weight: bold; + font-size: 11px; + padding-right: 8px; + word-spacing: 8px; +} +span.sideBarSmallHeader +{ + color: #fff; + font-weight: bold; + font-size: 11px; + padding-right: 8px; +} a { - color: #0771a6; - text-decoration: none; - font-weight: bold; + color: #0771a6; + text-decoration: none; + font-weight: bold; } - a:hover { - color: #333; - text-decoration: none; - font-weight: bold; -} - -h1,h2,h3,h4 { - font-size: 16pt; + color: #333; + text-decoration: none; + font-weight: bold; } -span.important { - color: #f00; +h1, h2, h3, h4 { + font-size: 16pt; } +span.important { color: #f00; } +/* vim:ts=2:sw=2:et:enc=utf-8: + * */ -- 1.4.4.4 -- Michael Klier www: http://www.chimeric.de jabber: chi(a)jabber.shipdown.de key: http://downloads.chimeric.de/chi.asc key-id: 0x8308F551

2 1

[aur-dev] [PATCH] Fix FS#8672
by Callan Barrett 05 Jun '08

05 Jun '08

Fixes all those bugs about people not being able to upload packages. It patches the can_submit_pkg function to allow people to overwrite dummy packages, I think this was the old behavior. -- Callan Barrett

3 2

[aur-dev] [PATCH] Rewrite pkg_search_form.php
by Callan Barrett 05 Jun '08

05 Jun '08

Ok let's try again, this does what the last 2 patches did except will actually work. -- Callan Barrett

1 0

[aur-dev] [PATCH] Moved package search form to template file
by Callan Barrett 05 Jun '08

05 Jun '08

Search form for packages is now in its own template file, no more print statements. I've also cleaned up the html a little and changed the way select elements are printed. -- Callan Barrett

2 2

[aur-dev] [PATCH] Bring back sort by search
by Callan Barrett 05 Jun '08

05 Jun '08

Since people wanted stuff like sorting by age I've put sort by back in the search dialog. I pretty much just dumped the form element back in from old releases so although it should work fine perhaps people can take a quick look and make sure. -- Callan Barrett

1 0

[aur-dev] [PATCH] Extended JSON query method
by Sylvester Johansson 04 Jun '08

04 Jun '08

Alright alright. Here you go. But there really should be some modelines if indentation is so important :P

1 0