From 9cb1fcba82027daa21eb457f1b2912ee02e5c7eb Mon Sep 17 00:00:00 2001
From: Starla Insigna <hatkirby@fourisland.com>
Date: Sun, 14 Dec 2008 09:39:10 -0500
Subject: Major design and code overhaul

I don't know, a lot of stuffses happened that I don't quite remember anymore. Goodness, that's not good.
---
 theme/archive.tpl       | 33 ++--------------------
 theme/css/blog.php      | 13 +++++++++
 theme/css/bubbles.css   |  9 +++---
 theme/css/website.css   | 74 +++++++++++++++++++++++++++++++++++++++----------
 theme/footer.tpl        | 43 +++++-----------------------
 theme/header.tpl        | 46 +++++++++++++++++++++++++++++-
 theme/pollIndex.tpl     | 17 ++++++++++--
 theme/post.tpl          |  2 +-
 theme/quotes/browse.tpl | 18 +++++++-----
 theme/quotes/header.tpl | 47 -------------------------------
 10 files changed, 158 insertions(+), 144 deletions(-)
 delete mode 100644 theme/quotes/header.tpl

(limited to 'theme')

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;
-	padding: 0px;
+	margin: 0;
+	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>
-												<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>
+											<!--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-->
 										</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>
-<A HREF="/quotes/vote.php?id=<!--QUOTES.NUMBER-->&dir=plus">+</A>
-<SPAN>(<!--QUOTES.RATING-->)</SPAN>
-<A HREF="/quotes/vote.php?id=<!--QUOTES.NUMBER-->&dir=minus">-</A>
-<A HREF="/quotes/flag.php?id=<!--QUOTES.NUMBER-->">[X]</A>
+<P>
+	<A HREF="/quotes/<!--QUOTES.NUMBER-->.php">#<!--QUOTES.NUMBER--></A>
+	<A HREF="/quotes/vote.php?id=<!--QUOTES.NUMBER-->&dir=plus">+</A>
+	<SPAN>(<!--QUOTES.RATING-->)</SPAN>
+	<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>
-- 
cgit 1.4.1