From ace19ec58f39faa084e6f5372732e3c094011c8e Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Fri, 5 Aug 2016 12:44:13 -0500 Subject: Style deploy button --- app/assets/stylesheets/pages/environments.scss | 17 +++++++++++++++++ app/views/projects/deployments/_actions.haml | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index e160d676e35..e9097d41c61 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -1,5 +1,22 @@ .environments { + .commit-title { margin: 0; } + + .fa-play { + font-size: 14px; + } + + .dropdown-new { + color: $table-text-gray; + } + + .dropdown-menu { + + .fa { + margin-right: 6px; + color: $table-text-gray; + } + } } diff --git a/app/views/projects/deployments/_actions.haml b/app/views/projects/deployments/_actions.haml index f70dba224fa..f7bf3b834ef 100644 --- a/app/views/projects/deployments/_actions.haml +++ b/app/views/projects/deployments/_actions.haml @@ -2,9 +2,9 @@ .pull-right - actions = deployment.manual_actions - if actions.present? - .btn-group.inline - .btn-group - %a.dropdown-toggle.btn.btn-default{type: 'button', 'data-toggle' => 'dropdown'} + .inline + .dropdown + %a.dropdown-new.btn.btn-default{type: 'button', 'data-toggle' => 'dropdown'} = icon("play") %b.caret %ul.dropdown-menu.dropdown-menu-align-right -- cgit v1.2.1 From 415921a7f38a19bc907ce0b3db21e4e66e9b1ac2 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Fri, 5 Aug 2016 14:08:39 -0500 Subject: Add avatar to commit message; environment style updates to match pipelines page --- app/assets/stylesheets/pages/environments.scss | 13 +++++++++++++ app/helpers/avatars_helper.rb | 2 -- app/views/projects/deployments/_commit.html.haml | 8 ++++++-- app/views/projects/environments/_environment.html.haml | 7 ++++--- app/views/projects/environments/index.html.haml | 4 ++-- 5 files changed, 25 insertions(+), 9 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index e9097d41c61..55f9d4a0011 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -19,4 +19,17 @@ color: $table-text-gray; } } + + .branch-name { + color: $gl-dark-link-color; + } +} + +.table.builds.environments { + min-width: 500px; + + .icon-container { + width: 20px; + text-align: center; + } } diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb index 6ff40c6b461..010246b6c23 100644 --- a/app/helpers/avatars_helper.rb +++ b/app/helpers/avatars_helper.rb @@ -8,8 +8,6 @@ module AvatarsHelper })) end - private - def user_avatar(options = {}) avatar_size = options[:size] || 16 user_name = options[:user].try(:name) || options[:user_name] diff --git a/app/views/projects/deployments/_commit.html.haml b/app/views/projects/deployments/_commit.html.haml index 0f9d9512d88..a90c8733862 100644 --- a/app/views/projects/deployments/_commit.html.haml +++ b/app/views/projects/deployments/_commit.html.haml @@ -1,12 +1,16 @@ %div.branch-commit - if deployment.ref - = link_to deployment.ref, namespace_project_commits_path(@project.namespace, @project, deployment.ref), class: "monospace" - · + .icon-container + = deployment.tag? ? icon('tag') : icon('code-fork') + = link_to deployment.ref, namespace_project_commits_path(@project.namespace, @project, deployment.ref), class: "monospace branch-name" + .icon-container + = custom_icon("icon_commit") = link_to deployment.short_sha, namespace_project_commit_path(@project.namespace, @project, deployment.sha), class: "commit-id monospace" %p.commit-title %span - if commit_title = deployment.commit_title + = user_avatar(user: deployment.user, size: 20) = link_to_gfm commit_title, namespace_project_commit_path(@project.namespace, @project, deployment.sha), class: "commit-row-message" - else Cant find HEAD commit for this branch diff --git a/app/views/projects/environments/_environment.html.haml b/app/views/projects/environments/_environment.html.haml index e2453395602..d04967fa72f 100644 --- a/app/views/projects/environments/_environment.html.haml +++ b/app/views/projects/environments/_environment.html.haml @@ -2,8 +2,7 @@ %tr.environment %td - %strong - = link_to environment.name, namespace_project_environment_path(@project.namespace, @project, environment) + = link_to environment.name, namespace_project_environment_path(@project.namespace, @project, environment) %td - if last_deployment @@ -14,7 +13,9 @@ %td - if last_deployment - #{time_ago_with_tooltip(last_deployment.created_at)} + %p.finished-at + = icon("calendar") + #{time_ago_with_tooltip(last_deployment.created_at, short_format: true, skip_js: true)} %td = render 'projects/deployments/actions', deployment: last_deployment diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml index a6dd34653ab..fe8ddb4716e 100644 --- a/app/views/projects/environments/index.html.haml +++ b/app/views/projects/environments/index.html.haml @@ -23,10 +23,10 @@ New environment - else .table-holder - %table.table.environments + %table.table.builds.environments %tbody %th Environment %th Last deployment - %th Date + %th %th = render @environments -- cgit v1.2.1 From 60a347228d90ce68eedb5bf4b75a4cad94a1dfb2 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Fri, 5 Aug 2016 14:54:17 -0500 Subject: Format environment history page --- app/views/projects/environments/show.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml index a07436ad7c9..8f8c1c4ce22 100644 --- a/app/views/projects/environments/show.html.haml +++ b/app/views/projects/environments/show.html.haml @@ -23,13 +23,13 @@ = link_to "Read more", help_page_path("ci/environments"), class: "btn btn-success" - else .table-holder - %table.table.environments + %table.table.builds.environments %thead %tr %th ID %th Commit %th Build - %th Date + %th %th = render @deployments -- cgit v1.2.1 From 0a15ad31ad4bafe0a87cb0c4fd345a5f82c44799 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Mon, 8 Aug 2016 11:39:24 -0500 Subject: Add deployment ID and gravatar to environments page --- app/views/projects/deployments/_commit.html.haml | 2 +- app/views/projects/environments/_environment.html.haml | 9 ++++++--- app/views/projects/environments/index.html.haml | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/views/projects/deployments/_commit.html.haml b/app/views/projects/deployments/_commit.html.haml index a90c8733862..28813babd7b 100644 --- a/app/views/projects/deployments/_commit.html.haml +++ b/app/views/projects/deployments/_commit.html.haml @@ -10,7 +10,7 @@ %p.commit-title %span - if commit_title = deployment.commit_title - = user_avatar(user: deployment.user, 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" - else Cant find HEAD commit for this branch diff --git a/app/views/projects/environments/_environment.html.haml b/app/views/projects/environments/_environment.html.haml index d04967fa72f..718eca15741 100644 --- a/app/views/projects/environments/_environment.html.haml +++ b/app/views/projects/environments/_environment.html.haml @@ -4,6 +4,11 @@ %td = link_to environment.name, namespace_project_environment_path(@project.namespace, @project, environment) + %td + - if last_deployment + = user_avatar(user: last_deployment.user, size: 20) + %span ##{last_deployment.id} + %td - if last_deployment = render 'projects/deployments/commit', deployment: last_deployment @@ -13,9 +18,7 @@ %td - if last_deployment - %p.finished-at - = icon("calendar") - #{time_ago_with_tooltip(last_deployment.created_at, short_format: true, skip_js: true)} + #{time_ago_with_tooltip(last_deployment.created_at)} %td = render 'projects/deployments/actions', deployment: last_deployment diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml index fe8ddb4716e..8bb238bae4e 100644 --- a/app/views/projects/environments/index.html.haml +++ b/app/views/projects/environments/index.html.haml @@ -26,6 +26,7 @@ %table.table.builds.environments %tbody %th Environment + %th Deployment ID %th Last deployment %th %th -- cgit v1.2.1 From f6c0c96b80b971ffaa7aa49553e13f6849f8ec4a Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Mon, 8 Aug 2016 11:43:12 -0500 Subject: Add gravatars to build history --- app/views/projects/deployments/_deployment.html.haml | 1 + app/views/projects/environments/_environment.html.haml | 2 +- app/views/projects/environments/index.html.haml | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml index baf02f1e6a0..cd95841ca5a 100644 --- a/app/views/projects/deployments/_deployment.html.haml +++ b/app/views/projects/deployments/_deployment.html.haml @@ -8,6 +8,7 @@ %td - if deployment.deployable = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable] do + = user_avatar(user: deployment.user, size: 20) = "#{deployment.deployable.name} (##{deployment.deployable.id})" %td diff --git a/app/views/projects/environments/_environment.html.haml b/app/views/projects/environments/_environment.html.haml index 718eca15741..36a6162a5a8 100644 --- a/app/views/projects/environments/_environment.html.haml +++ b/app/views/projects/environments/_environment.html.haml @@ -7,7 +7,7 @@ %td - if last_deployment = user_avatar(user: last_deployment.user, size: 20) - %span ##{last_deployment.id} + %strong ##{last_deployment.id} %td - if last_deployment diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml index 8bb238bae4e..b3eb5b0011a 100644 --- a/app/views/projects/environments/index.html.haml +++ b/app/views/projects/environments/index.html.haml @@ -26,8 +26,8 @@ %table.table.builds.environments %tbody %th Environment - %th Deployment ID - %th Last deployment + %th Last Deployment + %th Commit %th %th = render @environments -- cgit v1.2.1