diff options
author | canyonknight <canyonknight@gmail.com> | 2012-05-23 13:49:02 -0400 |
---|---|---|
committer | Lukas Fleischer <archlinux@cryptocrack.de> | 2012-07-06 11:26:25 +0200 |
commit | d2480e8b9d3d0f946d57fa9422811cb37296b8b4 (patch) | |
tree | 46c2f3de265c25bb40fadb507688e10dd1733e62 | |
parent | d8b2eb4b628e8927b0bed1b254c996520de95b83 (diff) |
Overhaul to stat tables to match archweb
* Move stat tables into widget boxes to match archweb
* Remove old span styles
* Clean-up XHTML formatting
* Minor whitespace fix
Signed-off-by: canyonknight <canyonknight@gmail.com>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
-rw-r--r-- | web/template/stats/general_stats_table.php | 39 | ||||
-rw-r--r-- | web/template/stats/updates_table.php | 46 | ||||
-rw-r--r-- | web/template/stats/user_table.php | 44 |
3 files changed, 49 insertions, 80 deletions
diff --git a/web/template/stats/general_stats_table.php b/web/template/stats/general_stats_table.php index a100dfe..e2b12c7 100644 --- a/web/template/stats/general_stats_table.php +++ b/web/template/stats/general_stats_table.php @@ -1,37 +1,36 @@ -<table class='boxSoft'> +<h3><?php echo __("Statistics") ?></h3> + +<table> <tr> - <th colspan='2' class='boxSoftTitle'><span class='f3'><?php print __("Statistics") ?></span></th> + <td><?php print __("Packages"); ?></td> + <td><?php print $unsupported_count; ?></td> </tr> <tr> - <td class='boxSoft'><span class='f4'><?php print __("Packages"); ?></span></td> - <td class='boxSoft'><span class='f4'><?php print $unsupported_count; ?></span></td> + <td><?php print __("Orphan Packages"); ?></td> + <td><?php print $orphan_count; ?></td> </tr> <tr> - <td class='boxSoft'><span class='f4'><?php print __("Orphan Packages"); ?></span></td> - <td class='boxSoft'><span class='f4'><?php print $orphan_count; ?></span></td> + <td><?php print __("Packages added in the past 7 days"); ?></td> + <td><?php print $add_count; ?></td> </tr> <tr> - <td class='boxSoft'><span class='f4'><?php print __("Packages added in the past 7 days"); ?></span></td> - <td class='boxSoft'><span class='f4'><?php print $add_count; ?></span></td> + <td><?php print __("Packages updated in the past 7 days"); ?></td> + <td><?php print $update_count; ?></td> </tr> <tr> - <td class='boxSoft'><span class='f4'><?php print __("Packages updated in the past 7 days"); ?></span></td> - <td class='boxSoft'><span class='f4'><?php print $update_count; ?></span></td> + <td><?php print __("Packages updated in the past year"); ?></td> + <td><?php print $update_year_count; ?></td> </tr> <tr> - <td class='boxSoft'><span class='f4'><?php print __("Packages updated in the past year"); ?></span></td> - <td class='boxSoft'><span class='f4'><?php print $update_year_count; ?></span></td> + <td><?php print __("Packages never updated"); ?></td> + <td><?php print $never_update_count; ?></td> </tr> <tr> - <td class='boxSoft'><span class='f4'><?php print __("Packages never updated"); ?></span></td> - <td class='boxSoft'><span class='f4'><?php print $never_update_count; ?></span></td> + <td><?php print __("Registered Users"); ?></td> + <td><?php print $user_count; ?></td> </tr> <tr> - <td class='boxSoft'><span class='f4'><?php print __("Registered Users"); ?></span></td> - <td class='boxSoft'><span class='f4'><?php print $user_count; ?></span></td> - </tr> - <tr> - <td class='boxSoft'><span class='f4'><?php print __("Trusted Users"); ?></span></td> - <td class='boxSoft'><span class='f4'><?php print $tu_count; ?></span></td> + <td><?php print __("Trusted Users"); ?></td> + <td><?php print $tu_count; ?></td> </tr> </table> diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php index 92c6e42..b942dbc 100644 --- a/web/template/stats/updates_table.php +++ b/web/template/stats/updates_table.php @@ -1,36 +1,16 @@ -<table class="boxSoft"> -<tr> -<th colspan="2" class="boxSoftTitle" style="text-align: right"> -<span class="f3"><?php print __("Recent Updates") ?><span class="f5"></span></span> -<a href="rss.php"><img src="images/feed-icon-14x14.png" alt="RSS Feed" /></a> -</th> -</tr> +<h3><?php echo __("Recent Updates") ?></h3> -<?php foreach ($newest_packages->getIterator() as $row): ?> -<tr> -<td class="boxSoft"> -<span class="f4"><span class="blue"> -<a href="packages.php?ID=<?php print intval($row["ID"]); ?>"> -<?php print htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]); ?> -</a></span></span> -</td> -<td class="boxSoft"> - -<?php -$mod_int = intval($row["ModifiedTS"]); -$sub_int = intval($row["SubmittedTS"]); - -if ($mod_int == $sub_int): - $modstring = '<img src="images/new.gif" alt="New!" /> ' . gmdate("Y-m-d H:i", $sub_int); -else: - $modstring = gmdate("Y-m-d H:i", $mod_int); -endif; -?> - -<span class="f4"><?php print $modstring; ?></span> -</td> -</tr> - -<?php endforeach; ?> +<a href="rss.php" title="Arch Package Updates RSS Feed" class="rss-icon"><img src="images/feed-icon-14x14.png" alt="RSS Feed" /></a> +<table> + <?php foreach ($newest_packages->getIterator() as $row): ?> + <tr> + <td> + <a href="packages.php?ID=<?php print intval($row["ID"]); ?>"><?php print htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]); ?></a> + </td> + <td> + <span><?php print gmdate("Y-m-d H:i", intval($row["ModifiedTS"])); ?></span> + </td> + </tr> + <?php endforeach; ?> </table> diff --git a/web/template/stats/user_table.php b/web/template/stats/user_table.php index 36a6b10..0882119 100644 --- a/web/template/stats/user_table.php +++ b/web/template/stats/user_table.php @@ -1,31 +1,21 @@ <?php - $username = username_from_sid($_COOKIE["AURSID"]); +$username = username_from_sid($_COOKIE["AURSID"]); ?> -<table class='boxSoft'> -<tr> -<th colspan='2' class='boxSoftTitle'> -<span class='f3'><?php print __("My Statistics"); ?></span> -</th> -</tr> -<tr> -<td class='boxSoft'> -<span class='f4'><a href="packages.php?SeB=m&L=2&K=<?php echo $username; ?>"> -<?php print __("Packages in unsupported"); ?></a></span> -</td> -<td class='boxSoft'> -<span class='f4'><?php print $maintainer_unsupported_count; ?></span> -</td> -</tr> -<tr> -<td class='boxSoft'> -<span class='f4'><a href="packages.php?SeB=m&outdated=on&K=<?php echo $username; ?>"> -<?php print __("Out of Date"); ?></a></span> -</td> -<td class='boxSoft'> -<span class='f4'> -<?php echo $flagged_outdated ?></span> -</td> -</tr> -</table> +<h3><?php echo __("My Statistics"); ?></h3> +<table> + <tr> + <td> + <a href="packages.php?SeB=m&L=2&K=<?php echo $username; ?>"> +<?php print __("Packages in unsupported"); ?></a> + </td> + <td><?php print $maintainer_unsupported_count; ?></td> + </tr> + <tr> + <td> + <a href="packages.php?SeB=m&outdated=on&K=<?php echo $username; ?>"><?php print __("Out of Date"); ?></a> + </td> + <td><?php echo $flagged_outdated ?></td> + </tr> +</table> |