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
6f55ab15
Commit
6f55ab15
authored
11 years ago
by
Jared Hancock
Browse files
Options
Downloads
Patches
Plain Diff
Fixup user view dialog on ticket view page
parent
5b878f9e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/staff/templates/user.tmpl.php
+14
-8
14 additions, 8 deletions
include/staff/templates/user.tmpl.php
include/staff/ticket-view.inc.php
+4
-1
4 additions, 1 deletion
include/staff/ticket-view.inc.php
scp/css/scp.css
+15
-2
15 additions, 2 deletions
scp/css/scp.css
with
33 additions
and
11 deletions
include/staff/templates/user.tmpl.php
+
14
−
8
View file @
6f55ab15
...
@@ -19,12 +19,12 @@ if ($info['error']) {
...
@@ -19,12 +19,12 @@ if ($info['error']) {
href=
"#tickets/
<?php
echo
$ticket
->
getId
();
?>
/change-user"
><i
class=
"icon-user"
></i>
Change User
</a>
href=
"#tickets/
<?php
echo
$ticket
->
getId
();
?>
/change-user"
><i
class=
"icon-user"
></i>
Change User
</a>
<?php
<?php
}
?>
}
?>
<div><b><
a
href=
"#"
id=
"edituser"
><i
class=
"icon-edit"
></i>
<
?php
<div><b>
<?php
echo
Format
::
htmlchars
(
$user
->
getName
()
->
getOriginal
());
?>
</
a></
b></div>
echo
Format
::
htmlchars
(
$user
->
getName
()
->
getOriginal
());
?>
</b></div>
<div>
<
<?php
echo
$user
->
getEmail
();
?>
>
</div>
<div
class=
"faded"
>
<
<?php
echo
$user
->
getEmail
();
?>
>
</div>
<?php
<?php
if
((
$org
=
$user
->
getOrganization
()))
{
?>
if
((
$org
=
$user
->
getOrganization
()))
{
?>
<div>
<?php
echo
$org
->
getName
();
?>
</div>
<div
style=
"margin-top: 7px;"
>
<?php
echo
$org
->
getName
();
?>
</div>
<?php
<?php
}
?>
}
?>
...
@@ -44,6 +44,11 @@ if ($info['error']) {
...
@@ -44,6 +44,11 @@ if ($info['error']) {
</ul>
</ul>
<div
class=
"tab_content"
id=
"info-tab"
>
<div
class=
"tab_content"
id=
"info-tab"
>
<div
class=
"floating-options"
>
<a
href=
"#"
id=
"edituser"
class=
"action"
title=
"edit"
><i
class=
"icon-edit"
></i></a>
<a
href=
"users.php?id=
<?php
echo
$user
->
getId
();
?>
"
title=
"manage"
class=
"action no-pjax"
><i
class=
"icon-share"
></i></a>
</div>
<table
class=
"custom-info"
>
<table
class=
"custom-info"
>
<?php
foreach
(
$user
->
getDynamicData
()
as
$entry
)
{
<?php
foreach
(
$user
->
getDynamicData
()
as
$entry
)
{
?>
?>
...
@@ -61,7 +66,11 @@ if ($info['error']) {
...
@@ -61,7 +66,11 @@ if ($info['error']) {
</div>
</div>
<div
class=
"tab_content"
id=
"organization-tab"
style=
"display:none"
>
<div
class=
"tab_content"
id=
"organization-tab"
style=
"display:none"
>
<table
class=
"custom-info"
>
<div
class=
"floating-options"
>
<a
href=
"orgs.php?id=
<?php
echo
$org
->
getId
();
?>
"
title=
"manage"
class=
"action no-pjax"
><i
class=
"icon-share"
></i></a>
</div>
<table
class=
"custom-info"
width=
"100%"
>
<?php
foreach
(
$org
->
getDynamicData
()
as
$entry
)
{
<?php
foreach
(
$org
->
getDynamicData
()
as
$entry
)
{
?>
?>
<tr><th
colspan=
"2"
><strong>
<?php
<tr><th
colspan=
"2"
><strong>
<?php
...
@@ -89,9 +98,6 @@ foreach ($notes as $note)
...
@@ -89,9 +98,6 @@ foreach ($notes as $note)
</div>
</div>
</div>
</div>
<div
class=
"clear"
></div>
<hr>
<div
class=
"faded"
>
Last updated
<b>
<?php
echo
Format
::
db_datetime
(
$user
->
getUpdateDate
());
?>
</b></div>
</div>
</div>
<div
id=
"user-form"
style=
"display:
<?php
echo
$forms
?
'block'
:
'none'
;
?>
;"
>
<div
id=
"user-form"
style=
"display:
<?php
echo
$forms
?
'block'
:
'none'
;
?>
;"
>
<div><p
id=
"msg_info"
><i
class=
"icon-info-sign"
></i>
Please note that updates will be reflected system-wide.
</p></div>
<div><p
id=
"msg_info"
><i
class=
"icon-info-sign"
></i>
Please note that updates will be reflected system-wide.
</p></div>
...
...
This diff is collapsed.
Click to expand it.
include/staff/ticket-view.inc.php
+
4
−
1
View file @
6f55ab15
...
@@ -185,7 +185,10 @@ if($ticket->isOverdue())
...
@@ -185,7 +185,10 @@ if($ticket->isOverdue())
$user
->
getId
(),
$closed
);
$user
->
getId
(),
$closed
);
?>
?>
<li><a
href=
"tickets.php?a=search&uid=
<?php
echo
$ticket
->
getOwnerId
();
?>
"
><i
class=
"icon-double-angle-right icon-fixed-width"
></i>
All Tickets
</a></li>
<li><a
href=
"tickets.php?a=search&uid=
<?php
echo
$ticket
->
getOwnerId
();
?>
"
><i
class=
"icon-double-angle-right icon-fixed-width"
></i>
All Tickets
</a></li>
<li><a
href=
"users.php?id=
<?php
echo
$user
->
getId
();
?>
"
><i
class=
"icon-user icon-fixed-width"
></i>
Manage Client
</a></li>
<li><a
href=
"users.php?id=
<?php
echo
$user
->
getId
();
?>
"
class=
"no-pjax"
><i
class=
"icon-user icon-fixed-width"
></i>
Manage Client
</a></li>
<?php
if
(
$user
->
getOrgId
())
{
?>
<li><a
href=
"orgs.php?id=
<?php
echo
$user
->
getOrgId
();
?>
"
class=
"no-pjax"
><i
class=
"icon-building icon-fixed-width"
></i>
Manage Organization
</a></li>
<?php
}
?>
</u>
</u>
</div>
</div>
<?php
<?php
...
...
This diff is collapsed.
Click to expand it.
scp/css/scp.css
+
15
−
2
View file @
6f55ab15
...
@@ -1674,12 +1674,14 @@ tr.disabled th {
...
@@ -1674,12 +1674,14 @@ tr.disabled th {
.quicknote
.body
{
.quicknote
.body
{
padding
:
10px
;
padding
:
10px
;
}
}
.quicknote
a
.action
{
.quicknote
a
.action
,
.floating-options
a
.action
{
padding
:
2px
4px
;
padding
:
2px
4px
;
margin
:
1px
;
margin
:
1px
;
color
:
black
!important
;
color
:
black
!important
;
}
}
.quicknote
a
.action
:hover
{
.quicknote
a
.action
:hover
,
.floating-options
a
.action
:hover
{
text-decoration
:
none
;
text-decoration
:
none
;
border
:
1px
solid
#ff9100
;
border
:
1px
solid
#ff9100
;
border-radius
:
3px
;
border-radius
:
3px
;
...
@@ -1708,6 +1710,17 @@ tr.disabled th {
...
@@ -1708,6 +1710,17 @@ tr.disabled th {
background-color
:
#3a87ad
;
background-color
:
#3a87ad
;
}
}
.tab_content
{
position
:
relative
;
}
.floating-options
{
display
:
inline-block
;
position
:
absolute
;
right
:
0
;
top
:
10px
;
padding-right
:
5px
;
}
table
.custom-info
th
{
table
.custom-info
th
{
background
:
transparent
;
background
:
transparent
;
border
:
none
;
border
:
none
;
...
...
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