| @@ -638,7 +638,7 module ApplicationHelper | |||||
| 638 | else |
|
638 | else | |
| 639 | wiki_page_id = page.present? ? Wiki.titleize(page) : nil |
|
639 | wiki_page_id = page.present? ? Wiki.titleize(page) : nil | |
| 640 | parent = wiki_page.nil? && obj.is_a?(WikiContent) && obj.page && project == link_project ? obj.page.title : nil |
|
640 | parent = wiki_page.nil? && obj.is_a?(WikiContent) && obj.page && project == link_project ? obj.page.title : nil | |
| 641 |
url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project, |
|
641 | url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project, | |
| 642 | :id => wiki_page_id, :version => nil, :anchor => anchor, :parent => parent) |
|
642 | :id => wiki_page_id, :version => nil, :anchor => anchor, :parent => parent) | |
| 643 | end |
|
643 | end | |
| 644 | end |
|
644 | end | |
| @@ -1001,7 +1001,7 module ApplicationHelper | |||||
| 1001 | html << "</ul></div>\n" |
|
1001 | html << "</ul></div>\n" | |
| 1002 | end |
|
1002 | end | |
| 1003 | html.html_safe |
|
1003 | html.html_safe | |
| 1004 |
end |
|
1004 | end | |
| 1005 |
|
1005 | |||
| 1006 | def delete_link(url, options={}) |
|
1006 | def delete_link(url, options={}) | |
| 1007 | options = { |
|
1007 | options = { | |
| @@ -1015,8 +1015,8 module ApplicationHelper | |||||
| 1015 |
|
1015 | |||
| 1016 | def preview_link(url, form, target='preview', options={}) |
|
1016 | def preview_link(url, form, target='preview', options={}) | |
| 1017 | content_tag 'a', l(:label_preview), { |
|
1017 | content_tag 'a', l(:label_preview), { | |
| 1018 |
:href => "#", |
|
1018 | :href => "#", | |
| 1019 |
:onclick => %|submitPreview("#{escape_javascript url_for(url)}", "#{escape_javascript form}", "#{escape_javascript target}"); return false;|, |
|
1019 | :onclick => %|submitPreview("#{escape_javascript url_for(url)}", "#{escape_javascript form}", "#{escape_javascript target}"); return false;|, | |
| 1020 | :accesskey => accesskey(:preview) |
|
1020 | :accesskey => accesskey(:preview) | |
| 1021 | }.merge(options) |
|
1021 | }.merge(options) | |
| 1022 | end |
|
1022 | end | |
| @@ -1104,14 +1104,14 module ApplicationHelper | |||||
| 1104 | start_of_week = start_of_week.to_i % 7 |
|
1104 | start_of_week = start_of_week.to_i % 7 | |
| 1105 | tags << javascript_tag( |
|
1105 | tags << javascript_tag( | |
| 1106 | "var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: #{start_of_week}, " + |
|
1106 | "var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: #{start_of_week}, " + | |
| 1107 |
"showOn: 'button', buttonImageOnly: true, buttonImage: '" + |
|
1107 | "showOn: 'button', buttonImageOnly: true, buttonImage: '" + | |
| 1108 | path_to_image('/images/calendar.png') + |
|
1108 | path_to_image('/images/calendar.png') + | |
| 1109 | "', showButtonPanel: true, showWeek: true, showOtherMonths: true, " + |
|
1109 | "', showButtonPanel: true, showWeek: true, showOtherMonths: true, " + | |
| 1110 | "selectOtherMonths: true, changeMonth: true, changeYear: true, " + |
|
1110 | "selectOtherMonths: true, changeMonth: true, changeYear: true, " + | |
| 1111 | "beforeShow: beforeShowDatePicker};") |
|
1111 | "beforeShow: beforeShowDatePicker};") | |
| 1112 | jquery_locale = l('jquery.locale', :default => current_language.to_s) |
|
1112 | jquery_locale = l('jquery.locale', :default => current_language.to_s) | |
| 1113 | unless jquery_locale == 'en' |
|
1113 | unless jquery_locale == 'en' | |
| 1114 |
tags << javascript_include_tag("i18n/jquery.ui.datepicker-#{jquery_locale}.js") |
|
1114 | tags << javascript_include_tag("i18n/jquery.ui.datepicker-#{jquery_locale}.js") | |
| 1115 | end |
|
1115 | end | |
| 1116 | tags |
|
1116 | tags | |
| 1117 | end |
|
1117 | end | |
General Comments 0
You need to be logged in to leave comments.
Login now