diff --git a/customer_tickets.php b/customer_tickets.php index ad90d428..9e7f844a 100644 --- a/customer_tickets.php +++ b/customer_tickets.php @@ -247,6 +247,13 @@ elseif($page == 'tickets') } $ticketsopen = (int)$opentickets['count']; + + $ticket_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/ticket/formfield.ticket_add.php'; + $ticket_add_form = htmlform::genHTMLForm($ticket_add_data); + + $title = $ticket_add_data['ticket_add']['title']; + $image = $ticket_add_data['ticket_add']['image']; + eval("echo \"" . getTemplate("ticket/tickets_new") . "\";"); } } @@ -360,6 +367,12 @@ elseif($page == 'tickets') // don't forget the main-ticket! + $ticket_reply_data = include_once dirname(__FILE__).'/lib/formfields/customer/ticket/formfield.ticket_reply.php'; + $ticket_reply_form = htmlform::genHTMLForm($ticket_reply_data); + + $title = $ticket_reply_data['ticket_reply']['title']; + $image = $ticket_reply_data['ticket_reply']['image']; + eval("echo \"" . getTemplate("ticket/tickets_reply") . "\";"); } } diff --git a/lib/formfields/customer/ticket/formfield.ticket_add.php b/lib/formfields/customer/ticket/formfield.ticket_add.php new file mode 100644 index 00000000..d88b69f5 --- /dev/null +++ b/lib/formfields/customer/ticket/formfield.ticket_add.php @@ -0,0 +1,50 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + */ + +return array( + 'ticket_add' => array( + 'title' => $lng['ticket']['ticket_new'], + 'image' => 'icons/ticket_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['ticket']['ticket_new'], + 'image' => 'icons/ticket_add.png', + 'fields' => array( + 'subject' => array( + 'label' => $lng['ticket']['subject'], + 'type' => 'text', + ), + 'priority' => array( + 'label' => $lng['ticket']['priority'], + 'type' => 'select', + 'select_var' => $priorities, + ), + 'categories' => array( + 'label' => $lng['ticket']['category'], + 'type' => 'select', + 'select_var' => $categories, + ), + 'message' => array( + 'label' => $lng['ticket']['message'], + 'type' => 'textarea', + 'rows' => 12, + 'cols' => 60, + ) + ) + ) + ) + ) +); diff --git a/lib/formfields/customer/ticket/formfield.ticket_reply.php b/lib/formfields/customer/ticket/formfield.ticket_reply.php new file mode 100644 index 00000000..698e55d6 --- /dev/null +++ b/lib/formfields/customer/ticket/formfield.ticket_reply.php @@ -0,0 +1,51 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Formfields + */ + +return array( + 'ticket_reply' => array( + 'title' => $lng['ticket']['ticket_reply'], + 'image' => 'icons/ticket_reply.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['ticket']['ticket_reply'], + 'image' => 'icons/ticket_reply.png', + 'fields' => array( + 'subject' => array( + 'label' => $lng['ticket']['subject'], + 'type' => 'text', + 'value' => "Re: $subject", + ), + 'priority' => array( + 'label' => $lng['ticket']['priority'], + 'type' => 'select', + 'select_var' => $priorities, + ), + 'category' => array( + 'label' => $lng['ticket']['category'], + 'type' => 'label', + 'value' => $row['name'], + ), + 'message' => array( + 'label' => $lng['ticket']['message'], + 'type' => 'textarea', + 'rows' => 12, + 'cols' => 60, + ), + ) + ) + ) + ) +); diff --git a/templates/Classic/customer/ticket/tickets_new.tpl b/templates/Classic/customer/ticket/tickets_new.tpl index 21d13b3d..283738de 100644 --- a/templates/Classic/customer/ticket/tickets_new.tpl +++ b/templates/Classic/customer/ticket/tickets_new.tpl @@ -5,31 +5,11 @@ $header - - - - - - - - - - - - - - - - - - - - - - + + {$ticket_add_form}
 {$lng['ticket']['ticket_new']}
{$lng['ticket']['subject']}:
{$lng['ticket']['priority']}:
{$lng['ticket']['category']}:
{$lng['ticket']['message']}:
 {$title}


-$footer \ No newline at end of file +$footer diff --git a/templates/Classic/customer/ticket/tickets_reply.tpl b/templates/Classic/customer/ticket/tickets_reply.tpl index fe2183aa..ab0e613d 100644 --- a/templates/Classic/customer/ticket/tickets_reply.tpl +++ b/templates/Classic/customer/ticket/tickets_reply.tpl @@ -10,29 +10,9 @@ $header - - - - - - - - - - - - - - - - - - - - - - + + {$ticket_reply_form}
 {$lng['ticket']['ticket_reply']}
{$lng['ticket']['subject']}:
{$lng['ticket']['priority']}:
{$lng['ticket']['category']}:{$row['name']}
{$lng['ticket']['message']}:
 {$title}
@@ -48,4 +28,4 @@ $header

-$footer \ No newline at end of file +$footer diff --git a/templates/Froxlor/customer/ticket/tickets_new.tpl b/templates/Froxlor/customer/ticket/tickets_new.tpl index 83be09b3..495a5015 100644 --- a/templates/Froxlor/customer/ticket/tickets_new.tpl +++ b/templates/Froxlor/customer/ticket/tickets_new.tpl @@ -1,35 +1,31 @@ $header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['ticket']['ticket_new']}
{$lng['ticket']['subject']}:
{$lng['ticket']['priority']}:
{$lng['ticket']['category']}:
{$lng['ticket']['message']}:
-
-
-
-$footer \ No newline at end of file +
+
+

+ {$title}  + {$title} +

+
+ +
+ +
+
+ Froxlor - {$title} + + + {$ticket_add_form} +
+ +

+ + + + +

+
+
+ +
+
+$footer diff --git a/templates/Froxlor/customer/ticket/tickets_reply.tpl b/templates/Froxlor/customer/ticket/tickets_reply.tpl index 7ccdf2c3..bce91972 100644 --- a/templates/Froxlor/customer/ticket/tickets_reply.tpl +++ b/templates/Froxlor/customer/ticket/tickets_reply.tpl @@ -1,51 +1,43 @@ $header -
- - - - - - $ticket_replies - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['ticket']['ticket_reply']}
{$lng['ticket']['subject']}:
{$lng['ticket']['priority']}:
{$lng['ticket']['category']}:{$row['name']}
{$lng['ticket']['message']}:
- - - - - - - - - -
 {$lng['ticket']['ticket_reopen']}
{$lng['ticket']['ticket_reopen']}
- -
-
-
-$footer \ No newline at end of file +
+
+

+ {$title}  + {$title} +

+
+ + +
+ $ticket_replies +
+ + +
+ +
+
+ Froxlor - {$title} + + + + {$ticket_reply_form} +
+ + + {$lng['ticket']['ticket_reopen']} + + +

+ + + + + +

+
+
+ +
+
+$footer