diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-02 19:52:21 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-02 19:52:21 +0000 |
| commit | 3be20afa9f7bfb4e4d13b30d5cfcd304b79ea478 (patch) | |
| tree | 0230a0719744247254a9900ed1c9a07ba014bf95 | |
| parent | cbe8b70908cc0344bc0c05221e123be9addca500 (diff) | |
| parent | 61c30061e7f36ada8da0459ea15561197bd48295 (diff) | |
| download | gitlab-ce-3be20afa9f7bfb4e4d13b30d5cfcd304b79ea478.tar.gz | |
Merge branch 'audit-log-ui' into 'master'
Audit log UI
Closes #13862
See merge request !3037
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 1 | ||||
| -rw-r--r-- | app/helpers/icons_helper.rb | 11 | ||||
| -rw-r--r-- | app/views/profiles/_event_table.html.haml | 28 | ||||
| -rw-r--r-- | app/views/profiles/audit_log.html.haml | 13 |
4 files changed, 32 insertions, 21 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 1f58be4bdf2..1d3c71932a8 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -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 } diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index 84c6d0883b0..ab3ef454e1c 100644 --- a/app/helpers/icons_helper.rb +++ b/app/helpers/icons_helper.rb @@ -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) diff --git a/app/views/profiles/_event_table.html.haml b/app/views/profiles/_event_table.html.haml index 58af79716a7..879fc170f92 100644 --- a/app/views/profiles/_event_table.html.haml +++ b/app/views/profiles/_event_table.html.haml @@ -1,17 +1,15 @@ -.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" diff --git a/app/views/profiles/audit_log.html.haml b/app/views/profiles/audit_log.html.haml index 8f45f41cfe3..f630c03e5f6 100644 --- a/app/views/profiles/audit_log.html.haml +++ b/app/views/profiles/audit_log.html.haml @@ -1,8 +1,11 @@ - 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 |