diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-06-02 22:48:18 +0300 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-06-06 19:59:49 +0300 |
commit | bf0c4426ffb1994b647a4f7e8c74b0fef29645d2 (patch) | |
tree | 351595f96a157f21ae5385bb036cdb35ce4e8766 /app/views/projects/labels | |
parent | 91b475a9c0ab880c533b4d802afdc2db97ed1abb (diff) |
Feedback
Diffstat (limited to 'app/views/projects/labels')
-rw-r--r-- | app/views/projects/labels/_form.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/labels/_label.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/labels/index.html.haml | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/app/views/projects/labels/_form.html.haml b/app/views/projects/labels/_form.html.haml index 227ce5d2317..aa143e54ffe 100644 --- a/app/views/projects/labels/_form.html.haml +++ b/app/views/projects/labels/_form.html.haml @@ -24,10 +24,6 @@ - suggested_colors.each do |color| = link_to '#', style: "background-color: #{color}", data: { color: color } do - .form-group - = f.label :priority, "Priority", class: 'control-label' - .col-sm-10 - = f.text_field :priority, class: "form-control" .form-actions - if @label.persisted? diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml index be367ab4562..b7df0aa36a7 100644 --- a/app/views/projects/labels/_label.html.haml +++ b/app/views/projects/labels/_label.html.haml @@ -1,5 +1,5 @@ - label_css_id = dom_id(label) -%li{id: label_css_id, :"data-id" => label.id} +%li{id: label_css_id, data: {id: label.id } } = render "shared/label_row", label: label .pull-info-right %span.append-right-20 diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml index 325c50abaf2..4b2fb04323f 100644 --- a/app/views/projects/labels/index.html.haml +++ b/app/views/projects/labels/index.html.haml @@ -10,7 +10,8 @@ New label .labels - .prioritized-labels{ class: ('hide' if params[:page].present?)} + - hide_class = 'hide' if ((params[:page].present? and params[:page] != '1') or @labels.blank?) + .prioritized-labels{ class: hide_class } %h5 Prioritized Label %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_sorting_namespace_project_labels_path(@project.namespace, @project) } - if @prioritized.present? @@ -18,7 +19,7 @@ - else %p.empty-message No prioritized labels yet .other-labels - %h5 Other Labels + %h5{ class: hide_class } Other Labels - if @labels.present? %ul.content-list.manage-labels-list.js-other-labels = render @labels |