Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
61c30061
Commit
61c30061
authored
Mar 01, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
audit log UI update
Closes #13862
parent
1fe9b933
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
21 deletions
+32
-21
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+1
-0
app/helpers/icons_helper.rb
app/helpers/icons_helper.rb
+10
-1
app/views/profiles/_event_table.html.haml
app/views/profiles/_event_table.html.haml
+13
-15
app/views/profiles/audit_log.html.haml
app/views/profiles/audit_log.html.haml
+8
-5
No files found.
app/assets/stylesheets/framework/common.scss
View file @
61c30061
...
...
@@ -14,6 +14,7 @@
.prepend-left-10
{
margin-left
:
10px
}
.prepend-left-default
{
margin-left
:
$gl-padding
}
.prepend-left-20
{
margin-left
:
20px
}
.append-right-5
{
margin-right
:
5px
}
.append-right-10
{
margin-right
:
10px
}
.append-right-20
{
margin-right
:
20px
}
.append-bottom-10
{
margin-bottom
:
10px
}
...
...
app/helpers/icons_helper.rb
View file @
61c30061
...
...
@@ -10,6 +10,15 @@ module IconsHelper
options
.
include?
(
:base
)
?
fa_stacked_icon
(
names
,
options
)
:
fa_icon
(
names
,
options
)
end
def
audit_icon
(
names
,
options
=
{})
case
names
when
"standard"
names
=
"key"
end
options
.
include?
(
:base
)
?
fa_stacked_icon
(
names
,
options
)
:
fa_icon
(
names
,
options
)
end
def
spinner
(
text
=
nil
,
visible
=
false
)
css_class
=
'loading'
css_class
<<
' hide'
unless
visible
...
...
@@ -37,7 +46,7 @@ module IconsHelper
else
# Gitlab::VisibilityLevel::PUBLIC
'globe'
end
name
<<
" fw"
if
fw
icon
(
name
)
...
...
app/views/profiles/_event_table.html.haml
View file @
61c30061
.table-holder
%table
.table
#audits
%thead
%tr
%th
Action
%th
When
%h5
.prepend-top-0
History of authentications
%ul
.well-list
-
events
.
each
do
|
event
|
%li
%span
.description
=
audit_icon
(
event
.
details
[
:with
],
class:
"append-right-5"
)
Signed in with
=
event
.
details
[
:with
]
authentication
%span
.pull-right
#{
time_ago_in_words
event
.
created_at
}
ago
%tbody
-
events
.
each
do
|
event
|
%tr
%td
%span
Signed in with
%b
=
event
.
details
[
:with
]
authentication
%td
#{
time_ago_in_words
event
.
created_at
}
ago
=
paginate
events
,
theme:
"gitlab"
app/views/profiles/audit_log.html.haml
View file @
61c30061
-
page_title
"Audit Log"
-
header_title
page_title
,
audit_log_profile_path
.alert.alert-help.prepend-top-default
History of authentications
.prepend-top-default
=
render
'event_table'
,
events:
@events
.row.prepend-top-default
.col-lg-3.profile-settings-sidebar
%h3
.prepend-top-0
=
page_title
%p
This is a security log of important events involving your account.
.col-lg-9
=
render
'event_table'
,
events:
@events
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment