From 3a865d90a6dc1493c06ab5cb500d63836b7c8c9b Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Sun, 5 Jul 2015 18:57:37 +0200
Subject: Make delete button fixed on upload history page

Also make the navigation fixed because otherwise this looks hideous and
the space is already occupied anyway.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/views/file/nav_history.php               |  2 +-
 application/views/file/upload_history.php            |  7 ++++++-
 application/views/file/upload_history_thumbnails.php | 18 +++++++++++-------
 3 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'application/views')

diff --git a/application/views/file/nav_history.php b/application/views/file/nav_history.php
index bbb695fd6..1a3e55c0b 100644
--- a/application/views/file/nav_history.php
+++ b/application/views/file/nav_history.php
@@ -1,4 +1,4 @@
-<ul class="nav nav-tabs nav-history">
+<ul class="nav nav-tabs">
 <?php
 $nav = array(
 	"List" => "file/upload_history",
diff --git a/application/views/file/upload_history.php b/application/views/file/upload_history.php
index 060cd25c3..253c0aa9e 100644
--- a/application/views/file/upload_history.php
+++ b/application/views/file/upload_history.php
@@ -1,5 +1,10 @@
-<?php include 'nav_history.php'; ?>
 <?php echo form_open("file/do_delete") ?>
+	<div class="nav-history">
+		<div class="container">
+			<input class="btn btn-danger pull-right" type="submit" value="Delete checked" name="process">
+		<?php include 'nav_history.php'; ?>
+		</div>
+	</div>
     <div class="table-responsive">
         <table id="upload_history" class="table table-striped tablesorter {sortlist: [[4,1]]}">
             <thead>
diff --git a/application/views/file/upload_history_thumbnails.php b/application/views/file/upload_history_thumbnails.php
index 04846e944..9fb9c5450 100644
--- a/application/views/file/upload_history_thumbnails.php
+++ b/application/views/file/upload_history_thumbnails.php
@@ -1,11 +1,15 @@
-<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>
-	</form>
-	<button class="btn btn-default" id="toggle_delete_mode" style="display: inline">Delete mode</button>
-</div>
+<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>
+			</form>
+			<button class="btn btn-default" id="toggle_delete_mode" style="display: inline">Delete mode</button>
+		</div>
 
-<?php include 'nav_history.php'; ?>
+	<?php include 'nav_history.php'; ?>
+	</div>
+</div>
 <?php include 'fragments/thumbnail.php'; ?>
 
 <div class="row-fluid">
-- 
cgit v1.2.3-24-g4f1b