meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-09 09:01:31 +00:00
Code Issues Releases Wiki Activity

shorten long line of lib/redmine/wiki_formatting/macros.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20638 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-12-12 15:49:29 +00:00
parent 655057f08b
commit 690135e1c5
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/redmine/wiki_formatting/macros.rb
View File

@ -224,7 +224,14 @@ module Redmine
raise t(:error_circular_inclusion) if @included_wiki_pages.include?(page.id)
@included_wiki_pages << page.id
out = textilizable(page.content, :text, :attachments => page.attachments, :headings => false, :inline_attachments => @@inline_attachments)
out =
textilizable(
page.content,
:text,
:attachments => page.attachments,
:headings => false,
:inline_attachments => @@inline_attachments
)
@included_wiki_pages.pop
out
end
@ -239,8 +246,21 @@ module Redmine
js = "$('##{html_id}-show, ##{html_id}-hide').toggle(); $('##{html_id}').fadeToggle(150);"
out = ''.html_safe
out << link_to_function(show_label, js, :id => "#{html_id}-show", :class => 'icon icon-collapsed collapsible')
out << link_to_function(hide_label, js, :id => "#{html_id}-hide", :class => 'icon icon-expended collapsible', :style => 'display:none;')
out << content_tag('div', textilizable(text, :object => obj, :headings => false, :inline_attachments => @@inline_attachments), :id => html_id, :class => 'collapsed-text', :style => 'display:none;')
out <<
link_to_function(
hide_label, js,
:id => "#{html_id}-hide",
:class => 'icon icon-expended collapsible',
:style => 'display:none;'
)
out <<
content_tag(
'div',
textilizable(text, :object => obj, :headings => false,
:inline_attachments => @@inline_attachments),
:id => html_id, :class => 'collapsed-text',
:style => 'display:none;'
)
out
end
@ -258,11 +278,15 @@ module Redmine
size = size.to_i
size = 200 unless size > 0
if obj && obj.respond_to?(:attachments) && attachment = Attachment.latest_attach(obj.attachments, filename)
if obj && obj.respond_to?(:attachments) &&
attachment = Attachment.latest_attach(obj.attachments, filename)
title = options[:title] || attachment.title
thumbnail_url = url_for(:controller => 'attachments', :action => 'thumbnail', :id => attachment, :size => size, :only_path => @only_path)
image_url = url_for(:controller => 'attachments', :action => 'show', :id => attachment, :only_path => @only_path)
thumbnail_url =
url_for(:controller => 'attachments', :action => 'thumbnail',
:id => attachment, :size => size, :only_path => @only_path)
image_url =
url_for(:controller => 'attachments', :action => 'show',
:id => attachment, :only_path => @only_path)
img = image_tag(thumbnail_url, :alt => attachment.filename)
link_to(img, image_url, :class => 'thumbnail', :title => title)
else