Merge branch 'webui-multipaste' into dev

3 files changed, 41 insertions, 6 deletions

diff --git a/application/views/file/multipaste/queue.php b/application/views/file/multipaste/queue.php
new file mode 100644
index 000000000..3f42b3cdf
--- /dev/null
+++ b/application/views/file/multipaste/queue.php
@@ -0,0 +1,32 @@
+<div class="multipasteQueue">
+	<?php echo form_open("file/multipaste/form_submit", ["data-ajax_url" => site_url("file/multipaste/ajax_submit")]); ?>
+		<div class="items"><!--
+			<?php foreach ($items as $item) {?>
+				--><div data-id="<?php echo $item['id']; ?>">
+					<input type="hidden" name="ids[<?php echo $item['id']; ?>]" value="<?php echo $item['id']; ?>">
+					<div class='item'>
+						<?php if (isset($item['thumbnail'])) { ?>
+							<img
+								src="<?php echo $item['thumbnail']; ?>"
+								title="<?php echo $item['title']; ?>"
+								data-content="<?php echo $item['tooltip']; ?>">
+						<?php } else { ?>
+							<div>
+								<?php echo $item['title']; ?><br>
+								<?php echo $item['tooltip']; ?>
+							</div>
+						<?php } ?>
+					</div>
+					<button class='multipaste_queue_delete btn-danger btn btn-xs'>Remove</button>
+				</div><!--
+			<?php } ?>
+		--></div>
+		<button type="submit" class="btn btn-default" name="process" value="save">
+			<div class="ajaxFeedback" style="display: none">
+				<span class="glyphicon glyphicon-refresh spinning"></span>
+			</div>
+			Only save queue order
+		</button>
+		<button type="submit" class="btn btn-primary" name="process" value="create">Create multipaste</button>
+	</form>
+</div>
diff --git a/application/views/file/upload_history.php b/application/views/file/upload_history.php
index 253c0aa9e..c6cbe7946 100644
--- a/application/views/file/upload_history.php
+++ b/application/views/file/upload_history.php
@@ -1,7 +1,10 @@
-<?php echo form_open("file/do_delete") ?>
+<?php echo form_open("file/handle_history_submit") ?>
 	<div class="nav-history">
 		<div class="container">
-			<input class="btn btn-danger pull-right" type="submit" value="Delete checked" name="process">
+			<div class="pull-right">
+				<button class="btn btn-danger" name="process" value="delete">Delete checked</button>
+				<button class="btn btn-primary" name="process" value="multipaste">Add checked to multipaste queue</button>
+			</div>
 		<?php include 'nav_history.php'; ?>
 		</div>
 	</div>
@@ -31,7 +34,6 @@
             </tbody>
         </table>
     </div>
-    <input class="btn btn-danger" type="submit" value="Delete checked" name="process">
 </form>
 
 <p>Total sum of your distinct uploads: <?php echo $total_size; ?>.</p>
diff --git a/application/views/file/upload_history_thumbnails.php b/application/views/file/upload_history_thumbnails.php
index 9fb9c5450..7d4fc6298 100644
--- a/application/views/file/upload_history_thumbnails.php
+++ b/application/views/file/upload_history_thumbnails.php
@@ -1,10 +1,11 @@
 <div class="nav-history">
 	<div class="container">
 		<div class="pull-right">
-			<?php echo form_open("file/do_delete/", array("id" => "delete_form", "style" => "display: inline")); ?>
-				<button type="submit" class="btn btn-danger" id="delete_button" style="display: none">Delete selected</button>
+			<?php echo form_open("file/handle_history_submit/", array("id" => "submit_form", "style" => "display: inline")); ?>
+				<button type="submit" class="btn btn-danger" style="display: none" name='process' value='delete'>Delete selected</button>
+				<button type="submit" class="btn btn-primary" style="display: none" name='process' value='multipaste'>Add selected to multipaste queue</button>
 			</form>
-			<button class="btn btn-default" id="toggle_delete_mode" style="display: inline">Delete mode</button>
+			<button class="btn btn-default" id="toggle_select_mode" style="display: inline">Select mode</button>
 		</div>
 
 	<?php include 'nav_history.php'; ?>