4 files changed, 16 insertions, 2 deletions
diff --git a/system/application/views/file/delete_form.php b/system/application/views/file/delete_form.php
new file mode 100644
index 000000000..7d4f2329f
--- /dev/null
+++ b/system/application/views/file/delete_form.php
@@ -0,0 +1,9 @@
+<div style="text-align:center">
+  <?php echo form_open('file/delete/'.$id); ?>
+		<p>
+			<?php if($msg) echo $msg."<br />"; ?>
+			Password:<input type="password" name="password" size="10" />
+			<input type="submit" value="Delete" name="process" />
+    </p>
+  </form>
+</div>
diff --git a/system/application/views/file/deleted.php b/system/application/views/file/deleted.php
new file mode 100644
index 000000000..865b5304a
--- /dev/null
+++ b/system/application/views/file/deleted.php
@@ -0,0 +1,3 @@
+<div style="text-align:center">
+	<p><?php echo $id; ?> has been deleted.</p>
+</div>
diff --git a/system/application/views/file/html_header.php b/system/application/views/file/html_header.php
index b7e27315d..52ffab007 100644
--- a/system/application/views/file/html_header.php
+++ b/system/application/views/file/html_header.php
@@ -11,7 +11,7 @@
       <a class="raw_link no" href="<?php echo $raw_link; ?>">Raw</a> |
       <a class="raw_link no" href="<?php echo $plain_link; ?>">Plain</a> |
       Currently: <?php echo $current_highlight; ?> |
-      Timeout: <?php echo $timeout; ?>
+      Timeout: <a class="raw_link no" href="<?php echo $delete_link; ?>" title="delete"><?php echo $timeout; ?></a>
       <div style="float:right;">
         <a class="raw_link no" href="<?php echo $auto_link; ?>">Code</a> |
         <a class="raw_link no" href="<?php echo $rmd_link; ?>">Render Markdown</a>
diff --git a/system/application/views/file/upload_form.php b/system/application/views/file/upload_form.php
index ec7ab53de..fe3f5db5a 100644
--- a/system/application/views/file/upload_form.php
+++ b/system/application/views/file/upload_form.php
@@ -2,13 +2,15 @@
   <?php echo form_open_multipart('file/do_upload'); ?>
     <p>
       File: <input type="file" name="file" size="30" />
-      <input type="submit" value="Upload" name="process" />
+      <input type="submit" value="Upload" name="process" /><br />
+      Optional password (for deletion): <input type="password" name="password" size="10" />
     </p>
   </form>
   <p><b>OR</b></p>
   <?php echo form_open_multipart('file/do_paste'); ?>
     <p>
       <textarea name="content" cols="80" rows="20"></textarea><br />
+      Optional password (for deletion): <input type="password" name="password" size="10" /><br />
       <input type="submit" value="Paste" name="process" />
     </p>
   </form>