[aur-dev] [PATCH 4/4] Rename "pgbox" class to "box"
Lukas Fleischer
archlinux at cryptocrack.de
Fri Nov 4 12:20:37 EDT 2011
For consistency with archweb. Change our style sheet to use the same
layout and colors that archweb uses, also.
Signed-off-by: Lukas Fleischer <archlinux at cryptocrack.de>
---
web/html/account.php | 4 ++--
web/html/addvote.php | 4 ++--
web/html/css/arch.css | 23 +++++++++++------------
web/html/index.php | 4 ++--
web/html/passreset.php | 4 ++--
web/html/pkgsubmit.php | 4 ++--
web/html/tu.php | 2 +-
web/template/actions_form.php | 2 +-
web/template/footer.php | 2 +-
web/template/login_form.php | 2 +-
web/template/pkg_comment_form.php | 2 +-
web/template/pkg_comments.php | 4 ++--
web/template/pkg_details.php | 4 ++--
web/template/pkg_search_form.php | 2 +-
web/template/pkg_search_results.php | 12 ++++++------
web/template/tu_details.php | 12 ++++++------
web/template/tu_list.php | 2 +-
17 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/web/html/account.php b/web/html/account.php
index 0f2ae2c..1c0fff4 100644
--- a/web/html/account.php
+++ b/web/html/account.php
@@ -12,9 +12,9 @@ html_header(__('Accounts'));
# Main page processing here
#
-echo "<div class=\"pgbox\">\n";
+echo "<div class=\"box\">\n";
echo " <h2>".__("Accounts")."</h2>\n";
-echo " <div class=\"pgboxbody\">\n";
+echo " <div class=\"boxbody\">\n";
$action = in_request("Action");
diff --git a/web/html/addvote.php b/web/html/addvote.php
index c264249..f7a74ff 100644
--- a/web/html/addvote.php
+++ b/web/html/addvote.php
@@ -81,9 +81,9 @@ if ($atype == "Trusted User" OR $atype == "Developer") {
<p style="color: red;" class="pkgoutput"><?php print $error ?></p>
<?php endif; ?>
-<div class="pgbox">
+<div class="box">
<h2><?php print __("Submit a proposal to vote on.") ?></h2>
-<div class="pgboxbody">
+<div class="boxbody">
<form action='addvote.php' method='post'>
<p>
<b><?php print __('Applicant/TU') ?></b>
diff --git a/web/html/css/arch.css b/web/html/css/arch.css
index 0ad7765..faeb4e8 100644
--- a/web/html/css/arch.css
+++ b/web/html/css/arch.css
@@ -292,27 +292,26 @@ blockquote.code {
/* AUR Styles */
-.pgbox {
- margin: 0 25px;
- margin-bottom: 1%;
- background-color: #fff;
- border: 2px solid #ddd;
- padding: 3px;
+.box {
+ margin-bottom: 1.5em;
+ padding: 0.65em;
+ background: #ecf2f5;
+ border: 1px solid #bcd;
}
-.frontpgboxbody {
+.frontboxbody {
padding: 10px;
}
-.frontpgboxbody > table {
+.frontboxbody > table {
width: 100%;
}
-.pgboxbody,
-.pgboxbody-comment {
+.boxbody,
+.boxbody-comment {
padding: 10px;
}
-.pgboxbody input {
+.boxbody input {
margin-right: 10px;
}
-.pgboxbody-comment > table {
+.boxbody-comment > table {
border-collapse: separate;
border-spacing: 0px 15px;
}
diff --git a/web/html/index.php b/web/html/index.php
index e9715c6..edf2a66 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -16,9 +16,9 @@ $dbh = db_connect();
?>
-<div class="pgbox">
+<div class="box">
<h2>AUR <?php print __("Home"); ?></h2>
-<div class="frontpgboxbody">
+<div class="frontboxbody">
<p>
<?php
diff --git a/web/html/passreset.php b/web/html/passreset.php
index a65a47b..fa32d9b 100644
--- a/web/html/passreset.php
+++ b/web/html/passreset.php
@@ -84,9 +84,9 @@ html_header(__("Password Reset"));
?>
-<div class="pgbox">
+<div class="box">
<h2><?php print __("Password Reset"); ?></h2>
- <div class="pgboxbody">
+ <div class="boxbody">
<?php
if ($error) {
echo '<p><span class="error">'.$error.'</span></p>';
diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php
index 8df2847..f7b0355 100644
--- a/web/html/pkgsubmit.php
+++ b/web/html/pkgsubmit.php
@@ -431,9 +431,9 @@ html_header("Submit");
<p class="pkgoutput"><?php print $error ?></p>
<?php endif; ?>
-<div class="pgbox">
+<div class="box">
<h2><?php print __("Submit"); ?></h2>
- <div class="pgboxbody">
+ <div class="boxbody">
<p><?php echo __("Upload your source packages here. Create source packages with `makepkg --source`.") ?></p>
<?php
diff --git a/web/html/tu.php b/web/html/tu.php
index 6e202c8..74f3ac2 100644
--- a/web/html/tu.php
+++ b/web/html/tu.php
@@ -151,7 +151,7 @@ if ($atype == "Trusted User" OR $atype == "Developer") {
$qnext = "SELECT ID FROM TU_VoteInfo";
$nextresult = db_query($qnext, $dbh);
?>
-<div class="pgbox">
+<div class="box">
<p><a href='addvote.php'><?php print __("Add Proposal") ?></a></p>
<?php if (mysql_num_rows($result)) { $by = htmlentities($by, ENT_QUOTES); ?>
diff --git a/web/template/actions_form.php b/web/template/actions_form.php
index 68d83d7..9b6039a 100644
--- a/web/template/actions_form.php
+++ b/web/template/actions_form.php
@@ -1,4 +1,4 @@
-<div class="pgbox">
+<div class="box">
<form action="packages.php?ID=<?php echo $row['ID'] ?>" method="post">
<fieldset>
<input type='hidden' name='IDs[<?php echo $row['ID'] ?>]' value='1' />
diff --git a/web/template/footer.php b/web/template/footer.php
index e3497f6..6a16e36 100644
--- a/web/template/footer.php
+++ b/web/template/footer.php
@@ -2,7 +2,7 @@
<!-- End of main content -->
<?php
if ($ver) {
- echo "<div class=\"pgbox version\">$ver</div>";
+ echo "<div class=\"box version\">$ver</div>";
}
?>
</div>
diff --git a/web/template/login_form.php b/web/template/login_form.php
index 21bdaa7..cc668af 100644
--- a/web/template/login_form.php
+++ b/web/template/login_form.php
@@ -1,4 +1,4 @@
-<div id="login_bar" class="pgbox">
+<div id="login_bar" class="box">
<?php
if (isset($_COOKIE["AURSID"])) {
print __("Logged-in as: %s", '<b>' . username_from_sid($_COOKIE["AURSID"]) . '</b>');
diff --git a/web/template/pkg_comment_form.php b/web/template/pkg_comment_form.php
index a2bbf71..ebe4194 100644
--- a/web/template/pkg_comment_form.php
+++ b/web/template/pkg_comment_form.php
@@ -49,7 +49,7 @@ if (isset($_REQUEST['comment'])) {
# Prompt visitor for comment
?>
-<div class="pgbox">
+<div class="box">
<form action='<?php echo $_SERVER['REQUEST_URI'] ?>' method='post'>
<div style="padding: 1%">
<?php
diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php
index aed9ca8..6480ea6 100644
--- a/web/template/pkg_comments.php
+++ b/web/template/pkg_comments.php
@@ -1,4 +1,4 @@
-<div class="pgbox">
+<div class="box">
<?php
$uid = uid_from_sid($SID);
while (list($indx, $carr) = each($comments)) { ?>
@@ -38,7 +38,7 @@ while (list($indx, $carr) = each($comments)) { ?>
<?php
$count = package_comments_count($_GET['ID']);
if ($count > 10 && !isset($_GET['comments'])) {
- echo '<div class="pgbox">';
+ echo '<div class="box">';
echo '<a href="'. $_SERVER['REQUEST_URI'] . '&comments=all">'. __('Show all %s comments', $count) . '</a>';
echo '</div>';
}
diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index 8fbee81..b664bcd 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -69,9 +69,9 @@ $required_by = package_required($row["Name"]);
$sources = package_sources($row["ID"]);
?>
-<div class="pgbox">
+<div class="box">
<h2><?php echo __("Package Details") . ': ' . htmlspecialchars($row['Name']) . ' ' . htmlspecialchars($row['Version']) ?></h2>
- <div class="pgboxbody">
+ <div class="boxbody">
<div id="detailslinks" class="listing">
<div id="actionlist">
diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php
index 3e291e1..39b9e21 100644
--- a/web/template/pkg_search_form.php
+++ b/web/template/pkg_search_form.php
@@ -1,6 +1,6 @@
<?php include_once('pkgfuncs.inc.php') ?>
-<div class='pgbox'>
+<div class='box'>
<form action='packages.php' method='get'>
<h2><?php print __("Search Criteria"); ?></h2>
<div>
diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php
index 209a80d..47146b8 100644
--- a/web/template/pkg_search_results.php
+++ b/web/template/pkg_search_results.php
@@ -1,10 +1,10 @@
<?php if (!$result) { ?>
- <div class='pgboxbody'><?php print __("Error retrieving package list.") ?></div>
+ <div class='boxbody'><?php print __("Error retrieving package list.") ?></div>
<?php } elseif ($total == 0) { ?>
- <div class='pgboxbody'><?php print __("No packages matched your search criteria.") ?></div>
+ <div class='boxbody'><?php print __("No packages matched your search criteria.") ?></div>
<?php } else { ?>
<form action='packages.php?<?php echo htmlentities($_SERVER['QUERY_STRING']) ?>' method='post'>
- <div class="pgbox">
+ <div class="box">
<h2><?php print __("Package Listing") ?></h2>
@@ -84,10 +84,10 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) {
<?php } ?>
</table>
-</div> <!-- .pgbox ??! -->
+</div> <!-- .box ??! -->
- <div class="pgbox pkg_search_results_footer">
+ <div class="box pkg_search_results_footer">
<div class="legend_and_actions">
<div class="legend">
<span class='f3'><?php echo __('Legend') ?></span>
@@ -132,6 +132,6 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) {
<?php } ?>
</div>
</div> <!-- .page_links -->
- </div> <!-- .pgbox .pkg_search_results_footer -->
+ </div> <!-- .box .pkg_search_results_footer -->
</form>
<?php } # search was successful and returned multiple results ?>
diff --git a/web/template/tu_details.php b/web/template/tu_details.php
index 4b79a98..c71c6b9 100644
--- a/web/template/tu_details.php
+++ b/web/template/tu_details.php
@@ -1,6 +1,6 @@
-<div class="pgbox">
+<div class="box">
<h2><?php print __("Proposal Details") ?></h2>
-<div class="pgboxbody">
+<div class="boxbody">
<?php
if ($isrunning == 1) { ?>
<p style='font-weight: bold; color: red'>
@@ -50,17 +50,17 @@ N/A
<?php
if (!$isrunning) { ?>
-<div class="pgbox">
+<div class="box">
<h2><?php echo __('Voters'); ?></h2>
- <div class="pgboxbody">
+ <div class="boxbody">
<?php echo $whovoted; ?>
</div>
</div>
<?php
} ?>
-<div class='pgbox'>
-<div class='pgboxbody'>
+<div class='box'>
+<div class='boxbody'>
<?php if ($canvote == 1) { ?>
<form action='tu.php?id=<?php print $row['ID'] ?>' method='post'>
<fieldset>
diff --git a/web/template/tu_list.php b/web/template/tu_list.php
index 006e65c..f99c632 100644
--- a/web/template/tu_list.php
+++ b/web/template/tu_list.php
@@ -1,4 +1,4 @@
-<div class="pgbox">
+<div class="box">
<h2><?php print $type ?></h2>
<table class='results'>
<tr>
--
1.7.7.2
More information about the aur-dev
mailing list