diff options
Diffstat (limited to 'app/views/projects/environments')
-rw-r--r-- | app/views/projects/environments/edit.html.haml | 1 | ||||
-rw-r--r-- | app/views/projects/environments/folder.html.haml | 1 | ||||
-rw-r--r-- | app/views/projects/environments/index.html.haml | 1 | ||||
-rw-r--r-- | app/views/projects/environments/new.html.haml | 1 | ||||
-rw-r--r-- | app/views/projects/environments/show.html.haml | 7 | ||||
-rw-r--r-- | app/views/projects/environments/terminal.html.haml | 4 |
6 files changed, 9 insertions, 6 deletions
diff --git a/app/views/projects/environments/edit.html.haml b/app/views/projects/environments/edit.html.haml index 56af252d785..c4e2c1eb63d 100644 --- a/app/views/projects/environments/edit.html.haml +++ b/app/views/projects/environments/edit.html.haml @@ -1,4 +1,5 @@ - page_title _("Edit"), @environment.name, _("Environments") +- add_page_specific_style 'page_bundles/environments' %h3.page-title = _('Edit environment') diff --git a/app/views/projects/environments/folder.html.haml b/app/views/projects/environments/folder.html.haml index 554cb4323f7..2b4d19a0e1d 100644 --- a/app/views/projects/environments/folder.html.haml +++ b/app/views/projects/environments/folder.html.haml @@ -1,5 +1,6 @@ - add_to_breadcrumbs _("Environments"), project_environments_path(@project) - breadcrumb_title _("Folder/%{name}") % { name: @folder } - page_title _("Environments in %{name}") % { name: @folder } +- add_page_specific_style 'page_bundles/environments' #environments-folder-list-view{ data: { environments_data: environments_folder_list_view_data, project_path: @project.full_path } } diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml index 9abc1a5a925..067c987e721 100644 --- a/app/views/projects/environments/index.html.haml +++ b/app/views/projects/environments/index.html.haml @@ -1,4 +1,5 @@ - page_title _("Environments") +- add_page_specific_style 'page_bundles/environments' #environments-list-view{ data: { environments_data: environments_list_data, "can-read-environment" => can?(current_user, :read_environment, @project).to_s, diff --git a/app/views/projects/environments/new.html.haml b/app/views/projects/environments/new.html.haml index 96edd3f0bd7..6b0ccc1dcc7 100644 --- a/app/views/projects/environments/new.html.haml +++ b/app/views/projects/environments/new.html.haml @@ -1,5 +1,6 @@ - breadcrumb_title _("Environments") - page_title _("New Environment") +- add_page_specific_style 'page_bundles/environments' %h3.page-title = _("New environment") diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml index 929015023d2..5b1556c9f52 100644 --- a/app/views/projects/environments/show.html.haml +++ b/app/views/projects/environments/show.html.haml @@ -1,9 +1,8 @@ - add_to_breadcrumbs _("Environments"), project_environments_path(@project) - breadcrumb_title @environment.name - page_title _("Environments") - -- content_for :page_specific_javascripts do - = stylesheet_link_tag 'page_bundles/xterm' +- add_page_specific_style 'page_bundles/xterm' +- add_page_specific_style 'page_bundles/environments' #environments-detail-view{ data: { name: @environment.name, id: @environment.id, delete_path: environment_delete_path(@environment)} } - if @environment.available? && can?(current_user, :stop_environment, @environment) @@ -67,7 +66,7 @@ %p.blank-state-text = html_escape(_("Define environments in the deploy stage(s) in %{code_open}.gitlab-ci.yml%{code_close} to track deployments here.")) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } .text-center - = link_to _("Read more"), help_page_path("ci/environments"), class: "btn btn-success" + = link_to _("Read more"), help_page_path("ci/environments/index.md"), class: "btn btn-success" - else .table-holder.gl-overflow-visible .ci-table.environments{ role: 'grid' } diff --git a/app/views/projects/environments/terminal.html.haml b/app/views/projects/environments/terminal.html.haml index 3a705d736f3..ed0bc0680d7 100644 --- a/app/views/projects/environments/terminal.html.haml +++ b/app/views/projects/environments/terminal.html.haml @@ -1,5 +1,5 @@ - page_title _("Terminal for environment"), @environment.name - +- add_page_specific_style 'page_bundles/terminal' - content_for :page_specific_javascripts do = stylesheet_link_tag "xterm.css" @@ -18,4 +18,4 @@ = render 'projects/deployments/actions', deployment: @environment.last_deployment .terminal-container{ class: container_class } - #terminal{ data: { project_path: "#{terminal_project_environment_path(@project, @environment)}.ws" } } + #terminal.gl-mt-4{ data: { project_path: "#{terminal_project_environment_path(@project, @environment)}.ws" } } |