[aur-dev] [PATCH 1/4] arch.css: Sync default color and font with archweb

newer
[aur-dev] [PATCH] Use sane date...

Lukas Fleischer

4 Nov 2011 4 Nov '11

4:20 p.m.

Signed-off-by: Lukas Fleischer --- web/html/css/arch.css | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/web/html/css/arch.css b/web/html/css/arch.css index 23b8aa7..a7cb74d 100644 --- a/web/html/css/arch.css +++ b/web/html/css/arch.css @@ -1,11 +1,10 @@ * { margin: 0; padding: 0; } * ul { padding: 20px; } body { - min-width: 600px; - background-color: white; - color: #555; - font-family: "DejaVu Sans", sans-serif; - font-size: 12px; + min-width: 650px; + background: #f6f9fc;; + color: #222; + font: normal 100% sans-serif; } /* Divs */ #title { -- 1.7.7.2

Show replies by date

Lukas Fleischer

4 Nov 4 Nov

4:20 p.m.

New subject: [aur-dev] [PATCH 2/4] Wrap everything in a content container

For consistency with archweb. Signed-off-by: Lukas Fleischer --- web/html/css/containers.css | 8 ++++++ web/template/footer.php | 1 + web/template/header.php | 55 ++++++++++++++++++++++--------------------- 3 files changed, 37 insertions(+), 27 deletions(-) diff --git a/web/html/css/containers.css b/web/html/css/containers.css index 977e215..ab1356b 100644 --- a/web/html/css/containers.css +++ b/web/html/css/containers.css @@ -267,3 +267,11 @@ input[type=image] { font-size: 0.9em; font-style: italic; } + +/* scale fonts down to a sane default (16 * .812 = 13px) */ +#content { + margin: 0 auto; + text-align: left; + width: 95%; + font-size: 0.812em; +} diff --git a/web/template/footer.php b/web/template/footer.php index 435de5c..e3497f6 100644 --- a/web/template/footer.php +++ b/web/template/footer.php @@ -5,5 +5,6 @@ echo "

$ver</div>"; } ?> + </div> </body> </html> diff --git a/web/template/header.php b/web/template/header.php index 73486b4..150982a 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -29,34 +29,35 @@ </div> </div> - <div id="archdev-navbar"> - <ul> - <li><a href="index.php">AUR <?php print __("Home"); ?></a></li> - <li><a href="account.php"><?php print __("Accounts"); ?></a></li> - <li><a href="packages.php"><?php print __("Packages"); ?></a></li> - <li><a href="http://bugs.archlinux.org/index.php?tasks=all&project=2"><?php print __("Bugs"); ?></a></li> - <li><a href="http://archlinux.org/mailman/listinfo/aur-general"><?php print __("Discussion"); ?></a></li> - <?php if (isset($_COOKIE['AURSID'])): ?> - <?php if (check_user_privileges()): ?><li><a href="tu.php"><?php print __("Trusted User"); ?></a></li><?php endif; ?> - <li><?php print __("My Packages"); ?></a></li> - <li><a href="pkgsubmit.php"><?php print __("Submit"); ?></a></li> - <?php endif; ?> - </ul> - </div> + <div id="content"> + <div id="archdev-navbar"> + <ul> + <li><a href="index.php">AUR <?php print __("Home"); ?></a></li> + <li><a href="account.php"><?php print __("Accounts"); ?></a></li> + <li><a href="packages.php"><?php print __("Packages"); ?></a></li> + <li><a href="http://bugs.archlinux.org/index.php?tasks=all&project=2"><?php print __("Bugs"); ?></a></li> + <li><a href="http://archlinux.org/mailman/listinfo/aur-general"><?php print __("Discussion"); ?></a></li> + <?php if (isset($_COOKIE['AURSID'])): ?> + <?php if (check_user_privileges()): ?><li><a href="tu.php"><?php print __("Trusted User"); ?></a></li><?php endif; ?> + <li><?php print __("My Packages"); ?></a></li> + <li><a href="pkgsubmit.php"><?php print __("Submit"); ?></a></li> + <?php endif; ?> + </ul> + </div> - <?php include("login_form.php"); ?> + <?php include("login_form.php"); ?> - <div id="lang_sub"> -<?php -reset($SUPPORTED_LANGS); -foreach ($SUPPORTED_LANGS as $lang => $lang_name) { - print '<a href="' - . htmlspecialchars($_SERVER["PHP_SELF"], ENT_QUOTES) - ."?setlang=$lang\" title=\"$lang_name\">" - . strtolower($lang) . "</a>\n"; -} -?> - </div> -  + <div id="lang_sub"> + <?php + reset($SUPPORTED_LANGS); + foreach ($SUPPORTED_LANGS as $lang => $lang_name) { + print '<a href="' + . htmlspecialchars($_SERVER["PHP_SELF"], ENT_QUOTES) + ."?setlang=$lang\" title=\"$lang_name\">" + . strtolower($lang) . "</a>\n"; + } + ?> + </div> +  -- 1.7.7.2

Lukas Fleischer

4:20 p.m.

New subject: [aur-dev] [PATCH 3/4] Remove all traces of ".pgboxtitle"

Using a div container to format heading is ridiculous. Use "<h2></h2>" instead. The new style of these headings is identical to the style definition in "archweb.css". Signed-off-by: Lukas Fleischer --- web/html/account.php | 2 +- web/html/addvote.php | 2 +- web/html/css/arch.css | 10 ---------- web/html/css/fonts.css | 7 ++++++- web/html/index.php | 4 +--- web/html/passreset.php | 4 +--- web/html/pkgsubmit.php | 4 +--- web/template/pkg_details.php | 2 +- web/template/pkg_search_form.php | 4 ++-- web/template/pkg_search_results.php | 4 +--- web/template/tu_details.php | 6 ++---- web/template/tu_list.php | 4 +--- 12 files changed, 18 insertions(+), 35 deletions(-) diff --git a/web/html/account.php b/web/html/account.php index d94d711..0f2ae2c 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -13,7 +13,7 @@ html_header(__('Accounts')); # Main page processing here # echo "

\n"; -echo "

".__("Accounts")."</span></div>\n"; +echo " <h2>".__("Accounts")."</h2>\n"; echo "

\n"; $action = in_request("Action"); diff --git a/web/html/addvote.php b/web/html/addvote.php index f0e7d31..c264249 100644 --- a/web/html/addvote.php +++ b/web/html/addvote.php @@ -82,7 +82,7 @@ if ($atype == "Trusted User" OR $atype == "Developer") { <?php endif; ?> <div class="pgbox"> -<div class="pgboxtitle"><?php print __("Submit a proposal to vote on.") ?></div> +<h2><?php print __("Submit a proposal to vote on.") ?></h2> <div class="pgboxbody"> <form action='addvote.php' method='post'> <p> diff --git a/web/html/css/arch.css b/web/html/css/arch.css index a7cb74d..0ad7765 100644 --- a/web/html/css/arch.css +++ b/web/html/css/arch.css @@ -155,9 +155,6 @@ body { font-size: x-small; } /* Headers */ -h2 { - margin: 20px 0px 10px 0px; -} h2.title { border-bottom: 1px solid #46494d; } @@ -308,13 +305,6 @@ blockquote.code { .frontpgboxbody > table { width: 100%; } -.pgboxtitle { - border: 2px solid #ddd; - border-top: 1px solid #fff; - border-left: 1px solid #fff; - background-color: #f1f2f4; - padding: 2px 10px 2px 10px; -} .pgboxbody, .pgboxbody-comment { padding: 10px; diff --git a/web/html/css/fonts.css b/web/html/css/fonts.css index 9dea935..c77ee9b 100644 --- a/web/html/css/fonts.css +++ b/web/html/css/fonts.css @@ -104,9 +104,14 @@ a:hover { text-decoration: none; font-weight: bold; } -h1, h2, h3, h4 { +h1, h3, h4 { font-size: 16pt; } +h2 { + font-size: 1.5em; + margin-bottom: 0.5em; + border-bottom: 1px solid #888; +} .important { font-weight: bold; diff --git a/web/html/index.php b/web/html/index.php index 0d513d3..e9715c6 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -17,9 +17,7 @@ $dbh = db_connect(); ?> <div class="pgbox"> -<div class="pgboxtitle"> -<span class="f3">AUR <?php print __("Home"); ?></span> -</div> +<h2>AUR <?php print __("Home"); ?></h2> <div class="frontpgboxbody"> <p> diff --git a/web/html/passreset.php b/web/html/passreset.php index 82be3ef..a65a47b 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -85,9 +85,7 @@ html_header(__("Password Reset")); ?> <div class="pgbox"> - <div class="pgboxtitle"> - <span class="f3"><?php print __("Password Reset"); ?></span> - </div> + <h2><?php print __("Password Reset"); ?></h2> <div class="pgboxbody"> <?php if ($error) { diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 75a4b69..8df2847 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -432,9 +432,7 @@ html_header("Submit"); <?php endif; ?> <div class="pgbox"> - <div class="pgboxtitle"> - <span class="f3"><?php print __("Submit"); ?></span> - </div> + <h2><?php print __("Submit"); ?></h2> <div class="pgboxbody"> <p><?php echo __("Upload your source packages here. Create source packages with `makepkg --source`.") ?></p> diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index d8d1e4b..8fbee81 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -70,7 +70,7 @@ $sources = package_sources($row["ID"]); ?> <div class="pgbox"> - <div class="pgboxtitle"><span class="f3"><?php echo __("Package Details") . ': ' . htmlspecialchars($row['Name']) . ' ' . htmlspecialchars($row['Version']) ?></span></div> + <h2><?php echo __("Package Details") . ': ' . htmlspecialchars($row['Name']) . ' ' . htmlspecialchars($row['Version']) ?></h2> <div class="pgboxbody"> <div id="detailslinks" class="listing"> diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index 53d34fe..3e291e1 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -2,8 +2,8 @@ <div class='pgbox'> <form action='packages.php' method='get'> -<div class='pgboxtitle'> - <span class='f3'><?php print __("Search Criteria"); ?></span> +<h2><?php print __("Search Criteria"); ?></h2> +<div> <input type='hidden' name='O' value='0' /> <input type='submit' style='min-width:80px' class='button' name='do_Search' value='<?php print __("Go"); ?>' /> diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index 8ef352b..209a80d 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -5,9 +5,7 @@ <?php } else { ?>

<div class="pgbox"> - <div class="pgboxtitle"> - <span class='f3'><?php print __("Package Listing") ?></span> - </div> + <h2><?php print __("Package Listing") ?></h2> diff --git a/web/template/tu_details.php b/web/template/tu_details.php index c48f603..4b79a98 100644 --- a/web/template/tu_details.php +++ b/web/template/tu_details.php @@ -1,5 +1,5 @@ <div class="pgbox"> -<div class="pgboxtitle"><span class="f3"><?php print __("Proposal Details") ?></span></div> +<h2><?php print __("Proposal Details") ?></h2> <div class="pgboxbody"> <?php if ($isrunning == 1) { ?> @@ -51,9 +51,7 @@ N/A <?php if (!$isrunning) { ?> <div class="pgbox"> - <div class="pgboxtitle"> - <span class="f3"><?php echo __('Voters'); ?></span> - </div> + <h2><?php echo __('Voters'); ?></h2> <div class="pgboxbody"> <?php echo $whovoted; ?> </div> diff --git a/web/template/tu_list.php b/web/template/tu_list.php index 0966a4c..006e65c 100644 --- a/web/template/tu_list.php +++ b/web/template/tu_list.php @@ -1,7 +1,5 @@ <div class="pgbox"> - <div class="pgboxtitle" style="text-align:right;"> - <span class='f3'><?php print $type ?></span> - </div> + <h2><?php print $type ?></h2> <table class='results'> <tr> <th class='header'><span class='f2'><?php print __("Proposal") ?></span></th> -- 1.7.7.2

0 0

Lukas Fleischer

4:20 p.m.

New subject: [aur-dev] [PATCH 4/4] Rename "pgbox" class to "box"

For consistency with archweb. Change our style sheet to use the same layout and colors that archweb uses, also. Signed-off-by: Lukas Fleischer --- 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 "

\n"; +echo "

\n"; echo " <h2>".__("Accounts")."</h2>\n"; -echo "

\n"; +echo "

\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> 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 @@  <?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">

<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 { ?> - <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>  +</div>  - <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>  - </div>  + </div>  </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) { ?> <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

0 0

4566

Age (days ago)

4566

Last active (days ago)

List overview

Download

3 comments

1 participants

participants (1)

Lukas Fleischer