Skip to content

G
gitlab-ce
Commit b876793d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Restlye issueable filters to be more compact

parent 61772560
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 119 deletions
app/assets/javascripts/issues.js.coffee
View file @ b876793d
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
$(this).html totalIssues + 1 $(this).html totalIssues + 1
else else
$(this).html totalIssues - 1 $(this).html totalIssues - 1
$("body").on "click", ".issues-filters .dropdown-menu a", -> $("body").on "click", ".issues-other-filters .dropdown-menu a", ->
$('.issues-list').block( $('.issues-list').block(
message: null, message: null,
overlayCSS: overlayCSS:
...@@ -77,9 +77,9 @@ ...@@ -77,9 +77,9 @@
ids.push $(value).attr("data-id") ids.push $(value).attr("data-id")
$("#update_issues_ids").val ids $("#update_issues_ids").val ids
$(".issues-filters").hide() $(".issues-other-filters").hide()
$(".issues_bulk_update").show() $(".issues_bulk_update").show()
else else
$("#update_issues_ids").val [] $("#update_issues_ids").val []
$(".issues_bulk_update").hide() $(".issues_bulk_update").hide()
$(".issues-filters").show() $(".issues-other-filters").show()
app/views/projects/issues/_issues.html.haml
View file @ b876793d
.append-bottom-10
.check-all-holder
= check_box_tag "check_all_issues", nil, false, class: "check_all_issues left", disabled: !can?(current_user, :modify_issue, @project)
= render 'shared/issuable_filter'
.clearfix
.issues_bulk_update.hide
= form_tag bulk_update_project_issues_path(@project), method: :post do
= select_tag('update[status]', options_for_select([['Open', 'open'], ['Closed', 'closed']]), prompt: "Status")
= project_users_select_tag('update[assignee_id]', placeholder: 'Assignee')
= select_tag('update[milestone_id]', bulk_update_milestone_options, prompt: "Milestone")
= hidden_field_tag 'update[issues_ids]', []
= hidden_field_tag :status, params[:status]
= button_tag "Update issues", class: "btn update_selected_issues btn-save"
.panel.panel-default .panel.panel-default
%ul.well-list.issues-list %ul.well-list.issues-list
= render @issues = render @issues
......
app/views/projects/issues/index.html.haml
View file @ b876793d
%h3.page-title .append-bottom-10
Issues
- if current_user
.hidden-xs.inline
= link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do
%small
%i.fa.fa-rss
.pull-right .pull-right
.pull-left .pull-left
- if current_user
.hidden-xs.pull-left
= link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }), class: 'btn append-right-10' do
%i.fa.fa-rss
= form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'pull-left issue-search-form' do = form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'pull-left issue-search-form' do
.append-right-10.hidden-xs.hidden-sm .append-right-10.hidden-xs.hidden-sm
= search_field_tag :issue_search, params[:issue_search], { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input input-mn-300' } = search_field_tag :issue_search, params[:issue_search], { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input input-mn-300' }
...@@ -21,7 +20,17 @@ ...@@ -21,7 +20,17 @@
%i.fa.fa-plus %i.fa.fa-plus
New Issue New Issue
= render 'shared/issuable_filter'
.clearfix
.issues_bulk_update.hide
= form_tag bulk_update_project_issues_path(@project), method: :post do
= select_tag('update[status]', options_for_select([['Open', 'open'], ['Closed', 'closed']]), prompt: "Status")
= project_users_select_tag('update[assignee_id]', placeholder: 'Assignee')
= select_tag('update[milestone_id]', bulk_update_milestone_options, prompt: "Milestone")
= hidden_field_tag 'update[issues_ids]', []
= hidden_field_tag :status, params[:status]
= button_tag "Update issues", class: "btn update_selected_issues btn-save"
%hr
.issues-holder .issues-holder
= render "issues" = render "issues"
app/views/shared/_issuable_filter.html.haml
View file @ b876793d
.issues-filters .issues-filters
.pull-left.append-right-20 .issues-state-filters
%ul.nav.nav-pills.nav-compact %ul.nav.nav-tabs
%li{class: ("active" if params[:state] == 'opened')} %li{class: ("active" if params[:state] == 'opened')}
= link_to page_filter_path(state: 'opened') do = link_to page_filter_path(state: 'opened') do
%i.fa.fa-exclamation-circle %i.fa.fa-exclamation-circle
...@@ -14,99 +14,106 @@ ...@@ -14,99 +14,106 @@
%i.fa.fa-compass %i.fa.fa-compass
All All
.dropdown.inline.assignee-filter %div
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"} - if controller.controller_name == 'issues'
%i.fa.fa-user .check-all-holder
%span.light assignee: = check_box_tag "check_all_issues", nil, false,
- if @assignee.present? class: "check_all_issues left",
%strong= @assignee.name disabled: !can?(current_user, :modify_issue, @project)
- elsif params[:assignee_id] == "0" .issues-other-filters
Unassigned .dropdown.inline.assignee-filter
- else %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
Any %i.fa.fa-user
%b.caret %span.light assignee:
%ul.dropdown-menu - if @assignee.present?
%li %strong= @assignee.name
= link_to page_filter_path(assignee_id: nil) do - elsif params[:assignee_id] == "0"
Any Unassigned
= link_to page_filter_path(assignee_id: 0) do - else
Unassigned Any
- @assignees.sort_by(&:name).each do |user| %b.caret
%li %ul.dropdown-menu
= link_to page_filter_path(assignee_id: user.id) do %li
= image_tag avatar_icon(user.email), class: "avatar s16", alt: '' = link_to page_filter_path(assignee_id: nil) do
= user.name Any
= link_to page_filter_path(assignee_id: 0) do
.dropdown.inline.prepend-left-10.author-filter Unassigned
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"} - @assignees.sort_by(&:name).each do |user|
%i.fa.fa-user %li
%span.light author: = link_to page_filter_path(assignee_id: user.id) do
- if @author.present? = image_tag avatar_icon(user.email), class: "avatar s16", alt: ''
%strong= @author.name = user.name
- elsif params[:author_id] == "0"
Unassigned
- else
Any
%b.caret
%ul.dropdown-menu
%li
= link_to page_filter_path(author_id: nil) do
Any
= link_to page_filter_path(author_id: 0) do
Unassigned
- @authors.sort_by(&:name).each do |user|
%li
= link_to page_filter_path(author_id: user.id) do
= image_tag avatar_icon(user.email), class: "avatar s16", alt: ''
= user.name
.dropdown.inline.prepend-left-10.milestone-filter
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
%i.fa.fa-clock-o
%span.light milestone:
- if @milestone.present?
%strong= @milestone.title
- elsif params[:milestone_id] == "0"
None (backlog)
- else
Any
%b.caret
%ul.dropdown-menu
%li
= link_to page_filter_path(milestone_id: nil) do
Any
= link_to page_filter_path(milestone_id: 0) do
None (backlog)
- @milestones.each do |milestone|
%li
= link_to page_filter_path(milestone_id: milestone.id) do
%strong= milestone.title
%small.light= milestone.expires_at
- if @project .dropdown.inline.prepend-left-10.author-filter
.dropdown.inline.prepend-left-10.labels-filter %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"} %i.fa.fa-user
%i.fa.fa-tags %span.light author:
%span.light label: - if @author.present?
- if params[:label_name].present? %strong= @author.name
%strong= params[:label_name] - elsif params[:author_id] == "0"
- else Unassigned
Any - else
%b.caret
%ul.dropdown-menu
%li
= link_to page_filter_path(label_name: nil) do
Any Any
- if @project.labels.any? %b.caret
- @project.labels.each do |label| %ul.dropdown-menu
%li
= link_to page_filter_path(author_id: nil) do
Any
= link_to page_filter_path(author_id: 0) do
Unassigned
- @authors.sort_by(&:name).each do |user|
%li %li
= link_to page_filter_path(label_name: label.name) do = link_to page_filter_path(author_id: user.id) do
= render_colored_label(label) = image_tag avatar_icon(user.email), class: "avatar s16", alt: ''
- else = user.name
.dropdown.inline.prepend-left-10.milestone-filter
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
%i.fa.fa-clock-o
%span.light milestone:
- if @milestone.present?
%strong= @milestone.title
- elsif params[:milestone_id] == "0"
None (backlog)
- else
Any
%b.caret
%ul.dropdown-menu
%li %li
= link_to generate_project_labels_path(@project, redirect: request.original_url), method: :post do = link_to page_filter_path(milestone_id: nil) do
%i.fa.fa-plus-circle Any
Create default labels = link_to page_filter_path(milestone_id: 0) do
None (backlog)
- @milestones.each do |milestone|
%li
= link_to page_filter_path(milestone_id: milestone.id) do
%strong= milestone.title
%small.light= milestone.expires_at
- if @project
.dropdown.inline.prepend-left-10.labels-filter
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
%i.fa.fa-tags
%span.light label:
- if params[:label_name].present?
%strong= params[:label_name]
- else
Any
%b.caret
%ul.dropdown-menu
%li
= link_to page_filter_path(label_name: nil) do
Any
- if @project.labels.any?
- @project.labels.each do |label|
%li
= link_to page_filter_path(label_name: label.name) do
= render_colored_label(label)
- else
%li
= link_to generate_project_labels_path(@project, redirect: request.original_url), method: :post do
%i.fa.fa-plus-circle
Create default labels
.pull-right .pull-right
= render 'shared/sort_dropdown' = render 'shared/sort_dropdown'
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7