HTML fixes;

PHP notice fixes;
home.php made translatable, include Lithuanian translation.

svn path=/trunk/boinc/; revision=13997
This commit is contained in:
Rytis Slatkevičius 2007-10-30 19:36:27 +00:00
parent 82b2b0f68f
commit 105d6aaae3
6 changed files with 333 additions and 59 deletions

View File

@ -8,16 +8,16 @@ $cpid_stats_sites = array(
"http://www.allprojectstats.com/showuser.php?id=%s"
),
array("BOINCstats",
"http://www.boincstats.com/stats/boinc_user_graph.php?pr=bo&id=%s"
"http://www.boincstats.com/stats/boinc_user_graph.php?pr=bo&id=%s"
),
array("BOINC Statistics for the WORLD!",
"http://www.boincsynergy.com/stats/boinc-individual.php?cpid=%s"
),
array("BOINC Combined Statistics",
"http://boinc.netsoft-online.com/e107_plugins/boinc/get_user.php?cpid=%s&html=1"
"http://boinc.netsoft-online.com/e107_plugins/boinc/get_user.php?cpid=%s&html=1"
),
array("The Knights Who Say 'Ni!'",
"http://stats.kwsn.net/user.php?proj=all&cpid=%s"
"http://stats.kwsn.net/user.php?proj=all&cpid=%s"
),
array("Team Starfire World BOINC Stats 'N Stones",
"http://statsnstones.tswb.org/userdetail.aspx?cpid=%s"

View File

@ -123,29 +123,29 @@ require_once("../inc/stats_sites.inc");
//
function show_user_stats_private($user) {
global $cpid_stats_sites;
row1("Work done");
row2(PROJECT." member since", date_str($user->create_time));
row1(tra("Work done"));
row2(tra("%1 member since", PROJECT), date_str($user->create_time));
show_credit($user);
$config = get_config();
if (parse_bool($config, "show_results")) {
row2("Pending credit", "<a href=pending.php>View</a>");
row2(tra("Pending credit"), "<a href=\"pending.php\">".tra("View")."</a>");
}
row2("Computers on this account",
"<a href=hosts_user.php>View</a>"
row2(tra("Computers on this account"),
"<a href=\"hosts_user.php\">".tra("View")."</a>"
);
row2("Tasks", "<a href=results.php?userid=$user->id>View</a>");
row2(tra("Tasks"), "<a href=\"results.php?userid=$user->id\">".tra("View")."</a>");
$cpid = md5($user->cross_project_id . $user->email_addr);
$x = "";
shuffle($cpid_stats_sites);
foreach ($cpid_stats_sites as $site) {
$name = $site[0];
$y = sprintf($site[1], $cpid);
$x .= "<a href=$y>$name</a><br>";
$x .= "<a href=\"$y\">$name</a><br>";
}
$x .= "<br><font size=-2>Cross-project ID: $cpid</font>\n";
row2("Cross-project statistics", $x);
row2("Stats on your cell phone", URL_BASE."/userw.php?id=$user->id");
row2("Account number<br><font size=-2>Used in URLs</font>", $user->id);
$x .= "<br><span class=\"smalltext\">".tra("Cross-project ID").": $cpid</span>\n";
row2(tra("Cross-project statistics"), $x);
row2(tra("Stats on your cell phone"), URL_BASE."userw.php?id=$user->id");
row2(tra("Account number")."<br><span class=\"smalltext\">".tra("Used in URLs")."</span>", $user->id);
}
// show static user info (private)
@ -157,65 +157,65 @@ function show_user_info_private($user) {
$email_text = "Verification pending";
}
row1("Account information");
row2("Email address<br>", $email_text);
row2("Name", $user->name);
row1(tra("Account information"));
row2(tra("Email address"), $email_text);
row2(tra("Name"), $user->name);
if (strlen($user->url)) {
$x = "http://$user->url";
} else {
$x = "none";
}
row2("URL", $x);
row2("Country", $user->country);
row2("Postal code", $user->postal_code);
row2("Change", "<a href=edit_email_form.php>email address</a> | <a href=edit_passwd_form.php>password</a> | <a href=edit_user_info_form.php>other account info</a>");
row2("", "<a href=logout.php?".url_tokens($user->authenticator).">Log out</a>");
row2(tra("URL"), $x);
row2(tra("Country"), $user->country);
row2(tra("Postal code"), $user->postal_code);
row2(tra("Change"), "<a href=\"edit_email_form.php\">".tra("email address")."</a> | <a href=\"edit_passwd_form.php\">".tra("password")."</a> | <a href=\"edit_user_info_form.php\">".tra("other account info")."</a>");
row2("", "<a href=\"logout.php?".url_tokens($user->authenticator)."\">".tra("Log out")."</a>");
row1("Community");
row1(tra("Community"));
if ($user->has_profile) {
$x = "<a href=view_profile.php?userid=$user->id>View or edit</a> | <a href=delete_profile.php>Delete</a>";
$x = "<a href=\"view_profile.php?userid=$user->id\">".tra("View or edit")."</a> | <a href=\"delete_profile.php\">".tra("Delete")."</a>";
} else {
$x = "<a href=create_profile.php>Create</a>";
$x = "<a href=\"create_profile.php\">".tra("Create")."</a>";
}
row2("Profile", $x);
row2(tra("Profile"), $x);
$tot = total_posts($user);
if ($tot) {
row2("Message boards", "<a href=".URL_BASE."/forum_user_posts.php?userid=$user->id>$tot posts</a>");
row2(tra("Message boards"), "<a href=".URL_BASE."/forum_user_posts.php?userid=$user->id>".tra("%1 posts", $tot)."</a>");
}
row2("Private messages", pm_notification($user));
row2(tra("Private messages"), pm_notification($user));
row1("Teams");
row1(tra("Teams"));
if ($user->teamid) {
$team = lookup_team($user->teamid);
$x = "<a href=team_display.php?teamid=$team->id>$team->name</a>
| <a href=team_quit_form.php>Quit team</a>";
$x = "<a href=\"team_display.php?teamid=$team->id\">$team->name</a>
| <a href=\"team_quit_form.php\">".tra("Quit team")."</a>";
if ($team->userid == $user->id) {
$x .= " | <a href=team_manage.php>management functions</a>";
$x .= " | <a href=\"team_manage.php\">".tra("management functions")."</a>";
}
row2("Team", $x);
row2(tra("Team"), $x);
} else {
row2("Team", "None (<a href=team_search.php>find a team</a>)");
row2(tra("Team"), tra("None")." | <a href=\"team_search.php\">".tra("find a team")."</a>");
}
$teams_founded = BoincTeam::enum("userid=$user->id");
foreach ($teams_founded as $team) {
if ($team->id != $user->teamid) {
row2("founder but not member of", "<a href=team_display.php?teamid=$team->id>$team->name</a> | <a href=\"team_manage.php?teamid=".$team->id."\">management functions</a>");
row2(tra("Founder but not member of"), "<a href=\"team_display.php?teamid=$team->id\">$team->name</a> | <a href=\"team_manage.php?teamid=".$team->id."\">".tra("management functions")."</a>");
}
}
row1("<a name=\"prefs\"></a>Preferences");
row1("<a name=\"prefs\"></a>".tra("Preferences"));
row2(
"General preferences<br><font size=-2>specify when and how BOINC uses your computer</font>",
"<a href=prefs.php?subset=global>View or edit</a>"
tra("General preferences")."<br><span class=\"smalltext\">".tra("specify when and how BOINC uses your computer")."</span>",
"<a href=\"prefs.php?subset=global\">".tra("View or edit")."</a>"
);
row2(PROJECT." preferences<br><font size=-2>control resource share and customize graphics</font>",
"<a href=prefs.php?subset=project>View or edit</a>"
row2(tra("%1 preferences", PROJECT)."<br><span class=\"smalltext\">".tra("control resource share and customize graphics")."</span>",
"<a href=\"prefs.php?subset=project\">".tra("View or edit")."</a>"
);
row2("Message board preferences<br><font size=-2>configure features and appearance of message boards</font>",
"<a href=\"edit_forum_preferences_form.php\">View or edit</a>"
row2(tra("Message board preferences")."<br><span class=\"smalltext\">".tra("configure features and appearance of message boards")."</span>",
"<a href=\"edit_forum_preferences_form.php\">".tra("View or edit")."</a>"
);
}
@ -267,7 +267,7 @@ function show_profile_link($user) {
function show_user_page_private($user) {
$config = get_config();
start_table("width=100%");
start_table("width=\"100%\"");
show_user_info_private($user);
show_user_stats_private($user);

View File

@ -265,7 +265,7 @@ function table_row() {
}
function row1($x, $ncols=2, $class="heading") {
echo "<tr><td class=$class colspan=$ncols>$x</td></tr>\n";
echo "<tr><td class=\"$class\" colspan=\"$ncols\">$x</td></tr>\n";
}
function row2($x, $y, $show_error=false) {
@ -278,11 +278,11 @@ function row2($x, $y, $show_error=false) {
$class1 = 'fieldname';
$class2 = 'fieldvalue';
}
echo "<tr><td width=40% class=$class1>$x</td><td class=$class2>$y</td></tr>\n";
echo "<tr><td width=\"40%\" class=\"$class1\">$x</td><td class=\"$class2\">$y</td></tr>\n";
}
function row2_init($x, $y) {
echo "<tr><td class=fieldname width=40%>$x</td><td valign=top><b>$y\n";
echo "<tr><td class=\"fieldname\" width=\"40%\">$x</td><td valign=\"top\"><b>$y\n";
}
function row2_plain($x, $y) {
@ -326,14 +326,14 @@ function random_string() {
function url_tokens($auth) {
$now = time();
$ttok = md5((string)$now.$auth);
return "&tnow=$now&ttok=$ttok";
return "&amp;tnow=$now&amp;ttok=$ttok";
}
function form_tokens($auth) {
$now = time();
$ttok = md5((string)$now.$auth);
return "<input type=hidden name=tnow value=$now>
<input type=hidden name=ttok value=$ttok>
return "<input type=\"hidden\" name=\"tnow\" value=\"$now\">
<input type=\"hidden\" name=\"ttok\" value=\"$ttok\">
";
}

View File

@ -479,3 +479,136 @@ msgstr ""
msgid "LINKS_QA"
msgstr "Questions and Answers"
#########################################
# "Your account" page (home.php)
#########################################
msgid "Your account"
msgstr ""
msgid "Welcome to %1"
msgstr ""
msgid "View and edit your account preferences using the links below."
msgstr ""
msgid "If you have not already done so, %1download BOINC client software%2."
msgstr ""
msgid "Account information"
msgstr ""
msgid "Email address"
msgstr ""
msgid "Name"
msgstr ""
msgid "URL"
msgstr ""
msgid "Country"
msgstr ""
msgid "Postal code"
msgstr ""
msgid "Change"
msgstr ""
msgid "email address"
msgstr ""
msgid "password"
msgstr ""
msgid "other account info"
msgstr ""
msgid "Log out"
msgstr ""
msgid "Community"
msgstr ""
msgid "Create"
msgstr ""
msgid "Profile"
msgstr ""
msgid "Teams"
msgstr ""
msgid "Team"
msgstr ""
msgid "None"
msgstr ""
msgid "management functions"
msgstr ""
msgid "Quit team"
msgstr ""
msgid "find a team"
msgstr ""
msgid "Preferences"
msgstr ""
msgid "General preferences"
msgstr ""
msgid "specify when and how BOINC uses your computer"
msgstr ""
msgid "View or edit"
msgstr ""
msgid "%1 preferences"
msgstr ""
msgid "control resource share and customize graphics"
msgstr ""
msgid "Message board preferences"
msgstr ""
msgid "configure features and appearance of message boards"
msgstr ""
msgid "Work done"
msgstr ""
msgid "%1 member since"
msgstr ""
msgid "Pending credit"
msgstr ""
msgid "View"
msgstr ""
msgid "Computers on this account"
msgstr ""
msgid "Tasks"
msgstr ""
msgid "Cross-project ID"
msgstr ""
msgid "Cross-project statistics"
msgstr ""
msgid "Stats on your cell phone"
msgstr ""
msgid "Account number"
msgstr ""
msgid "Used in URLs"
msgstr ""

View File

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2007-09-12 17:28+0200\n"
"PO-Revision-Date: 2007-10-30 21:31+0200\n"
"Last-Translator: Rytis Slatkevičius <rytis.s@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -464,9 +464,153 @@ msgstr "Atsakyti"
msgid "Block user"
msgstr "Blokuoti vartotoją"
msgid "With selected"
msgstr "Su pasirinktais"
msgid "Mark as read"
msgstr "Pažymėti kaip perskaitytus"
msgid "Mark as unread"
msgstr "Pažymėti kaip neskaitytus"
# ########################################
# Links from the main page
# ########################################
msgid "LINKS_QA"
msgstr "Klausimai ir Atsakymai"
# ########################################
# "Your account" page (home.php)
# ########################################
msgid "Your account"
msgstr "Jūsų abonementas"
msgid "Welcome to %1"
msgstr "Sveiki prisijungę prie %1"
msgid "View and edit your account preferences using the links below."
msgstr "Peržiūrėkite ir keiskite abonemento nustatymus naudodamiesi nuorodomis žemiau."
msgid "If you have not already done so, %1download BOINC client software%2."
msgstr "Jei to dar nepadarėte, %1parsisiųskite BOINC programinę įrangą%2."
msgid "Account information"
msgstr "Abonemento informacija"
msgid "Email address"
msgstr "El. pašto adresas"
msgid "Name"
msgstr "Vardas"
msgid "URL"
msgstr "Tinklapis"
msgid "Country"
msgstr "Valstybė"
msgid "Postal code"
msgstr "Pašto kodas"
msgid "Change"
msgstr "Pakeisti"
msgid "email address"
msgstr "el. pašto adresą"
msgid "password"
msgstr "slaptažodį"
# ########################################
# "Your account" page (home.php)
# ########################################
msgid "other account info"
msgstr "kitą abonemento informaciją"
msgid "Log out"
msgstr "Atsijungti"
msgid "Community"
msgstr "Bendruomenė"
msgid "Create"
msgstr "Sukurti"
msgid "Profile"
msgstr "Aprašymas"
msgid "Teams"
msgstr "Komandos"
msgid "Team"
msgstr "Komanda"
msgid "None"
msgstr "Nėra"
msgid "management functions"
msgstr "valdymo funkcijos"
msgid "Quit team"
msgstr "Palikti komandą"
msgid "find a team"
msgstr "raskite komandą"
msgid "Preferences"
msgstr "Nustatymai"
msgid "General preferences"
msgstr "Bendrieji nustatymai"
msgid "specify when and how BOINC uses your computer"
msgstr "nurodykite, kada ir kaip BOINC naudos jūsų kompiuterį"
msgid "View or edit"
msgstr "Peržiūrėti arba pakeisti"
msgid "%1 preferences"
msgstr "%1 nustatymai"
msgid "control resource share and customize graphics"
msgstr "valdykite resursų padalijimą ir keiskite grafikos nustatymus"
msgid "Message board preferences"
msgstr "Diskusijų lentos nustatymai"
msgid "configure features and appearance of message boards"
msgstr "nustatykite diskusijų lentos funkcijas ir išvaizdą"
msgid "Work done"
msgstr "Atlikta darbo"
msgid "%1 member since"
msgstr "%1 narys nuo"
msgid "Pending credit"
msgstr "Laukiamas kreditas"
msgid "View"
msgstr "Peržiūrėti"
msgid "Computers on this account"
msgstr "Abonementui priskirti kompiuteriai"
msgid "Tasks"
msgstr "Užduotys"
msgid "Cross-project ID"
msgstr "Tarpprojektinis ID"
msgid "Cross-project statistics"
msgstr "Tarpprojektinė statistika"
msgid "Stats on your cell phone"
msgstr "Statistika mobiliajame telefone"
msgid "Account number"
msgstr "Abonemento numeris"
msgid "Used in URLs"
msgstr "Naudojamas internetiniuose adresuose"

View File

@ -14,27 +14,24 @@ $user = get_other_projects($user);
$init = isset($_COOKIE['init']);
$via_web = isset($_COOKIE['via_web']);
if ($via_web) {
setcookie('via_web', '', time()-3600);
}
if ($init) {
setcookie('init', '', time()-3600);
page_head("Welcome to ".PROJECT);
echo "
<p>
View and edit your account preferences using the links below.
";
page_head(tra("Welcome to %1", PROJECT);
echo "<p>".tra("View and edit your account preferences using the links below.")."</p>\n";
if ($via_web) {
setcookie('via_web', '', time()-3600);
echo "
<p> If you have not already done so,
<a href=http://boinc.berkeley.edu/download.php>download BOINC client software</a>.
<a href=\"http://boinc.berkeley.edu/download.php\">download BOINC client software</a>.</p>
";
}
} else {
page_head("Your account");
}
echo "<p>\n";
show_user_page_private($user);
show_other_projects($user, true);
project_user_page_private($user);