summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2013-05-23 17:44:45 +0200
committerFlorian Pritz <bluewind@xinu.at>2013-05-24 00:11:26 +0200
commit2a6a1c63cb21015009fe4fd13f62cdac64e1fe36 (patch)
treea01b7cdf6e8819b5f41df4dae8b31c04d9904e38 /application
parentb7ff91d8e34e1d9f04ad0b153e94441efd312f78 (diff)
upload_history: Allow column sorting (jquery.tablesorter)
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application')
-rw-r--r--application/controllers/file.php1
-rw-r--r--application/views/file/upload_history.php5
2 files changed, 3 insertions, 3 deletions
diff --git a/application/controllers/file.php b/application/controllers/file.php
index 3e1946554..b26ebcf37 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -404,7 +404,6 @@ class File extends CI_Controller {
", array($user))->result_array();
foreach($query as $key => $item) {
- $query[$key]["date"] = date("r", $item["date"]);
$query[$key]["filesize"] = format_bytes($item["filesize"]);
if (is_cli_client()) {
// Keep track of longest string to pad plaintext output correctly
diff --git a/application/views/file/upload_history.php b/application/views/file/upload_history.php
index 9696f6770..d3699d565 100644
--- a/application/views/file/upload_history.php
+++ b/application/views/file/upload_history.php
@@ -1,5 +1,6 @@
+<?php register_js_include("/data/js/jquery.tablesorter.min.js"); ?>
<?php echo form_open("file/do_delete") ?>
- <table class="table table-striped">
+ <table id="upload_history" class="table table-striped tablesorter">
<thead>
<tr>
<th><input type="checkbox" name="all-ids" id="history-all"></th>
@@ -18,7 +19,7 @@
<td><a href="<?php echo site_url("/".$item["id"]) ?>/"><?php echo $item["id"] ?></a></td>
<td><?php echo htmlspecialchars($item["filename"]); ?></td>
<td><?php echo $item["mimetype"] ?></td>
- <td class="nowrap"><?php echo $item["date"] ?></td>
+ <td class="nowrap"><?php echo date("r", $item["date"]); ?><span class="hidden">t=<?php echo $item["date"]; ?></span></td>
<td><?php echo $item["hash"] ?></td>
<td><?php echo $item["filesize"] ?></td>
</tr>