*** empty log message ***

svn path=/trunk/boinc/; revision=11760
This commit is contained in:
Rytis Slatkevičius 2007-01-03 16:18:43 +00:00
parent 0b9f288215
commit 4a74e82f16
8 changed files with 117 additions and 60 deletions

View File

@ -23,3 +23,21 @@ Charlie 2 Jan 2007
mac_build/
boinc.xcodeproj/
project.pbxproj
Rytis 3 Jan 2007
- User web:
- Add optional 3rd element to project news file (title)
- Certificate now shows DEFINEd project name
- Front page now styled with CSS
html/
user/
cert.php
sample_index.php
sample_rss_main.php
white.css
inc/
news.inc
util.inc
project.sample/
project_news.inc

View File

@ -1,11 +1,9 @@
<?php
function news_item($date, $text) {
echo "<font color=666666>$date</font>
<br />
$text
<br /><br />
";
function news_item($date, $text, $title) {
echo '<h3>'.$date.' '.$title.'</h3>
<p>'.$text.'</p>
';
}
function show_news($items, $n) {
@ -13,7 +11,7 @@ function show_news($items, $n) {
$n = count($items);
}
for ($i=0; $i<$n; $i++) {
news_item($items[$i][0], $items[$i][1]);
news_item($items[$i][0], $items[$i][1], $items[$i][2]);
}
}

View File

@ -107,15 +107,17 @@ function page_head($title, $java_onload=null, $title_plain=null, $prefix="") {
header("Content-type: text/html; charset=".tr(CHARSET));
}
// echo '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">';
if (!$title_plain) {
echo "<html><head><title>".strip_tags($title)."</title>
<link rel=stylesheet type=text/css href=\"$styleSheet\">
<link rel='alternate' type='text/xml' title=\"$rssname\" href=\"$rsslink\" />
<link rel='alternate' type='text/xml' title=\"$rssname\" href=\"$rsslink\">
</head>";
} else {
echo "<html><head><title>".strip_tags($title_plain)."</title>
<link rel=stylesheet type=text/css href=\"$styleSheet\">
<link rel='alternate' type='text/xml' title=\"$rssname\" href=\"$rsslink\" />
<link rel='alternate' type='text/xml' title=\"$rssname\" href=\"$rsslink\">
</head>";
}
if ($java_onload){
@ -466,9 +468,9 @@ function sched_stopped() {
}
function user_links($user) {
$x = "<a href=show_user.php?userid=$user->id>$user->name</a>";
$x = '<a href="show_user.php?userid='.$user->id.'">'.$user->name.'</a>';
if ($user->has_profile) {
$x .= " <a href=view_profile.php?userid=$user->id><img border=0 src=img/head_20.png></a>";
$x .= ' <a href="view_profile.php?userid='.$user->id.'"><img border="0" src="img/head_20.png" alt="User profile image"></a>';
}
# Does this project accept donations?
# If so, do you want to have a link next to user name as it appears on the web site?

View File

@ -2,10 +2,12 @@
$project_news = array(
array("March 1, 2004",
"Sample news item"
"Sample news item",
"Sample news item title"
),
array("March 2, 2004",
"Another item"
"Another item",
"Another item title"
)
);

View File

@ -37,9 +37,9 @@ $user->name
<font face=\"Lucida Bright,Times New Roman\" style=\"font-size:16\">
<p>
has participated in PROJECT_NAME since $join,
has participated in ".PROJECT." since $join,
and has contributed $credit
to PROJECT_NAME.
to ".PROJECT.".
<br><br><br>
</td><tr></table>
@ -50,7 +50,7 @@ to PROJECT_NAME.
<img src=images/SIGNATURE>
<br>
PROJECT DIRECTOR NAME
<br>Director, PROJECT
<br>Director, ".PROJECT."
<br><br>
$today
</td>

View File

@ -15,35 +15,36 @@ require_once("../project/project_news.inc");
function show_nav() {
$config = get_config();
$master_url = parse_config($config, "<master_url>");
echo "
<h3>Join ".PROJECT." </h3>
echo "<div id=\"mainnav\">
<h2>Join ".PROJECT."</h2>
<p>
<ol>
<li><a href=info.php>".tr(RULES_TITLE)."</a>
<li><a target = _new href=http://boinc.berkeley.edu/download.php>Download BOINC</a>
<li> When prompted, enter <b>$master_url</b>
<li><a href=\"info.php\">".tr(RULES_TITLE)."</a>
<li><a target=\"_new\" href=\"http://boinc.berkeley.edu/download.php\">Download BOINC</a>
<li> When prompted, enter <b>".$master_url."</b>
</ol>
<h3>Returning participants</h3>
<h2>Returning participants</h2>
<ul>
<li><a href=home.php>Your account</a> - view stats, modify preferences
<li><a href=team.php>Teams</a> - create or join a team
<li><a href=apps.php>".tr(APPS_TITLE)."</a>
<li><a href=cert1.php>Certificate</a>
<li><a href=\"home.php\">Your account</a> - view stats, modify preferences
<li><a href=\"team.php\">Teams</a> - create or join a team
<li><a href=\"apps.php\">".tr(APPS_TITLE)."</a>
<li><a href=\"cert1.php\">Certificate</a>
</ul>
<h3>Community</h3>
<h2>Community</h2>
<ul>
<li><a href=".URL_BASE."profile_menu.php>Participant profiles</a>
<li><a href=forum_index.php>Message boards</a>
<li><a href=forum_help_desk.php>Questions and answers</a>
<li><a href=\"".URL_BASE."profile_menu.php\">Participant profiles</a>
<li><a href=\"forum_index.php\">Message boards</a>
<li><a href=\"forum_help_desk.php\">Questions and answers</a>
</ul>
<h3>Project totals and leader boards</h3>
<h2>Project totals and leader boards</h2>
<ul>
<li><a href=top_users.php>Top participants</a>
<li><a href=top_hosts.php>Top computers</a>
<li><a href=top_teams.php>Top teams</a>
<li><a href=stats.php>Other statistics</a></h3>
<li><a href=\"top_users.php\">Top participants</a>
<li><a href=\"top_hosts.php\">Top computers</a>
<li><a href=\"top_teams.php\">Top teams</a>
<li><a href=\"stats.php\">Other statistics</a>
</ul>
</div>
";
}
@ -57,30 +58,35 @@ $stopped = web_stopped();
$rssname = PROJECT . " RSS 2.0" ;
$rsslink = URL_BASE . "rss_main.php";
echo '<html>
if (defined("CHARSET")) {
header("Content-type: text/html; charset=".tr(CHARSET));
}
echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd\">";
echo "<html>
<head>
<title>'.PROJECT.'</title>
<link rel="stylesheet" type="text/css" href="white.css">
<link rel="alternate" type="text/xml" title="'.$rssname.'" href="'.$rsslink.'" />
<title>".PROJECT."</title>
<link rel=\"stylesheet\" type=\"text/css\" href=\"white.css\">
<link rel=\"alternate\" type=\"text/xml\" title=\"".$rssname."\" href=\"".$rsslink."\">
</head><body>
<h1>'.PROJECT.'</h1>
<table cellpadding="8" cellspacing="4">
<tr><td rowspan="2" valign="top" width="40%">
';
<h1>".PROJECT."</h1>
<table cellpadding=\"8\" cellspacing=\"4\">
<tr><td rowspan=\"2\" valign=\"top\" width=\"40%\">
";
if ($stopped) {
echo "
<b>".PROJECT." is temporarily shut down for maintenance.
Please try again later.
Please try again later</b>.
";
} else {
db_init();
show_nav();
}
echo"
echo "
<p>
Powered by <a href=http://boinc.berkeley.edu><img align=middle border=0 src=http://boinc.berkeley.edu/boinc_logo_trans.gif></a>
Powered by <a href=\"http://boinc.berkeley.edu/\"><img align=\"middle\" border=\"0\" src=\"http://boinc.berkeley.edu/boinc_logo_trans.gif\" alt=\"BOINC Logo\"></a>
</td>
";
@ -88,8 +94,8 @@ if (!$stopped) {
$profile = get_current_uotd();
if ($profile) {
echo "
<td valign=top bgcolor=f4eeff>
<b>User of the day</b><br><br>
<td id=\"uotd\">
<h2>User of the day</h2>
";
$user = lookup_user_id($profile->userid);
echo uotd_thumbnail($profile, $user);
@ -100,21 +106,20 @@ if (!$stopped) {
}
echo "
<tr><td valign=top bgcolor=dddddd>
<b>News</b>
<tr><td id=\"news\">
<h2>News</h2>
<p>
";
show_news($project_news, 5);
if (count($project_news > 5)) {
echo "<a href=old_news.php>...more</a>\n";
if (count($project_news) > 5) {
echo "<a href=\"old_news.php\">...more</a>";
}
echo "
<p>
<font size=-2>News is available as an
<a href=rss_main.php>RSS feed</a> <img src=img/xml.gif>.</font>
<p class=\"smalltext\">
News is available as an
<a href=\"rss_main.php\">RSS feed</a> <img src=\"xml.gif\" alt=\"XML\">.</p>
</td>
</tr></table>
<font color=ffffff>
<!--
";
@ -122,7 +127,6 @@ include 'schedulers.txt';
echo "
-->
</font>
";
if ($caching) {

View File

@ -63,12 +63,17 @@ $tot = count($project_news);
$news = min( $tot, $news);
for( $item=0; $item < $news; $item++ ) {
$j = $tot - $item;
if( count($project_news[$item]) == 2) {
if( count($project_news[$item]) >= 2) {
$d = strtotime($project_news[$item][0]);
$news_date=gmdate('D, d M Y H:i:s',$d) . ' GMT';
$unique_url=URL_BASE."all_news.php#$j";
if (isset($project_news[$item][2])) {
$title = strip_tags($project_news[$item][2]);
} else {
$title = "Project News ".strip_tags($project_news[$item][0]);
}
echo "<item>
<title>Project News ".strip_tags($project_news[$item][0])."</title>
<title>".$title."</title>
<link>$unique_url</link>
<guid isPermaLink=\"true\">$unique_url</guid>
<description><![CDATA[".strip_tags($project_news[$item][1])."]]></description>

View File

@ -226,7 +226,6 @@ tr.postseperator td{
}
td.threadline {
#font-size:10pt;
text-align:left;
}
@ -239,3 +238,32 @@ span.note{
font-family: System, Fixed, sans-serif;
color: #000000;
}
#news {
background-color: #dddddd;
vertical-align: top;
}
#news h2, #uotd h2, #mainnav h2 {
font-size: 1.2em;
font-weight: bold;
}
#news h3 {
color: #666666;
font-size: 1em;
margin-bottom: 2px;
}
#news p {
margin-top: 0px;
}
#uotd {
background-color: #ffeeff;
vertical-align: top;
}
.smalltext {
font-size: 0.8em;
}