From 224f9ee5014ae5c5399188afd8d38e3b620e2856 Mon Sep 17 00:00:00 2001
From: Starla Insigna <hatkirby@fourisland.com>
Date: Thu, 26 Nov 2009 14:21:20 -0500
Subject: Added Fouripedia compatibility

Made many strutural changes to Four Island allowing for the reinclusion of Fouripedia.
---
 theme/css/blog.php           |  2 +-
 theme/css/quotes.css         |  2 --
 theme/layouts/4.5/layout.tpl |  3 +++
 theme/layouts/6.2/layout.tpl | 10 ++++++++++
 theme/layouts/6.2/night.css  |  2 +-
 theme/layouts/6.2/style.php  |  4 ++--
 theme/layouts/7/layout.tpl   |  9 +++++++++
 7 files changed, 26 insertions(+), 6 deletions(-)

(limited to 'theme')

diff --git a/theme/css/blog.php b/theme/css/blog.php
index b84db08..e19d7df 100644
--- a/theme/css/blog.php
+++ b/theme/css/blog.php
@@ -229,7 +229,7 @@ div.post-date-4 {
 span.post-vote {
  float: right;
  position: relative;
- top: -2em;
+ top: -.5em;
  right: 1em;
 }
 
diff --git a/theme/css/quotes.css b/theme/css/quotes.css
index 5be0923..2d33e45 100644
--- a/theme/css/quotes.css
+++ b/theme/css/quotes.css
@@ -56,6 +56,4 @@ span.quote-update-result {
 	float: right;
 	text-transform: uppercase;
 	font-size: 70%;
-	position: relative;
-	top: -1.2em;
 }
diff --git a/theme/layouts/4.5/layout.tpl b/theme/layouts/4.5/layout.tpl
index 0ce0e5b..a90bdf3 100644
--- a/theme/layouts/4.5/layout.tpl
+++ b/theme/layouts/4.5/layout.tpl
@@ -37,6 +37,7 @@
 					<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-fourm"><A HREF="/fourm/"><B><SPAN>Fourm</SPAN></B></A></LI>
+					<LI id="bannernav-wiki"><A HREF="/wiki/"><B><SPAN>Wiki</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="http://fourisland.com/fourm/ucp.php?mode=log<!--LOGDATA-->&amp;redirect=<!--REDIRPAGE-->&amp;sid=<!--SID-->"><B><SPAN>Log<!--LOGDATA--></SPAN></B></A></LI>
@@ -87,6 +88,8 @@
 
 					<P />
 		                        <!--END CREATE_HATNAV-->
+
+					<!--EXTRASIDEBAR-->
 					
 					<div class="module rounded sidebar">
                                         	<h3>Poll of the Week</h3>
diff --git a/theme/layouts/6.2/layout.tpl b/theme/layouts/6.2/layout.tpl
index 59535af..889d509 100644
--- a/theme/layouts/6.2/layout.tpl
+++ b/theme/layouts/6.2/layout.tpl
@@ -51,6 +51,14 @@
 							</A>
 						</LI>
 
+
+						<LI<!--WIKIACTIVE-->>
+							<A HREF="http://fourisland.com/wiki/">
+								<IMG SRC="/theme/images/icons/report.png" ALT="Wiki">
+								<SPAN>Wiki</SPAN>
+							</A>
+						</LI>
+
 						<LI<!--POLLACTIVE-->>
 							<A HREF="http://fourisland.com/poll/">
 								<IMG SRC="/theme/images/icons/overlays.png" ALT="Polls">
@@ -121,6 +129,8 @@
 
 					<P />
 		                        <!--END CREATE_HATNAV-->
+
+					<!--EXTRASIDEBAR-->
 					
 					<div class="module rounded sidebar">
                                         	<h3>Poll of the Week</h3>
diff --git a/theme/layouts/6.2/night.css b/theme/layouts/6.2/night.css
index 2a24480..b74b1c6 100644
--- a/theme/layouts/6.2/night.css
+++ b/theme/layouts/6.2/night.css
@@ -18,5 +18,5 @@ div#fi-navbar ul li.active img {
 }
 
 .light-at-night, .light-at-night-l6p2 {
- color: #555555;
+ color: #536482 !important;
 }
diff --git a/theme/layouts/6.2/style.php b/theme/layouts/6.2/style.php
index 0d619e5..7dff742 100755
--- a/theme/layouts/6.2/style.php
+++ b/theme/layouts/6.2/style.php
@@ -27,8 +27,8 @@ include('layouts/6.2/style.css');
 if (((date('G') >= 20) || (date('G') <= 6)) || isset($_GET['night']) && !isset($_GET['day']))
 {
 	include('layouts/6.2/night.css');
+} else {
+	include('layouts/6.2/holiday.php');
 }
 
-include('layouts/6.2/holiday.php');
-
 ?>
diff --git a/theme/layouts/7/layout.tpl b/theme/layouts/7/layout.tpl
index 48eb1e6..3acf1cc 100644
--- a/theme/layouts/7/layout.tpl
+++ b/theme/layouts/7/layout.tpl
@@ -55,6 +55,8 @@
 				<!--BEGIN CREATE_HATNAV-->
 				</ul>
 				<!--END CREATE_HATNAV-->
+
+				<!--EXTRASIDEBAR-->
 				
 				<div class="module rounded sidebar">
 					<h3>Poll of the Week</h3>
@@ -136,6 +138,13 @@
 						</a>
 					</li>
 
+					<li<!--WIKIACTIVE-->>
+						<a href="http://fourisland.com/wiki/">
+							<img src="/theme/images/icons/report.png" alt="Wiki" />
+							<span>Wiki</span>
+						</a>
+					</li>
+
 					<li<!--POLLACTIVE-->>
 						<a href="http://fourisland.com/poll/">
 							<img src="/theme/images/icons/overlays.png" alt="Polls" />
-- 
cgit 1.4.1