Improved views

4 files changed, 44 insertions, 46 deletions

diff --git a/app/views/projects/environments/_environment.html.haml b/app/views/projects/environments/_environment.html.haml
index 16d04832e1a..5ca57bd153d 100644
--- a/app/views/projects/environments/_environment.html.haml
+++ b/app/views/projects/environments/_environment.html.haml
@@ -3,7 +3,7 @@
 %tr.environment
   %td
     %strong
-      = link_to environment.name, namespace_project_environment_path(@project.namespace, @project, environment), class: "monospace"
+      = link_to environment.name, namespace_project_environment_path(@project.namespace, @project, environment)
 
   %td
     - if last_deployment
@@ -27,5 +27,3 @@
     - if last_deployment
       %p
         #{time_ago_with_tooltip(last_deployment.created_at)}
-
-  %td
diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml
index 2da8d068e9f..4a445a157ec 100644
--- a/app/views/projects/environments/index.html.haml
+++ b/app/views/projects/environments/index.html.haml
@@ -9,17 +9,16 @@
         = link_to new_namespace_project_environment_path(@project.namespace, @project), class: 'btn btn-create' do
           New environment
 
-  %ul.content-list.environments
-    - if @environments.blank?
-      %li
-        .nothing-here-block No environments to show
-    - else
-      .table-holder
-        %table.table
-          %tbody
-            %th Environment
-            %th Last deployment
-            %th Date
-            %th
-          - @environments.each do |environment|
-            = render 'environment', environment: environment
+  - if @environments.blank?
+    %ul.content-list.environments
+      %li.nothing-here-block
+        No environments to show
+  - else
+    .table-holder
+      %table.table
+        %tbody
+          %th Environment
+          %th Last deployment
+          %th Date
+        - @environments.each do |environment|
+          = render 'environment', environment: environment
diff --git a/app/views/projects/environments/new.html.haml b/app/views/projects/environments/new.html.haml
index 5e8bc596f1e..c7abac6e49f 100644
--- a/app/views/projects/environments/new.html.haml
+++ b/app/views/projects/environments/new.html.haml
@@ -1,15 +1,15 @@
 - page_title "New Environment"
+= render "projects/pipelines/head"
 
-%h3.page-title
-  New Environment
-%hr
+.row.prepend-top-default.append-bottom-default
+  .col-lg-3
+    %h4.prepend-top-0
+      New Environment
 
-= form_for @environment, url: namespace_project_environments_path(@project.namespace, @project), html: { id: "new-environment-form", class: "form-horizontal js-new-environment-form js-requires-input" } do |f|
-  = form_errors(@environment)
-  .form-group
-    = f.label :ref, 'Name', class: 'control-label'
-    .col-sm-10
-      = f.text_field :name, required: true, tabindex: 2, class: 'form-control'
-  .form-actions
-    = f.submit 'Create', class: 'btn btn-create', tabindex: 3
-    = link_to 'Cancel', namespace_project_environments_path(@project.namespace, @project), class: 'btn btn-cancel'
+  = form_for @environment, url: namespace_project_environments_path(@project.namespace, @project), html: { id: "new-environment-form", class: "col-lg-9 js-new-environment-form js-requires-input" } do |f|
+    = form_errors(@environment)
+    .form-group
+      = f.label :ref, 'Environment name', class: 'label-light'
+      = f.text_field :name, required: true, class: 'form-control'
+    = f.submit 'Create environment', class: 'btn btn-create'
+    = link_to "Cancel", namespace_project_environments_path(@project.namespace, @project), class: "btn btn-cancel"
diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml
index dc07ad1a769..f5e30d75b42 100644
--- a/app/views/projects/environments/show.html.haml
+++ b/app/views/projects/environments/show.html.haml
@@ -9,23 +9,24 @@
 
     .col-md-3
       .nav-controls
-        = link_to 'Destroy', namespace_project_environment_path(@project.namespace, @project, @environment), data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
+        = link_to 'Destroy', namespace_project_environment_path(@project.namespace, @project, @environment), data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :delete
 
-  %ul.content-list
-    - if @deployments.blank?
-      %li
-        .nothing-here-block No deployments for #{@environment.name}
-    - else
-      .table-holder
-        %table.table.builds
-          %thead
-            %tr
-              %th ID
-              %th Commit
-              %th Build
-              %th Date
-              %th
+  - if @deployments.blank?
+    %ul.content-list
+      %li.nothing-here-block
+        No deployments for
+        %strong= @environment.name
+  - else
+    .table-holder
+      %table.table.builds
+        %thead
+          %tr
+            %th ID
+            %th Commit
+            %th Build
+            %th Date
+            %th
 
-          = render @deployments
+        = render @deployments
 
-      = paginate @deployments, theme: 'gitlab'
+    = paginate @deployments, theme: 'gitlab'