Merge branch 'master' of github.com:Froxlor/Froxlor

This commit is contained in:
Michael Kaufmann (d00p)
2013-10-06 11:36:51 +02:00
34 changed files with 24440 additions and 99 deletions

View File

@@ -1,4 +1,4 @@
<tr>
<tr <if $row['deactivated'] == 1>class="disabled"</if>>
<td>
<strong>
<if $row['name'] != '' && $row['firstname'] != ''>
@@ -55,6 +55,11 @@
</a>&nbsp;
<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'delete', 'id' => $row['customerid']))}" style="text-decoration:none;">
<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" />
</a>&nbsp;
<if $islocked == 1>
<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'unlock', 'id' => $row['customerid']))}">
<img src="templates/{$theme}/assets/img/icons/unlock.png" alt="{$lng['panel']['unlock']}" />
</a>
</if>
</td>
</tr>

View File

@@ -483,6 +483,10 @@ table tbody td {
border-right: 1px solid #666;
}
.disabled td, .disabled td a {
color: #cfcfcf;
}
.formtable {
width: 100%;
border-spacing: 0;
@@ -751,3 +755,25 @@ caption {
font-weight: bold;
margin-bottom: 0.2em;
}
/* dataTables */
table thead th.sorting_asc {
background-image: url('../img/icons/sort_down.png');
background-repeat: no-repeat;
background-position: 10px center;
padding-left: 25px;
}
table thead th.sorting_desc {
background-image: url('../img/icons/sort_up.png');
background-repeat: no-repeat;
background-position: 10px center;
padding-left: 25px;
}
table thead th.sorting {
background-image: url('../img/icons/sort_both.png');
background-repeat: no-repeat;
background-position: 10px center;
padding-left: 25px;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

@@ -22,18 +22,18 @@ $header
</div>
</if>
<table class="bradius">
<table class="bradius" id="sortable" sort-column="1">
<thead>
<tr>
<th>
{$lng['customer']['name']}&nbsp;&nbsp;{$arrowcode['name']}
{$lng['customer']['name']}
</th>
<th>
{$lng['login']['username']}&nbsp;{$arrowcode['loginname']}
{$lng['login']['username']}
</th>
<th>{$lng['admin']['customers']}</th>
<th>&nbsp;</th>
<th>{$lng['panel']['options']}</th>
<th class="nosort">&nbsp;</th>
<th class="nosort">{$lng['panel']['options']}</th>
</tr>
</thead>
<if $pagingcode != ''>

View File

@@ -11,35 +11,40 @@ $header
<form action="{$linker->getLink(array('section' => 'customers'))}" method="post" enctype="application/x-www-form-urlencoded">
<div class="overviewsearch">
{$searchcode}
</div>
<if ($userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1') && 15 < $userinfo['customers_used'] >
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/user_add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['customer_add']}</a>
</div>
</if>
<div class="overviewsearch">
{$searchcode}
</div>
<table class="bradius">
<table class="bradius" id="sortable" sort-column="1">
<thead>
<tr>
<th>
{$lng['customer']['name']}&nbsp;&nbsp;{$arrowcode['c.name']}
{$lng['customer']['firstname']}&nbsp;&nbsp;{$arrowcode['c.firstname']}
{$lng['customer']['name']},
{$lng['customer']['firstname']}
</th>
<th>
{$lng['login']['username']}&nbsp;{$arrowcode['c.loginname']}
{$lng['login']['username']}
</th>
<th>
{$lng['admin']['admin']}&nbsp;{$arrowcode['a.loginname']}
{$lng['admin']['admin']}
</th>
<th>{$lng['admin']['lastlogin_succ']}</th>
<th></th>
<th>{$lng['panel']['options']}</th>
<th class="nosort"></th>
<th class="nosort">{$lng['panel']['options']}</th>
</tr>
</thead>
<tbody>
$customers
</tbody>
<if $pagingcode != ''>
<tfoot>
<tr>
@@ -47,9 +52,6 @@ $header
</tr>
</tfoot>
</if>
<tbody>
$customers
</tbody>
</table>
<p style="display:none;">

View File

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

View File

@@ -22,15 +22,20 @@
</div>
</if>
<table class="bradius">
<table class="bradius" id="sortable">
<thead>
<tr>
<th>{$lng['domains']['domainname']}&nbsp;{$arrowcode['d.domain']}</th>
<th>{$lng['admin']['ipsandports']['ip']}&nbsp;:&nbsp;{$lng['admin']['ipsandports']['port']}</th>
<th>{$lng['admin']['customer']}&nbsp;&nbsp;{$arrowcode['c.loginname']}</th>
<th>{$lng['panel']['options']}</th>
<th>{$lng['domains']['domainname']}</th>
<th>{$lng['admin']['ipsandports']['ip']}</th>
<th>{$lng['admin']['customer']}</th>
<th class="nosort">{$lng['panel']['options']}</th>
</tr>
</thead>
<tbody>
{$domains}
</tbody>
<if $pagingcode != ''>
<tfoot>
<tr>
@@ -38,9 +43,6 @@
</tr>
</tfoot>
</if>
<tbody>
{$domains}
</tbody>
</table>
<p style="display:none;">

View File

@@ -22,17 +22,18 @@ $header
</div>
</if>
<table class="bradius">
<table class="bradius" id="sortable">
<thead>
<tr>
<th>{$lng['admin']['ipsandports']['ip']}&nbsp;{$arrowcode['ip']}&nbsp;:&nbsp;{$lng['admin']['ipsandports']['port']}&nbsp;{$arrowcode['port']}</th>
<th>{$lng['admin']['ipsandports']['ip']}</th>
<th>{$lng['admin']['ipsandports']['port']}</th>
<th>Listen</th>
<th>NameVirtualHost</th>
<th>vHost-Container</th>
<th>Specialsettings</th>
<th>ServerName</th>
<th>SSL</th>
<th>{$lng['panel']['options']}</th>
<th class="nosort">{$lng['panel']['options']}</th>
</tr>
</thead>
<if $pagingcode != ''>

View File

@@ -1,5 +1,6 @@
<tr>
<td>{$row['ip']}:{$row['port']}</td>
<td>{$row['ip']}</td>
<td>{$row['port']}</td>
<td><if $row['listen_statement']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td>
<td><if $row['namevirtualhost_statement']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td>
<td><if $row['vhostcontainer']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td>

View File

@@ -22,12 +22,12 @@ $header
</div>
</if>
<table class="bradius">
<table class="bradius" id="sortable" sort-direction="desc">
<thead>
<tr>
<th>{$lng['logger']['date']}&nbsp;&nbsp;{$arrowcode['date']}</th>
<th>{$lng['logger']['type']}&nbsp;&nbsp;{$arrowcode['type']}</th>
<th>{$lng['logger']['user']}&nbsp;&nbsp;{$arrowcode['user']}</th>
<th>{$lng['logger']['date']}</th>
<th>{$lng['logger']['type']}</th>
<th>{$lng['logger']['user']}</th>
<th style="width: 60%;">{$lng['logger']['action']}</th>
</tr>
</thead>

View File

@@ -1,3 +1,3 @@
<tr>
<!--<tr>
<td colspan="4"><strong>{$row['action']}</strong></td>
</tr>
</tr>-->

View File

@@ -8,12 +8,12 @@ $header
</header>
<section>
<table class="bradius">
<table class="bradius" id="sortable">
<thead>
<tr>
<th>{$lng['login']['language']}</th>
<th>{$lng['admin']['templates']['action']}</th>
<th>{$lng['panel']['options']}</th>
<th class="nosort">{$lng['panel']['options']}</th>
</tr>
</thead>
<tbody>

View File

@@ -22,13 +22,13 @@ $header
</div>
</if>
<table class="bradius">
<table class="bradius" <if 0 < $categories_count>id="sortable"</if>>
<thead>
<tr>
<th>{$lng['ticket']['category']}&nbsp;{$arrowcode['name']}</th>
<th>{$lng['ticket']['logicalorder']}&nbsp;{$arrowcode['logicalorder']}</th>
<th>{$lng['ticket']['ticketcount']}&nbsp;<if $categories_count < 0 >{$arrowcode['ticketcount']}</if></th>
<th>{$lng['panel']['options']}</th>
<th>{$lng['ticket']['category']}</th>
<th>{$lng['ticket']['logicalorder']}</th>
<th>{$lng['ticket']['ticketcount']}</if></th>
<th class="nosort">{$lng['panel']['options']}</th>
</tr>
</thead>
<if $pagingcode != ''>

View File

@@ -22,16 +22,16 @@ $header
</div>
</if>
<table class="bradius">
<table class="bradius" <if 0 < $tickets_count>id="sortable"</if>>
<thead>
<tr>
<th>{$lng['ticket']['lastchange']}&nbsp;{$arrowcode['lastchange']}</th>
<th>{$lng['ticket']['ticket_answers']}&nbsp;{$arrowcode['ticket_answers']}</th>
<th>{$lng['ticket']['subject']}&nbsp;{$arrowcode['subject']}</th>
<th>{$lng['ticket']['status']}&nbsp;{$arrowcode['status']}</th>
<th>{$lng['ticket']['lastreplier']}&nbsp;{$arrowcode['lastreplier']}</th>
<th>{$lng['ticket']['priority']}&nbsp;{$arrowcode['priority']}</th>
<th>{$lng['panel']['options']}</th>
<th>{$lng['ticket']['lastchange']}</th>
<th>{$lng['ticket']['ticket_answers']}</th>
<th>{$lng['ticket']['subject']}</th>
<th>{$lng['ticket']['status']}</th>
<th>{$lng['ticket']['lastreplier']}</th>
<th>{$lng['ticket']['priority']}</th>
<th class="nosort">{$lng['panel']['options']}</th>
</tr>
</thead>
<if $pagingcode != ''>

View File

@@ -506,23 +506,59 @@ th a:hover {
text-decoration: none;
}
th a img {
height: 10px;
width: 10px;
}
th a:nth-child(odd) img {
position: relative;
top: -5px;
left: 4px;
}
th a:nth-child(even) img {
position: relative;
top: 3px;
left: -14px;
left: -7px;
}
table thead:first-child th {
border-top: 0;
}
.disabled td, .disabled td a {
color: #cfcfcf;
}
/* dataTables */
table thead th.sorting_asc {
background-image: url('../img/icons/sort_down.png');
background-repeat: no-repeat;
background-position: 10px center;
padding-left: 25px;
}
table thead th.sorting_desc {
background-image: url('../img/icons/sort_up.png');
background-repeat: no-repeat;
background-position: 10px center;
padding-left: 25px;
}
table thead th.sorting {
background-image: url('../img/icons/sort_both.png');
background-repeat: no-repeat;
background-position: 10px center;
padding-left: 25px;
}
table thead th.nosort {
background-image: none;
padding-left: 8px;
}
.dataTables_length {
float: left;
}
.dataTables_filter {
float: right;
}
table tbody td {
border-bottom:1px dotted #ccc;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -20,6 +20,20 @@ $(document).ready(function() {
return false;
});
// Enable 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,
"bInfo": false,
"bPaginate": false,
"aaSorting": [[sortColumn, sortDirection]]
});
$('.nosort').unbind('click');
// this is necessary for the special setting feature (ref #1010)
$.getQueryVariable = function(key) {
var urlParams = decodeURI( window.location.search.substring(1) );

View File

@@ -16,13 +16,13 @@
</div>
</if>
<table class="bradius">
<table class="bradius" <if 0 < $count>id="sortable"</if>>
<thead>
<tr>
<th>{$lng['emails']['emailaddress']}</th>
<th>{$lng['autoresponder']['active']}</th>
<th>{$lng['autoresponder']['startenddate']}</th>
<th>{$lng['panel']['options']}</th>
<th class="nosort">{$lng['panel']['options']}</th>
</tr>
</thead>

View File

@@ -25,8 +25,8 @@
<table class="bradius">
<thead>
<tr>
<th>{$lng['domains']['domainname']}&nbsp;&nbsp;{$arrowcode['d.domain']}</th>
<th>{$lng['panel']['path']}&nbsp;&nbsp;{$arrowcode['d.documentroot']}
<th>{$arrowcode['d.domain']}{$lng['domains']['domainname']}</th>
<th>{$arrowcode['d.documentroot']}{$lng['panel']['path']}</th>
<th>{$lng['panel']['options']}</th>
</tr>
</thead>

View File

@@ -25,8 +25,8 @@
<table class="bradius">
<thead>
<tr>
<th>{$lng['emails']['emailaddress']}&nbsp;{$arrowcode['m.email_full']}</th>
<th>{$lng['emails']['forwarders']}&nbsp;{$arrowcode['m.destination']}</th>
<th>{$arrowcode['m.email_full']}{$lng['emails']['emailaddress']}</th>
<th>{$arrowcode['m.destination']}{$lng['emails']['forwarders']}</th>
<th>{$lng['emails']['account']}</th>
<if $settings['catchall']['catchall_enabled'] == '1'><th>{$lng['emails']['catchall']}</th></if>
<if $settings['system']['mail_quota_enabled'] == '1'>

View File

@@ -22,18 +22,18 @@
</div>
</if>
<table class="bradius">
<table class="bradius" <if 0 < $count>id="sortable"</if>>
<thead>
<tr>
<th>{$lng['panel']['path']}&nbsp;{$arrowcode['path']}</th>
<th>{$lng['extras']['view_directory']}&nbsp;{$arrowcode['options_indexes']}</th>
<th>{$lng['extras']['error404path']}&nbsp;{$arrowcode['error404path']}</th>
<th>{$lng['extras']['error403path']}&nbsp;{$arrowcode['error403path']}</th>
<th>{$lng['extras']['error500path']}&nbsp;{$arrowcode['error500path']}</th>
<th>{$lng['panel']['path']}</th>
<th>{$lng['extras']['view_directory']}</th>
<th>{$lng['extras']['error404path']}</th>
<th>{$lng['extras']['error403path']}</th>
<th>{$lng['extras']['error500path']}</th>
<if $cperlenabled == 1 >
<th>{$lng['extras']['execute_perl']}&nbsp;{$arrowcode['options_cgi']}</th>
<th>{$lng['extras']['execute_perl']}</th>
</if>
<th>{$lng['panel']['options']}</th>
<th class="nosort">{$lng['panel']['options']}</th>
</tr>
</thead>
<if $pagingcode != ''>

View File

@@ -22,12 +22,12 @@
</div>
</if>
<table class="bradius">
<table class="bradius" id="sortable">
<thead>
<tr>
<th>{$lng['login']['username']}&nbsp;{$arrowcode['username']}</th>
<th>{$lng['panel']['path']}&nbsp;{$arrowcode['path']}</th>
<th>{$lng['panel']['options']}</th>
<th>{$lng['login']['username']}</th>
<th>{$lng['panel']['path']}</th>
<th class="nosort">{$lng['panel']['options']}</th>
</tr>
</thead>
<if $pagingcode != ''>

View File

@@ -22,12 +22,12 @@
</div>
</if>
<table class="bradius">
<table class="bradius" <if 0 < $ftps_count>id="sortable"</if>>
<thead>
<tr>
<th>{$lng['login']['username']}&nbsp;&nbsp;{$arrowcode['username']}</th>
<th>{$lng['panel']['path']}&nbsp;&nbsp;{$arrowcode['homedir']}</th>
<th>{$lng['panel']['options']}</th>
<th>{$lng['login']['username']}</th>
<th>{$lng['panel']['path']}</th>
<th class="nosort">{$lng['panel']['options']}</th>
</tr>
</thead>
<if $pagingcode != ''>

View File

@@ -22,14 +22,14 @@
</div>
</if>
<table class="bradius">
<table class="bradius" <if 0 < $mysqls_count>id="sortable"</if>>
<thead>
<tr>
<th>{$lng['mysql']['databasename']}&nbsp;{$arrowcode['databasename']}</th>
<th>{$lng['mysql']['databasedescription']}&nbsp;{$arrowcode['description']}</th>
<th>{$lng['mysql']['databasename']}</th>
<th>{$lng['mysql']['databasedescription']}</th>
<th>{$lng['mysql']['size']}</th>
<if 1 < count($sql_root)><th>{$lng['mysql']['mysql_server']}</th></if>
<th>{$lng['panel']['options']}</th>
<th class="nosort">{$lng['panel']['options']}</th>
</tr>
</thead>
<if $pagingcode != ''>

View File

@@ -35,16 +35,16 @@ $header
</div>
</if>
<table class="bradius">
<table class="bradius" <if 0 < $tickets_count>id="sortable"</if>>
<thead>
<tr>
<th>{$lng['ticket']['lastchange']}&nbsp;{$arrowcode['lastchange']}</th>
<th>{$lng['ticket']['ticket_answers']}&nbsp;{$arrowcode['ticket_answers']}</th>
<th>{$lng['ticket']['subject']}&nbsp;{$arrowcode['subject']}</th>
<th>{$lng['ticket']['status']}&nbsp;{$arrowcode['status']}</th>
<th>{$lng['ticket']['lastreplier']}&nbsp;{$arrowcode['lastreplier']}</th>
<th>{$lng['ticket']['priority']}&nbsp;{$arrowcode['priority']}</th>
<th>{$lng['panel']['options']}</th>
<th>{$lng['ticket']['lastchange']}</th>
<th>{$lng['ticket']['ticket_answers']}</th>
<th>{$lng['ticket']['subject']}</th>
<th>{$lng['ticket']['status']}</th>
<th>{$lng['ticket']['lastreplier']}</th>
<th>{$lng['ticket']['priority']}</th>
<th class="nosort">{$lng['panel']['options']}</th>
</tr>
</thead>
<if $pagingcode != ''>

View File

@@ -26,6 +26,12 @@
<!--[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"/>
<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>
</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" />
<title><if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor Server Management Panel</title>
<style type="text/css">