diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-02-26 12:52:00 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-03-03 12:41:11 +0300 |
commit | 62dcdef969fe29f43abfbe2653e73ab09b2d1bf6 (patch) | |
tree | d8c1b1a2679335c923c1c8b676aba53bdd3640a4 /app/helpers/labels_helper.rb | |
parent | 7183a7da6dbe5d2faf2ae03dfe4652ca6ed6dfde (diff) |
Improve cross project label look and feel
Diffstat (limited to 'app/helpers/labels_helper.rb')
-rw-r--r-- | app/helpers/labels_helper.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb index 122f50081e4..37fc1dab876 100644 --- a/app/helpers/labels_helper.rb +++ b/app/helpers/labels_helper.rb @@ -50,22 +50,23 @@ module LabelsHelper @project.labels.pluck(:title) end - def render_colored_label(label, label_prefix = '') + def render_colored_label(label, label_suffix = '') label_color = label.color || Label::DEFAULT_COLOR text_color = text_color_for_bg(label_color) # Intentionally not using content_tag here so that this method can be called # by LabelReferenceFilter span = %(<span class="label color-label") + - %( style="background-color: #{label_color}; color: #{text_color}">) + - label_prefix + escape_once(label.name) + '</span>' + %(style="background-color: #{label_color}; color: #{text_color}">) + + %(#{escape_once(label.name)}#{label_suffix}</span>) span.html_safe end def render_colored_cross_project_label(label) - label_prefix = "#{label.project.path_with_namespace} » " - render_colored_label(label, label_prefix) + label_suffix = label.project.name + label_suffix = " <i>« #{label_suffix}</i>" + render_colored_label(label, label_suffix) end def suggested_colors |