maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #120 from BNoiZe/master

Browse Source 
Fixed natural sorting
This commit is contained in:
Michael Kaufmann
2013-10-06 01:24:01 -07:00
parent 11380a9819 6af5608f0f
commit 4584afe5fd
8 changed files with 24257 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/Sparkle/admin/admins/admins.tpl vendored
View File

@@ -22,7 +22,7 @@ $header
</div> </div>
</if> </if>
<table class="bradius" id="sortable"> <table class="bradius" id="sortable" sort-column="1">
<thead> <thead>
<tr> <tr>
<th> <th>

2
templates/Sparkle/admin/customers/customers.tpl vendored
View File

@@ -22,7 +22,7 @@ $header
{$searchcode} {$searchcode}
</div> </div>
<table class="bradius" id="sortable"> <table class="bradius" id="sortable" sort-column="1">
<thead> <thead>
<tr> <tr>
<th> <th>

12
templates/Sparkle/admin/customers/customers_customer.tpl vendored
View File

@@ -1,14 +1,18 @@
<tr <if $row['deactivated'] == 1>class="disabled"</if>> <tr <if $row['deactivated'] == 1>class="disabled"</if>>
<td> <td>
<if $row['company'] != ''> <if $row['company'] != '' && $row['name'] != ''>
{$row['company']}<br /> {$row['company']}<br />
<small>{$row['name']}&nbsp;{$row['firstname']}</small> <small>{$row['name']}&nbsp;{$row['firstname']}</small>
<else> </if>
<if $row['company'] != '' && $row['name'] == ''>
{$row['company']}
</if>
<if $row['company'] == ''>
{$row['name']}&nbsp;{$row['firstname']} {$row['name']}&nbsp;{$row['firstname']}
</if> </if>
</td> </td>
<td> <td>
<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'su', 'id' => $row['customerid']))}" rel="external">{$row['loginname']}</a> <a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'su', 'sort' => $row['loginname'], 'id' => $row['customerid']))}" rel="external">{$row['loginname']}</a>
</td> </td>
<td> <td>
{$row['adminname']} {$row['adminname']}
@@ -56,7 +60,7 @@
</span> </span>
</div> </div>
</td> </td>
<td style="white-space: nowrap;> <td style="white-space: nowrap;">
<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'edit', 'id' => $row['customerid']))}" style="text-decoration:none;"> <a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'edit', 'id' => $row['customerid']))}" style="text-decoration:none;">
<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" /> <img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" />
</a>&nbsp; </a>&nbsp;

2
templates/Sparkle/admin/logger/logger.tpl vendored
View File

@@ -22,7 +22,7 @@ $header
</div> </div>
</if> </if>
<table class="bradius" id="sortable"> <table class="bradius" id="sortable" sort-direction="desc">
<thead> <thead>
<tr> <tr>
<th>{$lng['logger']['date']}</th> <th>{$lng['logger']['date']}</th>

12232
templates/Sparkle/assets/js/jquery.dataTables.js vendored
View File

File diff suppressed because it is too large Load Diff

12142
templates/Sparkle/assets/js/jquery.dataTables.naturalSorting.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

10
templates/Sparkle/assets/js/main.js vendored
View File

@@ -21,13 +21,19 @@ $(document).ready(function() {
}); });
// Enable datatable // Enable datatable
$('#sortable').dataTable({ var sortColumn = $('#sortable').attr('sort-column');
if (sortColumn == null) { sortColumn = "0"; }
var sortDirection = $('#sortable').attr('sort-direction');
if (sortDirection == null) { sortDirection = "asc"; }
var sortTable = $('#sortable').dataTable({
"bFilter": false, "bFilter": false,
"bInfo": false, "bInfo": false,
"bPaginate": false "bPaginate": false,
"aaSorting": [[sortColumn, sortDirection]]
}); });
$('.nosort').unbind('click'); $('.nosort').unbind('click');
// this is necessary for the special setting feature (ref #1010) // this is necessary for the special setting feature (ref #1010)
$.getQueryVariable = function(key) { $.getQueryVariable = function(key) {
var urlParams = decodeURI( window.location.search.substring(1) ); var urlParams = decodeURI( window.location.search.substring(1) );

5
templates/Sparkle/header.tpl vendored
View File

@@ -26,7 +26,12 @@
<!--[if IE]><link rel="stylesheet" href="templates/{$theme}/css/main_ie.css" type="text/css" /><![endif]--> <!--[if IE]><link rel="stylesheet" href="templates/{$theme}/css/main_ie.css" type="text/css" /><![endif]-->
<link href="css/jquery-ui.min.css" rel="stylesheet" type="text/css"/> <link href="css/jquery-ui.min.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="templates/{$theme}/assets/js/main.js"></script> <script type="text/javascript" src="templates/{$theme}/assets/js/main.js"></script>
<if $settings['panel']['natsorting'] == '0'>
<script type="text/javascript" src="templates/{$theme}/assets/js/jquery.dataTables.js"></script> <script type="text/javascript" src="templates/{$theme}/assets/js/jquery.dataTables.js"></script>
</if>
<if $settings['panel']['natsorting'] == '1'>
<script type="text/javascript" src="templates/{$theme}/assets/js/jquery.dataTables.naturalSorting.js"></script>
</if>
<link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" /> <link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
<title><if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor Server Management Panel</title> <title><if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor Server Management Panel</title>
<style type="text/css"> <style type="text/css">