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

removing more ticket-stuff; update all unit-tests

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-19 19:42:50 +01:00
parent 60f1db5caf
commit 26510f0745
63 changed files with 537 additions and 1579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
templates/Sparkle/admin/index/index.tpl vendored
View File

@@ -149,21 +149,6 @@ $header
</if>
</small>
</div>
<if \Froxlor\Settings::Get('ticket.enabled') == 1>
<div class="canvasbox">
<input type="hidden" id="tickets" class="circular" data-used="{$overview['tickets_used']}" data-available="{$userinfo['tickets']}" data-assigned="{$userinfo['tickets_used']}">
<canvas id="tickets-canvas" width="120" height="76"></canvas><br/>
{$lng['customer']['tickets']}<br />
<small>
{$overview['tickets_used']} {$lng['panel']['used']}<br />
{$userinfo['tickets_used']} {$lng['panel']['assigned']}<br />
<if $userinfo['tickets'] != '∞'>
{$userinfo['tickets']} {$lng['panel']['available']}
</if>
</small>
</div>
</if>
</div>
<div class="grid-u-1-2">

3
templates/Sparkle/admin/settings/updatecounters_row_admin.tpl vendored
View File

@@ -18,8 +18,5 @@
{$lng['customer']['email_quota']}: <span <if $admin['email_quota_used'] == $admin['email_quota_used_new']>class="green"<else>class="red"</if>><b>{$admin['email_quota_used']} -&gt; {$admin['email_quota_used_new']}</b></span><br />
</if>
{$lng['customer']['ftps']}: <span <if $admin['ftps_used'] == $admin['ftps_used_new']>class="green"<else>class="red"</if>><b>{$admin['ftps_used']} -&gt; {$admin['ftps_used_new']}</b></span><br />
<if \Froxlor\Settings::Get('ticket.enabled') == '1'>
{$lng['customer']['tickets']}: <span <if $admin['tickets_used'] == $admin['tickets_used_new']>class="green"<else>class="red"</if>><b>{$admin['tickets_used']} -&gt; {$admin['tickets_used_new']}</b></span><br />
</if>
</td>
</tr>

3
templates/Sparkle/admin/settings/updatecounters_row_customer.tpl vendored
View File

@@ -14,8 +14,5 @@
{$lng['customer']['email_quota']}: <span <if $customer['email_quota_used'] == $customer['email_quota_used_new']>class="green"<else>class="red"</if>><b>{$customer['email_quota_used']} -&gt; {$customer['email_quota_used_new']}</b></span><br />
</if>
{$lng['customer']['ftps']}: <span <if $customer['ftps_used'] == $customer['ftps_used_new']>class="green"<else>class="red"</if>><b>{$customer['ftps_used']} -&gt; {$customer['ftps_used_new']}</b></span><br />
<if \Froxlor\Settings::Get('ticket.enabled') == '1'>
{$lng['customer']['tickets']}: <span <if $customer['tickets_used'] == $customer['tickets_used_new']>class="green"<else>class="red"</if>><b>{$customer['tickets_used']} -&gt; {$customer['tickets_used_new']}</b></span><br />
</if>
</td>
</tr>

23
templates/Sparkle/admin/templates/templates_add_2.tpl vendored
View File

@@ -137,29 +137,6 @@ $header
<td>{$lng['admin']['templates']['USAGE_PERCENT']}</td>
</tr>
</if>
<if ($template == 'new_ticket_by_customer') || ($template == 'new_ticket_for_customer') || ($template == 'new_ticket_by_staff')
|| ($template == 'new_reply_ticket_by_customer') || ($template == 'new_reply_ticket_by_staff') >
<tr>
<td><em>{SUBJECT}</em></td>
<td>{$lng['admin']['templates']['SUBJECT']}</td>
</tr>
<tr>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{FIRSTNAME}</em></td>
<td>{$lng['admin']['templates']['FIRSTNAME']}</td>
</tr>
<tr>
<td><em>{NAME}</em></td>
<td>{$lng['admin']['templates']['NAME']}</td>
</tr>
<tr>
<td><em>{COMPANY}</em></td>
<td>{$lng['admin']['templates']['COMPANY']}</td>
</tr>
</if>
<if ($template == 'new_database_by_customer')>
<tr>
<td><em>{SALUTATION}</em></td>

23
templates/Sparkle/admin/templates/templates_edit.tpl vendored
View File

@@ -139,29 +139,6 @@ $header
<td>{$lng['admin']['templates']['USAGE_PERCENT']}</td>
</tr>
</if>
<if ($template_name == 'new_ticket_by_customer') || ($template_name == 'new_ticket_for_customer') || ($template_name == 'new_ticket_by_staff')
|| ($template_name == 'new_reply_ticket_by_customer') || ($template_name == 'new_reply_ticket_by_staff') >
<tr>
<td><em>{SUBJECT}</em></td>
<td>{$lng['admin']['templates']['SUBJECT']}</td>
</tr>
<tr>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{FIRSTNAME}</em></td>
<td>{$lng['admin']['templates']['FIRSTNAME']}</td>
</tr>
<tr>
<td><em>{NAME}</em></td>
<td>{$lng['admin']['templates']['NAME']}</td>
</tr>
<tr>
<td><em>{COMPANY}</em></td>
<td>{$lng['admin']['templates']['COMPANY']}</td>
</tr>
</if>
<if ($template_name == 'new_database_by_customer')>
<tr>
<td><em>{SALUTATION}</em></td>