diff --git a/application/controllers/admin/reports.php b/application/controllers/admin/reports.php index c915d46298..9ee6c2346e 100755 --- a/application/controllers/admin/reports.php +++ b/application/controllers/admin/reports.php @@ -94,6 +94,16 @@ public function index($page = 1) { $keyword_raw = ""; } + + $order_field = 'date'; $sort = 'DESC'; + if (isset($_GET['order'])) + { + $order_field = htmlentities($_GET['order']); + } + if (isset($_GET['sort'])) + { + $sort = (strtoupper($_GET['sort']) == 'ASC') ? 'ASC' : 'DESC'; + } // Check, has the form been submitted? $form_error = FALSE; @@ -283,6 +293,9 @@ public function index($page = 1) // Status Tab $this->template->content->status = $status; + $this->template->content->order_field = $order_field; + $this->template->content->sort = $sort; + // Javascript Header $this->template->js = new View('admin/reports/reports_js'); diff --git a/application/views/admin/reports/main.php b/application/views/admin/reports/main.php index 9ea5c8eda8..86bb9b15f6 100644 --- a/application/views/admin/reports/main.php +++ b/application/views/admin/reports/main.php @@ -54,6 +54,25 @@ + +
+ 'get')); ?> + + Kohana::lang('ui_admin.report_date'), + 'id' => Kohana::lang('ui_main.id'), + 'datemodify' => Kohana::lang('ui_admin.date_modified'), + 'dateadd' => Kohana::lang('ui_admin.date_added'), + 'title' => Kohana::lang('ui_admin.report_title'), + ), $order_field); + echo form::dropdown('sort', array( + 'ASC' => Kohana::lang('ui_main.ascending'), + 'DESC' => Kohana::lang('ui_main.descending'), + ), $sort); + echo form::hidden('status', $status); + echo form::submit('submit', Kohana::lang('ui_main.sort')); + echo form::close(); ?> +
diff --git a/media/css/admin/all.css b/media/css/admin/all.css index e6a659b52d..a9f849c458 100755 --- a/media/css/admin/all.css +++ b/media/css/admin/all.css @@ -2535,3 +2535,9 @@ div.dp-popup td.disabled { height: 30px; display: inline-block; } + +.sort_by { + float: right; + margin: 0; + padding: 9px 10px 0; +}