jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
sw 2014-10-25 15:40:50 +08:00
parent 9707049703 ef15c15605
commit 6db235cf3c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/helpers/application_helper.rb
View File

@ -460,6 +460,7 @@ module ApplicationHelper
project_tree(projects) do |project, level| project_tree(projects) do |project, level|
name_prefix = (level > 0 ? ' ' * 2 * level + '» ' : '').html_safe name_prefix = (level > 0 ? ' ' * 2 * level + '» ' : '').html_safe
tag_options = {:value => project.id} tag_options = {:value => project.id}
tag_options[:title] = project.name
if project == options[:selected] || (options[:selected].respond_to?(:include?) && options[:selected].include?(project)) if project == options[:selected] || (options[:selected].respond_to?(:include?) && options[:selected].include?(project))
tag_options[:selected] = 'selected' tag_options[:selected] = 'selected'
else else

4
public/stylesheets/application.css
View File

@ -2835,3 +2835,7 @@ div.repos_explain{
.projects-index{min-height: 350px} .projects-index{min-height: 350px}
.school-index{min-height: 400px} .school-index{min-height: 400px}
#membership_project_id option
{
width: 190px;
}