Changes for page Macros

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -9,13 +9,13 @@
9	9	#end
10	10	#set ($browseMacrosURL = $xwiki.getURL('XWiki.XWikiPreferences', 'admin', "section=${section}&search=macro&repo="))
11	11	#else
12		- #set ($browseMacrosURL = 'http://extensions.xwiki.org/xwiki/bin/view/Extension/#%7Ct=extensions&p=1&l=30&s=doc.creationDate&d=desc&category=macro')
	12	+ #set ($browseMacrosURL = 'https://extensions.xwiki.org/xwiki/bin/view/Extension/#%7Ct=extensions&p=1&l=30&s=doc.creationDate&d=desc&category=macro')
13	13	#end
14	14
15	15	#set ($actionCards = [{
16	16	'title': $services.localization.render('help.macros.useMacros.title'),
17	17	'description': $services.localization.render('help.macros.useMacros.description'),
18		- 'tip':$services.localization.render('help.macros.useMacros.tip', ["<a href='http://extensions.xwiki.org/xwiki/bin/view/Extension/CKEditor+Integration' class='wikiexternallink'>",'</a>', $services.icon.renderHTML('cog')]),
	18	+ 'tip':$services.localization.render('help.macros.useMacros.tip', ["<a href='https://extensions.xwiki.org/xwiki/bin/view/Extension/CKEditor+Integration' class='wikiexternallink'>",'</a>', $services.icon.renderHTML('cog')]),
19	19	'thumbnail': 'Macro',
20	20	'actions': [{
21	21	'label': $services.localization.render('help.try.label'),
...	...	@@ -32,7 +32,7 @@
32	32	'url': $browseMacrosURL
33	33	}, {
34	34	'label': $services.localization.render('help.more.label'),
35		- 'url': 'http://platform.xwiki.org/xwiki/bin/view/DevGuide/WikiMacroTutorial'
	35	+ 'url': 'https://www.xwiki.org/xwiki/bin/view/Documentation/DevGuide/Tutorials/WritingMacros/WikiMacroTutorial/'
36	36	}]
37	37	}])
38	38
...	...	@@ -39,37 +39,37 @@
39	39	#set ($exampleCards = [{
40	40	'title': $services.localization.render('help.macros.box.title'),
41	41	'description': $services.localization.render('help.macros.box.description'),
42		- 'documentation': 'http://extensions.xwiki.org/xwiki/bin/view/Extension/Box+Macro',
	42	+ 'documentation': 'https://extensions.xwiki.org/xwiki/bin/view/Extension/Box+Macro',
43	43	'examples': 'Help.Macros.Box.WebHome',
44	44	'thumbnail': 'Help.Macros.Box.WebHome@box.png'
45	45	}, {
46	46	'title': $services.localization.render('help.macros.toc.title'),
47	47	'description': $services.localization.render('help.macros.toc.description'),
48		- 'documentation': 'http://extensions.xwiki.org/xwiki/bin/view/Extension/TOC+Macro',
	48	+ 'documentation': 'https://extensions.xwiki.org/xwiki/bin/view/Extension/TOC+Macro',
49	49	'examples': 'Help.Macros.ToC.WebHome',
50	50	'thumbnail': 'Help.Macros.ToC.WebHome@toc.png'
51	51	}, {
52	52	'title': $services.localization.render('help.macros.gallery.title'),
53	53	'description': $services.localization.render('help.macros.gallery.description'),
54		- 'documentation': 'http://extensions.xwiki.org/xwiki/bin/view/Extension/Gallery+Macro',
	54	+ 'documentation': 'https://extensions.xwiki.org/xwiki/bin/view/Extension/Gallery+Macro',
55	55	'examples': 'Help.Macros.Gallery.WebHome',
56	56	'thumbnail': 'Help.Macros.Gallery.WebHome@gallery.png'
57	57	}, {
58	58	'title': $services.localization.render('help.macros.chart.title') ,
59	59	'description': $services.localization.render('help.macros.chart.description'),
60		- 'documentation': 'http://extensions.xwiki.org/xwiki/bin/view/Extension/Chart+Macro',
	60	+ 'documentation': 'https://extensions.xwiki.org/xwiki/bin/view/Extension/Chart+Macro',
61	61	'examples': 'Help.Macros.Chart.WebHome',
62	62	'thumbnail': 'Help.Macros.Chart.WebHome@chart.png'
63	63	}, {
64	64	'title': $services.localization.render('help.macros.tree.title') ,
65	65	'description': $services.localization.render('help.macros.tree.description'),
66		- 'documentation': 'http://extensions.xwiki.org/xwiki/bin/view/Extension/Document+Tree+Macro',
	66	+ 'documentation': 'https://extensions.xwiki.org/xwiki/bin/view/Extension/Document+Tree+Macro',
67	67	'examples': 'Help.Macros.Tree.WebHome',
68	68	'thumbnail': 'Help.Macros.Tree.WebHome@tree.png'
69	69	}, {
70	70	'title': $services.localization.render('help.macros.notifications.title') ,
71	71	'description': $services.localization.render('help.macros.notifications.description'),
72		- 'documentation': 'http://extensions.xwiki.org/xwiki/bin/view/Extension/Notifications%20Application/#HNotificationsMacro',
	72	+ 'documentation': 'https://extensions.xwiki.org/xwiki/bin/view/Extension/Notifications%20Application/#HNotificationsMacro',
73	73	'examples': 'Help.Macros.Notifications.WebHome',
74	74	'thumbnail': 'Help.Macros.Notifications.WebHome@notifications.png'
75	75	}])
...	...	@@ -77,33 +77,22 @@
77	77
78	78	{{velocity}}
79	79	{{html clean="false"}}
80		-<div class="row">
	80	+<ul class="card-list two-cols">
81	81	#foreach ($card in $actionCards)
82		- ## See http://getbootstrap.com/css/#grid-responsive-resets .
83		- #if ($foreach.index > 0 && $foreach.index % 2 == 0)
84		- <div class="clearfix visible-sm-block visible-md-block visible-lg-block"></div>
85		- #end
86		- <div class="col-xs-12 col-sm-6">
	82	+ <li class="card">
87	87	#helpActionCard($card)
88		- </div>
	84	+ </li>
89	89	#end
90		-</div>
	86	+</ul>
91	91	<h3 id="HExamples">Examples</h3>
92	92	<p>Need help or confused with some of our macros? Check out their documentation and find out more about their functionality.</p>
93		-<div class="row">
	89	+<ul class="card-list three-cols">
94	94	#foreach ($card in $exampleCards)
95		- ## See http://getbootstrap.com/css/#grid-responsive-resets .
96		- #if ($foreach.index > 0 && $foreach.index % 2 == 0)
97		- <div class="clearfix visible-sm-block "></div>
98		- #end
99		- #if ($foreach.index > 0 && $foreach.index % 3 == 0)
100		- <div class="clearfix visible-md-block visible-lg-block"></div>
101		- #end
102		- <div class="col-xs-12 col-sm-6 col-md-4">
	91	+ <li class="card">
103	103	#helpExampleCard($card)
104		- </div>
	93	+ </li>
105	105	#end
106		-</div>
107		-<p><a href="http://extensions.xwiki.org/xwiki/bin/view/Main/#%7Ct=extensions&p=1&l=30&s=doc.creationDate&d=desc&category=macro" class="wikiexternallink">$services.localization.render('help.macros.more')</a></p>
	95	+</ul>
	96	+<p><a href="https://extensions.xwiki.org/xwiki/bin/view/Main/#%7Ct=extensions&p=1&l=30&s=doc.creationDate&d=desc&category=macro" class="wikiexternallink">$services.localization.render('help.macros.more')</a></p>
108	108	{{/html}}
109	109	{{/velocity}}