kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use ti tags for sidebar queries (#13242). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11466 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-02-24 11:06:08 +00:00
parent 0cefb7716e
commit ace19cc20f
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/helpers/issues_helper.rb
View File

@ -197,12 +197,15 @@ module IssuesHelper
# links to #index on issues/show # links to #index on issues/show
url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : params url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : params
content_tag('h3', h(title)) + content_tag('h3', h(title)) + "\n" +
queries.collect {|query| content_tag('ul',
css = 'query' queries.collect {|query|
css << ' selected' if query == @query css = 'query'
link_to(h(query.name), url_params.merge(:query_id => query), :class => css) css << ' selected' if query == @query
}.join('<br />').html_safe content_tag('li', link_to(h(query.name), url_params.merge(:query_id => query), :class => css))
}.join("\n").html_safe,
:class => 'queries'
) + "\n"
end end
def render_sidebar_queries def render_sidebar_queries

4
public/stylesheets/application.css
View File

@ -76,6 +76,8 @@ h4 {border-bottom: 1px dotted #bbb;}
#sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; } #sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
* html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; } * html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; }
#sidebar .contextual { margin-right: 1em; } #sidebar .contextual { margin-right: 1em; }
#sidebar ul.watchers, #sidebar ul.queries {margin: 0; padding: 0;}
#sidebar ul.watchers li, #sidebar ul.queries li {list-style-type:none;margin: 0px 2px 0px 0px; padding: 0px 0px 0px 0px;}
#content { width: 75%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; } #content { width: 75%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; }
* html #content{ width: 75%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;} * html #content{ width: 75%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
@ -267,8 +269,6 @@ div.members h3 { background: url(../images/group.png) no-repeat 0% 50%; padding-
div.news h3 { background: url(../images/news.png) no-repeat 0% 50%; padding-left: 20px; } div.news h3 { background: url(../images/news.png) no-repeat 0% 50%; padding-left: 20px; }
div.projects h3 { background: url(../images/projects.png) no-repeat 0% 50%; padding-left: 20px; } div.projects h3 { background: url(../images/projects.png) no-repeat 0% 50%; padding-left: 20px; }
#watchers ul {margin: 0; padding: 0;}
#watchers li {list-style-type:none;margin: 0px 2px 0px 0px; padding: 0px 0px 0px 0px;}
#watchers select {width: 95%; display: block;} #watchers select {width: 95%; display: block;}
#watchers a.delete {opacity: 0.4; vertical-align: middle;} #watchers a.delete {opacity: 0.4; vertical-align: middle;}
#watchers a.delete:hover {opacity: 1;} #watchers a.delete:hover {opacity: 1;}