Replacing with CSS styles where appropriate. A previously unused CSS style is tweaked in the stylesheet to match most of what was done via non-CSS styling. Signed-off-by: Dan McGee <dan@archlinux.org> --- Things look mostly the same on all these pages. However, there are a few exceptions- for example, the removal of the needless centering of the account search form. web/html/css/arch.css | 9 +++++---- web/html/index.php | 2 +- web/html/pkgsubmit.php | 2 +- web/lib/acctfuncs.inc.php | 14 ++++---------- web/template/pkg_search_results.php | 18 +++++++++--------- web/template/search_accounts_form.php | 2 +- web/template/tu_details.php | 12 ++++++------ web/template/tu_list.php | 16 ++++++++-------- 8 files changed, 35 insertions(+), 40 deletions(-) diff --git a/web/html/css/arch.css b/web/html/css/arch.css index eec02ee..1e588f1 100644 --- a/web/html/css/arch.css +++ b/web/html/css/arch.css @@ -244,13 +244,14 @@ table.center { } table.results { padding: 0px; + width: 100%; border-collapse: collapse; } .results th { - background-color: #e1e3e6; - border-bottom: 1px solid #46494d; - border-top: 1px solid #46494d; - padding: 0px 5px 0px 0px; + text-align: center; +} +.results th, .results td { + padding: 1px; } .results th>a { text-decoration: none; diff --git a/web/html/index.php b/web/html/index.php index 138541f..0d513d3 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -50,7 +50,7 @@ echo __( <br /> <?php echo __('Some packages may be provided as binaries in [community].'); ?> </p> -<table border='0' cellpadding='0' cellspacing='3' width='90%'> +<table> <tr> <td class='boxSoft' valign='top'> <?php updates_table($dbh); ?> diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index a5cc0c0..54c4b3e 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -437,7 +437,7 @@ html_header("Submit"); <form action='pkgsubmit.php' method='post' enctype='multipart/form-data'> <div> <input type='hidden' name='pkgsubmit' value='1' /> </div> - <table border='0' cellspacing='5'> + <table> <tr> <td class='f4' align='right'><?php print __("Package Category"); ?>:</td> <td class='f4' align='left'> diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 59fa730..4c6da9f 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -35,7 +35,7 @@ function display_account_form($UTYPE,$A,$U="",$T="",$S="", print "<input type='hidden' name='ID' value='".$UID."' />\n"; } print "</fieldset>"; - print "<table border='0' cellpadding='0' cellspacing='0' width='80%' style=\"margin:0 auto;\">\n"; + print "<table>\n"; print "<tr><td colspan='2'> </td></tr>\n"; print "<tr>"; @@ -415,13 +415,7 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="", } else { $num_rows = mysql_num_rows($result); if ($num_rows) { - print "<table border='0' cellpadding='0'"; - print " cellspacing='0' width='90%'"; - print " style=\"margin:0 auto\">\n"; - print "<tr>"; - print "<td colspan='2'>"; - print "<table border='0' cellpadding='0'"; - print " cellspacing='0' width='100%'>\n"; + print "<table class='results'>\n"; print "<tr>"; print "<th class='header'>"; print "<span class='f2'>".__("Username")."</span></th>"; @@ -483,8 +477,8 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="", $i++; } print "</table>\n"; - print "</td></tr>\n"; + print "<table class='results'>\n"; print "<tr>"; print "<td align='left'>"; print "<form action='account.php' method='post'>\n"; @@ -540,7 +534,7 @@ function display_account_info($U="", $T="", $E="", $R="", $I="") { global $SUPPORTED_LANGS; - print "<table border='0' cellpadding='0' cellspacing='0' width='33%' style=\"margin:0 auto;\">\n"; + print "<table>\n"; print " <tr>\n"; print " <td colspan='2'> </td>\n"; print " </tr>\n"; diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index e576e6e..8ef352b 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -12,32 +12,32 @@ -<table width='100%' cellspacing='0' cellpadding='2'> +<table class='results'> <tr> <?php if ($SID): ?> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'> </th> + <th class='header'> </th> <?php endif; ?> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <th class='header'><span class='f2'> <a href='?<?php print mkurl('SB=c&SO=' . $SO_next) ?>'><?php print __("Category") ?></a> </span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom; text-align: center;'><span class='f2'> + <th class='header'><span class='f2'> <a href='?<?php print mkurl('SB=n&SO=' . $SO_next) ?>'><?php print __("Name") ?></a> </span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <th class='header'><span class='f2'> <a href='?<?php print mkurl('SB=v&SO=' . $SO_next) ?>'><?php print __("Votes") ?></a> </span></th> <?php if ($SID): ?> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <th class='header'><span class='f2'> <a href='?<?php print mkurl('SB=w&SO=' . $SO_next) ?>'><?php print __("Voted") ?></a> </span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <th class='header'><span class='f2'> <a href='?<?php print mkurl('SB=o&SO=' . $SO_next) ?>'><?php print __("Notify") ?></a> </span></th> <?php endif; ?> - <th style='border-bottom: #666 1px solid; vertical-align: bottom; text-align: center;'><span class='f2'><?php print __("Description") ?></span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <th class='header'><span class='f2'><?php print __("Description") ?></span></th> + <th class='header'><span class='f2'> <a href='?<?php print mkurl('SB=m&SO=' . $SO_next) ?>'><?php print __("Maintainer") ?></a> </span></th> </tr> diff --git a/web/template/search_accounts_form.php b/web/template/search_accounts_form.php index 9d6c40d..9b0d8e2 100644 --- a/web/template/search_accounts_form.php +++ b/web/template/search_accounts_form.php @@ -1,6 +1,6 @@ <br /> <form action='account.php' method='post'> - <table border='0' cellpadding='0' cellspacing='0' width='80%' style="margin:0 auto;"> + <table> <tr> <td align='left'><?php print __("Username"); ?>:</td> diff --git a/web/template/tu_details.php b/web/template/tu_details.php index 7d6c305..c48f603 100644 --- a/web/template/tu_details.php +++ b/web/template/tu_details.php @@ -24,13 +24,13 @@ N/A <?php print str_replace("\n", "<br />\n", htmlspecialchars($row['Agenda'])) ?> </p> -<table class="boxSoft" width='100%' cellspacing='0' cellpadding='2'> +<table class="boxSoft"> <tr> -<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Yes") ?></span></th> -<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("No") ?></span></th> -<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Abstain") ?></span></th> -<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Total") ?></span></th> -<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __('Voted') ?></span></th> +<th class='boxSoftTitle'><span class='f2'><?php print __("Yes") ?></span></th> +<th class='boxSoftTitle'><span class='f2'><?php print __("No") ?></span></th> +<th class='boxSoftTitle'><span class='f2'><?php print __("Abstain") ?></span></th> +<th class='boxSoftTitle'><span class='f2'><?php print __("Total") ?></span></th> +<th class='boxSoftTitle'><span class='f2'><?php print __('Voted') ?></span></th> </tr> <tr> <td class='data1'><span class='f5'><span class='blue'><?php print $row['Yes'] ?></span></span></td> diff --git a/web/template/tu_list.php b/web/template/tu_list.php index 75d9414..0966a4c 100644 --- a/web/template/tu_list.php +++ b/web/template/tu_list.php @@ -2,17 +2,17 @@ <div class="pgboxtitle" style="text-align:right;"> <span class='f3'><?php print $type ?></span> </div> - <table width='100%' cellspacing='0' cellpadding='2'> + <table class='results'> <tr> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Proposal") ?></span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <th class='header'><span class='f2'><?php print __("Proposal") ?></span></th> + <th class='header'><span class='f2'> <a href='?off=<?php print $off ?>&by=<?php print $by_next ?>'><?php print __("Start") ?></a> </span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("End") ?></span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("User") ?></span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Yes") ?></span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("No") ?></span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __('Voted') ?></span></th> + <th class='header'><span class='f2'><?php print __("End") ?></span></th> + <th class='header'><span class='f2'><?php print __("User") ?></span></th> + <th class='header'><span class='f2'><?php print __("Yes") ?></span></th> + <th class='header'><span class='f2'><?php print __("No") ?></span></th> + <th class='header'><span class='f2'><?php print __('Voted') ?></span></th> </tr> <?php if (mysql_num_rows($result) == 0) { ?> <tr><td align='center' colspan='0'><?php print __("No results found.") ?></td></tr> -- 1.7.6