diff --git a/contest.php b/contest.php index 2c2ef86..8189fd1 100644 --- a/contest.php +++ b/contest.php @@ -34,7 +34,8 @@ ''; } - tableBoxHeader("Contestants", 1, 'white', '#737b9c', 'black'); + tableBoxHeader( $tableHeadColor, 'black' ); + tableTitle( 'Contestants', 1, $tableHeadColor ); Contestant( 'Mathieu Helie', 'matt@solarweb.hypermart.net', 'images/quakeforge12.png', 'To Be Announced'); Contestant( 'Nick Rusnov', 'nick@intus.net', 'images/qforgec1.png', 'To Be Announced'); Contestant( 'Nick Rusnov', 'nick@intus.net', 'images/qforgec2.png', 'To Be Announced'); diff --git a/contest_rules.php b/contest_rules.php index 3135269..6755879 100644 --- a/contest_rules.php +++ b/contest_rules.php @@ -14,11 +14,11 @@ ?>

- The QuakeForge project leader, Nelson Rush, contacted lead id Software programmer, John Carmack, and asked if QuakeForge had permission to use the Quake(R) logo. John wrote back saying that id Software's CEO had said that we are not allowed to use the logo for anything related to our project. + The QuakeForge project leader, Nelson Rush, contacted lead id Software programmer, John Carmack, and asked if QuakeForge had permission to use the Quake® logo. John wrote back saying that id Software's CEO had said that we are not allowed to use the logo for anything related to our project.

As a result, QuakeForge needs a new logo. The new logo will be used on the website, t-shirts, bumper stickers, advertisements, etc. Contest ends on Feb. 29, 2000.

diff --git a/index.php b/index.php index 6f4be38..a6b7178 100644 --- a/index.php +++ b/index.php @@ -18,45 +18,44 @@ include( "parts/topmain.php" ); // Display content top table ?>

- QuakeForge's aim is to create a long lasting project to work on developing and extending the Quake® source release (and any future releases) while maintaining backwards compatibility with the original Quake and QuakeWorld®. Our international team of developers is working hard to reach this goal, and we believe we are succeeding. + QuakeForge's aim is to create a long-lasting project to work on developing and extending the Quake® source release (and any future releases) while maintaining backwards compatibility with the original Quake and QuakeWorld®. Our international team of developers is working hard to reach this goal, and we believe we are succeeding.

-
( \'now\' + \'1 month ago\'::reltime )::date ' . 'ORDER BY n_date USING >'; - $result = pg_exec( $conn, $query ); - $numrows = pg_numrows( $result ); - tableBoxHeader("Latest News", 1, 'white', '#737b9c', 'black'); - if ($numrows >= 1) { - for ( $i = 0 ; $i < $numrows ; $i++ ) { - list($n_date, $n_user, $n_news) = pg_fetch_row($result,$i); - tableNewsItem($n_date, $n_user, $n_news); + $result = mysql_query( $query, $conn ); + $numRows = mysql_num_rows( $result ); + if ( $numRows > 0 ) { + for ( $i = 0 ; $i < $numRows ; $i++ ) { + list( $n_date, $n_user, $n_news ) = pg_fetch_row( $result,$i ); + tableNewsItem( $n_date, $n_user, $n_news ); } } else { tableNewsItem( 'Now', 'nobody', 'No current news!' ); } - $result = pg_close($conn); + $result = mysql_close( $conn ); } else { - tableBoxHeader("Latest News", 1, 'white', '#737b9c', 'black'); $newsItem = '

Thanks to Deek we now have a brand new site layout which should be much more consistent.' . '

In other news, the votes for the logo are still being submitted, but we should have something real soon now.'; - tableNewsItem('06 Mar 2000', 'Mercury', $newsItem); + tableNewsItem( '06 Mar 2000', 'Mercury', $newsItem ); $newsItem = '

Knghtbrd, our release manager, has been instructed to lay off the Quack.. <=:]'; - tableNewsItem('27 Feb 2000', 'Mercury', $newsItem); + tableNewsItem( '27 Feb 2000', 'Mercury', $newsItem ); $newsItem = '

QuackForge 0.1.1 has arrived! tar.gz, tar.bz2, and zip source archives are available at our Downloads page. Grab your copy today!'; - tableNewsItem('27 Feb 2000', 'Knghtbrd', $newsItem); + tableNewsItem( '27 Feb 2000', 'Knghtbrd', $newsItem ); $newsItem = '

Daniel McGregor has joined the project to maintain OpenBSD support.' . '

As a result of the current situation with QuakeLives, we have added a new goal: to support mod developers (such as MegaTF) more and provide 32-bit Windows executables (now that we have a qualified Windows developer working with us) for download.'; - tableNewsItem('25 Feb 2000', 'Palisade', $newsItem); + tableNewsItem( '25 Feb 2000', 'Palisade', $newsItem ); } tableBoxFooter(); ?> diff --git a/news.php b/news.php index c4554a2..9a75dae 100644 --- a/news.php +++ b/news.php @@ -22,25 +22,23 @@

'; - $result = pg_exec( $conn, $query ); - $numrows = pg_numrows( $result ); - tableBoxHeader("All News", 1, 'white', '#737b9c', 'black'); - if ($numrows >= 1) { - for ( $i = 0 ; $i < $numrows ; $i++ ) { - list($n_date, $n_user, $n_news) = pg_fetch_row($result,$i); - tableNewsItem($n_date, $n_user, $n_news); + $result = mysql_query( $query, $conn ); + $numRows = mysql_num_rows( $result ); + if ( $numRows > 0 ) { + for ( $i = 0 ; $i < $numRows ; $i++ ) { + list( $n_date, $n_user, $n_news ) = pg_fetch_row( $result,$i ); + tableNewsItem( $n_date, $n_user, $n_news ); } } else { tableNewsItem( 'Now', 'nobody', 'No news!' ); } - $result = pg_close($conn); + $result = mysql_close( $conn ); } else { - tableBoxHeader("All News", 1, 'white', '#737b9c', 'black'); - $newsItem = '

Thanks to Deek we now have a brand new site layout which should be much more consistent.' . '

In other news, the votes for the logo are still being submitted, but we should have something real soon now.'; tableNewsItem('06 Mar 2000', 'Mercury', $newsItem); @@ -212,7 +210,7 @@ ?>

+ diff --git a/parts/library.php b/parts/library.php index 6173dd2..0628f12 100644 --- a/parts/library.php +++ b/parts/library.php @@ -1,4 +1,8 @@ ' . $desc . '
'; } // Create a Menu Section header - function menuSectionHeader( $name, $fgColor , $bgColor ) + function menuSectionHeader( $name, $fgColor , $bgColor, $intBgColor ) { - echo "\n'; - echo ''; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo '
'; - echo '
'; - echo ' ' . $name . ''; - echo '
'; + echo "\n' . + '' . + ' ' . + ' ' . + ' ' . + ' ' . + '
' . + '
' . + ' ' . $name . '' . + '
'; } // Create a Menu Section footer function menuSectionFooter() @@ -90,17 +94,12 @@ } /* Table functions */ // - function tableBoxHeader( $name, $cols, $fgColor, $bgColor, $intBgColor ) + function tableBoxHeader( $bgColor, $intBgColor ) { echo '' . ' ' . ' ' . + ' ' . + ' '; + } function tableHeader( $cols, $fgColor, $bgColor ) { @@ -130,8 +138,8 @@ function tableSpacer( $height, $width, $cols, $bgColor ) { - echo ''; + echo ''; } ?> diff --git a/parts/menu.php b/parts/menu.php index ca0bdc5..35f8a66 100644 --- a/parts/menu.php +++ b/parts/menu.php @@ -3,7 +3,9 @@ ' . '
' . '
' . - ' ' . - ' ' . - ' ' . - ' '; + '
' . - ' ' . $name . '' . - '
'; } function tableBoxFooter() @@ -110,6 +109,15 @@ ' ' . '
'; } + + function tableTitle($name, $cols, $bgColor) + { + echo '
' . + ' ' . $name . '' . + '
'; - echo ' '; - echo '' . + ' ' . + '