|
|
@@ -638,7 +638,7 @@ module ApplicationHelper |
|
|
|
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 |
|
|
@@ -1001,7 +1001,7 @@ module ApplicationHelper |
|
|
|
html << "</ul></div>\n" |
|
|
|
end |
|
|
|
html.html_safe |
|
|
|
end |
|
|
|
end |
|
|
|
|
|
|
|
def delete_link(url, options={}) |
|
|
|
options = { |
|
|
@@ -1015,8 +1015,8 @@ module ApplicationHelper |
|
|
|
|
|
|
|
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 |
|
|
@@ -1104,14 +1104,14 @@ module ApplicationHelper |
|
|
|
start_of_week = start_of_week.to_i % 7 |
|
|
|
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, showWeek: true, showOtherMonths: true, " + |
|
|
|
"selectOtherMonths: true, changeMonth: true, changeYear: true, " + |
|
|
|
"beforeShow: beforeShowDatePicker};") |
|
|
|
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 |