Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
osticket
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
docker
osticket
Commits
49e5ddbf
Commit
49e5ddbf
authored
11 years ago
by
Jared Hancock
Browse files
Options
Downloads
Patches
Plain Diff
Better space usage on ticket-view page
parent
bfcebd5d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/staff/ticket-view.inc.php
+53
-48
53 additions, 48 deletions
include/staff/ticket-view.inc.php
with
53 additions
and
48 deletions
include/staff/ticket-view.inc.php
+
53
−
48
View file @
49e5ddbf
...
@@ -444,12 +444,12 @@ if(!$cfg->showNotesInline()) { ?>
...
@@ -444,12 +444,12 @@ if(!$cfg->showNotesInline()) { ?>
<input
type=
"hidden"
name=
"msgId"
value=
"
<?php
echo
$msgId
;
?>
"
>
<input
type=
"hidden"
name=
"msgId"
value=
"
<?php
echo
$msgId
;
?>
"
>
<input
type=
"hidden"
name=
"a"
value=
"reply"
>
<input
type=
"hidden"
name=
"a"
value=
"reply"
>
<span
class=
"error"
></span>
<span
class=
"error"
></span>
<table
border=
"0"
cellspacing=
"0"
cellpadding=
"3"
>
<table
style=
"width:100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"3"
>
<tr>
<tr>
<td
width=
"1
6
0"
>
<td
width=
"1
2
0"
>
<label><strong>
TO:
</strong></label>
<label><strong>
TO:
</strong></label>
</td>
</td>
<td
width=
"765"
>
<td>
<?php
<?php
$to
=
$ticket
->
getReplyToEmail
();
$to
=
$ticket
->
getReplyToEmail
();
if
((
$name
=
$ticket
->
getName
())
&&
!
strpos
(
$name
,
'@'
))
if
((
$name
=
$ticket
->
getName
())
&&
!
strpos
(
$name
,
'@'
))
...
@@ -463,14 +463,14 @@ if(!$cfg->showNotesInline()) { ?>
...
@@ -463,14 +463,14 @@ if(!$cfg->showNotesInline()) { ?>
</tr>
</tr>
<?php
<?php
if
(
$errors
[
'response'
])
{
?>
if
(
$errors
[
'response'
])
{
?>
<tr><td
width=
"1
6
0"
>
</td><td
class=
"error"
>
<?php
echo
$errors
[
'response'
];
?>
</td></tr>
<tr><td
width=
"1
2
0"
>
</td><td
class=
"error"
>
<?php
echo
$errors
[
'response'
];
?>
</td></tr>
<?php
<?php
}
?>
}
?>
<tr>
<tr>
<td
width=
"1
60
"
>
<td
width=
"1
20"
style=
"vertical-align:top
"
>
<label><strong>
Response:
</strong></label>
<label><strong>
Response:
</strong></label>
</td>
</td>
<td
width=
"765"
>
<td>
<?php
<?php
if
((
$cannedResponses
=
Canned
::
responsesByDeptId
(
$ticket
->
getDeptId
())))
{
?>
if
((
$cannedResponses
=
Canned
::
responsesByDeptId
(
$ticket
->
getDeptId
())))
{
?>
<select
id=
"cannedResp"
name=
"cannedResp"
>
<select
id=
"cannedResp"
name=
"cannedResp"
>
...
@@ -489,6 +489,7 @@ if(!$cfg->showNotesInline()) { ?>
...
@@ -489,6 +489,7 @@ if(!$cfg->showNotesInline()) { ?>
<input
type=
"hidden"
name=
"draft_id"
value=
""
/>
<input
type=
"hidden"
name=
"draft_id"
value=
""
/>
<textarea
name=
"response"
id=
"response"
cols=
"50"
<textarea
name=
"response"
id=
"response"
cols=
"50"
data-draft-namespace=
"ticket.response"
data-draft-namespace=
"ticket.response"
placeholder=
"Start writing your response here. Use canned responses from the drop-down above"
data-draft-object-id=
"
<?php
echo
$ticket
->
getId
();
?>
"
data-draft-object-id=
"
<?php
echo
$ticket
->
getId
();
?>
"
rows=
"9"
wrap=
"soft"
rows=
"9"
wrap=
"soft"
class=
"richtext ifhtml draft"
>
<?php
class=
"richtext ifhtml draft"
>
<?php
...
@@ -498,10 +499,10 @@ if(!$cfg->showNotesInline()) { ?>
...
@@ -498,10 +499,10 @@ if(!$cfg->showNotesInline()) { ?>
<?php
<?php
if
(
$cfg
->
allowAttachments
())
{
?>
if
(
$cfg
->
allowAttachments
())
{
?>
<tr>
<tr>
<td
width=
"1
6
0"
>
<td
width=
"1
2
0"
>
<label
for=
"attachment"
>
Attachments:
</label>
<label
for=
"attachment"
>
Attachments:
</label>
</td>
</td>
<td
width=
"765"
id=
"reply_form_attachments"
class=
"attachments"
>
<td
id=
"reply_form_attachments"
class=
"attachments"
>
<div
class=
"canned_attachments"
>
<div
class=
"canned_attachments"
>
</div>
</div>
<div
class=
"uploads"
>
<div
class=
"uploads"
>
...
@@ -514,10 +515,10 @@ if(!$cfg->showNotesInline()) { ?>
...
@@ -514,10 +515,10 @@ if(!$cfg->showNotesInline()) { ?>
<?php
<?php
}
?>
}
?>
<tr>
<tr>
<td
width=
"1
6
0"
>
<td
width=
"1
2
0"
>
<label
for=
"signature"
class=
"left"
>
Signature:
</label>
<label
for=
"signature"
class=
"left"
>
Signature:
</label>
</td>
</td>
<td
width=
"765"
>
<td>
<?php
<?php
$info
[
'signature'
]
=
$info
[
'signature'
]
?
$info
[
'signature'
]
:
$thisstaff
->
getDefaultSignatureType
();
$info
[
'signature'
]
=
$info
[
'signature'
]
?
$info
[
'signature'
]
:
$thisstaff
->
getDefaultSignatureType
();
?>
?>
...
@@ -540,10 +541,10 @@ if(!$cfg->showNotesInline()) { ?>
...
@@ -540,10 +541,10 @@ if(!$cfg->showNotesInline()) { ?>
<?php
<?php
if
(
$ticket
->
isClosed
()
||
$thisstaff
->
canCloseTickets
())
{
?>
if
(
$ticket
->
isClosed
()
||
$thisstaff
->
canCloseTickets
())
{
?>
<tr>
<tr>
<td
width=
"1
6
0"
>
<td
width=
"1
2
0"
>
<label><strong>
Ticket Status:
</strong></label>
<label><strong>
Ticket Status:
</strong></label>
</td>
</td>
<td
width=
"765"
>
<td>
<?php
<?php
$statusChecked
=
isset
(
$info
[
'reply_ticket_status'
])
?
'checked="checked"'
:
''
;
$statusChecked
=
isset
(
$info
[
'reply_ticket_status'
])
?
'checked="checked"'
:
''
;
if
(
$ticket
->
isClosed
())
{
?>
if
(
$ticket
->
isClosed
())
{
?>
...
@@ -573,42 +574,45 @@ if(!$cfg->showNotesInline()) { ?>
...
@@ -573,42 +574,45 @@ if(!$cfg->showNotesInline()) { ?>
<input
type=
"hidden"
name=
"id"
value=
"
<?php
echo
$ticket
->
getId
();
?>
"
>
<input
type=
"hidden"
name=
"id"
value=
"
<?php
echo
$ticket
->
getId
();
?>
"
>
<input
type=
"hidden"
name=
"locktime"
value=
"
<?php
echo
$cfg
->
getLockTime
();
?>
"
>
<input
type=
"hidden"
name=
"locktime"
value=
"
<?php
echo
$cfg
->
getLockTime
();
?>
"
>
<input
type=
"hidden"
name=
"a"
value=
"postnote"
>
<input
type=
"hidden"
name=
"a"
value=
"postnote"
>
<table
border=
"0"
cellspacing=
"0"
cellpadding=
"3"
>
<table
width=
"100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"3"
>
<?php
<?php
if
(
$errors
[
'postnote'
])
{
?>
if
(
$errors
[
'postnote'
])
{
?>
<tr>
<tr>
<td
width=
"1
6
0"
>
</td>
<td
width=
"1
2
0"
>
</td>
<td
class=
"error"
>
<?php
echo
$errors
[
'postnote'
];
?>
</td>
<td
class=
"error"
>
<?php
echo
$errors
[
'postnote'
];
?>
</td>
</tr>
</tr>
<?php
<?php
}
?>
}
?>
<tr>
<tr>
<td
width=
"1
60
"
>
<td
width=
"1
20"
style=
"vertical-align:top
"
>
<label><strong>
Internal Note:
</strong></label>
<label><strong>
Internal Note:
</strong><
span
class=
'error'
>
*
</span><
/label>
</td>
</td>
<td
width=
"765"
>
<td>
<div><span
class=
"faded"
>
Note details
</span>
<div>
<span
class=
"error"
>
*
<?php
echo
$errors
[
'note'
];
?>
</span>
<div
class=
"faded"
style=
"padding-left:0.15em"
>
Note title - summary of the note (optional)
</div>
<input
type=
"text"
name=
"title"
id=
"title"
size=
"60"
value=
"
<?php
echo
$info
[
'title'
];
?>
"
>
<br/>
<span
class=
"error"
&
nbsp
;
<?php
echo
$errors
[
'title'
];
?>
</
span
>
</div>
</div>
<br/>
<textarea
name=
"note"
id=
"internal_note"
cols=
"80"
<textarea
name=
"note"
id=
"internal_note"
cols=
"80"
placeholder=
"Note details"
rows=
"9"
wrap=
"soft"
data-draft-namespace=
"ticket.note"
rows=
"9"
wrap=
"soft"
data-draft-namespace=
"ticket.note"
data-draft-object-id=
"
<?php
echo
$ticket
->
getId
();
?>
"
data-draft-object-id=
"
<?php
echo
$ticket
->
getId
();
?>
"
class=
"richtext ifhtml draft"
>
<?php
echo
$info
[
'note'
];
class=
"richtext ifhtml draft"
>
<?php
echo
$info
[
'note'
];
?>
</textarea><br>
?>
</textarea>
<div>
<span
class=
"error"
>
<?php
echo
$errors
[
'note'
];
?>
</span>
<span
class=
"faded"
>
Note title - summary of the note (optional)
</span>
<br>
<span
class=
"error"
&
nbsp
;
<?php
echo
$errors
[
'title'
];
?>
</
span
>
</div>
<input
type=
"text"
name=
"title"
id=
"title"
size=
"60"
value=
"
<?php
echo
$info
[
'title'
];
?>
"
>
</td>
</td>
</tr>
</tr>
<?php
<?php
if
(
$cfg
->
allowAttachments
())
{
?>
if
(
$cfg
->
allowAttachments
())
{
?>
<tr>
<tr>
<td
width=
"1
6
0"
>
<td
width=
"1
2
0"
>
<label
for=
"attachment"
>
Attachments:
</label>
<label
for=
"attachment"
>
Attachments:
</label>
</td>
</td>
<td
width=
"765"
class=
"attachments"
>
<td
class=
"attachments"
>
<div
class=
"uploads"
>
<div
class=
"uploads"
>
</div>
</div>
<div
class=
"file_input"
>
<div
class=
"file_input"
>
...
@@ -621,10 +625,10 @@ if(!$cfg->showNotesInline()) { ?>
...
@@ -621,10 +625,10 @@ if(!$cfg->showNotesInline()) { ?>
?>
?>
<tr><td
colspan=
"2"
>
</td></tr>
<tr><td
colspan=
"2"
>
</td></tr>
<tr>
<tr>
<td
width=
"1
6
0"
>
<td
width=
"1
2
0"
>
<label>
Ticket Status:
</label>
<label>
Ticket Status:
</label>
</td>
</td>
<td
width=
"765"
>
<td>
<div
class=
"faded"
></div>
<div
class=
"faded"
></div>
<select
name=
"state"
>
<select
name=
"state"
>
<option
value=
""
selected=
"selected"
>
—
unchanged
—
</option>
<option
value=
""
selected=
"selected"
>
—
unchanged
—
</option>
...
@@ -683,21 +687,21 @@ if(!$cfg->showNotesInline()) { ?>
...
@@ -683,21 +687,21 @@ if(!$cfg->showNotesInline()) { ?>
<?php
csrf_token
();
?>
<?php
csrf_token
();
?>
<input
type=
"hidden"
name=
"ticket_id"
value=
"
<?php
echo
$ticket
->
getId
();
?>
"
>
<input
type=
"hidden"
name=
"ticket_id"
value=
"
<?php
echo
$ticket
->
getId
();
?>
"
>
<input
type=
"hidden"
name=
"a"
value=
"transfer"
>
<input
type=
"hidden"
name=
"a"
value=
"transfer"
>
<table
border=
"0"
cellspacing=
"0"
cellpadding=
"3"
>
<table
width=
"100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"3"
>
<?php
<?php
if
(
$errors
[
'transfer'
])
{
if
(
$errors
[
'transfer'
])
{
?>
?>
<tr>
<tr>
<td
width=
"1
6
0"
>
</td>
<td
width=
"1
2
0"
>
</td>
<td
class=
"error"
>
<?php
echo
$errors
[
'transfer'
];
?>
</td>
<td
class=
"error"
>
<?php
echo
$errors
[
'transfer'
];
?>
</td>
</tr>
</tr>
<?php
<?php
}
?>
}
?>
<tr>
<tr>
<td
width=
"1
6
0"
>
<td
width=
"1
2
0"
>
<label
for=
"deptId"
><strong>
Department:
</strong></label>
<label
for=
"deptId"
><strong>
Department:
</strong></label>
</td>
</td>
<td
width=
"765"
>
<td>
<?php
<?php
echo
sprintf
(
'<span class="faded">Ticket is currently in <b>%s</b> department.</span>'
,
$ticket
->
getDeptName
());
echo
sprintf
(
'<span class="faded">Ticket is currently in <b>%s</b> department.</span>'
,
$ticket
->
getDeptName
());
?>
?>
...
@@ -717,15 +721,15 @@ if(!$cfg->showNotesInline()) { ?>
...
@@ -717,15 +721,15 @@ if(!$cfg->showNotesInline()) { ?>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td
width=
"1
60
"
>
<td
width=
"1
20"
style=
"vertical-align:top
"
>
<label><strong>
Comments:
</strong></label>
<label><strong>
Comments:
</strong><
span
class=
'error'
>
*
</span><
/label>
</td>
</td>
<td
width=
"765"
>
<td>
<span
class=
"faded"
>
Enter reasons for the transfer.
</span>
<span
class=
"error"
>
*
<?php
echo
$errors
[
'transfer_comments'
];
?>
</span><br>
<textarea
name=
"transfer_comments"
id=
"transfer_comments"
<textarea
name=
"transfer_comments"
id=
"transfer_comments"
placeholder=
"Enter reasons for the transfer"
class=
"richtext ifhtml no-bar"
cols=
"80"
rows=
"7"
wrap=
"soft"
>
<?php
class=
"richtext ifhtml no-bar"
cols=
"80"
rows=
"7"
wrap=
"soft"
>
<?php
echo
$info
[
'transfer_comments'
];
?>
</textarea>
echo
$info
[
'transfer_comments'
];
?>
</textarea>
<span
class=
"error"
>
<?php
echo
$errors
[
'transfer_comments'
];
?>
</span>
</td>
</td>
</tr>
</tr>
</table>
</table>
...
@@ -742,22 +746,22 @@ if(!$cfg->showNotesInline()) { ?>
...
@@ -742,22 +746,22 @@ if(!$cfg->showNotesInline()) { ?>
<?php
csrf_token
();
?>
<?php
csrf_token
();
?>
<input
type=
"hidden"
name=
"id"
value=
"
<?php
echo
$ticket
->
getId
();
?>
"
>
<input
type=
"hidden"
name=
"id"
value=
"
<?php
echo
$ticket
->
getId
();
?>
"
>
<input
type=
"hidden"
name=
"a"
value=
"assign"
>
<input
type=
"hidden"
name=
"a"
value=
"assign"
>
<table
border=
"0"
cellspacing=
"0"
cellpadding=
"3"
>
<table
style=
"width:100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"3"
>
<?php
<?php
if
(
$errors
[
'assign'
])
{
if
(
$errors
[
'assign'
])
{
?>
?>
<tr>
<tr>
<td
width=
"1
6
0"
>
</td>
<td
width=
"1
2
0"
>
</td>
<td
class=
"error"
>
<?php
echo
$errors
[
'assign'
];
?>
</td>
<td
class=
"error"
>
<?php
echo
$errors
[
'assign'
];
?>
</td>
</tr>
</tr>
<?php
<?php
}
?>
}
?>
<tr>
<tr>
<td
width=
"1
6
0"
>
<td
width=
"1
2
0"
>
<label
for=
"assignId"
><strong>
Assignee:
</strong></label>
<label
for=
"assignId"
><strong>
Assignee:
</strong></label>
</td>
</td>
<td
width=
"765"
>
<td>
<?php
<?php
if
(
$ticket
->
isAssigned
()
&&
$ticket
->
isOpen
())
{
if
(
$ticket
->
isAssigned
()
&&
$ticket
->
isOpen
())
{
echo
sprintf
(
'<span class="faded">Ticket is currently assigned to <b>%s</b></span>'
,
echo
sprintf
(
'<span class="faded">Ticket is currently assigned to <b>%s</b></span>'
,
...
@@ -806,14 +810,15 @@ if(!$cfg->showNotesInline()) { ?>
...
@@ -806,14 +810,15 @@ if(!$cfg->showNotesInline()) { ?>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td
width=
"1
60
"
>
<td
width=
"1
20"
style=
"vertical-align:top
"
>
<label><strong>
Comments:
</strong><span
class=
'error'
>
</span></label>
<label><strong>
Comments:
</strong><span
class=
'error'
>
*
</span></label>
</td>
</td>
<td
width=
"765"
>
<td>
<
span
class=
"faded"
>
Enter reasons for the assignment or instructions for assignee.
</span>
<
textarea
name=
"assign_comments"
id=
"assign_comments"
<span
class=
"error"
>
*
<?php
echo
$errors
[
'assign_comments'
];
?>
</span><br>
cols=
"80"
rows=
"7"
wrap=
"soft"
<textarea
name=
"assign_comments"
id=
"assign_comments"
cols=
"80"
rows=
"7"
wrap=
"soft
"
placeholder=
"Enter reasons for the assignment or instructions for assignee
"
class=
"richtext ifhtml no-bar"
>
<?php
echo
$info
[
'assign_comments'
];
?>
</textarea>
class=
"richtext ifhtml no-bar"
>
<?php
echo
$info
[
'assign_comments'
];
?>
</textarea>
<span
class=
"error"
>
<?php
echo
$errors
[
'assign_comments'
];
?>
</span><br>
</td>
</td>
</tr>
</tr>
</table>
</table>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment