diff options
-rw-r--r-- | admin.php | 15 | ||||
-rwxr-xr-x | includes/comments.php | 2 | ||||
-rw-r--r-- | includes/common.php | 61 | ||||
-rwxr-xr-x | includes/functions.php | 7 | ||||
-rw-r--r-- | includes/layout.php | 26 | ||||
-rwxr-xr-x | includes/session.php | 2 | ||||
-rwxr-xr-x | index.php | 36 | ||||
-rwxr-xr-x | pages/blog.php | 4 | ||||
-rwxr-xr-x | pages/poll.php | 14 | ||||
-rwxr-xr-x | pages/quotes.php | 2 | ||||
-rwxr-xr-x | pages/welcome.php | 4 | ||||
-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 |
18 files changed, 123 insertions, 82 deletions
diff --git a/admin.php b/admin.php index 5e002a6..6657983 100644 --- a/admin.php +++ b/admin.php | |||
@@ -20,27 +20,18 @@ | |||
20 | 20 | ||
21 | require('headerproc.php'); | 21 | require('headerproc.php'); |
22 | 22 | ||
23 | header('Content-type: application/xhtml+xml'); | ||
24 | |||
25 | include('../security/config.php'); | 23 | include('../security/config.php'); |
26 | include('includes/db.php'); | 24 | include('includes/db.php'); |
27 | include('includes/template.php'); | 25 | include('includes/common.php'); |
28 | include('includes/session.php'); | ||
29 | include('includes/parsers.php'); | ||
30 | include('includes/xmlrpc/xmlrpc.inc'); | ||
31 | include('includes/specialdates.php'); | ||
32 | include('includes/functions.php'); | ||
33 | 26 | ||
34 | if (!isAdmin()) | 27 | if (!isAdmin()) |
35 | { | 28 | { |
36 | ob_start(); | 29 | ob_start(); |
37 | generateError('404'); | 30 | generateError('404'); |
38 | $doc = ob_get_contents(); | 31 | $content = ob_get_contents(); |
39 | ob_end_clean(); | 32 | ob_end_clean(); |
40 | 33 | ||
41 | include('includes/header.php'); | 34 | include('includes/layout.php'); |
42 | echo($doc); | ||
43 | include('includes/footer.php'); | ||
44 | 35 | ||
45 | exit; | 36 | exit; |
46 | } | 37 | } |
diff --git a/includes/comments.php b/includes/comments.php index 0f48444..78353c1 100755 --- a/includes/comments.php +++ b/includes/comments.php | |||
@@ -72,7 +72,7 @@ while ($getcomments3[$i] = mysql_fetch_array($getcomments2)) | |||
72 | 'USERNAME' => (($website != '') ? '<a href="' . $website . '">' . $username . '</a>' : $username), | 72 | 'USERNAME' => (($website != '') ? '<a href="' . $website . '">' . $username . '</a>' : $username), |
73 | 'DATE' => date("F jS Y \a\\t g:i:s a",strtotime($getcomments3[$i]['posttime'])), | 73 | 'DATE' => date("F jS Y \a\\t g:i:s a",strtotime($getcomments3[$i]['posttime'])), |
74 | 'ID' => $getcomments3[$i]['id'], | 74 | 'ID' => $getcomments3[$i]['id'], |
75 | 'TEXT' => parseText($getcomments3[$i]['comment']))); | 75 | 'TEXT' => parseText(stripslashes($getcomments3[$i]['comment'])))); |
76 | 76 | ||
77 | if (isLoggedIn()) | 77 | if (isLoggedIn()) |
78 | { | 78 | { |
diff --git a/includes/common.php b/includes/common.php new file mode 100644 index 0000000..e4321d9 --- /dev/null +++ b/includes/common.php | |||
@@ -0,0 +1,61 @@ | |||
1 | <?php | ||
2 | /* | ||
3 | 444444444 | ||
4 | 4::::::::4 | ||
5 | 4:::::::::4 | ||
6 | 4::::44::::4 | ||
7 | 4::::4 4::::4 Four Island | ||
8 | 4::::4 4::::4 | ||
9 | 4::::4 4::::4 Written and maintained by Starla Insigna | ||
10 | 4::::444444::::444 | ||
11 | 4::::::::::::::::4 includes/common.php | ||
12 | 4444444444:::::444 | ||
13 | 4::::4 Please do not use, reproduce or steal the | ||
14 | 4::::4 contents of this file without explicit | ||
15 | 4::::4 permission from Hatkirby. | ||
16 | 44::::::44 | ||
17 | 4::::::::4 | ||
18 | 4444444444 | ||
19 | */ | ||
20 | |||
21 | if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);} | ||
22 | |||
23 | require('headerproc.php'); | ||
24 | |||
25 | include('includes/template.php'); | ||
26 | include('includes/session.php'); | ||
27 | include('includes/maintenance.php'); | ||
28 | include('includes/parsers.php'); | ||
29 | include('includes/xmlrpc/xmlrpc.inc'); | ||
30 | include('includes/specialdates.php'); | ||
31 | include('includes/functions.php'); | ||
32 | include('includes/hits.php'); | ||
33 | include('includes/updatePending.php'); | ||
34 | |||
35 | if (isset($_GET['layout'])) | ||
36 | { | ||
37 | if (!file_exists('theme/layouts/' . basename($_GET['layout']))) | ||
38 | { | ||
39 | $_GET['layout'] = '7'; | ||
40 | } | ||
41 | |||
42 | setcookie('layout', $_GET['layout'], time()+60*60*24*30, '/', '.fourisland.com'); | ||
43 | |||
44 | unset($_GET['layout']); | ||
45 | |||
46 | header('Location: ' . getRewriteURL()); | ||
47 | exit; | ||
48 | } | ||
49 | |||
50 | if (preg_match('|MSIE ([0-9].[0-9]{1,2})|', $_SERVER['HTTP_USER_AGENT'], $matched)) | ||
51 | { | ||
52 | $usingIE = true; | ||
53 | } else { | ||
54 | if (getLayout() == '7') | ||
55 | { | ||
56 | header('Content-type: application/xhtml+xml'); | ||
57 | $xhtml = true; | ||
58 | } | ||
59 | } | ||
60 | |||
61 | ?> | ||
diff --git a/includes/functions.php b/includes/functions.php index bc839df..dc5a549 100755 --- a/includes/functions.php +++ b/includes/functions.php | |||
@@ -390,7 +390,12 @@ function getRewriteURL() | |||
390 | { | 390 | { |
391 | if (!isset($_GET['area'])) | 391 | if (!isset($_GET['area'])) |
392 | { | 392 | { |
393 | return '/'; | 393 | if (strpos($_SERVER['PHP_SELF'], 'wiki') !== false) |
394 | { | ||
395 | return $_SERVER['PHP_SELF']; | ||
396 | } else { | ||
397 | return '/'; | ||
398 | } | ||
394 | } else { | 399 | } else { |
395 | if ($_GET['area'] == 'blog') | 400 | if ($_GET['area'] == 'blog') |
396 | { | 401 | { |
diff --git a/includes/layout.php b/includes/layout.php index ffe1aa6..b11c56f 100644 --- a/includes/layout.php +++ b/includes/layout.php | |||
@@ -28,19 +28,17 @@ $template->add('CATEGORY',(isset($pageCategory)) ? $pageCategory : 'none'); | |||
28 | $template->add('AID',(isset($pageAID)) ? $pageAID : 'none'); | 28 | $template->add('AID',(isset($pageAID)) ? $pageAID : 'none'); |
29 | $template->add('EXTRATITLE',isset($title) ? ($title . ' - ') : ''); | 29 | $template->add('EXTRATITLE',isset($title) ? ($title . ' - ') : ''); |
30 | $template->add(strtoupper($pageCategory) . 'ACTIVE', ' class="active"'); | 30 | $template->add(strtoupper($pageCategory) . 'ACTIVE', ' class="active"'); |
31 | $template->add('EXTRASIDEBAR', isset($extraSidebar) ? $extraSidebar : ''); | ||
31 | 32 | ||
32 | if (($pageCategory != 'fourm') && ($pageCategory != 'wiki')) | 33 | $template->add('REDIRPAGE',rawurlencode($_SERVER['REQUEST_URI'])); |
33 | { | 34 | $template->add('LOGDATA',echoLogData()); |
34 | $template->add('REDIRPAGE',rawurlencode($_SERVER['REQUEST_URI'])); | 35 | $template->add('LOWERLOGDATA','log' . strtolower(echoLogData())); |
35 | $template->add('LOGDATA',echoLogData()); | 36 | $template->add('SID',getSessionID()); |
36 | $template->add('LOWERLOGDATA','log' . strtolower(echoLogData())); | 37 | $template->adds_block('MEMBERS',array('exi' => 1)); |
37 | $template->add('SID',getSessionID()); | ||
38 | $template->adds_block('MEMBERS',array('exi' => 1)); | ||
39 | 38 | ||
40 | if (isAdmin()) | 39 | if (isAdmin()) |
41 | { | 40 | { |
42 | $template->adds_block('ADMIN',array('exi' => 1)); | 41 | $template->adds_block('ADMIN',array('exi' => 1)); |
43 | } | ||
44 | } | 42 | } |
45 | 43 | ||
46 | if (isset($hatNav) && is_array($hatNav)) | 44 | if (isset($hatNav) && is_array($hatNav)) |
@@ -274,11 +272,11 @@ foreach ($counts as $tag => $count) | |||
274 | if (!isset($noRightbar)) | 272 | if (!isset($noRightbar)) |
275 | { | 273 | { |
276 | $template->adds_block('RIGHTBAR', array('exi'=>1)); | 274 | $template->adds_block('RIGHTBAR', array('exi'=>1)); |
277 | } | 275 | } |
278 | 276 | ||
279 | $template->add('ME', getRewriteURL()); | 277 | $template->add('ME', getRewriteURL()); |
280 | 278 | ||
281 | $template->add('CONTENT', stripslashes($content)); | 279 | $template->add('CONTENT', $content); |
282 | 280 | ||
283 | $template->display(); | 281 | $template->display(); |
284 | 282 | ||
diff --git a/includes/session.php b/includes/session.php index 94c919a..2e0824a 100755 --- a/includes/session.php +++ b/includes/session.php | |||
@@ -22,7 +22,7 @@ if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);} | |||
22 | 22 | ||
23 | require('headerproc.php'); | 23 | require('headerproc.php'); |
24 | 24 | ||
25 | session_start(); | 25 | @session_start(); |
26 | 26 | ||
27 | function getSessionID() | 27 | function getSessionID() |
28 | { | 28 | { |
diff --git a/index.php b/index.php index 7a958ee..83cdd99 100755 --- a/index.php +++ b/index.php | |||
@@ -24,41 +24,7 @@ header('X-Pingback: http://fourisland.com/xmlrpc.php'); | |||
24 | 24 | ||
25 | include('../security/config.php'); | 25 | include('../security/config.php'); |
26 | include('includes/db.php'); | 26 | include('includes/db.php'); |
27 | include('includes/template.php'); | 27 | include('includes/common.php'); |
28 | include('includes/session.php'); | ||
29 | include('includes/maintenance.php'); | ||
30 | include('includes/parsers.php'); | ||
31 | include('includes/xmlrpc/xmlrpc.inc'); | ||
32 | include('includes/specialdates.php'); | ||
33 | include('includes/functions.php'); | ||
34 | include('includes/hits.php'); | ||
35 | include('includes/updatePending.php'); | ||
36 | |||
37 | if (isset($_GET['layout'])) | ||
38 | { | ||
39 | if (!file_exists('theme/layouts/' . basename($_GET['layout']))) | ||
40 | { | ||
41 | $_GET['layout'] = '7'; | ||
42 | } | ||
43 | |||
44 | setcookie('layout', $_GET['layout'], time()+60*60*24*30, '/', '.fourisland.com'); | ||
45 | |||
46 | unset($_GET['layout']); | ||
47 | |||
48 | header('Location: ' . getRewriteURL()); | ||
49 | exit; | ||
50 | } | ||
51 | |||
52 | if (preg_match('|MSIE ([0-9].[0-9]{1,2})|', $_SERVER['HTTP_USER_AGENT'], $matched)) | ||
53 | { | ||
54 | $usingIE = true; | ||
55 | } else { | ||
56 | if (getLayout() == '7') | ||
57 | { | ||
58 | header('Content-type: application/xhtml+xml'); | ||
59 | $xhtml = true; | ||
60 | } | ||
61 | } | ||
62 | 28 | ||
63 | if (strpos($_SERVER['REQUEST_URI'],'index.php')) | 29 | if (strpos($_SERVER['REQUEST_URI'],'index.php')) |
64 | { | 30 | { |
diff --git a/pages/blog.php b/pages/blog.php index 28fa759..31978f2 100755 --- a/pages/blog.php +++ b/pages/blog.php | |||
@@ -67,10 +67,10 @@ if (isset($_GET['post'])) | |||
67 | 'MONTH' => date('M',strtotime($getpost3['pubDate'])), | 67 | 'MONTH' => date('M',strtotime($getpost3['pubDate'])), |
68 | 'DAY' => date('d',strtotime($getpost3['pubDate'])), | 68 | 'DAY' => date('d',strtotime($getpost3['pubDate'])), |
69 | 'CODED' => $getpost3['slug'], | 69 | 'CODED' => $getpost3['slug'], |
70 | 'TITLE' => htmlentities($getpost3['title']), | 70 | 'TITLE' => htmlentities(stripslashes($getpost3['title'])), |
71 | 'AUTHOR' => $getpost3['author'], | 71 | 'AUTHOR' => $getpost3['author'], |
72 | 'RATING' => $getpost3['rating'], | 72 | 'RATING' => $getpost3['rating'], |
73 | 'TEXT' => parseText($getpost3['text']))); | 73 | 'TEXT' => parseText(stripslashes($getpost3['text'])))); |
74 | 74 | ||
75 | $tags = getTags($getpost3['id']); | 75 | $tags = getTags($getpost3['id']); |
76 | foreach ($tags as $tag) | 76 | foreach ($tags as $tag) |
diff --git a/pages/poll.php b/pages/poll.php index a9ab19f..3099e32 100755 --- a/pages/poll.php +++ b/pages/poll.php | |||
@@ -53,7 +53,7 @@ if (!isset($_GET['id'])) | |||
53 | $question .= '....'; | 53 | $question .= '....'; |
54 | } | 54 | } |
55 | $template->adds_block('POLL', array( 'ID' => $getpolls3[$i]['id'], | 55 | $template->adds_block('POLL', array( 'ID' => $getpolls3[$i]['id'], |
56 | 'QUESTION' => htmlentities($question), | 56 | 'QUESTION' => htmlentities(stripslashes($question)), |
57 | 'WEEK' => date('F jS Y', strtotime($getpolls3[$i]['week'])), | 57 | 'WEEK' => date('F jS Y', strtotime($getpolls3[$i]['week'])), |
58 | 'EVEN' => (($i % 2 == 1) ? ' class="even"' : ''))); | 58 | 'EVEN' => (($i % 2 == 1) ? ' class="even"' : ''))); |
59 | $i++; | 59 | $i++; |
@@ -90,17 +90,17 @@ if (!isset($_GET['id'])) | |||
90 | 90 | ||
91 | if ($getpoll3['id'] == $_GET['id']) | 91 | if ($getpoll3['id'] == $_GET['id']) |
92 | { | 92 | { |
93 | $template->add('QUESTION', htmlentities($getpoll3['question'])); | 93 | $template->add('QUESTION', htmlentities(stripslashes($getpoll3['question']))); |
94 | 94 | ||
95 | if ($getpoll3['text'] != '') | 95 | if ($getpoll3['text'] != '') |
96 | { | 96 | { |
97 | $template->adds_block('COMPLETE', array( 'RSS' => parseText($getpoll3['text']), | 97 | $template->adds_block('COMPLETE', array( 'RSS' => parseText(stripslashes($getpoll3['text'])), |
98 | 'AUTHOR' => $getrss3['author'], | 98 | 'AUTHOR' => $getrss3['author'], |
99 | 'DATE' => date("F jS Y \a\\t g:i:s a",strtotime($getpoll3['week'])), | 99 | 'DATE' => date("F jS Y \a\\t g:i:s a",strtotime($getpoll3['week'])), |
100 | 'OPTION1' => $getpoll3['option1'], | 100 | 'OPTION1' => stripslashes($getpoll3['option1']), |
101 | 'OPTION2' => $getpoll3['option2'], | 101 | 'OPTION2' => stripslashes($getpoll3['option2']), |
102 | 'OPTION3' => $getpoll3['option3'], | 102 | 'OPTION3' => stripslashes($getpoll3['option3']), |
103 | 'OPTION4' => $getpoll3['option4'], | 103 | 'OPTION4' => stripslashes($getpoll3['option4']), |
104 | 'CLICKS1' => $getpoll3['clicks1'], | 104 | 'CLICKS1' => $getpoll3['clicks1'], |
105 | 'CLICKS2' => $getpoll3['clicks2'], | 105 | 'CLICKS2' => $getpoll3['clicks2'], |
106 | 'CLICKS3' => $getpoll3['clicks3'], | 106 | 'CLICKS3' => $getpoll3['clicks3'], |
diff --git a/pages/quotes.php b/pages/quotes.php index 8c6958d..17057c2 100755 --- a/pages/quotes.php +++ b/pages/quotes.php | |||
@@ -70,7 +70,7 @@ if (isset($_GET['id']) && !(is_numeric($_GET['id']))) | |||
70 | $template = new FITemplate('quotes/add'); | 70 | $template = new FITemplate('quotes/add'); |
71 | if (isset($_GET['submit'])) | 71 | if (isset($_GET['submit'])) |
72 | { | 72 | { |
73 | $template->adds_block('SUBMITTED',array('QUOTE' => str_replace("\n","<br />",htmlentities($_POST['rash_quote'])))); | 73 | $template->adds_block('SUBMITTED',array('QUOTE' => str_replace("\n","<br />",htmlentities(stripslashes($_POST['rash_quote']))))); |
74 | if (!isLoggedIn()) | 74 | if (!isLoggedIn()) |
75 | { | 75 | { |
76 | $insquote = "INSERT INTO rash_queue (quote) VALUES(\"" . mysql_real_escape_string(htmlspecialchars($_POST['rash_quote'])) . "\")"; | 76 | $insquote = "INSERT INTO rash_queue (quote) VALUES(\"" . mysql_real_escape_string(htmlspecialchars($_POST['rash_quote'])) . "\")"; |
diff --git a/pages/welcome.php b/pages/welcome.php index 833af8a..819420b 100755 --- a/pages/welcome.php +++ b/pages/welcome.php | |||
@@ -77,12 +77,12 @@ while ($getpost3 = mysql_fetch_array($getpost2)) | |||
77 | 'MONTH' => date('M',strtotime($getpost3['pubDate'])), | 77 | 'MONTH' => date('M',strtotime($getpost3['pubDate'])), |
78 | 'DAY' => date('d',strtotime($getpost3['pubDate'])), | 78 | 'DAY' => date('d',strtotime($getpost3['pubDate'])), |
79 | 'CODED' => $getpost3['slug'], | 79 | 'CODED' => $getpost3['slug'], |
80 | 'TITLE' => htmlentities($getpost3['title']), | 80 | 'TITLE' => htmlentities(stripslashes($getpost3['title'])), |
81 | 'AUTHOR' => $getpost3['author'], | 81 | 'AUTHOR' => $getpost3['author'], |
82 | 'PLURALCOMMENT' => (isset($plural) ? $plural : ''), | 82 | 'PLURALCOMMENT' => (isset($plural) ? $plural : ''), |
83 | 'COMMENTS' => $comText, | 83 | 'COMMENTS' => $comText, |
84 | 'RATING' => $getpost3['rating'], | 84 | 'RATING' => $getpost3['rating'], |
85 | 'TEXT' => parseText($getpost3['text']))); | 85 | 'TEXT' => parseText(stripslashes($getpost3['text'])))); |
86 | 86 | ||
87 | $tags = getTags($getpost3['id']); | 87 | $tags = getTags($getpost3['id']); |
88 | foreach ($tags as $tag) | 88 | foreach ($tags as $tag) |
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" /> |