101 files changed, 262 insertions, 723 deletions

@@ -111,7 +111,8 @@ if (!isset($noRightbar))
                         $getpost2 = mysql_query($getpost);
                         $getpost3 = mysql_fetch_array($getpost2);
 
-                        $template->adds_block('COMMENTS', array(        'AREA' => 'blog',
+                        $template->adds_block('COMMENTS', array(        'ID' => $getcomments3[$i]['id'],
+                                                                        'AREA' => 'blog',
                                                                         'CODED' => $getpost3['slug'],
                                                                         'ENDING' => '/',
                                                                         'TITLE' => stripslashes($getpost3['title']),
@@ -121,7 +122,8 @@ if (!isset($noRightbar))
                 {
                         $num = substr($getcomments3[$i]['page_id'],strpos($getcomments3[$i]['page_id'],'-')+1);
 
-                        $template->adds_block('COMMENTS', array(        'AREA' => 'quotes',
+                        $template->adds_block('COMMENTS', array(        'ID' => $getcomments3[$i]['id'],
+                                                                        'AREA' => 'quotes',
                                                                         'CODED' => $num,
                                                                         'ENDING' => '.php',
                                                                         'TITLE' => 'Quote #' . $num,
@@ -208,6 +210,9 @@ if (!isset($noRightbar))
         }
 }
 
+$template->add('REDIRPAGE',rawurlencode($_SERVER['REQUEST_URI']));
+$template->add('LOGDATA',echoLogData());
+
 $template->display();
 
 ?>
@@ -63,9 +63,9 @@ function generateError($error)
 function echoLogData()
 {
         if (!isLoggedIn()) {
-                return('Login');
+                return('in');
         } else {
-                return('Logout');
+                return('out');
         }
 }
 
@@ -45,17 +45,6 @@ $headerTemp->add('HEADTAGS',isset($headtags) ? $headtags : '');
 $headerTemp->add('EXTRATITLE',isset($title) ? ($title . ' - ') : '');
 $headerTemp->add('PAGEID',(isset($pageID)) ? $pageID : 'none');
 
-if (!isset($noMembers))
-{
-        $headerTemp->add('LOWERLOGDATA',strtolower(echoLogData()));
-        $headerTemp->add('REDIRPAGE',rawurlencode($_SERVER['REQUEST_URI']));
-        $headerTemp->add('LOGDATA',echoLogData());
-        if (getUserlevel() < 3)
-        {
-                $headerTemp->adds_block('PANEL',array('exi'=>1));
-        }
-}
-
 if (isset($_POST['message']))
 {
         $headerTemp->adds_block('MESSAGE',array('MSG' => $_POST['message']));
@@ -22,7 +22,7 @@ if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
 
 require('headerproc.php');
 
-//$disablePendingQueue = 1; // Use this when Four Island goes down
+$disablePendingQueue = 1; // Use this when Four Island goes down
 
 if (!isset($disablePendingQueue))
 {
@@ -333,6 +333,73 @@ if (isLoggedIn())
                                 $template->add('BACK', 'the previous page');
                                 $template->add('MSG', 'I\'m sorry, that pending post doesn\'t exist.');
                         }
+                } else if ($_GET['page'] == 'movePending')
+                {
+                        $getpending = "SELECT * FROM pending WHERE id = " . $_GET['id'];
+                        $getpending2 = mysql_query($getpending);
+                        $getpending3 = mysql_fetch_array($getpending2);
+
+                        if ($getpending3['id'] == $_GET['id'])
+                        {
+                                if ($_GET['dir'] == 'up')
+                                {
+                                        $get2pending = "SELECT * FROM pending WHERE id = " . ($_GET['id']-1);
+                                        $get2pending2 = mysql_query($get2pending);
+                                        $get2pending3 = mysql_fetch_array($get2pending2);
+
+                                        if ($get2pending3['id'] == ($_GET['id']-1))
+                                        {
+                                                $otherPending = $get2pending3;
+                                        } else {
+                                                $template = new FITemplate('msg');
+                                                $template->add('BACK', 'the previous page');
+                                                $template->add('MSG', 'I\'m sorry, that pending post is already the first.');
+                                        }
+                                } else if ($_GET['dir'] == 'down')
+                                {
+                                        $get2pending = "SELECT * FROM pending WHERE id = " . ($_GET['id']+1);
+                                        $get2pending2 = mysql_query($get2pending);
+                                        $get2pending3 = mysql_fetch_array($get2pending2);
+
+                                        if ($get2pending3['id'] == ($_GET['id']+1))
+                                        {
+                                                $otherPending = $get2pending3;
+                                        } else {
+                                                $template = new FITemplate('msg');
+                                                $template->add('BACK', 'the previous page');
+                                                $template->add('MSG', 'I\'m sorry, that pending post is already the last.');
+                                        }
+                                }
+
+                                if (isset($otherPending))
+                                {
+                                        $delpending = "DELETE FROM pending WHERE id = " . $_GET['id'] . " OR id = " . $otherPending['id'];
+                                        $delpending2 = mysql_query($delpending);
+
+                                        $inspending = "INSERT INTO pending (id, title, author, text, tag1, tag2, tag3, slug) VALUES (" . $_GET['id'] . ",\"" . $otherPending['title'] . "\",\"" . $otherPending['author'] . "\",\"" . $otherPending['text'] . "\",\"" . $otherPending['tag1'] . "\",\"" . $otherPending['tag2'] . "\",\"" . $otherPending['tag3'] . "\",\"" . $otherPending['slug'] . "\")";
+                                        $inspending2 = mysql_query($inspending);
+
+                                        $ins2pending = "INSERT INTO pending (id, title, author, text, tag1, tag2, tag3, slug) VALUES (" . $otherPending['id'] . ",\"" . $getpending3['title'] . "\",\"" . $getpending3['author'] . "\",\"" . $getpending3['text'] . "\",\"" . $getpending3['tag1'] . "\",\"" . $getpending3['tag2'] . "\",\"" . $getpending3['tag3'] . "\",\"" . $getpending3['slug'] . "\")";
+                                        $ins2pending2 = mysql_query($ins2pending);
+
+                                        $template = new FITemplate('admin/managePending');
+
+                                        $getpending = "SELECT * FROM pending ORDER BY id ASC";
+                                        $getpending2 = mysql_query($getpending);
+                                        $i=0;
+                                        while ($getpending3[$i] = mysql_fetch_array($getpending2))
+                                        {
+                                                $template->adds_block('PENDING', array( 'TITLE' => $getpending3[$i]['title'],
+                                                                                        'AUTHOR' => $getpending3[$i]['author'],
+                                                                                        'ID' => $getpending3[$i]['id']));
+                                                $i++;
+                                        }
+                                }
+                        } else {
+                                $template = new FITemplate('msg');
+                                $template->add('BACK', 'the previous page');
+                                $template->add('MSG', 'I\'m sorry, that pending post doesn\'t exist.');
+                        }
                 } else if ($_GET['page'] == 'managePosts')
                 {
                         $template = new FITemplate('admin/managePosts');
@@ -561,7 +628,8 @@ if (isLoggedIn())
                         {
                                 if (isset($_GET['approve']))
                                 {
-                                        $insquote = "INSERT INTO rash_quotes (quote) VALUES (\"" . addslashes($getpending3['quote']) . "\")";
+                                        $today = mktime(date('G'),date('i'),date('s'),date('m'),date('d'),date('Y'));
+                                        $insquote = "INSERT INTO rash_quotes (quote,date) VALUES (\"" . addslashes($getpending3['quote']) . "\",\"" . $today . "\")";
                                         $insquote2 = mysql_query($insquote);
 
                                         $delpending = "DELETE FROM rash_queue WHERE id = " . $_GET['id'];
@@ -22,6 +22,10 @@ if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
 
 require('headerproc.php');
 
+echo('<DIV ID="phpbb3-bubble">');
+
 include('fourm/link.php');
 
+echo('</DIV>');
+
 ?>
@@ -25,40 +25,17 @@ require('headerproc.php');
 include('includes/functions_quotes.php');
 
 $pageCategory = 'quotes';
+$headtags = '<LINK REL="stylesheet" HREF="/theme/css/quotes.css" />';
 
 if (isset($_GET['id']))
 {
         $quote_num = $_GET['id'];
 }
 
-if (!isset($_GET['act']))
+if ((!isset($_GET['act'])) || ($_GET['act'] == 'latest'))
 {
-        $template = new FITemplate('post');
-        $template->adds_block('INTERNAL',array('exi'=>1));
-
-        $getpost = "SELECT * FROM updates WHERE tag1 = \"quotes\" OR tag2 = \"tag2\" OR tag3 = \"tag3\" ORDER BY id DESC LIMIT 0,1";
-        $getpost2 = mysql_query($getpost);
-        $getpost3 = mysql_fetch_array($getpost2);
-
-        $title = $getpost3['title'] . ' - Blog Archive';
-
-        $template->adds_block('POST', array(    'ID' => $getpost3['id'],
-                                                'YEARID' => ((date('Y',strtotime($getpost3['pubDate']))-2006) % 4),
-                                                'DATE' => date('F dS Y \a\\t g:i:s a',strtotime($getpost3['pubDate'])),
-                                                'MONTH' => date('M',strtotime($getpost3['pubDate'])),
-                                                'DAY' => date('d',strtotime($getpost3['pubDate'])),
-                                                'CODED' => urlencode($getpost3['title']),
-                                                'TITLE' => $getpost3['title'],
-                                                'AUTHOR' => $getpost3['author'],
-                                                'TAG1' => $getpost3['tag1'],
-                                                'TAG2' => $getpost3['tag2'],
-                                                'TAG3' => $getpost3['tag3'],
-                                                'TEXT' => parseBBCode($getpost3['text'])));
-
-        $template->display();
-        $page_id = 'updates-' . $getpost3['id'];
-
-        include('includes/comments.php');
+        $query = "SELECT id, quote, rating, flag FROM rash_quotes ORDER BY id DESC LIMIT 50";
+        quote_generation($query, "Latest", -1);
 } else if ($_GET['act'] == 'add')
 {
         $template = new FITemplate('quotes/add');
@@ -107,10 +84,6 @@ if (!isset($_GET['act']))
         }
         $template->add('BACK','Quote #' . $quote_num);
         $template->display();
-} elseif ($_GET['act'] == 'latest')
-{
-        $query = "SELECT id, quote, rating, flag FROM rash_quotes ORDER BY id DESC LIMIT 50";
-        quote_generation($query, "Latest", -1);
 } elseif ($_GET['act'] == 'random')
 {
         $query = "SELECT id, quote, rating, flag FROM rash_quotes ORDER BY rand() LIMIT 50";
@@ -16,6 +16,8 @@
                         <A HREF="/admin/editPending.php?id=<!--PENDING.ID-->"><IMG SRC="/theme/images/icons/page_edit.png" ALT="Edit"></A>
                         <A HREF="/admin/deletePending.php?id=<!--PENDING.ID-->"><IMG SRC="/theme/images/icons/page_delete.png" ALT="Delete"></A>
                         <A HREF="/admin/viewPending.php?id=<!--PENDING.ID-->"><IMG SRC="/theme/images/icons/page_go.png" ALT="View"></A>
+                        <A HREF="/admin/movePending.php?id=<!--PENDING.ID-->&amp;dir=up"><IMG SRC="/theme/images/icons/thumb_up.png" ALT="Move Up"></A>
+                        <A HREF="/admin/movePending.php?id=<!--PENDING.ID-->&amp;dir=down"><IMG SRC="/theme/images/icons/thumb_down.png" ALT="Move Down"></A>
                 </TD>
         </TR>
         <!--END PENDING-->
@@ -1,4 +1,8 @@
+<A NAME="comments" />
+
 <!--BEGIN COMMENTS-->
+<A NAME="comment-<!--COMMENTS.ID-->" />
+
 <DIV CLASS="bubble">
         <BLOCKQUOTE>
                 <DIV>
@@ -25,16 +25,8 @@ header('Content-type: text/css');
 include('../../security/config.php');
 include('../includes/db.php');
 
-if (!isset($_GET['background']))
-{
-        include("css/website.php");
-        include("css/headers.php");
-        include("css/navigation.php");
-        include("css/uniform.php");
-        include("css/quotes.php");
-        include("css/bubbles.css");
-}
-
-include("css/backgrounds.php");
+include("css/website.php");
+include("css/bubbles.css");
+include("css/thickbox.css");
 
 ?>
@@ -1,148 +0,0 @@
-<?php
-/*
-       444444444  
-      4::::::::4  
-     4:::::::::4  
-    4::::44::::4  
-   4::::4 4::::4   Four Island
-  4::::4  4::::4  
- 4::::4   4::::4   Written and maintained by Starla Insigna
-4::::444444::::444
-4::::::::::::::::4  theme/css/backgrounds.php
-4444444444:::::444
-          4::::4   Please do not use, reproduce or steal the
-          4::::4   contents of this file without explicit
-          4::::4   permission from Hatkirby.
-        44::::::44
-        4::::::::4
-        4444444444
-*/
-
-if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
-
-require('headerproc.php');
-?>
-/* Four Island Background CSS */
-<?php
-
-include_once('../includes/specialdates.php');
-
-if (sd_ifNoSpecialDay())
-{
-        $bgimgm = 'island6';
-} elseif (sd_isSpecialDay('Four Island A'))
-{
-        $bgimgm = 'islandYearly';
-} elseif (sd_isSpecialDay('Christmas Eve'))
-{
-        $bgimgm = 'christmasEve';
-        $bgcolor = 'black';
-} elseif (sd_isSpecialDay('Christmas Day'))
-{
-        $bgimgm = 'christmas';
-} elseif (sd_isSpecialDay('New Years Eve'))
-{
-        $bgimgm = 'newYearsEve';
-        $bgcolor = 'black';
-} elseif (sd_isSpecialDay('Veterans Day'))
-{
-        $bgimgm = 'veterans';
-} elseif (sd_isSpecialDay('Independance Day'))
-{
-        $bgimgm = '4ofjuly';
-        $bgcolor = 'black';
-} elseif (sd_isSpecialDay('Fathers Day'))
-{
-        $bgimgm = 'fathers';
-} elseif (sd_isSpecialDay('Hatkirbys B-Day'))
-{
-        $bgimgm = 'hatkirbybday';
-} elseif (sd_isSpecialDay('Kirby Week'))
-{
-        $bgimgm = 'kirbyweek';
-} elseif (sd_isSpecialDay('Memorial Day'))
-{
-        $bgimgm = 'memorial';
-        $bgcolor = 'gray';
-} elseif (sd_isSpecialDay('Mothers Day'))
-{
-        $bgimgm = 'mothers';
-} elseif (sd_isSpecialDay('New Years Day'))
-{
-        $bgimgm = 'newYear';
-} elseif (sd_isSpecialDay('Ash Wednesday'))
-{
-        $bgimgm = 'ashWeds';
-} elseif (sd_isSpecialDay('Columbus Day'))
-{
-        $bgimgm = 'columbus';
-} elseif (sd_isSpecialDay('Easter'))
-{
-        $bgimgm = 'easter';
-} elseif (sd_isSpecialDay('Flag Day'))
-{
-        $bgimgm = 'flagDay';
-} elseif (sd_isSpecialDay('Good Friday'))
-{
-        $bgimgm = 'goodFriday';
-} elseif (sd_isSpecialDay('Groundhog Day'))
-{
-        $bgimgm = 'groundhog';
-} elseif (sd_isSpecialDay('Halloween'))
-{
-        $bgimgm = 'halloween';
-        $bgcolor = 'black';
-} elseif (sd_isSpecialDay('Mardi Gras'))
-{
-        $bgimgm = 'mardiGras';
-} elseif (sd_isSpecialDay('Martin Luther King Day'))
-{
-        $bgimgm = 'martinLuther';
-} elseif (sd_isSpecialDay('Valentines Day'))
-{
-        $bgimgm = 'valentines';
-} else {
-        $bgimgm = 'island6';
-}
-
-if (isset($_GET['nolayout']))
-{
-        if ((date('G') >= 20) || (date('G') <= 6))
-        {
-//              $bodyID = 'night';
-        } else {
-                $bodyID = 'day';
-        }
-} else {
-        $bodyID = $_GET['id'];
-}
-
-if (!isset($bgcolor)) {$bgcolor='aqua';}
-if (($bgimgm == 'island6') && ($bodyID == 'night')) {$bgcolor='black';}
-
-?>
-/* Body */
-
-body {
- background-color: <?php echo($bgcolor); ?>;
- background-image: url(/theme/images/backgrounds/<?php echo($bgimgm); ?>.PNG);
- background-repeat: repeat-x;
- background-attachment: fixed;
- background-position: bottom left;
- font-family: Arial, FreeSans;
- margin: 0px;
- padding: 0px 0px 30px !important;
-}
-                
-<?php
-
-if ($bgimgm == 'island6')
-{
-?>
-body#night {
- background: black url(/theme/images/backgrounds/island6night.PNG) repeat-x fixed bottom left;
-}
-
-<?php
-}
-?>
@@ -1,85 +0,0 @@
-<?php
-/*
-       444444444  
-      4::::::::4  
-     4:::::::::4  
-    4::::44::::4  
-   4::::4 4::::4   Four Island
-  4::::4  4::::4  
- 4::::4   4::::4   Written and maintained by Starla Insigna
-4::::444444::::444
-4::::::::::::::::4  theme/css/headers.php
-4444444444:::::444
-          4::::4   Please do not use, reproduce or steal the
-          4::::4   contents of this file without explicit
-          4::::4   permission from Hatkirby.
-        44::::::44
-        4::::::::4
-        4444444444
-*/
-
-if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
-
-require('headerproc.php');
-
-?>
-/* Four Island Header CSS */
-<?php
-
-include_once('../includes/specialdates.php');
-
-if (sd_ifNoSpecialDay())
-{
-        $bgimgm = 'main';
-} elseif (sd_isSpecialDay('Four Island A'))
-{
-        $bgimgm = 'islandYearly';
-} elseif (sd_isSpecialDay('Mothers Day'))
-{
-        $bgimgm = 'mothers';
-} elseif (sd_isSpecialDay('Memorial Day'))
-{
-        $bgimgm = 'memorial';
-} elseif (sd_isSpecialDay('Hatkirbys B-Day'))
-{
-        $bgimgm = 'hatkirbybday';
-} else if (sd_isSpecialDay('CTNH'))
-{
-        $bgimgm = 'ctnh';
-} else {
-        $bgimgm = 'main';
-}
-
-if ($bgimgm == 'main')
-{
-        //Check for page-based headers
-?>
-/* Category-Based Headers */
-body.projects div#banner {
- background-image: url("/theme/images/headers/projects.png");
-}
-body.wiki div#banner {
- background-image: url("/theme/images/headers/kfm.png");
-}
-body.fourm div#banner {
- background-image: url("/theme/images/headers/fourm.png");
-}
-body.misc div#banner {
- background-image: url("/theme/images/headers/random.png");
-}
-body.webs div#banner {
- background-image: url("/theme/images/headers/links.png");
-}
-body.quotes div#banner {
- background-image: url("/theme/images/headers/quotes.png");
-}
-body.poll div#banner {
- background-image: url("/theme/images/headers/potw.png");
-}
-/* AID-Based Headers */
-<?php
-}
-?>
-div#banner {
- background-image: url("/theme/images/headers/<?php echo($bgimgm); ?>.png"); /*850x129*/
-}
@@ -1,198 +0,0 @@
-<?php
-/*
-       444444444  
-      4::::::::4  
-     4:::::::::4  
-    4::::44::::4  
-   4::::4 4::::4   Four Island
-  4::::4  4::::4  
- 4::::4   4::::4   Written and maintained by Starla Insigna
-4::::444444::::444
-4::::::::::::::::4  theme/css/navigation.php
-4444444444:::::444
-          4::::4   Please do not use, reproduce or steal the
-          4::::4   contents of this file without explicit
-          4::::4   permission from Hatkirby.
-        44::::::44
-        4::::::::4
-        4444444444
-*/
-
-if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
-
-require('headerproc.php');
-
-?>
-/* Four Island NavBar CSS */

-

-ul#bannernav {

- list-style: none;

- clear: both;

- margin: 0px;

-}

-

-div#banner-nav {

- height: 30px;

- clear: both;

- margin: 1px 30px 0 30px;

- background: url("/theme/images/bg_navbar.gif") repeat-x 0 0;

-}

-

-ul#bannernav li {

- float: left;

- margin: 0;

- padding: 0;

- padding-right: 6px;

-}

-

-ul#bannernav li a {

- text-decoration: none;

- display: block;

- width: 100;

- height: 30;

-}

-

-ul#bannernav li a span {

- visibility: hidden;

-}

-

-ul#bannernav li img {

- display: none;

-}

-

-ul#bannernav li#bannernav-home a {

- background-image: url("/theme/images/Home.gif");

-}

-

-body.home ul#bannernav li#bannernav-home a,

-ul#bannernav li#bannernav-home a:hover {

- background-image: url("/theme/images/Home_ro.gif");

-}

-

-ul#bannernav li#bannernav-projects a {

- background-image: url("/theme/images/Projects.gif");

-}

-

-body.projects ul#bannernav li#bannernav-projects a,

-ul#bannernav li#bannernav-projects a:hover {

- background-image: url("/theme/images/Projects_ro.gif");

-}

-

-ul#bannernav li#bannernav-wiki a {

- background-image: url("/theme/images/Wiki.gif");

-}

-

-body.wiki ul#bannernav li#bannernav-wiki a,

-ul#bannernav li#bannernav-wiki a:hover {

- background-image: url("/theme/images/Wiki_ro.gif");

-}

-

-ul#bannernav li#bannernav-fourm a {

- background-image: url("/theme/images/Fourm.gif");

-}

-

-body.fourm ul#bannernav li#bannernav-fourm a,

-ul#bannernav li#bannernav-fourm a:hover {

- background-image: url("/theme/images/Fourm_ro.gif");

-}

-

-ul#bannernav li#bannernav-misc a {

- background-image: url("/theme/images/Random.gif");

-}

-

-body.misc ul#bannernav li#bannernav-misc a,

-ul#bannernav li#bannernav-misc a:hover {

- background-image: url("/theme/images/Random_ro.gif");

-}

-

-ul#bannernav li#bannernav-webs a {

- background-image: url("/theme/images/Links.gif");

-}

-

-body.webs ul#bannernav li#bannernav-webs a,

-ul#bannernav li#bannernav-webs a:hover {

- background-image: url("/theme/images/Links_ro.gif");

-}

-

-ul#bannernav li#bannernav-poll a {

- background-image: url("/theme/images/Poll.gif");

-}

-

-body.poll ul#bannernav li#bannernav-poll a,

-ul#bannernav li#bannernav-poll a:hover {

- background-image: url("/theme/images/Poll_ro.gif");

-}

-

-ul#bannernav li#bannernav-quotes a {

- background-image: url("/theme/images/Quotes.gif");

-}

-

-body.quotes ul#bannernav li#bannernav-quotes a,

-ul#bannernav li#bannernav-quotes a:hover {

- background-image: url("/theme/images/Quotes_ro.gif");

-}

-

-ul#bannernav li#bannernav-login a {

- background-image: url("/theme/images/Login.gif");

-}

-

-body.login ul#bannernav li#bannernav-login a,

-ul#bannernav li#bannernav-login a:hover {

- background-image: url("/theme/images/Login_ro.gif");

-}

-

-ul#bannernav li#bannernav-logout a {

- background-image: url("/theme/images/Logout.gif");

-}

-

-ul#bannernav li#bannernav-logout a:hover {

- background-image: url("/theme/images/Logout_ro.gif");

-}

-

-ul#bannernav li#bannernav-panel a {

- background-image: url("/theme/images/Panel.gif");

-}

-

-body.panel ul#bannernav li#bannernav-panel a,

-ul#bannernav li#bannernav-panel a:hover {

- background-image: url("/theme/images/Panel_ro.gif");

-}

-

-ul#bannernav li#bannernav-search {

- display: block;

- float: right;

- width: 165px;

- height: 30px;

- margin: 0px;

- background: url("/theme/images/bg_search.gif") 0 0 no-repeat;

-}

-

-ul#bannernav li#bannernav-search fieldset {

- border: none;

- padding-top: 6px;

- border-width:0pt;

- font-family:Verdana,Helvetica,Arial,sans-serif;

- font-size:1.1em;

-}

-

-ul#bannernav li#bannernav-search input {

- width: 125px;

- height: 19px !important;

- margin-left: 13px;

- border: none !important;

- background-color: transparent;

- cursor:pointer;

- font-family:Verdana,Helvetica,Arial,sans-serif;

- font-weight:normal;

- padding:0pt 3px;

- vertical-align:middle;

- line-height:1.3em;

- color:#536482;

- margin-top: -20px;

-}

-

-body.fourm ul#bannernav li#bannernav-search input {

- margin-top: 0px;

- font-size: 1.1em !important;

- margin-left: 28px;

-}

@@ -25,6 +25,21 @@ require('headerproc.php');
 ?>
 /* Four Island General CSS */
 
+body {
+ background-color: white;
+ background-repeat: repeat-x;
+ background-attachment: fixed;
+ background-position: bottom left;
+ font-family: Arial, FreeSans;
+ margin: 0px;
+ padding: 0px 0px 30px !important;
+}
+
+body.fourm {
+ font-family: Verdana, Helvetica, Arial, sans-serif ;
+}
+ 
+
 ul#bannernav, p {
  margin:0pt;
  padding:0pt;
@@ -34,7 +49,7 @@ ul#bannernav, p {
  text-align: none !important;
 }
 
-p {margin-top: 1em;}
+p {margin-top: 1em}
 
 ul, ol {margin-top: 1em; margin-bottom: 1em}
 
@@ -106,8 +121,6 @@ acronym, abbr {
  border-bottom: 1px dashed #999;
 }
 
-<?php if (!isset($_GET['nolayout'])) { ?>
-
 blockquote {
  padding-left: 10px;
  border-left: 3px solid #CCC;
@@ -118,8 +131,6 @@ blockquote {
  margin-left: 50px;
 }
 
-<?php } ?>
-
 pre {
  line-height: 12px;
 }
@@ -129,13 +140,8 @@ pre {
  cursor: help;
 }
 
-* html div#members {
- position: absolute;
-}
-
 #wrap {
  width: 910px;
- background: #FFFFFF url("/theme/images/bg_body.gif") repeat-y 0 0;
  margin: 10px auto;
  text-align: left;
  padding: 0;
@@ -143,35 +149,6 @@ pre {
 /* margin-left: 50px; */
 }
 
-#page-header {
- background: url("/theme/images/bg_header.gif") repeat-x 0 0;
- height: 150px;
- clear: both;
-}
-
-span.side-left, span.side-right {
-        display: block;
-        width: 20px;
-        height: 150px;
-        background: url("/theme/images/sides_top.gif") no-repeat;
-}
-span.side-left {
-        float: left;
-        margin-right: 10px;
-}
-span.side-right {
-        background-position: 100% 0;
-        float: right;
-}
-span.fcorners-bottom, span.fcorners-bottom span {
-        font-size: 1px;
-        line-height: 1px;
-        display: block;
-        height: 20px;
-        background-repeat: no-repeat;
-        background-image: url("/theme/images/corners_bottom.gif");
-        margin: 0;
-}
 span.fcorners-bottom {
         background-position: 0 0;
 }
@@ -179,14 +156,12 @@ span.fcorners-bottom span {
         background-position: 100% -20px;
 }
 
-<?php //if (!isset($_GET['nolayout'])) { ?>
-
 /* Banner */
                 
 div#banner, div#fi-banner {
  background-repeat: no-repeat;
- width: 850px;
- height: 129px;
+ width: 900px; /*728*/
+ height: 200px;
  float: left;
  margin-top: 21px;
 }
@@ -197,8 +172,8 @@ body div#banner h1, body div#fi-banner h1 {
 
 body div#banner h1 a, body div#fi-banner h1 a {
  display: block;
- width: 850px;
- height: 129px;
+ width: 900px;
+ height: 200px;
  text-indent: -5000px;
  text-decoration: none;
  margin: 0;
@@ -210,9 +185,10 @@ div#banner h1, div#fi-banner h1 {
  font-weight: normal;
 }
                                 
-div#banner div#bannerNav, div#fi-banner div#bannerNav {
- position: relative;
- top: -20px;
+div#bannernav {
+/* position: relative;
+ top: -20px;*/
+ text-align: center;
 }
 
 #page-body {
@@ -270,7 +246,7 @@ body.login div#pageTabs ul li#bannernav-login {
 /* Sidebar */
 
 div#rightbar {
- float: right;
+ float: left;
  width: 250px; /*210*/
 /* clear: right; */
  padding: 0 10;
@@ -285,6 +261,10 @@ div#iconbar ul li {
  list-style-type: none;
 }
 
+div#banner {
+ background-image: url("/theme/images/fourisland_header.png"); /*850x129*/
+}
+
 div.sidebar {
  width: 250px; /*250*/ /*240*/ /*210*/
  padding: 0 10px;
@@ -382,7 +362,7 @@ div#sidebar li img {
 /* Content */
                                                                                                                         
 div#content, div#fi-content {
- float: left;
+ float: right;
  width: 555px; /*465*/ /*555*/
 }
 
@@ -394,9 +374,6 @@ body#day div#page div#content code {
  overflow: visible;
 }
 
-<?php //} ?>
-
-
 div#content h2 {
  color: #59770e;
  margin: 0px 0px 2px;
@@ -633,14 +610,10 @@ div#footer ul li img {
  vertical-align: top;
 }
 
-<?php if (!isset($_GET['nolayout'])) { ?>
-
 div#content ul {
  list-style: url(/theme/images/bullet_disk_big.png);
 }
 
-<?php } ?>
-
 div.push {
  clear: both;
  height: 20px;
@@ -709,33 +682,6 @@ div.post-date-4 {
  background: url(/theme/images/date-bg-4.gif) no-repeat;
 }
 
-div#members {
- position: fixed;
- left: -40px;
- top: 20px;
-}
-
-div#members ul li {
- list-style-type: none;
-}
-
-div#members ul li a {
- color: white;
- width: 100px;
- height: 30px;
- padding-right: 5px;
- background-image: url(/theme/images/tabBG.png);
- display: block;
- text-align: right;
- padding-top: 5px;
- padding-bottom: 0px;
- background-repeat: no-repeat;
-}
-
-div#members ul li a:hover {
- background-image: url(/theme/images/tabBG2.png);
-}
-
 div#content a img {
  border: solid transparent 1px;
 }
@@ -759,41 +705,6 @@ div.breadcrumb {
  border-bottom: 1px dotted black;
 }
 
-.delicious-posts { margin: 1em; padding: 0.5em; font-family: sans-serif; }
-.delicious-posts ul, .delicious-posts li, .delicious-banner { margin: 0; padding: 0}
-.delicious-post { border-top: 1px solid #eee; padding: 0.25em; font-size: 80% }
-.delicious-posts a:hover { text-decoration: underline }
-
-/* #twitter_div {
- margin: 1em;
- padding: 0.5em;
- font-family: sans-serif;
-} */
-
-/* #twitter_div ul, #twitter_div li, .twitter-title {
- margin: 0;
- padding: 0;
-} */
-
-.twitter_update_list {
- list-style-type: none;
-}
-
-.twitter_update_list li {
- /* border-top: 1px solid #eee;
- padding: 0.25em; */
- display: inline;
-}
-
-/* .twitter-title {
- margin-left: -20px;
- font-size: 120%;
-} */
-
-.dispIfNew a:visited img {
- display: none;
-}
-
 /* Tables */
 
 table.webmail {
@@ -821,23 +732,3 @@ table.webmail th {
 table.webmail td {
  word-wrap: break-word;
 }
-
-/* Print Only */
-
-@media print {
- body {
-  width: 100% !important;
- }
-
- div#banner, div#footer, div#members {
-  display: none;
- }
- 
- span.print {
-  display: inline;
- }
- 
- div#cleardiv {
-  clear: none;
- }
-}
@@ -22,38 +22,77 @@
                                                 </DIV>
                                         </DIV>
 
-                                        <!--BEGIN USEHATNAV-->
                                         <DIV class="sidebar">
                                                 <DIV CLASS="bubble">
                                                         <DIV CLASS="rounded">
                                                                 <BLOCKQUOTE>
-                                                                        <DIV ID="hatnav"><H3>Hatnav</H3><P>
+                                                                        <DIV ID="hatbar"><H3>HatNav</H3><P>
                                                                                 <UL>
-                                                                                        <!--BEGIN HATNAV-->
-                                                                                        <LI STYLE="margin-left: 10"><A ID="<!--HATNAV.AID-->" HREF="<!--HATNAV.HREF-->"><IMG SRC="<!--HATNAV.IMAGE-->"><!--HATNAV.TEXT--><!--HATNAV.NEW--></A></LI>
-                                                                                        <!--END HATNAV-->
+                                                                                        <LI>
+                                                                                                <IMG SRC="/theme/images/icons/newspaper.png" />
+                                                                                                <A HREF="http://fourisland.com/">Blog</A>
+                                                                                        </LI>
+
+                                                                                        <LI>
+                                                                                                <IMG SRC="/theme/images/projects.png" />
+                                                                                                <A HREF="http://projects.fourisland.com/">Projects</A>
+                                                                                        </LI>
+
+                                                                                        <LI>
+                                                                                                <IMG SRC="/theme/images/icons/comment.png" />
+                                                                                                <A HREF="http://fourisland.com/fourm/">The Fourm</A>
+                                                                                        </LI>
+
+                                                                                        <LI>
+                                                                                                <IMG SRC="/theme/images/icons/page_edit.png" />
+                                                                                                <A HREF="http://fourisland.com/wiki/">Fouripedia</A>
+                                                                                        </LI>
+
+                                                                                        <LI>
+                                                                                                <IMG SRC="/theme/images/icons/overlays.png" />
+                                                                                                <A HREF="http://fourisland.com/poll/">Polls</A>
+                                                                                        </LI>
+
+                                                                                        <LI>
+                                                                                                <IMG SRC="/theme/images/icons/16-file-page.png" />
+                                                                                                <A HREF="http://fourisland.com/quotes/">Quotes</A>
+                                                                                        </LI>
+
+                                                                                        <LI>
+                                                                                                <IMG SRC="/theme/images/icons/door_<!--LOGDATA-->.png" />
+                                                                                                <A HREF="http://fourisland.com/log<!--LOGDATA-->.php?redirect=<!--REDIRPAGE-->">Log<!--LOGDATA--></A>
+                                                                                        </LI>
                                                                                 </UL>
-                                                                        </P></DIV>
+                                                                        </DIV>
+                                                                </BLOCKQUOTE>
+                                                        </DIV>
+                                                </DIV>
+                                        </DIV>
+                                                                                        
+                                        <DIV class="sidebar">
+                                                <DIV CLASS="bubble">
+                                                        <DIV CLASS="rounded">
+                                                                <BLOCKQUOTE>
+                                                                        <DIV ID="hatbar"><H3>Poll of the Week</H3><P>
+                                                                                <P>
+                                                                                        <!--INCLUDE polloftheweek-->
+                                                                                </P>
+                                                                        </DIV>
                                                                 </BLOCKQUOTE>
                                                         </DIV>
                                                 </DIV>
                                         </DIV>
-                                        <!--END USEHATNAV-->
-
-                                        <!--EXTRASIDEBARS-->
 
                                         <DIV class="sidebar">
                                                 <DIV CLASS="bubble">
                                                         <DIV CLASS="rounded">
                                                                 <BLOCKQUOTE>
                                                                         <DIV ID="hatbar"><H3>Hatbar</H3><P>
-                                                                                Confused? Email the webmaster at hatk<a href="http://mailhide.recaptcha.net/d?k=01gkW_nSHD3Qbf7dcAwJVdsg==&amp;c=M-Dz6vqhsLdR6tNVOO5f7c6jZUsKP1mUNWfmLFkJqak=" onclick="window.open('http://mailhide.recaptcha.net/d?k=01gkW_nSHD3Qbf7dcAwJVdsg==&amp;c=M-Dz6vqhsLdR6tNVOO5f7c6jZUsKP1mUNWfmLFkJqak=', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;" title="Reveal this e-mail address">...</a>@fourisland.com</SMALL>
                                                                                 <P>
                                                                                         <SPAN ID="hitcounter">
                                                                                                 Hits: <!--HITS--><BR>
                                                                                                 Today: <!--TODAY--><BR>
-                                                                                        <SPAN>
-                                                                                        <!--INCLUDE polloftheweek--><BR>
+                                                                                        </SPAN>
                                                                                         <!--INCLUDE datefinder-->
                                                                                 </P>
 
@@ -110,7 +149,7 @@
                                                                                 <P>
                                                                                         <UL>
                                                                                                 <!--BEGIN COMMENTS-->
-                                                                                                <LI STYLE="font-size: 0.9em"><!--COMMENTS.AUTHOR--> on <A HREF="/<!--COMMENTS.AREA-->/<!--COMMENTS.CODED--><!--COMMENTS.ENDING-->"><!--COMMENTS.TITLE--></A></LI>
+                                                                                                <LI STYLE="font-size: 0.9em"><!--COMMENTS.AUTHOR--> on <A HREF="/<!--COMMENTS.AREA-->/<!--COMMENTS.CODED--><!--COMMENTS.ENDING-->#comment-<!--COMMENTS.ID-->"><!--COMMENTS.TITLE--></A></LI>
                                                                                                 <!--END COMMENTS-->
                                                                                         </UL>
                                                                                 </P>
@@ -2,8 +2,7 @@
         <HEAD>
                 <TITLE><!--EXTRATITLE-->Four Island</TITLE>
 
-                <LINK REL="stylesheet" TYPE="text/css" HREF="http://fourisland.com/theme/css.php?id=<!--BODYID-->" />
-                <LINK REL="stylesheet" TYPE="text/css" HREF="http://fourisland.com/theme/css/thickbox.css" />
+                <LINK REL="stylesheet" TYPE="text/css" HREF="http://fourisland.com/theme/css.php" />
                 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8" />
                 <META HTTP-EQUIV="Content-Language" CONTENT="en" />
                 <LINK REL="alternate" TYPE="application/rss+xml" HREF="http://feeds.feedburner.com/FourIsland?format=xml" TITLE="Four Island" />
@@ -27,38 +26,16 @@
         </HEAD>
 
         <BODY ID="<!--BODYID-->" CLASS="<!--CATEGORY--> <!--AID--> <!--CATEGORY-->-<!--AID-->"<!--BODYTAGS-->>
-                <DIV ID="stripe">
-                        You can get notifications on new Four Island posts either via
-                        <A HREF="http://feeds.feedburner.com/FourIsland">RSS</A>
-                        or
-                        <A HREF="http://www.feedburner.com/fb/a/emailverifySubmit?feedId=1464430">Email</A>
-                </DIV>
-
                 <DIV ID="wrap">
                         <DIV ID="page-header">
-                                <SPAN CLASS="side-left"></SPAN>
                                 <DIV ID="banner" STYLE="position: relative;">
-                                        <H1 ID="logo-banner"><A HREF="/" TITLE="Four Island">Four Island</A></H1>
-                                </DIV>
-                                <SPAN CLASS="side-right"></SPAN>
-                        </DIV>
-
-                        <DIV ID="banner-nav">
-                                <UL ID="bannernav">
-                                        <LI id="bannernav-home"><A HREF="/" REL="home"><B><SPAN>Home</SPAN></B></A></LI>
-                                        <LI id="bannernav-projects"><A HREF="http://projects.fourisland.com"><B><SPAN>Projects</SPAN></B></A></LI>
-                                        <LI id="bannernav-wiki"><A HREF="/wiki/"><B><SPAN>Wiki</SPAN></B></A></LI>
-                                        <LI id="bannernav-fourm"><A HREF="/fourm/"><B><SPAN>Fourm</SPAN></B></A></LI>
-                                        <LI id="bannernav-poll"><A HREF="/poll/"><B><SPAN>Poll</SPAN></B></A></LI>
-                                        <LI id="bannernav-quotes"><A HREF="/quotes/"><B><SPAN>Quotes</SPAN></B></A></LI>
-                                        <LI id="bannernav-<!--LOWERLOGDATA-->"><A HREF="/<!--LOWERLOGDATA-->.php?redirect=<!--REDIRPAGE-->"><B><SPAN><!--LOGDATA--></SPAN></B></A></LI>
-                                        <!--BEGIN PANEL-->
-                                        <LI id="bannernav-panel"><A HREF="/admin/"><B><SPAN>Panel</SPAN></B></A></LI>
-                                        <!--END PANEL-->
-                                </UL>
+                                        <H1 ID="logo-banner">
+                                                <A HREF="/" TITLE="Four Island">Four Island</A>
+                                        </H1>
+                                </DIV>                          
                         </DIV>
 
                         <DIV CLASS="push"></DIV>
 
                         <DIV id="page-body">
-                                <DIV id="content"><!-- Begin content -->
+                                <DIV id="content">
@@ -1,8 +1,18 @@
 <H2><!--QUESTION--></H2>
 <P>
-<CENTER>
-        <!--INCLUDE polloftheweek-->
-</CENTER>
+<DIV CLASS="sidebar" STYLE="margin: auto">
+        <DIV CLASS="bubble">
+                <DIV CLASS="rounded">
+                        <BLOCKQUOTE>
+                                <DIV ID="hatbar">
+                                        <P>
+                                                <!--INCLUDE polloftheweek-->
+                                        </P>
+                                </DIV>
+                        </BLOCKQUOTE>
+                </DIV>
+        </DIV>
+</DIV>
 <P>
 <DIV CLASS="bubble">
         <DIV CLASS="rounded">
@@ -1,8 +1,20 @@
 <H2>Poll of the Week</H2>
-<P>

-<CENTER><!--INCLUDE polloftheweek--></CENTER>
-<P>

-Welcome to the Poll of the Week! Feel free to vote on these! You can review old ones and also comment on them if

+<P>
+<DIV CLASS="sidebar" STYLE="margin: auto">
+        <DIV CLASS="bubble">
+                <DIV CLASS="rounded">
+                        <BLOCKQUOTE>
+                                <DIV ID="hatbar">
+                                        <P>
+                                                <!--INCLUDE polloftheweek-->
+                                        </P>
+                                </DIV>
+                        </BLOCKQUOTE>
+                </DIV>
+        </DIV>
+</DIV>
+<P>
+Welcome to the Poll of the Week! Feel free to vote on these! You can review old ones and also comment on them if
 you're logged in using the links below!
 <P>
 <UL>
@@ -1,59 +1,63 @@
 <!--BEGIN FORM-->
-<FORM ACTION="/polloftheweek.php?potw=" METHOD="POST" ID="pollOfTheWeek">

-        <TABLE BORDER=1 STYLE="background: #d3d3d3; font-size: 12px" ALIGN="center">
+<FORM ACTION="/polloftheweek.php?potw=" METHOD="POST" ID="pollOfTheWeek">
+        <SPAN STYLE="font-size: 16px; text-align: center">
+                <!--QUESTION-->
+        </SPAN>
+
+        <P>
+                <INPUT TYPE="radio" NAME="options" VALUE="1" ID="option1">
+                <LABEL FOR="option1"><!--OPTION1--></LABEL>
+
+                <BR />
+
+                <INPUT TYPE="radio" NAME="options" VALUE="2" ID="option2">
+                <LABEL FOR="option2"><!--OPTION2--></LABEL>
+
+                <BR />
+
+                <INPUT TYPE="radio" NAME="options" VALUE="3" ID="option3">
+                <LABEL FOR="option3"><!--OPTION3--></LABEL>
+
+                <BR />
+
+                <INPUT TYPE="radio" NAME="options" VALUE="4" ID="option4">
+                <LABEL FOR="option4"><!--OPTION4--></LABEL>
+        </P>
+
+        <P>
+                <CENTER>
+                        <INPUT TYPE="submit" VALUE="Vote!">
+                </CENTER>
+        </P>
+</FORM>
+<!--END FORM-->
+
+<!--BEGIN DISPLAY-->
+<SPAN STYLE="font-size: 16px; text-align: center">
+        <!--QUESTION-->
+</SPAN>
+
+<P>
+        <TABLE WIDTH="100%" BORDER="0" STYLE="font-size: 12px">
                 <TR>
-                        <TD WIDTH="100%" COLSPAN=2><!--QUESTION--></TD>
+                        <TD>%<!--PERCENT1--></TD>
+                        <TD><!--OPTION1--></TD>
                 </TR>
 
                 <TR>
-                        <TD>
-                                <INPUT TYPE="radio" NAME="options" VALUE="1" ID="option1">
-                                <LABEL FOR="option1"><!--OPTION1--></LABEL>
-                        </TD>

-
-                        <TD>
-                                <INPUT TYPE="radio" NAME="options" VALUE="2" ID="option2">
-                                <LABEL FOR="option2"><!--OPTION2--></LABEL>

-                        </TD>
+                        <TD>%<!--PERCENT2--></TD>
+                        <TD><!--OPTION2--></TD>
                 </TR>
 
                 <TR>
-                        <TD>
-                                <INPUT TYPE="radio" NAME="options" VALUE="3" ID="option3">
-                                <LABEL FOR="option3"><!--OPTION3--></LABEL>
-                        </TD>

-
-                        <TD>
-                                <INPUT TYPE="radio" NAME="options" VALUE="4" ID="option4">
-                                <LABEL FOR="option4"><!--OPTION4--></LABEL>
-                        </TD>
+                        <TD>%<!--PERCENT3--></TD>
+                        <TD><!--OPTION3--></TD>
                 </TR>
 
                 <TR>
-                        <TD COLSPAN=2>

-                                <CENTER>
-                                        <INPUT TYPE="submit" VALUE="Vote!">
-                                </CENTER>
-                        </TD>
+                        <TD>%<!--PERCENT4--></TD>
+                        <TD><!--OPTION4--></TD>
                 </TR>
         </TABLE>
-</FORM>

-<!--END FORM-->
-
-<!--BEGIN DISPLAY-->
-<TABLE BORDER=1 STYLE="background: #d3d3d3; font-size: 12px" ALIGN="center" ID="pollOfTheWeek">
-        <TR>
-                <TD WIDTH="100%" COLSPAN=2><!--QUESTION--></TD>
-        </TR>
-
-        <TR>
-                <TD>%<!--PERCENT1--><IMG SRC="/theme/images/blue.PNG" WIDTH="<!--PERCENT1-->" HEIGHT="8" ALT="%<!--PERCENT1-->"><BR><!--OPTION1--></TD>
-                <TD>%<!--PERCENT2--><IMG SRC="/theme/images/blue.PNG" WIDTH="<!--PERCENT2-->" HEIGHT="8" ALT="%<!--PERCENT2-->"><BR><!--OPTION2--></TD>

-        </TR>
-
-        <TR>
-                <TD>%<!--PERCENT3--><IMG SRC="/theme/images/blue.PNG" WIDTH="<!--PERCENT3-->" HEIGHT="8" ALT="%<!--PERCENT3-->"><BR><!--OPTION3--></TD>
-                <TD>%<!--PERCENT4--><IMG SRC="/theme/images/blue.PNG" WIDTH="<!--PERCENT4-->" HEIGHT="8" ALT="%<!--PERCENT4-->"><BR><!--OPTION4--></TD>
-        </TR>
-</TABLE>
+</P>
 <!--END DISPLAY-->