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>

14
templates/Sparkle/customer/index/index.tpl vendored
View File

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

8
templates/Sparkle/customer/tickets/ticket.tpl vendored
View File

@@ -1,8 +0,0 @@
$header
<div class="messagewrapper">
<div class="neutralcontainer bradius">
<div class="neutraltitle">{$lng['menue']['ticket']['ticket']}</div>
<div class="neutral">{$lng['ticket']['description']}</div>
</div>
</div>
$footer

80
templates/Sparkle/customer/tickets/tickets.tpl vendored
View File

@@ -1,80 +0,0 @@
$header
<article>
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/tickets_big.png" alt="" />&nbsp;
{$lng['menue']['ticket']['ticket']}
</h2>
</header>
<section>
<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="send" value="send" />
<if 0 < $supportavailable >
<div class="successcontainer bradius">
<div class="successtitle">{$lng['ticket']['supportstatus']}</div>
<div class="success">{$lng['ticket']['supportavailable']}</div>
</div>
</if>
<if $supportavailable < 1 >
<div class="warningcontainer bradius">
<div class="warningtitle">{$lng['ticket']['supportstatus']}</div>
<div class="warning">{$lng['ticket']['supportnotavailable']}</div>
</div>
</if>
<div class="overviewsearch">
{$searchcode}
</div>
<if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') && ($ticketsopen < \Froxlor\Settings::Get('ticket.concurrently_open') || (\Froxlor\Settings::Get('ticket.concurrently_open') == '-1' || \Froxlor\Settings::Get('ticket.concurrently_open') == '')) >
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'new'))}">{$lng['ticket']['ticket_new']}</a>
</div>
</if>
<table class="full hl">
<thead>
<tr>
<th>{$lng['ticket']['lastchange']}&nbsp;{$arrowcode['lastchange']}</th>
<th>{$lng['ticket']['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']}</th>
<th>{$lng['panel']['options']}</th>
</tr>
</thead>
<if $pagingcode != ''>
<tfoot>
<tr>
<td colspan="7">{$pagingcode}</td>
</tr>
</tfoot>
</if>
<tbody>
{$tickets}
</tbody>
</table>
</form>
<if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') && 15 < $tickets_count && ($ticketsopen < \Froxlor\Settings::Get('ticket.concurrently_open') || (\Froxlor\Settings::Get('ticket.concurrently_open') == '-1' || \Froxlor\Settings::Get('ticket.concurrently_open') == '')) >
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'new'))}">{$lng['ticket']['ticket_new']}</a>
</div>
</if>
</section>
</article>
$footer

25
templates/Sparkle/customer/tickets/tickets_new.tpl vendored
View File

@@ -1,25 +0,0 @@
$header
<article>
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/ticket_add_big.png" alt="{$title}" />&nbsp;
{$title}
</h2>
</header>
<section>
<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="action" value="$action" />
<input type="hidden" name="send" value="send" />
<table class="full">
{$ticket_add_form}
</table>
</form>
</section>
</article>
$footer

36
templates/Sparkle/customer/tickets/tickets_reply.tpl vendored
View File

@@ -1,36 +0,0 @@
$header
<article>
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/ticket_reply_big.png" alt="{$title}" />&nbsp;
{$title}
</h2>
</header>
<if 0 < $ticket_replies_count >
$ticket_replies
</if>
<section>
<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="action" value="$action" />
<input type="hidden" name="send" value="send" />
<input type="hidden" name="id" value="$id" />
<if $isclosed < 1 >
<table class="full">
{$ticket_reply_form}
</table>
</if>
<if 0 < $isclosed >
<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'reopen', 'id' => $id))}">{$lng['ticket']['ticket_reopen']}</a>
</if>
</form>
</section>
</article>
$footer

28
templates/Sparkle/customer/tickets/tickets_tickets.tpl vendored
View File

@@ -1,28 +0,0 @@
<tr>
<td>{$row['lastchange']}</td>
<td>{$row['ticket_answers']}</td>
<td>{$row['subject']}</td>
<td>{$row['status']}</td>
<td>{$row['lastreplier']}</td>
<td>{$row['priority']}</td>
<td>
<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'answer', 'id' => $row['id']))}">
<if $cananswer < 1 >
<img src="templates/{$theme}/assets/img/icons/view.png" alt="{$lng['ticket']['show']}" title="{$lng['ticket']['show']}" />
</if>
<if 0 < $cananswer >
<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['ticket']['answer']}" title="{$lng['ticket']['answer']}" />
</if>
</a>
<if $reopen < 1 >
&nbsp;<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'close', 'id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/lock.png" alt="{$lng['ticket']['close']}" title="{$lng['ticket']['close']}" />
</a>
</if>
<if 0 < $reopen >
&nbsp;<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'reopen', 'id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/unlock.png" alt="{$lng['ticket']['reopen']}" title="{$lng['ticket']['reopen']}" />
</a>
</if>
</td>
</tr>

15
templates/Sparkle/customer/tickets/tickets_tickets_list.tpl vendored
View File

@@ -1,15 +0,0 @@
<section>
<table class="full">
<tr>
<th><strong>{$lastchange}&nbsp;{$lng['ticket']['by']}&nbsp;{$by}</strong></th>
</tr>
<tr>
<td>{$subject}</td>
</tr>
<tr>
<td>{$message}</td>
</tr>
</table>
<br /><br />
</section>
<br />

15
templates/Sparkle/customer/tickets/tickets_tickets_main.tpl vendored
View File

@@ -1,15 +0,0 @@
<section>
<table class="full">
<tr>
<th><strong>{$dt}&nbsp;{$lng['ticket']['by']}&nbsp;{$by}&nbsp;({$status})</strong></th>
</tr>
<tr>
<td>{$subject}</td>
</tr>
<tr>
<td>{$message}</td>
</tr>
</table>
<br />
</section>
<br />