19 files changed, 287 insertions, 229 deletions
diff --git a/includes/bbcode.php b/includes/bbcode.php
index 40533a3..42ff8d0 100755
--- a/includes/bbcode.php
+++ b/includes/bbcode.php

@@ -32,6 +32,7 @@ class BBCode
        {
                $this->bbcodes['b'] = '<B>{CONTENT}</B>';
                $this->bbcodes['i'] = '<I>{CONTENT}</I>';
+                $this->bbcodes['u'] = '<U>{CONTENT}</U>';
                $this->bbcodes['url'] = '<A HREF="{CONTENT}">{CONTENT}</A>';
                $this->bbcodes2['url'] = '<A HREF="{PARAM}">{CONTENT}</A>';
                $this->bbcodes['img'] = '<IMG SRC="{CONTENT}" />';
@@ -46,8 +47,8 @@ class BBCode
                $this->bbcodes2['blog'] = '<A HREF="/blog/{PARAM}/">{CONTENT}</A>';
                $this->bbcodes['ins'] = '<INS>{CONTENT}</INS>';
                $this->bbcodes['del'] = '<DEL>{CONTENT}</DEL>';
-                $this->bbcodes['bquote'] = '<P><DIV CLASS="autosize"><DIV CLASS="bubble"><DIV CLASS="bquote"><BLOCKQUOTE><DIV><NOBR>{CONTENT}</NOBR></DIV></BLOCKQUOTE></DIV><CITE><STRONG>Anonymous</STRONG></CITE></DIV></DIV><DIV CLASS="cleardiv"></DIV>';
+                $this->bbcodes['bquote'] = '<P><DIV CLASS="autosize"><DIV CLASS="bubble"><DIV CLASS="bquote"><BLOCKQUOTE><DIV>{CONTENT}</DIV></BLOCKQUOTE></DIV><CITE><STRONG>Anonymous</STRONG></CITE></DIV></DIV><DIV CLASS="cleardiv"></DIV>';
-                $this->bbcodes2['bquote'] = '<P><DIV CLASS="autosize"><DIV CLASS="bubble"><DIV CLASS="bquote"><BLOCKQUOTE><DIV><NOBR>{CONTENT}</NOBR></DIV></BLOCKQUOTE></DIV><CITE><STRONG>{PARAM}</STRONG></CITE></DIV></DIV><DIV CLASS="cleardiv"></DIV>';
+                $this->bbcodes2['bquote'] = '<P><DIV CLASS="autosize"><DIV CLASS="bubble"><DIV CLASS="bquote"><BLOCKQUOTE><DIV>{CONTENT}</DIV></BLOCKQUOTE></DIV><CITE><STRONG>{PARAM}</STRONG></CITE></DIV></DIV><DIV CLASS="cleardiv"></DIV>';
                $this->bbcodes2['abbr'] = '<ABBR TITLE="{PARAM}">{CONTENT}</ABBR>';
                $this->bbcodes['hidden'] = '<DIV STYLE="display: none">{CONTENT}</DIV>';
diff --git a/includes/db.php b/includes/db.php
index 8cc5449..8f305e7 100755
--- a/includes/db.php
+++ b/includes/db.php

@@ -46,4 +46,13 @@ function db_multi_select($query, $callback)
        }
 }
+function db_count($query)
+{
+        $cntitem = $query;
+        $cntitem2 = mysql_query($cntitem) or die($cntitem);
+        $cntitem3 = mysql_fetch_array($cntitem2);
+        return $cntitem3['COUNT(*)'];
+}
 ?>
diff --git a/includes/footer.php b/includes/footer.php
index be8dd1b..4daf35e 100755
--- a/includes/footer.php
+++ b/includes/footer.php

@@ -37,32 +37,38 @@ if (!isset($noRightbar))
        if (!isset($noHatNav))
        {
-                $template->adds_block('USEHATNAV', array('exi'=>1));
+                $cnthatnav = "SELECT COUNT(*) FROM hatnav WHERE category = \"" . $pageCategory . "\"";
-                if (!isset($genHatNav))
+                $cnthatnav2 = mysql_query($cnthatnav);
+                $cnthatnav3 = mysql_fetch_array($cnthatnav2);
+                if ($cnthatnav3['COUNT(*)'] > 0)
                {
-                        $gethnis = 'SELECT * FROM hatnav WHERE category = "' . 
+                        $template->adds_block('USEHATNAV', array('exi'=>1));
-                        $pageCategory . '"';
+                        if (!isset($genHatNav))
-                        $gethnis2 = mysql_query($gethnis);
-                        $i=0;
-                        while ($gethnis3[$i] = mysql_fetch_array($gethnis2))
                        {
-                                $template->adds_block('HATNAV', array(  'AID' =>        $gethnis3[$i]['AID'],
+                                $gethnis = 'SELECT * FROM hatnav WHERE category = "' . $pageCategory . '"';
-                                                                        'HREF' => $gethnis3[$i]['href'],
+                                $gethnis2 = mysql_query($gethnis);
-                                                                        'IMAGE' => '/theme/images/icons/' . $gethnis3[$i]['image'] . '.png',
+                                $i=0;
-                                                                        'TEXT' => $gethnis3[$i]['text'],
+                                while ($gethnis3[$i] = mysql_fetch_array($gethnis2))
-                                                                        'NEW' => dispIfNotOld($gethnis3[$i]['lastEdit'])));
+                                {
-                                $i++;
+                                        $template->adds_block('HATNAV', array(  'AID' =>        $gethnis3[$i]['AID'],
-                        }
+                                                                                'HREF' => $gethnis3[$i]['href'],
-                } else {
+                                                                                'IMAGE' => '/theme/images/icons/' . $gethnis3[$i]['image'] . '.png',
-                        $i=0;
+                                                                                'TEXT' => $gethnis3[$i]['text'],
-                        while ($i < $genHatNavNum)
+                                                                                'NEW' => dispIfNotOld($gethnis3[$i]['lastEdit'])));
-                        {
+                                        $i++;
-                                $template->adds_block('HATNAV', array(  'AID' =>        'post',
+                                }
-                                                                        'HREF' => $genHatNav[$i]['href'],
+                        } else {
-                                                                        'IMAGE' => '/theme/images/blue.PNG',
+                                $i=0;
-                                                                        'TEXT' => $genHatNav[$i]['text'],
+                                while ($i < $genHatNavNum)
-                                                                        'NEW' => ''));
+                                {
-                                $i++;
+                                        $template->adds_block('HATNAV', array(  'AID' =>        'post',
+                                                                                'HREF' => $genHatNav[$i]['href'],
+                                                                                'IMAGE' => '/theme/images/blue.PNG',
+                                                                                'TEXT' => $genHatNav[$i]['text'],
+                                                                                'NEW' => ''));
+                                        $i++;
+                                }
                        }
                }
        }
@@ -235,9 +241,6 @@ if (!isset($noRightbar))
        }
 }
-$template->add('REDIRPAGE',rawurlencode($_SERVER['REQUEST_URI']));
-$template->add('LOGDATA',echoLogData());
 $template->display();
 ?>
diff --git a/includes/functions.php b/includes/functions.php
index 7f85f96..1caef59 100755
--- a/includes/functions.php
+++ b/includes/functions.php

@@ -282,4 +282,29 @@ if (!function_exists('unique_id'))
        }
 }
+function displayRelated($title, $avoid = 0)
+{
+        $getrelated = "SELECT *, MATCH (title, text) AGAINST (\"" . addslashes($title) . "\") AS score FROM updates WHERE MATCH (title, text) AGAINST (\"" . addslashes($title) . "\") AND id <> " . $avoid . " LIMIT 0,5";
+        $getrelated2 = mysql_query($getrelated);
+        $i=0;
+        while ($getrelated3[$i] = mysql_fetch_array($getrelated2))
+        {
+                if ($i==0)
+                {
+                        $template = new FITemplate('related');
+                }
+                $template->adds_block('POST', array(    'TITLE' => $getrelated3[$i]['title'],
+                                                        'CODED' => $getrelated3[$i]['slug'],
+                                                        'AUTHOR' => $getrelated3[$i]['author'],
+                                                        'DATE' => date('F d<\S\U\P>S</\S\U\P> Y',strtotime($getrelated3[$i]['pubDate']))));
+                $i++;
+        }
+        if ($i > 0)
+        {
+                $template->display();
+        }
+}
 ?>
diff --git a/includes/header.php b/includes/header.php
index e9f31f6..6018179 100755
--- a/includes/header.php
+++ b/includes/header.php

@@ -44,6 +44,9 @@ $headerTemp->add('BODYTAGS',(isset($bodyTags)) ? $bodyTags : '');
 $headerTemp->add('HEADTAGS',isset($headtags) ? $headtags : '');
 $headerTemp->add('EXTRATITLE',isset($title) ? ($title . ' - ') : '');
 $headerTemp->add('PAGEID',(isset($pageID)) ? $pageID : 'none');
+$headerTemp->add(strtoupper($pageCategory) . 'ACTIVE', ' CLASS="active"');
+$headerTemp->add('REDIRPAGE',rawurlencode($_SERVER['REQUEST_URI']));
+$headerTemp->add('LOGDATA',echoLogData());
 if (isset($_POST['message']))
 {
diff --git a/pages/blog.php b/pages/blog.php
index f99ad17..d55f9a4 100755
--- a/pages/blog.php
+++ b/pages/blog.php

@@ -106,27 +106,7 @@ if (isset($_GET['post']))
                $page_id = 'updates-' . $getpost3['id'];
                include('includes/comments.php');
-                $getrelated = "SELECT *, MATCH (title, text) AGAINST (\"" . addslashes($getpost3['title']) . "\") AS score FROM updates WHERE MATCH (title, text) AGAINST (\"" . addslashes($getpost3['title']) . "\") AND id <> " . $getpost3['id'] . " LIMIT 0,5";
+                displayRelated($getpost3['title'], $getpost3['id']);
-                $getrelated2 = mysql_query($getrelated);
-                $i=0;
-                while ($getrelated3[$i] = mysql_fetch_array($getrelated2))
-                {
-                        if ($i==0)
-                        {
-                                $template = new FITemplate('related');
-                        }
-                        $template->adds_block('POST', array(    'TITLE' => $getrelated3[$i]['title'],
-                                                                'CODED' => $getrelated3[$i]['slug'],
-                                                                'AUTHOR' => $getrelated3[$i]['author'],
-                                                                'DATE' => date('F d<\S\U\P>S</\S\U\P> Y',strtotime($getrelated3[$i]['pubDate']))));
-                        $i++;
-                }
-                if ($i > 0)
-                {
-                        $template->display();
-                }
        } else {
                generateError('404');
        }
@@ -135,6 +115,7 @@ if (isset($_GET['post']))
        if (isset($_GET['author']))
        {
                $title = 'Author: ' . $_GET['author'] . ' - Blog Archive';
+                $template->add('HEADER', 'Posts by ' . $_GET['author']);
                $getposts = "SELECT * FROM updates AS u WHERE author = \"" . $_GET['author'] . "\" ORDER BY id DESC";
                $getbio = "SELECT * FROM bio WHERE username = \"" . $_GET['author'] . "\"";
                $getbio2 = mysql_query($getbio);
@@ -148,9 +129,11 @@ if (isset($_GET['post']))
        } elseif (isset($_GET['tag']))
        {
                $title = 'Tag: ' . $_GET['tag'] . ' - Blog Archive';
+                $template->add('HEADER', 'Posts tagged with ' . $_GET['tag']);
                $getposts = "SELECT * FROM updates AS u, tags AS t WHERE u.id = t.post_id AND t.post_type = \"published\" AND t.tag = \"" . $_GET['tag'] . "\" ORDER BY u.id DESC";
        } else {
                $title = 'Blog Archive';
+                $template->add('HEADER', 'Blog Archive');
                $getposts = "SELECT * FROM updates AS u ORDER BY id DESC";
        }
        $getposts2 = mysql_query($getposts);
@@ -166,10 +149,6 @@ if (isset($_GET['post']))
                                $curID++;
                        }
                        $template->add_ref($curID, 'MONTH', array('TITLE' => date('F Y',strtotime($getposts3[$i]['pubDate']))));
-                        if ($curID == 0)
-                        {
-                                $template->adds_ref_sub($curID, 'BIGEND',array('exi'=>1));
-                        }
                        $lastmonth = date('m-Y',strtotime($getposts3[$i]['pubDate']));
                }
@@ -195,23 +174,9 @@ if (isset($_GET['post']))
                        $comText = $total_post . ' Comments';
                }
-                if ($curID == 0)
+                $template->adds_ref_sub($curID, 'SMALL',array(  'DATE' => date('m-d-Y',strtotime($getposts3[$i]['pubDate'])),
-                {
+                                                                'CODED' => $getposts3[$i]['slug'],
-                        $template->adds_ref_sub($curID, 'BIG',array(    'DATE' => date('m-d-Y',strtotime($getposts3[$i]['pubDate'])),
+                                                                'TITLE' => $getposts3[$i]['title']));
-                                                                        'CODED' => $getposts3[$i]['slug'],
-                                                                        'TITLE' => $getposts3[$i]['title'],
-                                                                        'ID' => $getposts3[$i]['id'],
-                                                                        'YEARID' => ((date('Y',strtotime($getposts3[$i]['pubDate']))-2006) % 4),
-                                                                        'MONTH' => date('M',strtotime($getposts3[$i]['pubDate'])),
-                                                                        'DAY' => date('d',strtotime($getposts3[$i]['pubDate'])),
-                                                                        'AUTHOR' => $getposts3[$i]['author'],
-                                                                        'PLURALCOMMENT' => (isset($plural) ? $plural : ''),
-                                                                        'COMMENTS' => $comText));
-                } else {
-                        $template->adds_ref_sub($curID, 'SMALL',array(  'DATE' => date('m-d-Y',strtotime($getposts3[$i]['pubDate'])),
-                                                                        'CODED' => $getposts3[$i]['slug'],
-                                                                        'TITLE' => $getposts3[$i]['title']));
-                }
                $i++;
        }
        if ($i==0)
diff --git a/pages/login.php b/pages/login.php
index 690a0e8..a787729 100755
--- a/pages/login.php
+++ b/pages/login.php

@@ -22,7 +22,7 @@ if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
 require('headerproc.php');
-$noMembers=1;
+$pageCategory = 'log';
 if (!isset($_GET['submit']))
 {
diff --git a/pages/poll.php b/pages/poll.php
index d871a7d..2dee559 100755
--- a/pages/poll.php
+++ b/pages/poll.php

@@ -26,12 +26,12 @@ $pageCategory = 'poll';
 if (isset($_GET['submit']))
 {
-        $setip = "INSERT INTO didpollalready SET ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
+        $setip = "INSERT INTO didpollalready SET ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
-        $setip2 = mysql_query($setip);
+        $setip2 = mysql_query($setip);
-        $getpoll = "SELECT * FROM polloftheweek ORDER BY id DESC LIMIT 0,1";
+        $getpoll = "SELECT * FROM polloftheweek ORDER BY id DESC LIMIT 0,1";
-        $getpoll2 = mysql_query($getpoll);
+        $getpoll2 = mysql_query($getpoll);
-        $getpoll3 = mysql_fetch_array($getpoll2);
+        $getpoll3 = mysql_fetch_array($getpoll2);
-        $setpoll = "UPDATE polloftheweek SET clicks" . $_POST['options'] . " = " . ($getpoll3['clicks' . $_POST['options']]+1) . " WHERE id = " . $getpoll3['id'];
+        $setpoll = "UPDATE polloftheweek SET clicks" . $_POST['options'] . " = " . ($getpoll3['clicks' . $_POST['options']]+1) . " WHERE id = " . $getpoll3['id'];
        $setpoll2 = mysql_query($setpoll);
        $template = new FITemplate('msg');
@@ -43,17 +43,57 @@ if (isset($_GET['submit']))
 {
        $template = new FITemplate('pollIndex');
-        $getpolls = "SELECT * FROM polloftheweek ORDER BY id DESC";
+        if (isset($_GET['start']))
+        {
+                $start = $_GET['start'] * 10;
+        } else {
+                $start = 0;
+        }
+        $getpolls = "SELECT * FROM polloftheweek ORDER BY id DESC LIMIT " . $start . ",10";
        $getpolls2 = mysql_query($getpolls);
        $i=0;
        while ($getpolls3[$i] = mysql_fetch_array($getpolls2))
        {
+                $question = strip_tags($getpolls3[$i]['question']);
+                if (strlen($question) > 50)
+                {
+                        $question = substr($question, 0, 50);
+                        while (substr($question, strlen($question)-1) != ' ')
+                        {
+                                $question = substr($question, 0, strlen($question)-1);
+                        }
+                        $question = substr($question, 0, strlen($question)-1);
+                        $question .= '....';
+                }
                $template->adds_block('POLL', array(    'ID' => $getpolls3[$i]['id'],
-                                                        'QUESTION' => $getpolls3[$i]['question'],
+                                                        'QUESTION' => $question,
-                                                        'WEEK' => date('F jS Y', strtotime($getpolls3[$i]['week']))));
+                                                        'WEEK' => date('F jS Y', strtotime($getpolls3[$i]['week'])),
+                                                        'EVEN' => (($i % 2 == 1) ? ' CLASS="even"' : '')));
                $i++;
        }
+        if ($i==0)
+        {
+                generateError('404');
+                exit;
+        }
+        $start /= 10;
+        if ($start > 0)
+        {
+                $template->adds_block('PREVIOUS', array('ID' => ($start-1)));
+        }
+        $cntpolls = "SELECT COUNT(*) FROM polloftheweek";
+        $cntpolls2 = mysql_query($cntpolls);
+        $cntpolls3 = mysql_fetch_array($cntpolls2);
+        if ($start < floor($cntpolls3['COUNT(*)'] / 10))
+        {
+                $template->adds_block('NEXT', array('ID' => ($start+1)));
+        }
        include('pages/polloftheweek.php');
        $template->display();
@@ -95,6 +135,8 @@ if (isset($_GET['submit']))
        $page_id = 'polloftheweek-' . $getpoll3['id'];
        include('includes/comments.php');
+        displayRelated($getpoll3['question']);
 }
 ?>
diff --git a/pages/quotes.php b/pages/quotes.php
index b02875e..8aaa5db 100755
--- a/pages/quotes.php
+++ b/pages/quotes.php

@@ -25,10 +25,6 @@ require('headerproc.php');
 include('includes/functions_quotes.php');
 $pageCategory = 'quotes';
-$headtags = '<LINK REL="stylesheet" HREF="/theme/css/quotes.css" />';
-$template = new FITemplate('quotes/header');
-$template->display();
 if (isset($_GET['id']))
 {
diff --git a/theme/archive.tpl b/theme/archive.tpl
index b06aad9..1a73af2 100755
--- a/theme/archive.tpl
+++ b/theme/archive.tpl

@@ -1,37 +1,8 @@
+<CENTER><H2><!--HEADER--></H2></CENTER>
 <!--BEGIN MONTH-->
 <H3 STYLE="clear: both; display: block; margin-bottom: 0"><!--MONTH.TITLE--></H2>
-        <!--BEGIN MONTH.BIG-->
-        <DIV CLASS="post">
-                <DIV CLASS="post-date-<!--MONTH.BIG.YEARID-->">
-                        <ABBR CLASS="dtstart" TITLE="<!--MONTH.BIG.DATE-->">
-                                <SPAN CLASS="post-month"><!--MONTH.BIG.MONTH--></SPAN>
-                                <SPAN CLASS="post-day"><!--MONTH.BIG.DAY--></SPAN>
-                        </ABBR>
-                </DIV>
-                <DIV CLASS="post-title">
-                        <H2>
-                                <A CLASS="url" HREF="/blog/<!--MONTH.BIG.CODED-->/" REL="bookmark" TITLE="Permalink for <!--MONTH.BIG.TITLE-->">
-                                        <SPAN CLASS="summary"><!--MONTH.BIG.TITLE--></SPAN>
-                                </A>
-                        </H2>
-                        <SPAN CLASS="post-cat-<!--MONTH.BIG.AUTHOR--> category">
-                                <A HREF="/blog/author/<!--MONTH.BIG.AUTHOR-->.php"><!--MONTH.BIG.AUTHOR--></A>
-                        </SPAN>
-                        <SPAN CLASS="post-comment<!--MONTH.BIG.PLURALCOMMENT-->">
-                                <A CLASS="noVisit" HREF="/blog/<!--MONTH.BIG.CODED-->/#comments"><!--MONTH.BIG.COMMENTS-->&nbsp;&#187;</A>
-                        </SPAN>
-                </DIV>
-        </DIV>
-        <!--END MONTH.BIG-->
        <!--BEGIN MONTH.SMALL-->
                <SMALL><SPAN STYLE="margin-left: 50"><!--MONTH.SMALL.DATE--> | <A HREF="/blog/<!--MONTH.SMALL.CODED-->/"><!--MONTH.SMALL.TITLE--></A></SPAN></SMALL><BR>
        <!--END MONTH.SMALL-->
-        <!--BEGIN MONTH.BIGEND-->
-        <BR><P><BR>
-        <!--END MONTH.BIGEND-->
 <!--END MONTH-->
diff --git a/theme/css/blog.php b/theme/css/blog.php
index b4b80d0..bef21dd 100644
--- a/theme/css/blog.php
+++ b/theme/css/blog.php

@@ -91,6 +91,13 @@ div.entry {
 font: 75%/150% Arial, "Trebuchet MS", Tahoma;
 }
+div.entry ol,
+div.entry ul,
+a[name|="comment"]+div.bubble ol,
+a[name|="comment"]+div.bubble ul {
+ margin-left: 3em;
+}
 <?php
 $getupdates = "SELECT * FROM updates";
@@ -207,3 +214,9 @@ div.post-date-4 {
 float: left;
 background: url(/theme/images/date-bg-4.gif) no-repeat;
 }
+span.post-vote {
+ float: right;
+ position: relative;
+ top: -10px;
+}
diff --git a/theme/css/bubbles.css b/theme/css/bubbles.css
index c859bf9..311e471 100755
--- a/theme/css/bubbles.css
+++ b/theme/css/bubbles.css

@@ -2,7 +2,7 @@
 div.bubble {
        width: auto;
        font-size: 0.75em;
-        margin-bottom: 24px;
+        margin-bottom: 14px;
        font: 1em "Lucida Grande", Lucida, Verdana, sans-serif;
 }
@@ -20,7 +20,7 @@ div.bubble blockquote div {
 div.bubble cite {
        position: relative;
-        margin: 0px;
+        margin: 0;
        padding: 7px 0px 0px 15px;
        top: 6px;
        background: transparent url(/theme/images/tip.gif) no-repeat 20px 0;
@@ -62,8 +62,8 @@ div#pimped.bubble cite.rounded {
 }
 div.bubble div.bquote blockquote {
-        margin: 0px;
+        margin: 0;
-        padding: 0px;
+        padding: 4px 0;
        border: 1px solid #c9c2c1;
        background-color: #fff;
 }
@@ -85,4 +85,5 @@ div.bubble div.bquote blockquote {
        border-top-right-radius: 10px;
        border-bottom-left-radius: 10px;
        border-bottom-right-radius: 10px;
+        padding: 4px;
 }
diff --git a/theme/css/website.css b/theme/css/website.css
index de2fecd..806b01f 100755
--- a/theme/css/website.css
+++ b/theme/css/website.css

@@ -67,13 +67,12 @@ a img {
 /* Random Elements */
-ul#bannernav, p {
+* {
 margin:0pt;
 padding:0pt;
 }
-p {margin-top: 1em}
+p {margin-top: 1em;}
 ul, ol {margin-top: 1em; margin-bottom: 1em}
 img.center, img[align="center"] {
@@ -93,7 +92,7 @@ acronym, abbr {
 blockquote {
 padding-left: 10px;
 border-left: 3px solid #CCC;
- font-family: helvetica;
+ font-family: Helvetica, sans-serif;
 font-size: 14px;
 margin-top: 10px;
 margin-bottom: 10px;
@@ -111,7 +110,7 @@ div#banner, div#fi-banner {
 width: 900px; /*728*/
 height: 200px;
 float: left;
- margin-top: 21px;
+/* margin-top: 21px; */
 }
 div#banner {
@@ -136,11 +135,50 @@ div#banner h1, div#fi-banner h1 {
 font-size: 3.0em;
 font-weight: normal;
 }
-                                
-div#bannernav {
+/* NavBar */
+div#fi-navbar {
+ position: relative;
+}
+div#fi-navbar .rounded {
+ padding: 0;
+}
+div#fi-navbar ul {
+ margin-top: .25em;
+ margin-bottom: .25em;
+ padding-left: 1em;
 text-align: center;
 }
+div#fi-navbar ul li {
+ display: inline;
+ font-family: Verdana, sans-serif;
+ font-size: 1.1em;
+}
+div#fi-navbar ul li+li:before {
+ content: " - ";
+}
+div#fi-navbar ul li img {
+ display: none;
+}
+div#fi-navbar ul li.active a {
+ display: none;
+}
+div#fi-navbar ul li.active img {
+ display: inline;
+ background-color: white;
+ outline: white solid .5em;
+ margin-left: .5em;
+ margin-right: .5em;
+}
 /* Sidebar */
 div#rightbar {
@@ -197,7 +235,6 @@ div#sidebar li img {
 margin: 10px auto;
 text-align: left;
 padding: 0;
- margin-top: 25px;
 }
 div#top-fade {
@@ -256,7 +293,6 @@ div#content h2 {
 div.cleardiv {
 clear: both;
- height: 1em;
 }
                                
 div#footer {
@@ -269,6 +305,7 @@ div#footer {
 width: 100%;
 border-top: 1px black solid;
 border-bottom: 4px gray solid;
+ background-color: white;
 }
 div#footer ul.rows li {
@@ -296,11 +333,6 @@ div#content ul {
 list-style: url(/theme/images/bullet_disk_big.png);
 }
-div.push {
- clear: both;
- height: 20px;
-}
 div#content a img {
 border: solid transparent 1px;
 }
@@ -313,6 +345,20 @@ div#hatbar.quotes-options ul {
 list-style: none;
 }
+div.autosize {
+ margin-bottom: 6px !important;
+}
+ul blockquote, ol blockquote {
+ position: relative;
+ left: -3em;
+ width: 110%;
+}
+li+br {
+ display: none;
+}
 /* Tables */
 table.webmail {
diff --git a/theme/footer.tpl b/theme/footer.tpl
index faa5189..ceb9658 100755
--- a/theme/footer.tpl
+++ b/theme/footer.tpl

@@ -22,52 +22,23 @@
                                                </DIV>
                                        </DIV>
+                                        <!--BEGIN USEHATNAV-->
                                        <DIV class="sidebar">
                                                <DIV CLASS="bubble">
                                                        <DIV CLASS="rounded">
                                                                <BLOCKQUOTE>
-                                                                        <DIV ID="hatbar"><H3>HatNav</H3><P>
+                                                                        <DIV ID="hatnav"><H3>Hatnav</H3><P>
                                                                                <UL>
-                                                                                        <LI>
+                                                                                        <!--BEGIN HATNAV-->
-                                                                                                <IMG SRC="/theme/images/icons/newspaper.png" />
+                                                                                        <LI STYLE="margin-left: 10"><A ID="<!--HATNAV.AID-->" HREF="<!--HATNAV.HREF-->"><IMG SRC="<!--HATNAV.IMAGE-->"><!--HATNAV.TEXT--><!--HATNAV.NEW--></A></LI>
-                                                                                                <A HREF="http://fourisland.com/">Blog</A>
+                                                                                        <!--END HATNAV-->
-                                                                                        </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>
-                                                                        </DIV>
+                                                                        </P></DIV>
                                                                </BLOCKQUOTE>
                                                        </DIV>
                                                </DIV>
                                        </DIV>
+                                        <!--END USEHATNAV-->
                                                                                        
                                        <DIV class="sidebar">
                                                <DIV CLASS="bubble">
diff --git a/theme/header.tpl b/theme/header.tpl
index 85ddf9b..6f02792 100755
--- a/theme/header.tpl
+++ b/theme/header.tpl

@@ -36,7 +36,51 @@
                                </DIV>                          
                        </DIV>
-                        <DIV CLASS="push"></DIV>
+                        <DIV CLASS="cleardiv"></DIV>
+                        <DIV ID="fi-navbar">
+                                <DIV CLASS="bubble">
+                                        <DIV CLASS="rounded">
+                                                <BLOCKQUOTE>
+                                                        <UL>
+                                                                <LI<!--HOMEACTIVE-->>
+                                                                        <IMG SRC="/theme/images/icons/newspaper.png" />
+                                                                        <A HREF="http://fourisland.com/">Blog</A>
+                                                                </LI>
+                                                                <LI>
+                                                                        <A HREF="http://projects.fourisland.com/">Projects</A>
+                                                                </LI>
+                                                                <LI<!--FOURMACTIVE-->>
+                                                                        <IMG SRC="/theme/images/icons/comment.png" />
+                                                                        <A HREF="http://fourisland.com/fourm/">The Fourm</A>
+                                                                </LI>
+                                                                <LI<!--WIKIACTIVE-->>
+                                                                        <IMG SRC="/theme/images/icons/page_edit.png" />
+                                                                        <A HREF="http://fourisland.com/wiki/">Fouripedia</A>
+                                                                </LI>
+                                                                <LI<!--POLLACTIVE-->>
+                                                                        <IMG SRC="/theme/images/icons/overlays.png" />
+                                                                        <A HREF="http://fourisland.com/poll/">Polls</A>
+                                                                </LI>
+                                                                <LI<!--QUOTESACTIVE-->>
+                                                                        <IMG SRC="/theme/images/icons/16-file-page.png" />
+                                                                        <A HREF="http://fourisland.com/quotes/">Quotes</A>
+                                                                </LI>
+                                                                <LI<!--LOGACTIVE-->>
+                                                                        <IMG SRC="/theme/images/icons/door_in.png" />
+                                                                        <A HREF="http://fourisland.com/log<!--LOGDATA-->.php?redirect=<!--REDIRPAGE-->">Log<!--LOGDATA--></A>
+                                                                </LI>
+                                                        </UL>
+                                                </BLOCKQUOTE>
+                                        </DIV>
+                                </DIV>
+                        </DIV>
                        <DIV id="page-body">
                                <DIV id="content">
diff --git a/theme/pollIndex.tpl b/theme/pollIndex.tpl
index 18b3c43..ced43cf 100755
--- a/theme/pollIndex.tpl
+++ b/theme/pollIndex.tpl

@@ -17,8 +17,19 @@
 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>
+<TABLE CLASS="webmail">
+        <TR><TH>Question</TH><TH>Week</TH></TR>
        <!--BEGIN POLL-->
-        <LI><A HREF="/poll/<!--POLL.ID-->.php"><!--POLL.QUESTION--></A> -  Week of <!--POLL.WEEK--></LI>
+        <TR<!--POLL.EVEN-->><TD><A HREF="/poll/<!--POLL.ID-->.php"><!--POLL.QUESTION--></A></TD><TD><NOBR><!--POLL.WEEK--></NOBR></TD></TR>
        <!--END POLL-->
-</UL>
+</TABLE>
+<P>
+        <!--BEGIN PREVIOUS-->
+        <A HREF="/poll/?start=<!--PREVIOUS.ID-->" STYLE="float: left">Previous</A>
+        <!--END PREVIOUS-->
+        <!--BEGIN NEXT-->
+        <A HREF="/poll/?start=<!--NEXT.ID-->" STYLE="float: right">Next</A>
+        <!--END NEXT-->
+</P>
diff --git a/theme/post.tpl b/theme/post.tpl
index 3314d4e..a2342be 100755
--- a/theme/post.tpl
+++ b/theme/post.tpl

@@ -55,7 +55,7 @@
                        </DIV>
                        <CITE CLASS="rounded"><STRONG><!--POST.AUTHOR--></STRONG> on <!--POST.DATE--></CITE>
-                        <SPAN STYLE="float: right">
+                        <SPAN CLASS="post-vote">
                                <A HREF="/vote.php?id=<!--POST.ID-->&amp;dir=plus" REL="nofollow"><IMG SRC="/theme/images/icons/thumb_up.png"></A>
                                <BIG><!--POST.RATING--></BIG>
                                <A HREF="/vote.php?id=<!--POST.ID-->&amp;dir=minus" REL="nofollow"><IMG SRC="/theme/images/icons/thumb_down.png"></A>
diff --git a/theme/quotes/browse.tpl b/theme/quotes/browse.tpl
index 7b4312a..2880dfb 100755
--- a/theme/quotes/browse.tpl
+++ b/theme/quotes/browse.tpl

@@ -2,16 +2,20 @@
 <!--INCLUDE quotes/pagenumbers-->
 <!--END PAGENUMBERS-->
-<P><!--ORIGIN--></P>
+<H2><!--ORIGIN--></H2>
 <!--BEGIN QUOTES-->
-<A HREF="/quotes/<!--QUOTES.NUMBER-->.php">#<!--QUOTES.NUMBER--></A>
+<P>
-<A HREF="/quotes/vote.php?id=<!--QUOTES.NUMBER-->&dir=plus">+</A>
+        <A HREF="/quotes/<!--QUOTES.NUMBER-->.php">#<!--QUOTES.NUMBER--></A>
-<SPAN>(<!--QUOTES.RATING-->)</SPAN>
+        <A HREF="/quotes/vote.php?id=<!--QUOTES.NUMBER-->&dir=plus">+</A>
-<A HREF="/quotes/vote.php?id=<!--QUOTES.NUMBER-->&dir=minus">-</A>
+        <SPAN>(<!--QUOTES.RATING-->)</SPAN>
-<A HREF="/quotes/flag.php?id=<!--QUOTES.NUMBER-->">[X]</A>
+        <A HREF="/quotes/vote.php?id=<!--QUOTES.NUMBER-->&dir=minus">-</A>
+        <A HREF="/quotes/flag.php?id=<!--QUOTES.NUMBER-->">[X]</A>
-<P><!--QUOTES.QUOTE--></P>
+        <BR />
+        <!--QUOTES.QUOTE-->
+</P>
 <!--END QUOTES-->
 <!--BEGIN PAGENUMBERS-->
diff --git a/theme/quotes/header.tpl b/theme/quotes/header.tpl
deleted file mode 100644
index 620a4d0..0000000
--- a/theme/quotes/header.tpl
+++ /dev/null

@@ -1,47 +0,0 @@
-<DIV CLASS="sidebar" STYLE="margin: auto">
-        <DIV CLASS="bubble">
-                <DIV CLASS="rounded">
-                        <BLOCKQUOTE>
-                                <DIV ID="hatbar" CLASS="quotes-options">
-                                        <H3>Quote Options</H3>
-                                        <UL>
-                                                <LI>
-                                                        <IMG SRC="/theme/images/icons/16-star-hot.png" />
-                                                        <A HREF="/quotes/latest.php">Latest</A>
-                                                </LI>
-                                                <LI>
-                                                        <IMG SRC="/theme/images/icons/medal_gold_1.png" />
-                                                        <A HREF="/quotes/top.php">Best</A>
-                                                </LI>
-                                                <LI>
-                                                        <IMG SRC="/theme/images/icons/16-message-warn.png" />
-                                                        <A HREF="/quotes/bottom.php">Worst</A>
-                                                </LI>
-                                                <LI>
-                                                        <IMG SRC="/theme/images/icons/16-file-archive.png" />
-                                                        <A HREF="/quotes/browse.php">Browse All</A>
-                                                </LI>
-                                                <LI>
-                                                        <IMG SRC="/theme/images/icons/16-clock.png" />
-                                                        <A HREF="/quotes/random.php">Random</A>
-                                                </LI>
-                                                <LI>
-                                                        <IMG SRC="/theme/images/icons/16-em-pencil.png" />
-                                                        <A HREF="/quotes/add.php">Add</A>
-                                                </LI>
-                                                <LI>
-                                                        <IMG SRC="/theme/images/icons/book_open.png" />
-                                                        <A HREF="/quotes/search.php">Search</A> 
-                                                </LI>
-                                        </UL>
-                                </DIV>
-                        </BLOCKQUOTE>
-                </DIV>
-        </DIV>
-</DIV>