Changes for page Administration
Last modified by Leon Poon on 2025/05/12 14:26
Summary
-
Page properties (1 modified, 0 added, 0 removed)
-
Objects (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -9,7 +9,7 @@ 9 9 #set ($adminAction = 'admin') 10 10 #set ($crtCategoryId = "$!{request.category}") 11 11 #if ($crtCategoryId != '') 12 - #set ($crtCategoryId = $m athtool.toInteger($crtCategoryId))12 + #set ($crtCategoryId = $numbertool.toNumber($crtCategoryId).intValue()) 13 13 #end 14 14 #set ($crtSectionId = "$!{request.section}") 15 15 ... ... @@ -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 { ... ... @@ -84,7 +84,7 @@ 84 84 #set ($crtCategory = $NULL) 85 85 #foreach ($category in $adminMenu) 86 86 ## "Standard" URLs and icons for categories 87 - #set ($category.url = $xwiki.getURL($currentDoc, $adminAction, "category=${mathtool.sub($ velocityCount, 1)}"))90 + #set ($category.url = $xwiki.getURL($currentDoc, $adminAction, "category=${mathtool.sub($foreach.count, 1)}")) 88 88 #if ($xwiki.getDocument('XWiki.AdminSheet').getAttachment("${category.id}.png")) 89 89 #set ($category.iconReference = "XWiki.AdminSheet@${category.id}.png") 90 90 #else ... ... @@ -93,7 +93,7 @@ 93 93 #set ($category.description = $services.localization.render("admin.${category.id}.description").trim()) 94 94 #set ($category.cssClass = "${category.id}Icon") 95 95 #set ($category.name = $services.localization.render("admin.${category.id}").trim()) 96 - #if ("$!{crtCategoryId}" != '' && $ velocityCount == $mathtool.add($crtCategoryId, 1))99 + #if ("$!{crtCategoryId}" != '' && $foreach.count == $mathtool.add($crtCategoryId, 1)) 97 97 #set ($crtCategory = $category) 98 98 #end 99 99 ## ... ... @@ -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')## ... ... @@ -361,11 +361,8 @@ 361 361 ##------------------------------------------------------------------------------------------------------------ 362 362 ## The Administration allows editing other pages from different applications inside the admin context (UI) 363 363 ##------------------------------------------------------------------------------------------------------------ 364 - #if ("$!{request.editmode}" == 'inline' && $xwiki.exists($section)) 365 - #set ($discard = $xcontext.setDisplayMode('edit')) 366 - {{html clean="false"}}{{include reference="XWiki.AdminInlineSheet" /}}{{/html}} 367 - #elseif ($xwiki.exists("XWiki.Admin${section}Sheet")) 368 - ## Custom XE administration section 370 + #if ($xwiki.exists("XWiki.Admin${section}Sheet")) 371 + ## Handle known XWiki administration sections 369 369 {{include reference="XWiki.Admin${section}Sheet" /}} 370 370 #elseif ($xwiki.exists($section)) 371 371 {{html clean="false"}}#includeForm($section){{/html}}
- 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 });