Merge commit 'origin/testing'

Yeah I actually want to work from testing.
Conflicts:

	web/lib/pkgfuncs.inc

Signed-off-by: Loui Chang <louipc.ist@gmail.com>
This commit is contained in:
Loui Chang 2007-09-27 00:06:56 -04:00
commit d2134f7637
22 changed files with 839 additions and 375 deletions

View file

@ -13,6 +13,10 @@ html_header(); # print out the HTML header
# Main page processing here
#
echo "<div class=\"pgbox\">\n";
echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Accounts")."</span></div>\n";
echo " <div class=\"pgboxbody\">\n";
if (isset($_COOKIE["AURSID"])) {
# visitor is logged in
#
@ -148,6 +152,9 @@ if (isset($_COOKIE["AURSID"])) {
}
}
echo " </div>";
echo "</div>";
html_footer("\$Id$");
# vim: ts=2 sw=2 noet ft=php
?>

459
web/html/css/arch.css Normal file
View file

@ -0,0 +1,459 @@
* { margin: 0; padding: 0; }
* ul { padding: 20px; }
body {
background: url("/images/title_back.png") repeat-x top left #fbf8f1;
padding: 0 30px;
color: #46494d;
font-family: Bitstream Vera Sans, Lucida Grande, Arial, sans-serif;
}
/*
* Divs
*/
#head_container {
height: 175px;
}
#main_nav ul {
list-style: none;
padding-right: 10px;
padding-top: 48px;
}
#main_nav ul li {
display: block;
float: right;
width: 67px;
height: 20px;
padding-top: 2px;
margin-left: 3px;
background: url("/images/tab.png") repeat-x bottom left #fbf8f1;
text-align: center;
font-size: 13px;
}
#main_nav ul li[class~=selected] {
background: #fbf8f1;
}
#main_nav ul li a {
text-decoration: none;
}
#sub_nav ul {
list-style: none;
padding-right: 10px;
padding-top: 5px;
}
#sub_nav ul li {
display: block;
float: right;
width: 87px;
height: 20px;
padding-top: 2px;
margin-left: 3px;
background: url("/images/tab.png") repeat-x bottom left #fbf8f1;
border: 1px solid #cccccc;
text-align: center;
font-size: 13px;
}
#sub_nav ul li[class~=selected] {
background: #fbf8f1;
}
#sub_nav ul li a {
text-decoration: none;
}
#lang_sub {
display: block;
position: absolute;
top: 0;
right: 20px;
}
#lang_sub ul {
list-style: none;
}
#lang_sub ul a {
text-decoration: none;
color: #000000;
}
#lang_sub ul a:hover {
color: #FF0000;
}
#lang_sub ul li {
display: block;
float: right;
margin-left: 6px;
font-size: 10px;
text-align: center;
}
#title {
height: 140px;
float: left;
}
#updates {
font-size: small;
/*position: relative;*/
top: 0px;
background: #f6efe0;
border: 1px solid #eee4cb;
padding: 10px;
}
#ads {
float: right;
}
#logo {
float: left;
width: 140px;
height: 140px;
}
#titleimg {
float: left;
}
#devlist {
width: 80%;
padding: 10px;
margin-left: auto;
margin-right: auto;
border-top: 1px dashed black;
border-bottom: 1px dashed black;
text-align: center;
}
.clear {
clear: both;
margin: 0;
padding: 0;
}
.right {
float: right;
width: 320px;
padding: 0 10px 10px 0;
}
.left {
padding: 10px;
margin: 0 360px 0 0;
}
.left p {
text-align: justify;
padding-bottom: 10px;
}
.box {
padding: 10px;
background: #e1e3e6;
border: 1px solid #8faecd;
}
.greybox {
padding: 10px;
background: #f6efe0;
border: 1px solid #eee4cb;
}
div.listing {
padding-right: 10px;
border-left: 1px solid #387cbf;
}
.error {
color: #dd0000;
font-size: small;
}
.foot {
clear: both;
text-align: center;
font-size: 0.8em;
}
#search {
float: right;
position: relative;
top: -2em;
font-size: 0.8em;
}
#search input {
background: #f6efe0;
border: 1px solid #eee4cb;
}
.smalltext {
text-align: right;
font-size: x-small;
}
/*
* Headers
*/
h2 {
margin: 20px 0 10px 0;
}
h2.title {
border-bottom: 1px solid #46494d;
}
h3 {
margin-bottom: 10px;
}
h3.title {
text-align: right;
border-bottom: 1px solid #46494d;
}
h4.title {
text-align: left;
border-bottom: 1px solid #46494d;
}
h4.news {
border-bottom: 1px dotted #8faecd;
}
div.listing h4 {
background: #d1d3d6;
border-top: 1px double #387cbf;
padding: 3px;
}
/*
* Paragraphs, Anchors, Images
*/
p {
padding-bottom: 20px;
}
p.news {
text-align: left;
font-size: small;
}
a {
color: #35526f;
font-weight: bold;
text-decoration: underline;
}
.news a {
text-decoration: none;
}
#about {
position: relative;
top: -9px;
}
#about a {
text-decoration: none;
}
.community a {
text-decoration: none;
}
ol {
padding-left: 45px;
}
ul.small {
list-style: none;
font-size: x-small;
}
ul.links {
list-style: none;
font-size: small;
padding: 0px 0px 20px 20px;
}
img {
border: none;
}
hr {
border: none;
border-top: 1px solid #46494d;
}
.greybox input, button, textarea, select {
background: #e1e3e6;
border: 1px solid #8faecd;
}
.box input, button {
padding: 2px;
background: #c1c3f6;
font-size: x-small;
border: 1px solid #8faecd;
}
button#f_trigger {
background: #e1e3e6;
}
/*
* Table stuff
*/
table.center {
margin-left: auto;
margin-right: auto;
}
table#releases {
font-size: small;
width: 100%;
}
table#releases td {
padding-right: 20px;
}
table#repolinks {
font-size: small;
width: 100%;
}
table#repolinks td {
text-align: right;
}
table#repolinks th {
text-align: left;
}
table#art {
text-align: center;
margin-left: auto;
margin-right: auto;
}
.devpic {
vertical-align: top;
padding-right: 15px;
}
table.deventry {
padding-bottom: 25px;
}
.deventry th {
text-align: left;
vertical-align: top;
white-space: nowrap;
}
.deventry td {
border-bottom: 1px solid black;
width: 100%;
}
table.results {
padding: 0px;
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;
}
.results th>a {
text-decoration: none;
color: #46494d;
}
.results td {
padding-right: 5px;
vertical-align: top;
font-size: 0.8em;
}
.listing th {
background: #d1d3d6;
border-left: 1px solid #387cbf;
font-size: small;
vertical-align: top;
text-align: left;
padding: 2px;
}
.listing td {
font-size: small;
padding: 2px;
}
blockquote.code {
background: #c1c3f6;
border: 1px solid #8faecd;
margin-left: auto;
margin-right: auto;
white-space: nowrap;
padding: 5px;
font-family: Courier, Courier New, Monospace;
}
/*
* Wiki Styles
*/
h1.wiki {
border-bottom: 1px solid #46494d;
}
div.wikifoot_l {
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;
}
.wikibody {
padding-top: 15px;
}
.wikibody ol {
padding-left: 28px;
padding-top: 0px;
}
.wikibody ul {
padding-left: 25px;
padding-top: 0px;
}
.wikibody dd {
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;
}
.wikibody blockquote {
padding-left: 30px;
}
.wikibody td {
padding: 5px;
border: 1px solid black;
}
/* Used by Django's FormWrappers */
textarea.vLargeTextField {
width: 450px;
height: 250px;
}
.pkgr2 {
background-color: #eee4cb;
}
#maincontent {
width: 100%;
text-align: left;
}
#maincontent > table {
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;
}
.frontpgboxbody {
padding: 10px;
}
.frontpgboxbody > table {
width: 100%;
}
.boxSoftTitle {
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: right;
padding-top: 2px;
padding-bottom: 2px;
padding-right: 10px;
}
.pgboxbody, .pgboxbody-comment {
padding: 10px;
}
.pgboxbody input {
margin-right: 10px;
}
.pgboxbody-comment > table {
border-collapse: separate;
border-spacing: 0 15px;
}

View file

@ -3,7 +3,6 @@
border: 0px;
margin: 0px;
padding: 0px;
font-family: arial,verdana,tahoma;
}
/* Main Wrapper Data Format */
@ -182,7 +181,6 @@
td.text
{
color: #000;
font-family: verdana;
font-size: 12px;
}
th
@ -198,7 +196,7 @@
input,textarea,select
{
background-color: rgb(108,131,176);
font-family: courier;
font-family: monospace;
font-size: 12px;
background-color: #ccc;
border: #000000 1px solid;
@ -210,6 +208,5 @@
background-color: #fff;
color: rgb(108,131,176);
border: 1px dashed rgb(108,131,176);
font-family: trebuchet ms, tahoma, verdana;
font-size: 12px;
}

View file

@ -2,11 +2,10 @@
span /* Applicable by default in all fonts */
{
color: #666;
font-family: verdana, trebuchet ms, tahoma, luxi sans;
font-family: Bitstream Vera Sans, Lucida Grande, Arial, sans-serif;
}
span.f1 /* Important */
{
font-family: verdana;
font-size: 20px;
letter-spacing: 1px;
}
@ -25,13 +24,11 @@
span.f4 /* Content Text */
{
color: #444;
font-family: verdana;
font-size: 12px;
}
span.f5 /* Content Small */
{
color: #333;
font-family: trebuchet ms, tahoma, verdana;
font-size: 11px;
}
span.f6 /* Red Message */
@ -55,13 +52,11 @@
span.error /* Content Text */
{
color: #900;
font-family: verdana;
font-size: 12px;
}
span.warning /* Content Text */
{
color: #C0C000;
font-family: verdana;
font-size: 12px;
}
@ -95,7 +90,6 @@
color: rgb( 201, 209, 226 );
font-weight: bold;
font-size: 11px;
font-family: tahoma, trebuchet ms, verdana;
padding-right: 8px;
word-spacing: 8px;
}
@ -104,7 +98,6 @@
color: #fff;
font-weight: bold;
font-size: 11px;
font-family: tahoma, trebuchet ms, verdana;
padding-right: 8px;
}

BIN
web/html/images/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
web/html/images/tab.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 B

BIN
web/html/images/title.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 B

View file

@ -79,19 +79,19 @@ if (isset($_REQUEST["user"]) || isset($_REQUEST["pass"])) {
html_header();
# Big Top Level Table (Table 1)
print "<table border='0' cellpadding='0' cellspacing='3' width='90%'>\n";
print "<tr>\n";
echo "<div class=\"pgbox\">\n";
echo " <div class=\"pgboxtitle\"><span class=\"f3\">AUR-".__("Home")."</span></div>\n";
echo " <div class=\"frontpgboxbody\">\n";
echo "<table border='0' cellpadding='0' cellspacing='3' width='90%'>\n";
echo "<tr>\n";
# MAIN: Top Left
print "<td class='boxSoft' valign='top'>";
print "<p>".__("Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information.", array('<a href="http://wiki.archlinux.org/index.php/AUR_User_Guidelines">', '</a>', '<a href="http://wiki.archlinux.org/index.php/AUR_Trusted_User_Guidelines">', '</a>'))."<br>";
print __("Contributed PKGBUILDs <b>must</b> conform to the %hArch Packaging Standards%h otherwise they will be deleted!", array('<a href="http://wiki.archlinux.org/index.php/Arch_Packaging_Standards">', '</a>'))."</p>";
#print "<p>".__("If you have feedback about the AUR, please leave it in %hFlyspray%h.", array('<a href="http://bugs.archlinux.org/index.php?tasks=all&amp;project=2">', '</a>'))."<br>";
#print __("Email discussion about the AUR takes place on the %sTUR Users List%s.", array('<a href="http://www.archlinux.org/mailman/listinfo/tur-users">', '</a>'))."</p>";
print "<p>".__("Remember to vote for your favourite packages!")."<br>";
print __("The most popular packages will be provided as binary packages in [community].")."</p>";
#print "<p>".__("Though we can't vouch for their contents, we provide a %hlist of user repositories%h for your convenience.", array('<a href="http://wiki2.archlinux.org/index.php/Unofficial%20Repositories">', '</a>'))."</p>";
# MAIN: Top Right
print "</td>";
@ -178,9 +178,6 @@ print "</tr>";
print "</table>";
# End Table 2
#print " <td>&nbsp;&nbsp;</td>";
#print " <td align='left' valign='top' nowrap>\n";
# MAIN: Bottom Right
print "</td>";
print "<td class='boxSoft' valign='top'>";
@ -357,8 +354,10 @@ print "</table>";
print " </td>";
print "</tr>\n";
print "</table>\n";
echo "</div>\n";
# End Table 1
echo " </div>";
echo "</div>";
html_footer("<b>Version 1.3.1</b> \$Id$");
# vim: ts=2 sw=2 noet ft=php
?>

View file

@ -66,6 +66,27 @@ if (isset($_REQUEST["do_Flag"])) {
print "<p>\n";
print __("The selected packages have been flagged out-of-date.");
print "</p>\n";
# notification by tardo.
$f_name = username_from_sid($_COOKIE['AURSID']);
$f_email = email_from_sid($_COOKIE['AURSID']);
$f_uid = uid_from_sid($_COOKIE['AURSID']);
$q = "SELECT Packages.Name, Users.Email, Packages.ID ";
$q.= "FROM Packages, Users ";
$q.= "WHERE Packages.ID IN (" . $flag .") ";
$q.= "AND Users.ID = Packages.MaintainerUID ";
$q.= "AND Users.ID != " . $f_uid;
$result = db_query($q, $dbh);
if (mysql_num_rows($result)) {
while ($row = mysql_fetch_assoc($result)) {
# construct email
$body = "Your package " . $row['Name'] . " has been flagged out of date by " . $f_name . ". You may view your package at:\nhttp://aur.archlinux.org/packages.php?do_Details=1&ID=" . $row['ID'];
$body = wordwrap($body, 70);
$headers = "To: ".$row['Email']."\nReply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n";
@mail(' ', "AUR Out-of-date Notification for ".$row['Name'], $body, $headers);
}
}
} else {
print "<p>\n";
print __("You did not select any packages to flag.");

View file

@ -9,7 +9,9 @@ include("config.inc"); # configuration file with dir locations
set_lang(); # this sets up the visitor's language
check_sid(); # see if they're still logged in
html_header(); # print out the HTML header
print "<center>\n";
echo "<div class=\"pgbox\">\n";
echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Submit")."</span></div>\n";
echo " <div class=\"pgboxbody\">\n";
# Debugging
$DBUG = 0;
@ -665,8 +667,8 @@ if ($_COOKIE["AURSID"]) {
print __("You must create an account before you can upload packages.");
print "<br />\n";
}
print "</center>\n";
echo " </div>\n";
echo "</div>\n";
html_footer("\$Id$");
# vim: ts=2 sw=2 noet ft=php
?>