From: Jean-Philippe Lang Date: Sun, 15 Jan 2017 12:09:24 +0000 (+0000) Subject: Always show "Jump to project" drop-down (#24833). X-Git-Tag: 3.4.0~410 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=df18ece50437b105091f3e26cfa6748fd45fe12f;p=redmine.git Always show "Jump to project" drop-down (#24833). Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@16199 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b319537ee..2a5acc477 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -358,20 +358,18 @@ module ApplicationHelper # Renders the project quick-jump box def render_project_jump_box projects = projects_for_jump_box(User.current) - if projects.any? - text = @project.try(:name) || l(:label_jump_to_a_project) - trigger = content_tag('span', text, :class => 'drdn-trigger') - q = text_field_tag('q', '', :id => 'projects-quick-search', :class => 'autocomplete', :data => {:automcomplete_url => projects_path(:format => 'js')}) - all = link_to(l(:label_project_all), projects_path(:jump => current_menu_item), :class => (@project.nil? && controller.class.main_menu ? 'selected' : nil)) - content = content_tag('div', - content_tag('div', q, :class => 'quick-search') + - content_tag('div', render_projects_for_jump_box(projects, @project), :class => 'drdn-items projects selection') + - content_tag('div', all, :class => 'drdn-items all-projects selection'), - :class => 'drdn-content' - ) - - content_tag('span', trigger + content, :id => "project-jump", :class => "drdn") - end + text = @project.try(:name) || l(:label_jump_to_a_project) + trigger = content_tag('span', text, :class => 'drdn-trigger') + q = text_field_tag('q', '', :id => 'projects-quick-search', :class => 'autocomplete', :data => {:automcomplete_url => projects_path(:format => 'js')}) + all = link_to(l(:label_project_all), projects_path(:jump => current_menu_item), :class => (@project.nil? && controller.class.main_menu ? 'selected' : nil)) + content = content_tag('div', + content_tag('div', q, :class => 'quick-search') + + content_tag('div', render_projects_for_jump_box(projects, @project), :class => 'drdn-items projects selection') + + content_tag('div', all, :class => 'drdn-items all-projects selection'), + :class => 'drdn-content' + ) + + content_tag('span', trigger + content, :id => "project-jump", :class => "drdn") end def project_tree_options_for_select(projects, options = {}) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index a7e51146f..641dd01e7 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -202,6 +202,9 @@ div + .drdn-items {border-top:1px solid #ccc;} .drdn-items.selection>*.selected:before { content:"\2713 "; } +.drdn-items.selection:empty { + border: none; +} .drdn-items>span {color:#999;} #project-jump.drdn {width:200px;display:inline-block;}