Modifications pour le document Search administration

Résumé

• Propriétés de la Page (3 modifications, 0 ajouts, 0 suppressions)

Détails

Propriétés de la Page

Auteur du document

...	...	@@ -1,1 +1,1 @@
1		-xwiki:XWiki.fcharton
	1	+XWiki.superadmin

Syntaxe

...	...	@@ -1,1 +1,1 @@
1		-XWiki 2.1
	1	+XWiki 2.0

Contenu

...	...	@@ -1,16 +1,29 @@
1	1	{{include reference='XWiki.SearchCode' /}}
2	2
3	3	{{velocity}}
4		-{{html clean="false"}}
5		-<form id="search_XWiki.SearchConfig" method="post" action="$escapetool.xml($searchConfigDoc.getURL('save'))" class="xform">
	4	+#set ($searchEnginePropertyClass = $searchConfigClass.engine)
	5	+#set ($availableSearchExtensions = $services.uix.getExtensions('org.xwiki.platform.search', {'sortById' : ''}))
	6	+{{html wiki='true'}}
	7	+<form id='search_XWiki.SearchConfig' method='post' action="${searchConfigDoc.getURL('save')}" class='xform'>
6	6	<div class="hidden">
7		- <input type="hidden" name="form_token" value="$!escapetool.xml($services.csrf.token)" />
8		- <input type="hidden" name="xredirect" value="$escapetool.xml($doc.getURL($xcontext.action, $request.queryString))" />
	9	+ <input type='hidden' name='form_token' value="$!{services.csrf.getToken()}" />
	10	+ <input type='hidden' name='xredirect' value="$doc.getURL($xcontext.action, $!{request.queryString})" />
9	9	</div>
10		- $services.display.content($searchConfigDoc)
11		- <div class="buttonwrapper">
12		- <input class="button" type="submit" name="action_saveandcontinue"
13		- value="$escapetool.xml($services.localization.render('search.admin.configuration.button'))" />
	12	+ <dl>
	13	+ <dt>
	14	+ <label>$searchEnginePropertyClass.translatedPrettyName</label>
	15	+ <span class='xHint'>$services.localization.render('search.admin.configuration.seexwikicfg')</span>
	16	+ </dt>
	17	+ <dd>
	18	+ <select name='XWiki.SearchConfigClass_0_engine'>
	19	+ #foreach ($availableSearchExtension in $availableSearchExtensions)
	20	+ <option value="$availableSearchExtension.id" #if($availableSearchExtension.id == $searchEngine)selected='selected'#end>$availableSearchExtension.parameters.label</option>
	21	+ #end
	22	+ </select>
	23	+ </dd>
	24	+ </dl>
	25	+ <div class='buttonwrapper'>
	26	+ <input value="$services.localization.render('search.admin.configuration.button')" class='button' type='submit'>
14	14	</div>
15	15	</form>
16	16	{{/html}}
...	...	@@ -25,10 +25,8 @@
25	25	{{html clean="false"}}
26	26	<ul class="nav nav-tabs" role="tablist">
27	27	<li role="presentation" class="active">
28		- <a href="#${escapetool.xml($searchEngine)}Config" aria-controls="${escapetool.xml($searchEngine)}Config"
29		- role="tab"
30		- data-toggle="tab">
31		- $escapetool.xml($searchExtension.parameters.label)
	41	+ <a href="#${searchEngine}Config" aria-controls="${searchEngine}Config" role="tab" data-toggle="tab">
	42	+ $searchExtension.parameters.label
32	32	</a>
33	33	</li>
34	34	</ul>
...	...	@@ -35,10 +35,9 @@
35	35	{{/html}}
36	36
37	37	(% class="tab-content" %)(((
38		- (% role="tabpanel" class="tab-pane active" id="${services.rendering.escape($searchEngine, 'xwiki/2.1')}Config"
39		- %)(((
	49	+ (% role="tabpanel" class="tab-pane active" id="${searchEngine}Config" %)(((
40	40	## Use context='new' in the include so that we can use PR.
41		- {{include reference="$services.rendering.escape($searchAdminPage, 'xwiki/2.1')" context='new'}}
	51	+ {{include reference="$searchAdminPage" context='new'}}
42	42	)))
43	43	)))
44	44	#end