diff options
| author | Nick Kipling <nkipling@gitlab.com> | 2019-07-09 13:43:53 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-07-09 13:43:53 +0000 |
| commit | 476f0955480eb67fe3c6e2a95137caf91a27b5d4 (patch) | |
| tree | f0839265b4d57bff512b87fdb7f623ca40fc941d /app/views | |
| parent | 2523672b20b2d8ecee5186319bdb26d7934bcee1 (diff) | |
| download | gitlab-ce-476f0955480eb67fe3c6e2a95137caf91a27b5d4.tar.gz | |
Implemented frontend suggestions
Converted storage details into a small partial
Reworded the storage details summary as suggested
Updated pot file
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/groups/show.html.haml | 6 | ||||
| -rw-r--r-- | app/views/admin/projects/show.html.haml | 6 | ||||
| -rw-r--r-- | app/views/shared/_storage_counter_statistics.html.haml | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index f524d35d79e..98230684d56 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -43,11 +43,7 @@ = render_if_exists 'admin/namespace_plan_info', namespace: @group %li - %span.light= _('Storage:') - %strong= storage_counter(@group.storage_size) - ( - = storage_counters_details(@group) - ) + = render 'shared/storage_counter_statistics', storage_size: @group.storage_size, storage_details: @group %li %span.light= _('Group Git LFS status:') diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index e23accc1ea9..0fae8060b32 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -73,11 +73,7 @@ = @project.repository.relative_path %li - %span.light= _('Storage:') - %strong= storage_counter(@project.statistics&.storage_size) - - if @project.statistics - = surround '(', ')' do - = storage_counters_details(@project.statistics) + = render 'shared/storage_counter_statistics', storage_size: @project.statistics&.storage_size, storage_details: @project.statistics %li %span.light last commit: diff --git a/app/views/shared/_storage_counter_statistics.html.haml b/app/views/shared/_storage_counter_statistics.html.haml new file mode 100644 index 00000000000..99b2323ca82 --- /dev/null +++ b/app/views/shared/_storage_counter_statistics.html.haml @@ -0,0 +1,4 @@ +%span.light= _('Storage:') +%strong= storage_counter(storage_size) +- if storage_details + (#{storage_counters_details(storage_details)}) |