diff options
author | Starla Insigna <hatkirby@fourisland.com> | 2009-11-26 14:21:20 -0500 |
---|---|---|
committer | Starla Insigna <hatkirby@fourisland.com> | 2009-11-26 14:21:20 -0500 |
commit | 224f9ee5014ae5c5399188afd8d38e3b620e2856 (patch) | |
tree | 6432f783d495626e962835009b6d2f4fd53e42cd /theme | |
parent | 34d358ba240bd19491f0f97faf04513318bee6c0 (diff) | |
download | fourisland-224f9ee5014ae5c5399188afd8d38e3b620e2856.tar.gz fourisland-224f9ee5014ae5c5399188afd8d38e3b620e2856.tar.bz2 fourisland-224f9ee5014ae5c5399188afd8d38e3b620e2856.zip |
Added Fouripedia compatibility
Made many strutural changes to Four Island allowing for the reinclusion of Fouripedia.
Diffstat (limited to 'theme')
-rw-r--r-- | theme/css/blog.php | 2 | ||||
-rw-r--r-- | theme/css/quotes.css | 2 | ||||
-rw-r--r-- | theme/layouts/4.5/layout.tpl | 3 | ||||
-rw-r--r-- | theme/layouts/6.2/layout.tpl | 10 | ||||
-rw-r--r-- | theme/layouts/6.2/night.css | 2 | ||||
-rwxr-xr-x | theme/layouts/6.2/style.php | 4 | ||||
-rw-r--r-- | theme/layouts/7/layout.tpl | 9 |
7 files changed, 26 insertions, 6 deletions
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 { | |||
229 | span.post-vote { | 229 | span.post-vote { |
230 | float: right; | 230 | float: right; |
231 | position: relative; | 231 | position: relative; |
232 | top: -2em; | 232 | top: -.5em; |
233 | right: 1em; | 233 | right: 1em; |
234 | } | 234 | } |
235 | 235 | ||
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 { | |||
56 | float: right; | 56 | float: right; |
57 | text-transform: uppercase; | 57 | text-transform: uppercase; |
58 | font-size: 70%; | 58 | font-size: 70%; |
59 | position: relative; | ||
60 | top: -1.2em; | ||
61 | } | 59 | } |
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 @@ | |||
37 | <LI id="bannernav-home"><A HREF="/" REL="home"><B><SPAN>Home</SPAN></B></A></LI> | 37 | <LI id="bannernav-home"><A HREF="/" REL="home"><B><SPAN>Home</SPAN></B></A></LI> |
38 | <LI id="bannernav-projects"><A HREF="http://projects.fourisland.com"><B><SPAN>Projects</SPAN></B></A></LI> | 38 | <LI id="bannernav-projects"><A HREF="http://projects.fourisland.com"><B><SPAN>Projects</SPAN></B></A></LI> |
39 | <LI id="bannernav-fourm"><A HREF="/fourm/"><B><SPAN>Fourm</SPAN></B></A></LI> | 39 | <LI id="bannernav-fourm"><A HREF="/fourm/"><B><SPAN>Fourm</SPAN></B></A></LI> |
40 | <LI id="bannernav-wiki"><A HREF="/wiki/"><B><SPAN>Wiki</SPAN></B></A></LI> | ||
40 | <LI id="bannernav-poll"><A HREF="/poll/"><B><SPAN>Poll</SPAN></B></A></LI> | 41 | <LI id="bannernav-poll"><A HREF="/poll/"><B><SPAN>Poll</SPAN></B></A></LI> |
41 | <LI id="bannernav-quotes"><A HREF="/quotes/"><B><SPAN>Quotes</SPAN></B></A></LI> | 42 | <LI id="bannernav-quotes"><A HREF="/quotes/"><B><SPAN>Quotes</SPAN></B></A></LI> |
42 | <LI id="bannernav-<!--LOWERLOGDATA-->"><A HREF="http://fourisland.com/fourm/ucp.php?mode=log<!--LOGDATA-->&redirect=<!--REDIRPAGE-->&sid=<!--SID-->"><B><SPAN>Log<!--LOGDATA--></SPAN></B></A></LI> | 43 | <LI id="bannernav-<!--LOWERLOGDATA-->"><A HREF="http://fourisland.com/fourm/ucp.php?mode=log<!--LOGDATA-->&redirect=<!--REDIRPAGE-->&sid=<!--SID-->"><B><SPAN>Log<!--LOGDATA--></SPAN></B></A></LI> |
@@ -87,6 +88,8 @@ | |||
87 | 88 | ||
88 | <P /> | 89 | <P /> |
89 | <!--END CREATE_HATNAV--> | 90 | <!--END CREATE_HATNAV--> |
91 | |||
92 | <!--EXTRASIDEBAR--> | ||
90 | 93 | ||
91 | <div class="module rounded sidebar"> | 94 | <div class="module rounded sidebar"> |
92 | <h3>Poll of the Week</h3> | 95 | <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 @@ | |||
51 | </A> | 51 | </A> |
52 | </LI> | 52 | </LI> |
53 | 53 | ||
54 | |||
55 | <LI<!--WIKIACTIVE-->> | ||
56 | <A HREF="http://fourisland.com/wiki/"> | ||
57 | <IMG SRC="/theme/images/icons/report.png" ALT="Wiki"> | ||
58 | <SPAN>Wiki</SPAN> | ||
59 | </A> | ||
60 | </LI> | ||
61 | |||
54 | <LI<!--POLLACTIVE-->> | 62 | <LI<!--POLLACTIVE-->> |
55 | <A HREF="http://fourisland.com/poll/"> | 63 | <A HREF="http://fourisland.com/poll/"> |
56 | <IMG SRC="/theme/images/icons/overlays.png" ALT="Polls"> | 64 | <IMG SRC="/theme/images/icons/overlays.png" ALT="Polls"> |
@@ -121,6 +129,8 @@ | |||
121 | 129 | ||
122 | <P /> | 130 | <P /> |
123 | <!--END CREATE_HATNAV--> | 131 | <!--END CREATE_HATNAV--> |
132 | |||
133 | <!--EXTRASIDEBAR--> | ||
124 | 134 | ||
125 | <div class="module rounded sidebar"> | 135 | <div class="module rounded sidebar"> |
126 | <h3>Poll of the Week</h3> | 136 | <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 { | |||
18 | } | 18 | } |
19 | 19 | ||
20 | .light-at-night, .light-at-night-l6p2 { | 20 | .light-at-night, .light-at-night-l6p2 { |
21 | color: #555555; | 21 | color: #536482 !important; |
22 | } | 22 | } |
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'); | |||
27 | if (((date('G') >= 20) || (date('G') <= 6)) || isset($_GET['night']) && !isset($_GET['day'])) | 27 | if (((date('G') >= 20) || (date('G') <= 6)) || isset($_GET['night']) && !isset($_GET['day'])) |
28 | { | 28 | { |
29 | include('layouts/6.2/night.css'); | 29 | include('layouts/6.2/night.css'); |
30 | } else { | ||
31 | include('layouts/6.2/holiday.php'); | ||
30 | } | 32 | } |
31 | 33 | ||
32 | include('layouts/6.2/holiday.php'); | ||
33 | |||
34 | ?> | 34 | ?> |
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 @@ | |||
55 | <!--BEGIN CREATE_HATNAV--> | 55 | <!--BEGIN CREATE_HATNAV--> |
56 | </ul> | 56 | </ul> |
57 | <!--END CREATE_HATNAV--> | 57 | <!--END CREATE_HATNAV--> |
58 | |||
59 | <!--EXTRASIDEBAR--> | ||
58 | 60 | ||
59 | <div class="module rounded sidebar"> | 61 | <div class="module rounded sidebar"> |
60 | <h3>Poll of the Week</h3> | 62 | <h3>Poll of the Week</h3> |
@@ -136,6 +138,13 @@ | |||
136 | </a> | 138 | </a> |
137 | </li> | 139 | </li> |
138 | 140 | ||
141 | <li<!--WIKIACTIVE-->> | ||
142 | <a href="http://fourisland.com/wiki/"> | ||
143 | <img src="/theme/images/icons/report.png" alt="Wiki" /> | ||
144 | <span>Wiki</span> | ||
145 | </a> | ||
146 | </li> | ||
147 | |||
139 | <li<!--POLLACTIVE-->> | 148 | <li<!--POLLACTIVE-->> |
140 | <a href="http://fourisland.com/poll/"> | 149 | <a href="http://fourisland.com/poll/"> |
141 | <img src="/theme/images/icons/overlays.png" alt="Polls" /> | 150 | <img src="/theme/images/icons/overlays.png" alt="Polls" /> |