summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xincludes/bbcode.php6
-rwxr-xr-xincludes/footer.php2
-rwxr-xr-xincludes/smilies.php1
-rwxr-xr-xtheme/comments.tpl2
-rwxr-xr-xtheme/css/bubbles.css3
-rw-r--r--theme/css/ie.css4
-rwxr-xr-xtheme/css/night.css14
-rwxr-xr-xtheme/css/website.css38
-rwxr-xr-xtheme/footer.tpl3
-rwxr-xr-xtheme/header.tpl70
-rwxr-xr-xtheme/images/fourisland_header.pngbin24386 -> 24124 bytes
-rwxr-xr-xtheme/images/fourisland_header_night.pngbin19678 -> 0 bytes
-rwxr-xr-xtheme/images/home.pngbin673 -> 0 bytes
-rwxr-xr-xtheme/images/loadingAnimation.gifbin5886 -> 0 bytes
-rwxr-xr-xtheme/images/misc.pngbin720 -> 0 bytes
-rwxr-xr-xtheme/images/projects.pngbin794 -> 0 bytes
-rw-r--r--theme/images/smilies/biggrin.gifbin0 -> 696 bytes
-rwxr-xr-xtheme/images/top_fade.pngbin172 -> 0 bytes
-rwxr-xr-xtheme/images/top_fade_night.pngbin190 -> 0 bytes
-rwxr-xr-xtheme/images/webs.pngbin772 -> 0 bytes
-rwxr-xr-xtheme/images/youdropifollow.jpgbin6825 -> 0 bytes
21 files changed, 56 insertions, 87 deletions
diff --git a/includes/bbcode.php b/includes/bbcode.php index 5e29038..e586100 100755 --- a/includes/bbcode.php +++ b/includes/bbcode.php
@@ -35,7 +35,7 @@ class BBCode
35 $this->bbcodes['u'] = '<U>{CONTENT}</U>'; 35 $this->bbcodes['u'] = '<U>{CONTENT}</U>';
36 $this->bbcodes['url'] = '<A HREF="{CONTENT}">{CONTENT}</A>'; 36 $this->bbcodes['url'] = '<A HREF="{CONTENT}">{CONTENT}</A>';
37 $this->bbcodes2['url'] = '<A HREF="{PARAM}">{CONTENT}</A>'; 37 $this->bbcodes2['url'] = '<A HREF="{PARAM}">{CONTENT}</A>';
38 $this->bbcodes['img'] = '<IMG SRC="{CONTENT}" ALT="{CONTENT}">'; 38 $this->bbcodes['img'] = '<IMG SRC="{CONTENT}" ALT="Image">';
39 $this->bbcodes2['img'] = '<IMG SRC="{CONTENT}" ALT="{PARAM}" TITLE="{PARAM}">'; 39 $this->bbcodes2['img'] = '<IMG SRC="{CONTENT}" ALT="{PARAM}" TITLE="{PARAM}">';
40 $this->bbcodes['big'] = '<BIG>{CONTENT}</BIG>'; 40 $this->bbcodes['big'] = '<BIG>{CONTENT}</BIG>';
41 $this->bbcodes['small'] = '<SMALL>{CONTENT}</SMALL>'; 41 $this->bbcodes['small'] = '<SMALL>{CONTENT}</SMALL>';
@@ -51,8 +51,8 @@ class BBCode
51 $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>'; 51 $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>';
52 $this->bbcodes2['abbr'] = '<ABBR TITLE="{PARAM}">{CONTENT}</ABBR>'; 52 $this->bbcodes2['abbr'] = '<ABBR TITLE="{PARAM}">{CONTENT}</ABBR>';
53 $this->bbcodes['hidden'] = '<SPAN STYLE="display: none">{CONTENT}</SPAN>'; 53 $this->bbcodes['hidden'] = '<SPAN STYLE="display: none">{CONTENT}</SPAN>';
54 $this->bbcodes['thumb'] = '<A HREF="/images/{CONTENT}"><IMG SRC="http://fourisland.com/thumb.php?file=images/{CONTENT}&amp;mode=scale&amp;by=521&amp;side=0" ALT="{CONTENT}"></A>'; 54 $this->bbcodes['thumb'] = '<A HREF="/images/{CONTENT}"><IMG SRC="http://fourisland.com/thumb.php?file=images/{CONTENT}&amp;mode=scale&amp;by=521&amp;side=0" ALT="Image"></A>';
55 $this->bbcodes['thumb2'] = '<A HREF="/images/{CONTENT}"><IMG SRC="http://fourisland.com/thumb.php?file=images/{CONTENT}&amp;mode=scale&amp;by=260&amp;side=0" ALIGN="right" ALT="{CONTENT}"></A>'; 55 $this->bbcodes['thumb2'] = '<A HREF="/images/{CONTENT}"><IMG SRC="http://fourisland.com/thumb.php?file=images/{CONTENT}&amp;mode=scale&amp;by=260&amp;side=0" ALIGN="right" ALT="Image"></A>';
56 56
57 $this->init = true; 57 $this->init = true;
58 } 58 }
diff --git a/includes/footer.php b/includes/footer.php index b49559b..dadb6f5 100755 --- a/includes/footer.php +++ b/includes/footer.php
@@ -244,6 +244,8 @@ if (!isset($noRightbar))
244 } 244 }
245} 245}
246 246
247$template->add('REVISION', exec('hg tip --template {rev}'));
248
247$template->display(); 249$template->display();
248 250
249?> 251?>
diff --git a/includes/smilies.php b/includes/smilies.php index 7001705..e7579a6 100755 --- a/includes/smilies.php +++ b/includes/smilies.php
@@ -31,6 +31,7 @@ class Smilies
31 { 31 {
32 $this->smilies[':)'] = '001_smile.gif'; 32 $this->smilies[':)'] = '001_smile.gif';
33 $this->smilies[':('] = 'sad.gif'; 33 $this->smilies[':('] = 'sad.gif';
34 $this->smilies[':D'] = 'biggrin.gif';
34 35
35 $this->init = true; 36 $this->init = true;
36 } 37 }
diff --git a/theme/comments.tpl b/theme/comments.tpl index 2b9bc51..33a8bbc 100755 --- a/theme/comments.tpl +++ b/theme/comments.tpl
@@ -6,7 +6,7 @@
6<DIV CLASS="bubble"> 6<DIV CLASS="bubble">
7 <BLOCKQUOTE> 7 <BLOCKQUOTE>
8 <DIV> 8 <DIV>
9 <IMG SRC="http://www.gravatar.com/avatar/<!--COMMENTS.CODEDEMAIL-->?s=32&amp;d=identicon&amp;r=G" ALT="Gravatar"> 9 <IMG SRC="http://www.gravatar.com/avatar/<!--COMMENTS.CODEDEMAIL-->?s=32&amp;d=identicon&amp;r=G">
10 <!--COMMENTS.TEXT--> 10 <!--COMMENTS.TEXT-->
11 </DIV> 11 </DIV>
12 </BLOCKQUOTE> 12 </BLOCKQUOTE>
diff --git a/theme/css/bubbles.css b/theme/css/bubbles.css index ac982f9..bf3445c 100755 --- a/theme/css/bubbles.css +++ b/theme/css/bubbles.css
@@ -34,7 +34,8 @@ div.bubble div.rounded {
34 border: 3px solid #fff; 34 border: 3px solid #fff;
35 background-color: #b7e0ff; 35 background-color: #b7e0ff;
36} 36}
37div.bubble div.rounded blockquote { 37div.bubble div.rounded blockquote,
38div.bubble div.navbar-rounded blockquote {
38 border: 0; 39 border: 0;
39 background-color: transparent; 40 background-color: transparent;
40} 41}
diff --git a/theme/css/ie.css b/theme/css/ie.css index bdf6d92..0537b43 100644 --- a/theme/css/ie.css +++ b/theme/css/ie.css
@@ -1,7 +1,3 @@
1div#top-fade {
2 display: none;
3}
4
5body * { 1body * {
6 overflow: hidden; 2 overflow: hidden;
7} 3}
diff --git a/theme/css/night.css b/theme/css/night.css index fba4758..e97ac71 100755 --- a/theme/css/night.css +++ b/theme/css/night.css
@@ -2,17 +2,3 @@ body {
2 background-color: black; 2 background-color: black;
3 background-image: url(/theme/images/backgrounds/island6night.PNG); 3 background-image: url(/theme/images/backgrounds/island6night.PNG);
4} 4}
5
6body div#banner {
7 background-image: url("/theme/images/fourisland_header_night.png") !important;
8}
9
10body div#top-fade {
11 background-image: url(/theme/images/top_fade_night.png) !important;
12}
13
14body.home div.bubble cite,
15body.quotes div#content p,
16body.quotes cite {
17 color: yellow;
18}
diff --git a/theme/css/website.css b/theme/css/website.css index 6161d8d..56c2c4a 100755 --- a/theme/css/website.css +++ b/theme/css/website.css
@@ -107,6 +107,7 @@ div#banner, div#fi-banner {
107 107
108div#banner { 108div#banner {
109 background-image: url("/theme/images/fourisland_header.png"); 109 background-image: url("/theme/images/fourisland_header.png");
110 background-position: center;
110} 111}
111 112
112body div#banner h1, body div#fi-banner h1 { 113body div#banner h1, body div#fi-banner h1 {
@@ -132,10 +133,19 @@ div#banner h1, div#fi-banner h1 {
132 133
133div#fi-navbar { 134div#fi-navbar {
134 position: relative; 135 position: relative;
136 background-color: #b7e0ff;
137 border-left: 5px solid gray;
138 border-right: 5px solid gray;
139 border-top: none;
140 border-bottom: none;
141 width: auto;
142 margin-bottom: 14px;
143 font: 0.9em "Lucida Grande", Lucida, Verdana, sans-serif;
135} 144}
136 145
137div#fi-navbar .rounded { 146div#fi-navbar div {
138 padding: 0; 147 padding: .001em 0;
148 margin: 10px;
139} 149}
140 150
141div#fi-navbar ul { 151div#fi-navbar ul {
@@ -185,7 +195,6 @@ div#fi-navbar div.bubble blockquote a {
185div#rightbar { 195div#rightbar {
186 float: left; 196 float: left;
187 width: 250px; /*210*/ 197 width: 250px; /*210*/
188 padding: 0 10;
189} 198}
190 199
191div.sidebar { 200div.sidebar {
@@ -236,23 +245,9 @@ div#sidebar li img {
236 margin: 10px auto; 245 margin: 10px auto;
237 text-align: left; 246 text-align: left;
238 padding: 0; 247 padding: 0;
239}
240
241body.fourm div#wrap,
242body.poll div#wrap,
243body.admin div#wrap {
244 background-image: url(/theme/images/bg_body.gif); 248 background-image: url(/theme/images/bg_body.gif);
245 background-repeat: repeat-y; 249 background-repeat: repeat-y;
246} 250 border-top: 4px solid gray;
247
248div#top-fade {
249 position: absolute;
250 top: 0;
251 left: 0;
252 width: 100%;
253 background-image: url(/theme/images/top_fade.png);
254 height: 400px;
255 z-index: 0;
256} 251}
257 252
258#page-body { 253#page-body {
@@ -310,17 +305,10 @@ div#footer {
310 margin-top: .5em; 305 margin-top: .5em;
311 text-align: center; 306 text-align: center;
312 font-size: .68em; 307 font-size: .68em;
313 width: 100%;
314 border-top: 1px black solid; 308 border-top: 1px black solid;
315 border-bottom: 4px gray solid; 309 border-bottom: 4px gray solid;
316} 310}
317 311
318body.home div#footer {
319 background-color: white;
320 border-left: 4px gray solid;
321 border-right: 4px gray solid;
322}
323
324div#footer ul.rows li { 312div#footer ul.rows li {
325 display: list-item; 313 display: list-item;
326} 314}
diff --git a/theme/footer.tpl b/theme/footer.tpl index 9c21d7b..eecbdcf 100755 --- a/theme/footer.tpl +++ b/theme/footer.tpl
@@ -17,7 +17,8 @@
17 17
18 <DIV ID="footer"> 18 <DIV ID="footer">
19 <UL CLASS="rows"> 19 <UL CLASS="rows">
20 <LI>Four Island by <a href="http://fourisland.com">Starla Insigna</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/">Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License</a>.</LI> 20 <LI>Four Island (r<!--REVISION-->) is by <a href="http://fourisland.com">Starla Insigna</a></LI>
21 <LI>Licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/">Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License</a>.</LI>
21 <LI><A HREF="/wiki/privacy-policy/">Privacy Policy</A></LI> 22 <LI><A HREF="/wiki/privacy-policy/">Privacy Policy</A></LI>
22 </UL> 23 </UL>
23 24
diff --git a/theme/header.tpl b/theme/header.tpl index d5b24b1..dfe3459 100755 --- a/theme/header.tpl +++ b/theme/header.tpl
@@ -16,8 +16,6 @@
16 </HEAD> 16 </HEAD>
17 17
18 <BODY ID="<!--BODYID-->" CLASS="<!--CATEGORY--> <!--AID--> <!--CATEGORY-->-<!--AID-->"<!--BODYTAGS-->> 18 <BODY ID="<!--BODYID-->" CLASS="<!--CATEGORY--> <!--AID--> <!--CATEGORY-->-<!--AID-->"<!--BODYTAGS-->>
19 <DIV ID="top-fade"></DIV>
20
21 <DIV ID="wrap"> 19 <DIV ID="wrap">
22 <DIV ID="page-header"> 20 <DIV ID="page-header">
23 <DIV ID="banner" STYLE="position: relative;"> 21 <DIV ID="banner" STYLE="position: relative;">
@@ -30,48 +28,44 @@
30 <DIV CLASS="cleardiv"></DIV> 28 <DIV CLASS="cleardiv"></DIV>
31 29
32 <DIV ID="fi-navbar"> 30 <DIV ID="fi-navbar">
33 <DIV CLASS="bubble"> 31 <DIV>
34 <DIV CLASS="rounded"> 32 <UL>
35 <BLOCKQUOTE> 33 <LI<!--HOMEACTIVE-->>
36 <UL> 34 <IMG SRC="/theme/images/icons/newspaper.png" ALT="Blog">
37 <LI<!--HOMEACTIVE-->> 35 <A HREF="http://fourisland.com/">Blog</A>
38 <IMG SRC="/theme/images/icons/newspaper.png" ALT="Blog"> 36 </LI>
39 <A HREF="http://fourisland.com/">Blog</A>
40 </LI>
41 37
42 <LI> 38 <LI>
43 <A HREF="http://projects.fourisland.com/">Projects</A> 39 <A HREF="http://projects.fourisland.com/">Projects</A>
44 </LI> 40 </LI>
45 41
46 <LI<!--FOURMACTIVE-->> 42 <LI<!--FOURMACTIVE-->>
47 <IMG SRC="/theme/images/icons/comment.png" ALT="The Fourm"> 43 <IMG SRC="/theme/images/icons/comment.png" ALT="The Fourm">
48 <A HREF="http://fourisland.com/fourm/">The Fourm</A> 44 <A HREF="http://fourisland.com/fourm/">The Fourm</A>
49 </LI> 45 </LI>
50 46
51 <LI<!--WIKIACTIVE-->> 47 <LI<!--WIKIACTIVE-->>
52 <IMG SRC="/theme/images/icons/page_edit.png" ALT="Fouripedia"> 48 <IMG SRC="/theme/images/icons/page_edit.png" ALT="Fouripedia">
53 <A HREF="http://fourisland.com/wiki/">Fouripedia</A> 49 <A HREF="http://fourisland.com/wiki/">Fouripedia</A>
54 </LI> 50 </LI>
55 51
56 <LI<!--POLLACTIVE-->> 52 <LI<!--POLLACTIVE-->>
57 <IMG SRC="/theme/images/icons/overlays.png" ALT="Polls"> 53 <IMG SRC="/theme/images/icons/overlays.png" ALT="Polls">
58 <A HREF="http://fourisland.com/poll/">Polls</A> 54 <A HREF="http://fourisland.com/poll/">Polls</A>
59 </LI> 55 </LI>
60 56
61 <LI<!--QUOTESACTIVE-->> 57 <LI<!--QUOTESACTIVE-->>
62 <IMG SRC="/theme/images/icons/16-file-page.png" ALT="Quotes"> 58 <IMG SRC="/theme/images/icons/16-file-page.png" ALT="Quotes">
63 <A HREF="http://fourisland.com/quotes/">Quotes</A> 59 <A HREF="http://fourisland.com/quotes/">Quotes</A>
64 </LI> 60 </LI>
65 61
66 <!--BEGIN MEMBERS--> 62 <!--BEGIN MEMBERS-->
67 <LI<!--LOGACTIVE-->> 63 <LI<!--LOGACTIVE-->>
68 <IMG SRC="/theme/images/icons/door_in.png" ALT="Log<!--LOGDATA-->"> 64 <IMG SRC="/theme/images/icons/door_in.png" ALT="Log<!--LOGDATA-->">
69 <A HREF="http://fourisland.com/log<!--LOGDATA-->.php?redirect=<!--REDIRPAGE-->">Log<!--LOGDATA--></A> 65 <A HREF="http://fourisland.com/log<!--LOGDATA-->.php?redirect=<!--REDIRPAGE-->">Log<!--LOGDATA--></A>
70 </LI> 66 </LI>
71 <!--END MEMBERS--> 67 <!--END MEMBERS-->
72 </UL> 68 </UL>
73 </BLOCKQUOTE>
74 </DIV>
75 </DIV> 69 </DIV>
76 </DIV> 70 </DIV>
77 71
diff --git a/theme/images/fourisland_header.png b/theme/images/fourisland_header.png index becd0b1..35f7886 100755 --- a/theme/images/fourisland_header.png +++ b/theme/images/fourisland_header.png
Binary files differ
diff --git a/theme/images/fourisland_header_night.png b/theme/images/fourisland_header_night.png deleted file mode 100755 index 25502a0..0000000 --- a/theme/images/fourisland_header_night.png +++ /dev/null
Binary files differ
diff --git a/theme/images/home.png b/theme/images/home.png deleted file mode 100755 index 2615467..0000000 --- a/theme/images/home.png +++ /dev/null
Binary files differ
diff --git a/theme/images/loadingAnimation.gif b/theme/images/loadingAnimation.gif deleted file mode 100755 index 82290f4..0000000 --- a/theme/images/loadingAnimation.gif +++ /dev/null
Binary files differ
diff --git a/theme/images/misc.png b/theme/images/misc.png deleted file mode 100755 index fc226e6..0000000 --- a/theme/images/misc.png +++ /dev/null
Binary files differ
diff --git a/theme/images/projects.png b/theme/images/projects.png deleted file mode 100755 index 1821e93..0000000 --- a/theme/images/projects.png +++ /dev/null
Binary files differ
diff --git a/theme/images/smilies/biggrin.gif b/theme/images/smilies/biggrin.gif new file mode 100644 index 0000000..ad04031 --- /dev/null +++ b/theme/images/smilies/biggrin.gif
Binary files differ
diff --git a/theme/images/top_fade.png b/theme/images/top_fade.png deleted file mode 100755 index 5f24673..0000000 --- a/theme/images/top_fade.png +++ /dev/null
Binary files differ
diff --git a/theme/images/top_fade_night.png b/theme/images/top_fade_night.png deleted file mode 100755 index 90f27f6..0000000 --- a/theme/images/top_fade_night.png +++ /dev/null
Binary files differ
diff --git a/theme/images/webs.png b/theme/images/webs.png deleted file mode 100755 index 5506afd..0000000 --- a/theme/images/webs.png +++ /dev/null
Binary files differ
diff --git a/theme/images/youdropifollow.jpg b/theme/images/youdropifollow.jpg deleted file mode 100755 index c811576..0000000 --- a/theme/images/youdropifollow.jpg +++ /dev/null
Binary files differ
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-22 13:06:07 +0000