Enhance deployment terminal view

4 files changed, 27 insertions, 19 deletions

diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index e44a2bfed9d..0f4423a8651 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -47,7 +47,7 @@
             Repository
 
     - if project_nav_tab? :pipelines
-      = nav_link(controller: [:pipelines, :builds, :environments, :cycle_analytics]) do
+      = nav_link(controller: [:pipelines, :builds, :environments, :cycle_analytics, :deployments]) do
         = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do
           %span
             Pipelines
diff --git a/app/views/projects/deployments/_actions.haml b/app/views/projects/deployments/_actions.haml
index 373db9b665c..ad4aa065a46 100644
--- a/app/views/projects/deployments/_actions.haml
+++ b/app/views/projects/deployments/_actions.haml
@@ -2,12 +2,14 @@
   - if local_assigns.fetch(:show_external_url, false)
     - external_url = deployment.environment.external_url
     - if external_url
-      = link_to external_url, target: '_blank', class: 'btn external-url' do
-        = icon('external-link')
+      .inline
+        = link_to external_url, target: '_blank', class: 'btn external-url' do
+          = icon('external-link')
 
   - if can?(current_user, :update_deployment, deployment) && deployment.deployable && local_assigns.fetch(:show_terminal, false)
-    = link_to terminal_namespace_project_deployment_path(@project.namespace.becomes(Namespace), @project, deployment), class: 'btn btn-default btn-terminal', rel: 'nofollow' do
-      = custom_icon('icon_terminal')
+    .inline
+      = link_to terminal_namespace_project_deployment_path(@project.namespace.becomes(Namespace), @project, deployment), class: 'btn btn-default btn-terminal', rel: 'nofollow' do
+        = custom_icon('icon_terminal')
 
   - if can?(current_user, :create_deployment, deployment) && deployment.deployable && local_assigns.fetch(:show_actions, false)
     - actions = deployment.manual_actions
diff --git a/app/views/projects/deployments/terminal.html.haml b/app/views/projects/deployments/terminal.html.haml
index de283725efb..26d6fdf2cdd 100644
--- a/app/views/projects/deployments/terminal.html.haml
+++ b/app/views/projects/deployments/terminal.html.haml
@@ -1,19 +1,25 @@
-- if current_user
-  - @no_container = true
-  - page_title "Deployment Terminal"
-  = render "projects/pipelines/head"
+- @no_container = true
+- page_title "Deployment", "##{@deployment.iid}"
+= render "projects/pipelines/head"
 
-  = content_for :head do
-    = stylesheet_link_tag "xterm/xterm"
+= content_for :head do
+  = stylesheet_link_tag "xterm/xterm"
 
-  - content_for :page_specific_javascripts do
-    = page_specific_javascript_tag("terminal/terminal_bundle.js")
+- content_for :page_specific_javascripts do
+  = page_specific_javascript_tag("terminal/terminal_bundle.js")
 
-  .terminal-container{class: container_class}
-
-    %p.content-block
-      Environment:
-      %a{href: '#'} add information
+%div{ class: container_class }
+  .top-area
+    .row
+      .col-sm-6
+        %h3.page-title
+          Deployment
+          = "##{@deployment.iid}"
 
+      .col-sm-6
+        .nav-controls
+          = render 'projects/deployments/actions', deployment: @deployment, allow_rollback: true,
+            show_actions: true, show_external_url: true, show_actions: true, allow_close: true
 
+  .terminal-container{class: container_class}
     #terminal{data:{project_path: "#{terminal_namespace_project_deployment_path(@project.namespace, @project, @deployment)}_websocket"}}
diff --git a/app/views/projects/pipelines/_head.html.haml b/app/views/projects/pipelines/_head.html.haml
index 7d421c0e740..477e8e1d873 100644
--- a/app/views/projects/pipelines/_head.html.haml
+++ b/app/views/projects/pipelines/_head.html.haml
@@ -16,7 +16,7 @@
                 Builds
 
         - if project_nav_tab? :environments
-          = nav_link(controller: %w(environments)) do
+          = nav_link(controller: %w(environments deployments)) do
             = link_to project_environments_path(@project), title: 'Environments', class: 'shortcuts-environments' do
               %span
                 Environments