From 341100d5a66f7bd0d0b39ee5afc809f6c2deb59d Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Tue, 30 Nov 2010 20:38:24 +1100 Subject: Optional subtitle in static pages. --- templates/page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/page.html') diff --git a/templates/page.html b/templates/page.html index d9968b1e..f47fbca4 100644 --- a/templates/page.html +++ b/templates/page.html @@ -8,7 +8,7 @@

{title}

- {subtitle?

{subtitle}

} +

{subtitle?{subtitle}}

{body}

-- cgit v1.3 From 04a812c5ff02c463550369ff827a66f2d6f2f3c9 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 10 Dec 2010 20:48:13 +1100 Subject: moderator template change --- templates/page.html | 1 + 1 file changed, 1 insertion(+) (limited to 'templates/page.html') diff --git a/templates/page.html b/templates/page.html index f47fbca4..bdf09579 100644 --- a/templates/page.html +++ b/templates/page.html @@ -9,6 +9,7 @@

{title}

{subtitle?{subtitle}}

+ {mod?Return to dashboard} {body}

-- cgit v1.3 From 12848daf0c2c6d0f695d9d45040291310d5b27f4 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 10 Dec 2010 20:49:28 +1100 Subject: Style change on dashboard link --- templates/page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/page.html') diff --git a/templates/page.html b/templates/page.html index bdf09579..487f8f28 100644 --- a/templates/page.html +++ b/templates/page.html @@ -9,7 +9,7 @@

{title}

{subtitle?{subtitle}}

- {mod?Return to dashboard} + {mod?Return to dashboard} {body}

-- cgit v1.3 From 466d5e4832d68f6e3a88957db1b0997d12550711 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Thu, 16 Dec 2010 19:12:13 +1100 Subject: "Return to dashboard" links --- templates/index.html | 3 ++- templates/page.html | 3 +-- templates/thread.html | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'templates/page.html') diff --git a/templates/index.html b/templates/index.html index 048a3dd9..7aaf72e0 100644 --- a/templates/index.html +++ b/templates/index.html @@ -10,7 +10,8 @@

{board[url]} - {board[name]}

{board[title]?{board[title]}}

{mod?Return to dashboard}

diff --git a/templates/page.html b/templates/page.html index 487f8f28..9e243b75 100644 --- a/templates/page.html +++ b/templates/page.html @@ -8,8 +8,7 @@

{title}

{subtitle?{subtitle}}

- {mod?Return to dashboard} +

{subtitle?{subtitle}}

{mod?Return to dashboard}

{body}

diff --git a/templates/thread.html b/templates/thread.html index f0f271b7..a56a3ad7 100644 --- a/templates/thread.html +++ b/templates/thread.html @@ -11,6 +11,7 @@

{board[url]} - {board[name]}

{board[title]?{board[title]}}

+ {mod?Return to dashboard} -- cgit v1.3 From 82557e2c125989cccae40b4b82c2e310f05409c4 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Sun, 2 Jan 2011 21:10:18 +1100 Subject: Fixed encodign errors --- templates/index.html | 20 +++++++++++++++++++- templates/login.html | 2 +- templates/page.html | 2 +- templates/thread.html | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) (limited to 'templates/page.html') diff --git a/templates/index.html b/templates/index.html index 7aaf72e0..99c60d4f 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,4 +1,4 @@ - + @@ -15,6 +15,7 @@ + {mod?} + {mod? + + + + + }

@@ -57,6 +58,23 @@

+ Flags +

+ Sticky +
+

+ Lock
+ +

Password diff --git a/templates/login.html b/templates/login.html index 5ce955a7..312bd6e9 100644 --- a/templates/login.html +++ b/templates/login.html @@ -1,4 +1,4 @@ - + {error?

{error}

} diff --git a/templates/page.html b/templates/page.html index 9e243b75..d8b78898 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,4 +1,4 @@ - + diff --git a/templates/thread.html b/templates/thread.html index e816e127..e0c33a1e 100644 --- a/templates/thread.html +++ b/templates/thread.html @@ -1,4 +1,4 @@ - + -- cgit v1.3 From 3a3578c80507d80d571297b6bbf2502d5da73fd9 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Mon, 3 Jan 2011 16:29:34 +1100 Subject: Valid HTML5 --- inc/config.php | 2 +- inc/display.php | 4 ++-- templates/index.html | 3 +-- templates/page.html | 2 +- templates/thread.html | 3 +-- 5 files changed, 6 insertions(+), 8 deletions(-) (limited to 'templates/page.html') diff --git a/inc/config.php b/inc/config.php index d40f7654..521d3eb3 100644 --- a/inc/config.php +++ b/inc/config.php @@ -202,7 +202,7 @@ // Correspond to above permission directives define('MOD_LINK_DELETE', '[D]', true); define('MOD_LINK_BAN', '[B]', true); - define('MOD_LINK_BANDELETE', '[B&D]', true); + define('MOD_LINK_BANDELETE', '[B&D]', true); define('MOD_LINK_DELETEFILE', '[F]', true); define('MOD_LINK_DELETEBYIP', '[D+]', true); define('MOD_LINK_STICKY', '[Sticky]', true); diff --git a/inc/display.php b/inc/display.php index 58f26960..edcbf21b 100644 --- a/inc/display.php +++ b/inc/display.php @@ -138,7 +138,7 @@ ($index?'':' onclick="highlightReply(' . $this->id . ');"') . ' href="' . $this->root . $board['dir'] . DIR_RES . $this->thread . '.html' . '#' . $this->id . '">No.' . // JavaScript cite - ''.$this->id.'' . + ''.$this->id.'' . '

'; // File info @@ -290,7 +290,7 @@ ($index?'':' onclick="highlightReply(' . $this->id . ');"') . ' href="' . $this->root . $board['dir'] . DIR_RES . $this->id . '.html' . '#' . $this->id . '">No.' . // JavaScript cite - ''.$this->id.'' . + ''.$this->id.'' . // Sticky ($this->sticky ? '

' : '') . // Locked diff --git a/templates/index.html b/templates/index.html index 99c60d4f..d0702ba9 100644 --- a/templates/index.html +++ b/templates/index.html @@ -3,8 +3,7 @@ {board[url]} - {board[name]} - - + diff --git a/templates/page.html b/templates/page.html index d8b78898..f8525e01 100644 --- a/templates/page.html +++ b/templates/page.html @@ -3,7 +3,7 @@ {title} - + diff --git a/templates/thread.html b/templates/thread.html index 58b5028c..2fd03418 100644 --- a/templates/thread.html +++ b/templates/thread.html @@ -3,8 +3,7 @@ {board[url]} - {board[name]} - - + -- cgit v1.3 From 0190dcfa52aee3acd6871cd1885ed171ad30c69f Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Thu, 20 Jan 2011 19:34:16 +1100 Subject: changed omegadev.org to omegasdg.com --- README.md | 2 +- templates/index.html | 3 +-- templates/page.html | 2 +- templates/thread.html | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) (limited to 'templates/page.html') diff --git a/README.md b/README.md index 2cd9ba2c..3d59f3c5 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Tinyboard is an imageboard software package written in PHP. It aims to maintain Tinyboard is not currently at a stable state. -[o]: http://omegadev.org/ +[o]: http://omegasdg.com/ ## Requirements 1. PHP >= 5.2.0 diff --git a/templates/index.html b/templates/index.html index acca2408..219fec12 100644 --- a/templates/index.html +++ b/templates/index.html @@ -8,7 +8,6 @@ -

{board[url]} - {board[name]}

{board[title]?{board[title]}}

{mod?Return to dashboard}

@@ -91,6 +90,6 @@ Pages: {pages: [{pages[num]}]{!%last? } } -

\ No newline at end of file diff --git a/templates/page.html b/templates/page.html index f8525e01..ddcac8c6 100644 --- a/templates/page.html +++ b/templates/page.html @@ -11,6 +11,6 @@

{subtitle?{subtitle}}

{mod?Return to dashboard}

{body}

\ No newline at end of file diff --git a/templates/thread.html b/templates/thread.html index 82867ec2..d6a48213 100644 --- a/templates/thread.html +++ b/templates/thread.html @@ -8,7 +8,6 @@ -

{board[url]} - {board[name]}

{board[title]?{board[title]}}

{mod?Return to dashboard}

@@ -73,6 +72,6 @@

{body} [Return.] -

\ No newline at end of file -- cgit v1.3 From 701602d16a364990c805ef3f47a1dc21a765312c Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Sat, 22 Jan 2011 03:41:00 +1100 Subject: copyright update --- README.md | 2 +- templates/index.html | 2 +- templates/page.html | 2 +- templates/thread.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'templates/page.html') diff --git a/README.md b/README.md index 3d59f3c5..b57169ce 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ An automated installation script will be completed soon. [r]: http://github.com/savetheinternet/Tinyboard/blob/master/README.md ## License -Copyright (c) 2010 by Omega Software Development Group +Copyright (c) 2010-2011 by Omega Software Development Group Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright diff --git a/templates/index.html b/templates/index.html index 9df80376..88101984 100644 --- a/templates/index.html +++ b/templates/index.html @@ -101,6 +101,6 @@ Pages: {pages: [{pages[num]}]{!%last? } } -

\ No newline at end of file diff --git a/templates/page.html b/templates/page.html index ddcac8c6..5246dd62 100644 --- a/templates/page.html +++ b/templates/page.html @@ -11,6 +11,6 @@

{subtitle?{subtitle}}

{mod?Return to dashboard}

{body}

\ No newline at end of file diff --git a/templates/thread.html b/templates/thread.html index f8f71640..95867830 100644 --- a/templates/thread.html +++ b/templates/thread.html @@ -83,6 +83,6 @@ [Return.] -

\ No newline at end of file -- cgit v1.3 From d448125d991d8bb179c27801c64b0debcfeb959f Mon Sep 17 00:00:00 2001 From: "Michael D. Reiley" Date: Thu, 27 Jan 2011 09:19:17 -0800 Subject: Updated licensing. --- LICENSE | 34 +++++++++++++++++++++------------- templates/index.html | 4 ++-- templates/page.html | 4 ++-- templates/thread.html | 4 ++-- 4 files changed, 27 insertions(+), 19 deletions(-) (limited to 'templates/page.html') diff --git a/LICENSE b/LICENSE index 3c10b3ca..3a742f99 100644 --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,21 @@ -Copyright (c) 2010 by Omega Software Development Group - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above copyright -notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. \ No newline at end of file +Copyright (c) 2010-2011, Omega Software Development Group + +Permission to use, copy, modify, and/or distribute this software is granted, +provided that the following terms are obeyed. + +1. The above copyright notice, this permission notice, and these terms must +appear in all copies and modifications of this software. + +2. This software must not be utilized in any manner that is primarily intended +for or directed toward commercial advantage or private monetary compensation. + +3. Any changes to this software must be made easily publicly available in the +form of source code. + +THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. diff --git a/templates/index.html b/templates/index.html index 88101984..9cc085d1 100644 --- a/templates/index.html +++ b/templates/index.html @@ -101,6 +101,6 @@ Pages: {pages: [{pages[num]}]{!%last? } } -

- \ No newline at end of file + diff --git a/templates/page.html b/templates/page.html index 5246dd62..75b9ecdd 100644 --- a/templates/page.html +++ b/templates/page.html @@ -11,6 +11,6 @@

{subtitle?{subtitle}}

{mod?Return to dashboard}

{body}

- \ No newline at end of file + diff --git a/templates/thread.html b/templates/thread.html index 95867830..918d4c0b 100644 --- a/templates/thread.html +++ b/templates/thread.html @@ -83,6 +83,6 @@ [Return.] -

- \ No newline at end of file + -- cgit v1.3 From 0346862645aa0b9a8ba0f0d929b336b08ff8fcf4 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 11 Feb 2011 22:44:49 +1100 Subject: Corrected spelling of "Tinyboard" and updated license in the README --- README.md | 29 ++++++++++++++++++----------- templates/index.html | 2 +- templates/page.html | 2 +- templates/thread.html | 2 +- 4 files changed, 21 insertions(+), 14 deletions(-) (limited to 'templates/page.html') diff --git a/README.md b/README.md index b57169ce..bad204dc 100644 --- a/README.md +++ b/README.md @@ -32,17 +32,24 @@ An automated installation script will be completed soon. [r]: http://github.com/savetheinternet/Tinyboard/blob/master/README.md ## License -Copyright (c) 2010-2011 by Omega Software Development Group +Copyright (c) 2010-2011, Omega Software Development Group -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above copyright -notice and this permission notice appear in all copies. +Permission to use, copy, modify, and/or distribute this software is granted, +provided that the following terms are obeyed. -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +1. The above copyright notice, this permission notice, and these terms must +appear in all copies and modifications of this software. +2. This software must not be utilized in any manner that is primarily intended +for or directed toward commercial advantage or private monetary compensation. + +3. Any changes to this software must be made easily publicly available in the +form of source code. + +THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index 142316fd..424cf21b 100644 --- a/templates/index.html +++ b/templates/index.html @@ -105,6 +105,6 @@ Pages: {pages: [{pages[num]}]{!%last? } } -

\ No newline at end of file diff --git a/templates/page.html b/templates/page.html index 75b9ecdd..41f0d4e6 100644 --- a/templates/page.html +++ b/templates/page.html @@ -11,6 +11,6 @@

{subtitle?{subtitle}}

{mod?Return to dashboard}

{body}

diff --git a/templates/thread.html b/templates/thread.html index bc11f1a8..4fff9b88 100644 --- a/templates/thread.html +++ b/templates/thread.html @@ -96,6 +96,6 @@ [Return.] -

\ No newline at end of file -- cgit v1.3