Mercurial > hg > soundsoftware-site
changeset 1120:55944e901e9e redmine-2.2-integration
fixed a syntax error on an if/else statement.
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Tue, 08 Jan 2013 16:04:52 +0000 |
parents | 22d81bd0b62c |
children | 6b49ed91e183 |
files | app/helpers/application_helper.rb |
diffstat | 1 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/app/helpers/application_helper.rb Tue Jan 08 14:43:04 2013 +0000 +++ b/app/helpers/application_helper.rb Tue Jan 08 16:04:52 2013 +0000 @@ -309,13 +309,13 @@ def principals_check_box_tags(name, principals) s = '' principals.sort.each do |principal| - - if principal.type == "User": + + if principal.type == "User" s << "<label>#{ check_box_tag name, principal.id, false } #{link_to_user principal}</label>\n" else s << "<label>#{ check_box_tag name, principal.id, false } #{h principal} (Group)</label>\n" end - + end s.html_safe end @@ -488,7 +488,7 @@ root = ancestors.shift b << link_to_project(root, {:jump => current_menu_item}, :class => 'root') if ancestors.size > 2 - b << '…' + b << '…' ancestors = ancestors[-2, 2] end b += ancestors.collect {|p| link_to_project(p, {:jump => current_menu_item}, :class => 'ancestor') } @@ -669,7 +669,7 @@ else wiki_page_id = page.present? ? Wiki.titleize(page) : nil parent = wiki_page.nil? && obj.is_a?(WikiContent) && obj.page && project == link_project ? obj.page.title : nil - url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project, + url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project, :id => wiki_page_id, :version => nil, :anchor => anchor, :parent => parent) end end @@ -1029,7 +1029,7 @@ html << "</ul></div>\n" end html.html_safe - end + end def delete_link(url, options={}) options = { @@ -1043,8 +1043,8 @@ def preview_link(url, form, target='preview', options={}) content_tag 'a', l(:label_preview), { - :href => "#", - :onclick => %|submitPreview("#{escape_javascript url_for(url)}", "#{escape_javascript form}", "#{escape_javascript target}"); return false;|, + :href => "#", + :onclick => %|submitPreview("#{escape_javascript url_for(url)}", "#{escape_javascript form}", "#{escape_javascript target}"); return false;|, :accesskey => accesskey(:preview) }.merge(options) end @@ -1132,12 +1132,12 @@ tags = javascript_tag( "var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: #{start_of_week}, " + - "showOn: 'button', buttonImageOnly: true, buttonImage: '" + + "showOn: 'button', buttonImageOnly: true, buttonImage: '" + path_to_image('/images/calendar.png') + "', showButtonPanel: true};") jquery_locale = l('jquery.locale', :default => current_language.to_s) unless jquery_locale == 'en' - tags << javascript_include_tag("i18n/jquery.ui.datepicker-#{jquery_locale}.js") + tags << javascript_include_tag("i18n/jquery.ui.datepicker-#{jquery_locale}.js") end tags end