kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Environment detail view

This commit is contained in:
Annabel Dunstone Gray 2017-06-06 22:38:39 +00:00 committed by Clement Ho
parent 71f9c43c83
commit 67830322b9
7 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/framework/responsive-tables.scss
View File

@ -19,7 +19,11 @@
.table-section { .table-section {
white-space: nowrap; white-space: nowrap;
$section-widths: 10 15 25 30; .branch-commit {
max-width: 100%;
}
$section-widths: 10 15 20 25 30 40;
@each $width in $section-widths { @each $width in $section-widths {
&.section-#{$width} { &.section-#{$width} {
flex: 0 0 #{$width + '%'}; flex: 0 0 #{$width + '%'};

7
app/assets/stylesheets/pages/environments.scss
View File

@ -143,7 +143,8 @@
} }
> .btn-group, > .btn-group,
.external-url { .external-url,
.btn {
flex: 1; flex: 1;
flex-basis: 28px; flex-basis: 28px;
} }
@ -154,6 +155,10 @@
} }
} }
} }
.branch-commit {
max-width: 100%;
}
} }
.folder-row { .folder-row {

2
app/views/projects/deployments/_actions.haml
View File

@ -6,7 +6,7 @@
%button.dropdown.dropdown-new.btn.btn-default{ type: 'button', 'data-toggle' => 'dropdown' } %button.dropdown.dropdown-new.btn.btn-default{ type: 'button', 'data-toggle' => 'dropdown' }
= custom_icon('icon_play') = custom_icon('icon_play')
= icon('caret-down') = icon('caret-down')
%ul.dropdown-menu.dropdown-menu-align-right %ul.dropdown-menu
- actions.each do |action| - actions.each do |action|
- next unless can?(current_user, :update_build, action) - next unless can?(current_user, :update_build, action)
%li %li

6
app/views/projects/deployments/_commit.html.haml
View File

@ -1,14 +1,14 @@
.branch-commit .branch-commit
- if deployment.ref - if deployment.ref
.icon-container %span.icon-container
= deployment.tag? ? icon('tag') : icon('code-fork') = deployment.tag? ? icon('tag') : icon('code-fork')
= link_to deployment.ref, project_ref_path(@project, deployment.ref), class: "ref-name" = link_to deployment.ref, project_ref_path(@project, deployment.ref), class: "ref-name"
.icon-container.commit-icon .icon-container.commit-icon
= custom_icon("icon_commit") = custom_icon("icon_commit")
= link_to deployment.short_sha, namespace_project_commit_path(@project.namespace, @project, deployment.sha), class: "commit-sha" = link_to deployment.short_sha, namespace_project_commit_path(@project.namespace, @project, deployment.sha), class: "commit-sha"
%p.commit-title %p.commit-title.flex-truncate-parent
%span %span.flex-truncate-child
- if commit_title = deployment.commit_title - if commit_title = deployment.commit_title
= author_avatar(deployment.commit, size: 20) = author_avatar(deployment.commit, size: 20)
= link_to_gfm commit_title, namespace_project_commit_path(@project.namespace, @project, deployment.sha), class: "commit-row-message" = link_to_gfm commit_title, namespace_project_commit_path(@project.namespace, @project, deployment.sha), class: "commit-row-message"

14
app/views/projects/deployments/_deployment.html.haml
View File

@ -1,11 +1,11 @@
%tr.deployment .gl-responsive-table-row.deployment
%td .table-section.section-10{ role: 'gridcell' }
%strong ##{deployment.iid} %strong ##{deployment.iid}
%td .table-section.section-40{ role: 'gridcell' }
= render 'projects/deployments/commit', deployment: deployment = render 'projects/deployments/commit', deployment: deployment
%td.build-column .table-section.section-15.build-column{ role: 'gridcell' }
- if deployment.deployable - if deployment.deployable
= link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable], class: 'build-link' do = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable], class: 'build-link' do
#{deployment.deployable.name} (##{deployment.deployable.id}) #{deployment.deployable.name} (##{deployment.deployable.id})
@ -13,10 +13,10 @@
by by
= user_avatar(user: deployment.user, size: 20) = user_avatar(user: deployment.user, size: 20)
%td .table-section.section-15{ role: 'gridcell' }
#{time_ago_with_tooltip(deployment.created_at)} #{time_ago_with_tooltip(deployment.created_at)}
%td.hidden-xs .table-section.section-20.environments-actions.table-button-footer{ role: 'gridcell' }
.pull-right.btn-group .btn-group.environment-action-buttons
= render 'projects/deployments/actions', deployment: deployment = render 'projects/deployments/actions', deployment: deployment
= render 'projects/deployments/rollback', deployment: deployment = render 'projects/deployments/rollback', deployment: deployment

16
app/views/projects/environments/show.html.haml
View File

@ -3,7 +3,7 @@
= render "projects/pipelines/head" = render "projects/pipelines/head"
%div{ class: container_class } %div{ class: container_class }
.top-area.adjust .row.top-area.adjust
.col-md-7 .col-md-7
%h3.page-title= @environment.name %h3.page-title= @environment.name
.col-md-5 .col-md-5
@ -28,14 +28,12 @@
= link_to "Read more", help_page_path("ci/environments"), class: "btn btn-success" = link_to "Read more", help_page_path("ci/environments"), class: "btn btn-success"
- else - else
.table-holder .table-holder
%table.table.ci-table.environments .ci-table.environments
%thead .gl-responsive-table-row.table-row-header{ role: 'row' }
%tr .table-section.section-10{ role: 'rollheader' } ID
%th ID .table-section.section-40{ role: 'rollheader' } Commit
%th Commit .table-section.section-15{ role: 'rollheader' } Job
%th Job .table-section.section-15{ role: 'rollheader' } Created
%th Created
%th.hidden-xs
= render @deployments = render @deployments

4
changelogs/unreleased/environment-detail-view.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Make environment tables responsive
merge_request:
author: