summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-02-24 11:06:08 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-02-24 11:06:08 +0000
commitace19cc20fc603bf52a09cb4d1e7b8e94c425680 (patch)
tree05e6cbd938fee19d2107004fe98d110e7bcd1a25
parent0cefb7716eaa6d1a970a7f077d779e63ea3258cf (diff)
downloadredmine-ace19cc20fc603bf52a09cb4d1e7b8e94c425680.tar.gz
redmine-ace19cc20fc603bf52a09cb4d1e7b8e94c425680.zip
Use ti tags for sidebar queries (#13242).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11466 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/issues_helper.rb15
-rw-r--r--public/stylesheets/application.css4
2 files changed, 11 insertions, 8 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 59cff5ec1..7851159c2 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -197,12 +197,15 @@ module IssuesHelper
# links to #index on issues/show
url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : params
- content_tag('h3', h(title)) +
- queries.collect {|query|
- css = 'query'
- css << ' selected' if query == @query
- link_to(h(query.name), url_params.merge(:query_id => query), :class => css)
- }.join('<br />').html_safe
+ content_tag('h3', h(title)) + "\n" +
+ content_tag('ul',
+ queries.collect {|query|
+ css = 'query'
+ css << ' selected' if query == @query
+ content_tag('li', link_to(h(query.name), url_params.merge(:query_id => query), :class => css))
+ }.join("\n").html_safe,
+ :class => 'queries'
+ ) + "\n"
end
def render_sidebar_queries
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index ca9877fd6..2ab2032c4 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -76,6 +76,8 @@ h4 {border-bottom: 1px dotted #bbb;}
#sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
* html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; }
#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; }
* 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.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 a.delete {opacity: 0.4; vertical-align: middle;}
#watchers a.delete:hover {opacity: 1;}