jro_apps/redmine Commit - r10469:d29fa4735b57

Adds a macro for inserting collapsed text (#12167)....

Jean-Philippe Lang -

r10469:d29fa4735b57

parent child

Context file:

r10469:d29fa4735b57

Collapse all files

config/locales/en.yml +1 0

               button_quote: Quote
               button_duplicate: Duplicate
               button_show: Show
+              button_hide: Hide
               button_edit_section: Edit this section
               button_export: Export
               button_delete_my_account: Delete my account

config/locales/fr.yml +1 0

               button_quote: Citer
               button_duplicate: Dupliquer
               button_show: Afficher
+              button_hide: Cacher
               button_edit_section: Modifier cette section
               button_export: Exporter
               button_delete_my_account: Supprimer mon compte

lib/redmine/wiki_formatting/macros.rb +13 0

@@ -212,6 +212,19 module Redmine
212	out	212	out
213	end	213	end
214		214
		215	desc "Inserts of collapsed block of text. Example:\n\n {{collapse(View details...)\nThis is a block of text that is collapsed by default.\nIt can be expanded by clicking a link.\n}}"
		216	macro :collapse do \|obj, args, text\|
		217	html_id = "collapse-#{Redmine::Utils.random_hex(4)}"
		218	show_label = args[0] \|\| l(:button_show)
		219	hide_label = args[1] \|\| args[0] \|\| l(:button_hide)
		220	js = "$('##{html_id}-show, ##{html_id}-hide').toggle(); $('##{html_id}').fadeToggle(150);"
		221	out = ''.html_safe
		222	out << link_to_function(show_label, js, :id => "#{html_id}-show", :class => 'collapsible collapsed')
		223	out << link_to_function(hide_label, js, :id => "#{html_id}-hide", :class => 'collapsible', :style => 'display:none;')
		224	out << content_tag('div', textilizable(text, :object => obj), :id => html_id, :class => 'collapsed-text', :style => 'display:none;')
		225	out
		226	end
		227
215	desc "Displays a clickable thumbnail of an attached image. Examples:\n\n<pre>{{thumbnail(image.png)}}\n{{thumbnail(image.png, size=300, title=Thumbnail)}}</pre>"	228	desc "Displays a clickable thumbnail of an attached image. Examples:\n\n<pre>{{thumbnail(image.png)}}\n{{thumbnail(image.png, size=300, title=Thumbnail)}}</pre>"
216	macro :thumbnail do \|obj, args\|	229	macro :thumbnail do \|obj, args\|
217	args, options = extract_macro_options(args, :size, :title)	230	args, options = extract_macro_options(args, :size, :title)

test/test_helper.rb +5 0

                 assert !s.include?(expected), "\"#{expected}\" found in \"#{s}\""
               end
+              def assert_select_in(text, *args, &block)
+                d = HTML::Document.new(CGI::unescapeHTML(String.new(text))).root
+                assert_select(d, *args, &block)
+              end
               def assert_mail_body_match(expected, mail)
                 if expected.is_a?(String)
                   assert_include expected, mail_body(mail)

test/unit/lib/redmine/wiki_formatting/macros_test.rb +30 0

@@ -180,6 +180,36 class Redmine::WikiFormatting::MacrosTest < ActionView::TestCase
180	assert_include 'Page not found', textilizable(text)	180	assert_include 'Page not found', textilizable(text)
181	end	181	end
182		182
		183	def test_macro_collapse
		184	text = "{{collapse\nCollapsed block of text\n}}"
		185	result = textilizable(text)
		186
		187	assert_select_in result, 'div.collapsed-text'
		188	assert_select_in result, 'strong', :text => 'Collapsed'
		189	assert_select_in result, 'a.collapsible.collapsed', :text => 'Show'
		190	assert_select_in result, 'a.collapsible', :text => 'Hide'
		191	end
		192
		193	def test_macro_collapse_with_one_arg
		194	text = "{{collapse(Example)\nCollapsed block of text\n}}"
		195	result = textilizable(text)
		196
		197	assert_select_in result, 'div.collapsed-text'
		198	assert_select_in result, 'strong', :text => 'Collapsed'
		199	assert_select_in result, 'a.collapsible.collapsed', :text => 'Example'
		200	assert_select_in result, 'a.collapsible', :text => 'Example'
		201	end
		202
		203	def test_macro_collapse_with_two_args
		204	text = "{{collapse(Show example, Hide example)\nCollapsed block of text\n}}"
		205	result = textilizable(text)
		206
		207	assert_select_in result, 'div.collapsed-text'
		208	assert_select_in result, 'strong', :text => 'Collapsed'
		209	assert_select_in result, 'a.collapsible.collapsed', :text => 'Show example'
		210	assert_select_in result, 'a.collapsible', :text => 'Hide example'
		211	end
		212
183	def test_macro_child_pages	213	def test_macro_child_pages
184	expected = "<p><ul class=\"pages-hierarchy\">\n" +	214	expected = "<p><ul class=\"pages-hierarchy\">\n" +
185	"<li><a href=\"/projects/ecookbook/wiki/Child_1\">Child 1</a>\n" +	215	"<li><a href=\"/projects/ecookbook/wiki/Child_1\">Child 1</a>\n" +

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages