merged mod branch

5 files changed, 131 insertions, 20 deletions

diff --git a/templates/index.html b/templates/index.html
index 048a3dd9..424cf21b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,26 +1,27 @@
-<!DOCTYPE html>

+<!DOCTYPE html>

 <html>

 <head>

 	<link rel="stylesheet" media="screen" href="{index}style.css"/>

 	<title>{board[url]} - {board[name]}</title>

-	<meta http-equiv="Content-Type" content="text/html; charset=utf8" />

-	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />

+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />

 	<script type="text/javascript" src="{index}main.js"></script>

 </head>

 <body>

 	<h1>{board[url]} - {board[name]}</h1>

-	<div class="title">{board[title]?{board[title]}}</div>

+	<div class="title">{board[title]?{board[title]}}<p>{mod?<a href="?/">Return to dashboard</a>}</p></div>

+	

 	

 	<form onsubmit="return dopost(this);" enctype="multipart/form-data" action="{post_url}" method="post">

 	<input type="hidden" name="board" value="{board[uri]}" />

+	{mod?<input type="hidden" name="mod" value="1" />}

 		<table>

 			<tr>

 				<th>

 					Name

 				</th>

 				<td>

-					<input type="text" name="name" size="25" maxlength="25" autocomplete="off" />

+					<input type="text" name="name" size="25" maxlength="50" autocomplete="off" />

 				</td>

 			</tr>

 			<tr>

@@ -37,7 +38,7 @@
 				</th>

 				<td>

 					<input style="float:left;" type="text" name="subject" size="25" maxlength="25" autocomplete="off" />

-					<input style="float:right;" type="submit" name="post" value="{button=New Topic}" />

+					<input accesskey="s" style="float:right;" type="submit" name="post" value="{button=New Topic}" />

 				</td>

 			</tr>

 			<tr>

@@ -56,6 +57,27 @@
 					<input type="file" name="file"/>

 				</td>

 			</tr>

+			{mod?

+			<tr>

+				<th>

+					Flags

+				</th>

+				<td>

+					<div>

+						<label for="sticky">Sticky</label>

+						<input title="Sticky" type="checkbox" name="sticky" id="sticky"><br/>

+					</div>

+					<div>

+						<label for="lock">Lock</label><br/>

+						<input title="Lock" type="checkbox" name="lock" id="lock">

+					</div>

+					<div>

+						<label for="raw">Raw HTML</label><br/>

+						<input title="Raw HTML" type="checkbox" name="raw" id="raw">

+					</div>

+				</td>

+			</tr>

+			}

 			<tr>

 				<th>

 					Password

@@ -68,10 +90,21 @@
 		</table>

 	</form>

 	<hr/>

+	<form action="{post_url}" method="post">

+	<input type="hidden" name="delete" value="1" />

+	<input type="hidden" name="board" value="{board[uri]}" />

+	{mod?<input type="hidden" name="mod" value="1" />}

 	{body}

+	<div class="delete">

+		Delete Post [<input title="Delete file only" type="checkbox" name="file" id="delete_file"/>

+		 <label for="delete_file">File</label>] Password

+			<input type="password" name="password" size="12" maxlength="18" />

+			<input type="submit" value="Delete" />

+	</div>

+	</form>

 	Pages: {pages:

 		[<a href="{pages[link]}">{pages[num]}</a>]{!%last? }

 	}

-	<p class="unimportant" style="text-align:center;">Copyright &copy; 2010 <a href="http://omegadev.org/">OmegaSDG</a></p>

+	<p class="unimportant" style="text-align:center;">Tinyboard Software Copyright &copy; 2010-2011 <a href="http://omegasdg.com/">OmegaSDG</a></p>

 </body>

 </html>
\ No newline at end of file
diff --git a/templates/login.html b/templates/login.html
new file mode 100644
index 00000000..312bd6e9
--- /dev/null
+++ b/templates/login.html
@@ -0,0 +1,28 @@
+<center>

+	{error?<h2>{error}</h2>}

+	<form action="" method="post">

+	<table style="margin-top:25px;">

+		<tr>

+			<th>

+				Username

+			</th>

+			<td>

+				<input type="text" name="username" size="20" maxlength="30" value="{username}">

+			</td>

+		</tr>

+		<tr>

+			<th>

+				Password

+			</th>

+			<td>

+				<input type="password" name="password" size="20" maxlength="30" value="">

+			</td>

+		</tr>

+		<tr>

+			<td></td>

+			<td>

+				<input type="submit" name="login" value="Continue" />

+			</td>

+	</table>

+	</form>

+</center>
\ No newline at end of file
diff --git a/templates/page.html b/templates/page.html
index f47fbca4..41f0d4e6 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,16 +1,16 @@
-<!DOCTYPE html>

+<!DOCTYPE html>

 <html>

 <head>

 	<link rel="stylesheet" media="screen" href="{index}style.css"/>

 	<title>{title}</title>

-	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />

+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />

 </head>

 <body>

 	<h1>{title}</h1>

-	<div class="title">{subtitle?{subtitle}}</div>

+	<div class="title">{subtitle?{subtitle}}<p>{mod?<a href="?/">Return to dashboard</a>}</p></div>

 	{body}

 	<hr/>

-	<p class="unimportant" style="text-align:center;">Copyright &copy; 2010 <a href="http://omegadev.org/">OmegaSDG</a></p>

+	<p class="unimportant" style="text-align:center;">Tinyboard Software Copyright &copy; 2010-2011 <a href="http://omegasdg.com/">OmegaSDG</a></p>

 </body>

-</html>
\ No newline at end of file
+</html>

diff --git a/templates/posts.sql b/templates/posts.sql
new file mode 100644
index 00000000..f8e1b6fb
--- /dev/null
+++ b/templates/posts.sql
@@ -0,0 +1,25 @@
+CREATE TABLE IF NOT EXISTS `posts_{board}` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `thread` int(11) DEFAULT NULL,
+  `subject` varchar(40) NOT NULL,
+  `email` varchar(30) NOT NULL,
+  `name` varchar(25) NOT NULL,
+  `trip` varchar(45) DEFAULT NULL,
+  `body` text NOT NULL,
+  `time` int(11) NOT NULL,
+  `bump` int(11) DEFAULT NULL,
+  `thumb` varchar(50) DEFAULT NULL,
+  `thumbwidth` int(11) DEFAULT NULL,
+  `thumbheight` int(11) DEFAULT NULL,
+  `file` varchar(50) DEFAULT NULL,
+  `filewidth` int(11) DEFAULT NULL,
+  `fileheight` int(11) DEFAULT NULL,
+  `filesize` int(11) DEFAULT NULL,
+  `filename` varchar(30) DEFAULT NULL,
+  `filehash` varchar(32) DEFAULT NULL,
+  `password` varchar(20) DEFAULT NULL,
+  `ip` varchar(15) NOT NULL,
+  `sticky` int(1) NOT NULL,
+  `locked` int(1) NOT NULL,
+  UNIQUE KEY `id` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
\ No newline at end of file
diff --git a/templates/thread.html b/templates/thread.html
index f0f271b7..4fff9b88 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html>

+<!DOCTYPE html>

 <html>

 <head>

 	<link rel="stylesheet" media="screen" href="{index}style.css"/>

 	<title>{board[url]} - {board[name]}</title>

-	<meta http-equiv="Content-Type" content="text/html; charset=utf8" />

-	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />

+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />

 	<script type="text/javascript" src="{index}main.js"></script>

 </head>

 <body>

 	<h1>{board[url]} - {board[name]}</h1>

-	<div class="title">{board[title]?{board[title]}}</div>

+	<div class="title">{board[title]?{board[title]}}<p>{mod?<a href="?/">Return to dashboard</a>}</p></div>

 	

-	<div class="banner">Posting mode: Reply <a class="unimportant" href="{index}{board[dir]}">[Return.]</a></div>

+	<div class="banner">Posting mode: Reply <a class="unimportant" href="{return}">[Return.]</a></div>

 	<form onsubmit="return dopost(this);" enctype="multipart/form-data" action="{post_url}" method="post">

 	<input type="hidden" name="thread" value="{id}" />

 	<input type="hidden" name="board" value="{board[uri]}" />

+	{mod?<input type="hidden" name="mod" value="1" />}

 		<table>

 			<tr>

 				<th>

 					Name

 				</th>

 				<td>

-					<input type="text" name="name" size="25" maxlength="25" autocomplete="off" />

+					<input type="text" name="name" size="25" maxlength="50" autocomplete="off" />

 				</td>

 			</tr>

 			<tr>

@@ -39,7 +39,7 @@
 				</th>

 				<td>

 					<input style="float:left;" type="text" name="subject" size="25" maxlength="25" autocomplete="off" />

-					<input style="float:right;" type="submit" name="post" value="{button=New Topic}" />

+					<input accesskey="s" style="float:right;" type="submit" name="post" value="{button=New Topic}" />

 				</td>

 			</tr>

 			<tr>

@@ -58,6 +58,19 @@
 					<input type="file" name="file"/>

 				</td>

 			</tr>

+			{mod?

+			<tr>

+				<th>

+					Flags

+				</th>

+				<td>

+					<div>

+						<label for="raw">Raw HTML</label><br/>

+						<input title="Raw HTML" type="checkbox" name="raw" id="raw">

+					</div>

+				</td>

+			</tr>

+			}

 			<tr>

 				<th>

 					Password

@@ -70,7 +83,19 @@
 		</table>

 	</form>

 	<hr/>

+	<form action="{post_url}" method="post">

+	<input type="hidden" name="delete" value="1" />

+	<input type="hidden" name="board" value="{board[uri]}" />

+	{mod?<input type="hidden" name="mod" value="1" />}

 	{body}

-	<p class="unimportant" style="text-align:center;">Copyright &copy; 2010 <a href="http://omegadev.org/">OmegaSDG</a></p>

+	<div class="delete">

+		Delete Post [<input title="Delete file only" type="checkbox" name="file" id="delete_file"/>

+		 <label for="delete_file">File</label>] Password

+			<input type="password" name="password" size="12" maxlength="18" />

+			<input type="submit" value="Delete" />

+	</div>

+	</form>

+	<a href="{return}">[Return.]</a>

+	<p class="unimportant" style="text-align:center;">Tinyboard Software Copyright &copy; 2010-2011 <a href="http://omegasdg.com/">OmegaSDG</a></p>

 </body>

 </html>
\ No newline at end of file