Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
osticket
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
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
ba3334ea
Commit
ba3334ea
authored
10 years ago
by
Jared Hancock
Browse files
Options
Downloads
Patches
Plain Diff
notes: Add icon to indicate type of note
parent
1c9a87e5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/class.note.php
+13
-0
13 additions, 0 deletions
include/class.note.php
include/staff/templates/note.tmpl.php
+2
-3
2 additions, 3 deletions
include/staff/templates/note.tmpl.php
scp/css/scp.css
+9
-2
9 additions, 2 deletions
scp/css/scp.css
with
24 additions
and
5 deletions
include/class.note.php
+
13
−
0
View file @
ba3334ea
...
@@ -52,6 +52,19 @@ class QuickNote extends QuickNoteModel {
...
@@ -52,6 +52,19 @@ class QuickNote extends QuickNoteModel {
return
static
::
$types
[
$this
->
ext_id
[
0
]];
return
static
::
$types
[
$this
->
ext_id
[
0
]];
}
}
function
getExtIconClass
()
{
switch
(
$this
->
ext_id
[
0
])
{
case
'U'
:
return
'user'
;
case
'O'
:
return
'building'
;
}
}
function
getIconTitle
()
{
return
sprintf
(
"%s Note"
,
static
::
$types
[
$this
->
ext_id
[
0
]]);
}
static
function
forUser
(
$user
,
$org
=
false
)
{
static
function
forUser
(
$user
,
$org
=
false
)
{
if
(
$org
)
if
(
$org
)
return
static
::
objects
()
->
filter
(
array
(
'ext_id__in'
=>
return
static
::
objects
()
->
filter
(
array
(
'ext_id__in'
=>
...
...
This diff is collapsed.
Click to expand it.
include/staff/templates/note.tmpl.php
+
2
−
3
View file @
ba3334ea
<div
class=
"quicknote"
data-id=
"
<?php
echo
$note
->
id
;
?>
"
>
<div
class=
"quicknote"
data-id=
"
<?php
echo
$note
->
id
;
?>
"
>
<div
class=
"header"
>
<div
class=
"header"
>
<div
class=
"header-left"
>
<div
class=
"header-left"
>
<i
class=
"note-type icon-
<?php
echo
$note
->
getExtIconClass
();
?>
"
i
title=
"
<?php
echo
$note
->
getIconTitle
();
?>
"
></i>
<?php
echo
$note
->
getFormattedTime
();
?>
<?php
echo
$note
->
getFormattedTime
();
?>
</div>
</div>
<div
class=
"header-right"
>
<div
class=
"header-right"
>
<?php
<?php
echo
$note
->
getStaff
()
->
getName
();
echo
$note
->
getStaff
()
->
getName
();
if
(
$ext_id
&&
$note
->
ext_id
!=
$ext_id
)
{
?>
<span
class=
"label label-info"
>
<?php
echo
$note
->
getExtType
();
?>
</span>
<?php
}
if
(
isset
(
$show_options
)
&&
$show_options
)
{
?>
if
(
isset
(
$show_options
)
&&
$show_options
)
{
?>
<div
class=
"options"
>
<div
class=
"options"
>
<a
href=
"#"
class=
"action edit-note no-pjax"
title=
"edit"
><i
class=
"icon-pencil"
></i></a>
<a
href=
"#"
class=
"action edit-note no-pjax"
title=
"edit"
><i
class=
"icon-pencil"
></i></a>
...
...
This diff is collapsed.
Click to expand it.
scp/css/scp.css
+
9
−
2
View file @
ba3334ea
...
@@ -1666,8 +1666,8 @@ tr.disabled th {
...
@@ -1666,8 +1666,8 @@ tr.disabled th {
}
}
.quicknote
.header
.options
{
.quicknote
.header
.options
{
display
:
inline-block
;
display
:
inline-block
;
padding-left
:
5
px
;
padding-left
:
10
px
;
margin-left
:
10
px
;
margin-left
:
5
px
;
white-space
:
nowrap
;
white-space
:
nowrap
;
border-left
:
1px
solid
rgba
(
0
,
0
,
0
,
0.2
);
border-left
:
1px
solid
rgba
(
0
,
0
,
0
,
0.2
);
}
}
...
@@ -1732,6 +1732,13 @@ tr.disabled th {
...
@@ -1732,6 +1732,13 @@ tr.disabled th {
padding-right
:
5px
;
padding-right
:
5px
;
}
}
i
.note-type
{
color
:
#2a67ac
;
opacity
:
0.8
;
border-right
:
1px
solid
rgba
(
0
,
0
,
0
,
0.2
);
padding-right
:
8px
;
}
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