Changes for page Administration

Summary

• Page properties (2 modified, 0 added, 0 removed)
• Objects (1 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]

Details

Page properties

Title

...	...	@@ -1,1 +1,1 @@
1		-$services.localization.render("administration.title#if ($doc.name == 'WebPreferences').page#elseif ($doc.fullName == 'XWiki.XWikiPreferences')#if ($xcontext.isMainWiki()).global#{else}.wiki#end#end")
	1	+$services.localization.render("administration.title#if ($doc.documentReference.name == 'WebPreferences').page#elseif ($doc.fullName == 'XWiki.XWikiPreferences')#if ($xcontext.isMainWiki()).global#{else}.wiki#end#end")

Content

...	...	@@ -16,6 +16,9 @@
16	16	##
17	17	## Admin menu map
18	18	##
	19	+## displayInSection: menu.name | sectionOrder: 200 | page: Menu.MenuConfigurationSection
	20	+## displayInSection: panels.applications | sectionOrder: 400 | page: PanelsCode.ApplicationsPanelConfigurable
	21	+## displayInSection: panels.navigation | sectionOrder: 500 | page: PanelsCode.NavigationConfigurationSection
19	19	#set($adminMenu = [
20	20	{
21	21	'id' : 'lf',
...	...	@@ -23,8 +23,8 @@
23	23	'displayBeforeCategory': 'content',
24	24	'children': [
25	25	{'id' : 'Themes', 'perSpace' : true, 'order' : 100},
26		- {'id' : 'Panels.PanelWizard', 'perSpace' : true, 'order' : 200},
27		- {'id' : 'Presentation', 'perSpace' : true, 'order' : 300}
	29	+ {'id' : 'Panels.PanelWizard', 'perSpace' : true, 'order' : 300},
	30	+ {'id' : 'Presentation', 'perSpace' : true, 'order' : 600}
28	28	]
29	29	},
30	30	{
...	...	@@ -231,8 +231,11 @@
231	231	{{html clean="false"}}
232	232	<div id="$!options.id" class="panel-group $!options.cssClass" role="tablist" aria-multiselectable="true">
233	233	<div class="panel xform">
234		- <input type="text" class="form-control panel-group-filter" autocomplete="off"
235		- placeholder="$escapetool.xml($services.localization.render('administration.menu.search.hint'))" />
	237	+ <label for="adminsearchmenu" class="hidden">$services.localization.render('search')</label>
	238	+ <input type="text" class="form-control panel-group-filter" autocomplete="off" id="adminsearchmenu"
	239	+ placeholder="$escapetool.xml($services.localization.render('administration.menu.search.hint'))"
	240	+ ## Disable the search input initially until the JavaScript code that handles the search is ready.
	241	+ disabled="disabled" />
236	236	</div>
237	237	#foreach ($item in $menu)
238	238	#verticalNavigationItem($item $options)
...	...	@@ -284,7 +284,7 @@
284	284	## Administration Sheet, used to display a common UI for some wiki features (presentation, users,
285	285	## groups, rights etc.) at global / space level and also for several applications.
286	286	##**************************************************************************************************
287		-#if($xcontext.action == 'view')
	293	+#if($xcontext.action == 'view' && "$!request.viewer" == '')
288	288	$response.sendRedirect($xwiki.getURL($doc.getFullName(), 'admin', $request.getQueryString()))##
289	289	#else
290	290	$xwiki.jsx.use('XWiki.AdminSheet')##
...	...	@@ -317,7 +317,7 @@
317	317
318	318	## Determine the administration level.
319	319	#set ($level = '')
320		-#if ($doc.name == 'WebPreferences')
	326	+#if ($doc.documentReference.name == 'WebPreferences')
321	321	#set ($level = '.page')
322	322	#elseif ($doc.fullName == 'XWiki.XWikiPreferences')
323	323	#if ($xcontext.isMainWiki())

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -3,6 +3,8 @@
3	3	$(document).on('click', '.admin-menu a.panel-heading', function(event) {
4	4	event.preventDefault();
5	5	});
	6	+ // Mark the administration menu as ready for user interaction.
	7	+ $('.admin-menu').attr('data-ready', true);
6	6	});
7	7
8	8	/**
...	...	@@ -60,5 +60,7 @@
60	60	var text = $(this).val().toLowerCase();
61	61	// Schedule a new filter operation.
62	62	timeoutId = setTimeout($.proxy(filterPanelGroup, panelGroup, text), 500);
63		- });
	65	+
	66	+ // Finally, enable the search input.
	67	+ }).prop('disabled', false);
64	64	});