Commit 4ba48d6b authored by Filipa Lacerda's avatar Filipa Lacerda

Merge two partials into one. Rename it to match the other partials

parent 863146d4
...@@ -3,9 +3,16 @@ ...@@ -3,9 +3,16 @@
- klass = "ci-status-icon ci-status-icon-#{detailed_status}" - klass = "ci-status-icon ci-status-icon-#{detailed_status}"
- if details_path - if details_path
= link_to details_path, class: klass, data: { toggle: 'tooltip', title: "#{subject.name} - #{detailed_status}" } do = link_to details_path, class: klass,
data: { toggle: 'tooltip', title: "#{subject.name} - #{detailed_status}" } do
%span{ class: klass }= custom_icon(detailed_status.icon) %span{ class: klass }= custom_icon(detailed_status.icon)
.ci-status-text= subject.name .ci-status-text= subject.name
- else - else
%span{ class: klass }= custom_icon(detailed_status.icon) %span{ class: klass }= custom_icon(detailed_status.icon)
.ci-status-text= subject.name .ci-status-text= subject.name
- if detailed_status.has_action?
= link_to detailed_status.action_path, method: detailed_status.action_method,
title: "#{subject.name}: #{detailed_status.action_title}", class: 'ci-action-icon-container' do
%i.ci-action-icon-wrapper
= icon(detailed_status.action_icon, class: detailed_status.action_class)
= render "ci/status/icon_with_name", subject: subject
- detailed_status = subject.detailed_status(current_user)
- if detailed_status.has_action?
= link_to detailed_status.action_path, method: detailed_status.action_method,
title: "#{subject.name}: #{detailed_status.action_title}", class: 'ci-action-icon-container' do
%i.ci-action-icon-wrapper
= icon(detailed_status.action_icon, class: detailed_status.action_class)
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
%li.build %li.build
.curve .curve
.build-content .build-content
= render 'ci/status/icon_with_name_and_action', subject: status = render 'ci/status/bagde_graph_icon_with_name_and_action', subject: status
- else - else
%li.build %li.build
.curve .curve
......
...@@ -10,4 +10,4 @@ ...@@ -10,4 +10,4 @@
%ul %ul
- subject.each do |status| - subject.each do |status|
%li.dropdown-build %li.dropdown-build
= render 'ci/status/icon_with_name_and_action', subject: status = render 'ci/status/bagde_graph_icon_with_name_and_action', subject: status
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment