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 = $ numbertool.toNumber($crtCategoryId).intValue())12 + #set ($crtCategoryId = $mathtool.toInteger($crtCategoryId)) 13 13 #end 14 14 #set ($crtSectionId = "$!{request.section}") 15 15 ... ... @@ -16,9 +16,6 @@ 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 22 22 #set($adminMenu = [ 23 23 { 24 24 'id' : 'lf', ... ... @@ -26,8 +26,8 @@ 26 26 'displayBeforeCategory': 'content', 27 27 'children': [ 28 28 {'id' : 'Themes', 'perSpace' : true, 'order' : 100}, 29 - {'id' : 'Panels.PanelWizard', 'perSpace' : true, 'order' : 300},30 - {'id' : 'Presentation', 'perSpace' : true, 'order' : 600}26 + {'id' : 'Panels.PanelWizard', 'perSpace' : true, 'order' : 200}, 27 + {'id' : 'Presentation', 'perSpace' : true, 'order' : 300} 31 31 ] 32 32 }, 33 33 { ... ... @@ -87,7 +87,7 @@ 87 87 #set ($crtCategory = $NULL) 88 88 #foreach ($category in $adminMenu) 89 89 ## "Standard" URLs and icons for categories 90 - #set ($category.url = $xwiki.getURL($currentDoc, $adminAction, "category=${mathtool.sub($ foreach.count, 1)}"))87 + #set ($category.url = $xwiki.getURL($currentDoc, $adminAction, "category=${mathtool.sub($velocityCount, 1)}")) 91 91 #if ($xwiki.getDocument('XWiki.AdminSheet').getAttachment("${category.id}.png")) 92 92 #set ($category.iconReference = "XWiki.AdminSheet@${category.id}.png") 93 93 #else ... ... @@ -96,7 +96,7 @@ 96 96 #set ($category.description = $services.localization.render("admin.${category.id}.description").trim()) 97 97 #set ($category.cssClass = "${category.id}Icon") 98 98 #set ($category.name = $services.localization.render("admin.${category.id}").trim()) 99 - #if ("$!{crtCategoryId}" != '' && $ foreach.count == $mathtool.add($crtCategoryId, 1))96 + #if ("$!{crtCategoryId}" != '' && $velocityCount == $mathtool.add($crtCategoryId, 1)) 100 100 #set ($crtCategory = $category) 101 101 #end 102 102 ## ... ... @@ -234,11 +234,8 @@ 234 234 {{html clean="false"}} 235 235 <div id="$!options.id" class="panel-group $!options.cssClass" role="tablist" aria-multiselectable="true"> 236 236 <div class="panel xform"> 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" /> 234 + <input type="text" class="form-control panel-group-filter" autocomplete="off" 235 + placeholder="$escapetool.xml($services.localization.render('administration.menu.search.hint'))" /> 242 242 </div> 243 243 #foreach ($item in $menu) 244 244 #verticalNavigationItem($item $options) ... ... @@ -290,7 +290,7 @@ 290 290 ## Administration Sheet, used to display a common UI for some wiki features (presentation, users, 291 291 ## groups, rights etc.) at global / space level and also for several applications. 292 292 ##************************************************************************************************** 293 -#if($xcontext.action == 'view' && "$!request.viewer" == '')287 +#if($xcontext.action == 'view') 294 294 $response.sendRedirect($xwiki.getURL($doc.getFullName(), 'admin', $request.getQueryString()))## 295 295 #else 296 296 $xwiki.jsx.use('XWiki.AdminSheet')## ... ... @@ -367,8 +367,11 @@ 367 367 ##------------------------------------------------------------------------------------------------------------ 368 368 ## The Administration allows editing other pages from different applications inside the admin context (UI) 369 369 ##------------------------------------------------------------------------------------------------------------ 370 - #if ($xwiki.exists("XWiki.Admin${section}Sheet")) 371 - ## Handle known XWiki administration sections 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 372 372 {{include reference="XWiki.Admin${section}Sheet" /}} 373 373 #elseif ($xwiki.exists($section)) 374 374 {{html clean="false"}}#includeForm($section){{/html}}
- XWiki.JavaScriptExtension[0]
-
- Code
-
... ... @@ -3,8 +3,6 @@ 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); 8 8 }); 9 9 10 10 /** ... ... @@ -26,7 +26,7 @@ 26 26 // Filter the categories. 27 27 panelGroup.find('a.panel-heading').each(function() { 28 28 var panel = $(this).closest('.panel'); 29 - var hasVisibleSections = panel.find('.list-group-item').not('.hidden'). length> 0;27 + var hasVisibleSections = panel.find('.list-group-item').not('.hidden').size() > 0; 30 30 var matchesFilterQuery = !filterItem.call($(this), text); 31 31 panel.toggle(hasVisibleSections || matchesFilterQuery); 32 32 if (!hasVisibleSections && matchesFilterQuery) { ... ... @@ -50,7 +50,7 @@ 50 50 .next('.panel-collapse').addClass('in').css('height', ''); 51 51 } 52 52 // Show/Hide the "No results." message. 53 - var hasVisibleCategories = panelGroup.find('a.panel-heading').filter(':visible'). length> 0;51 + var hasVisibleCategories = panelGroup.find('a.panel-heading').filter(':visible').size() > 0; 54 54 panelGroup.find('.noitems').toggleClass('hidden', hasVisibleCategories); 55 55 }; 56 56 ... ... @@ -61,8 +61,6 @@ 61 61 var panelGroup = $(this).closest('.panel-group'); 62 62 var text = $(this).val().toLowerCase(); 63 63 // Schedule a new filter operation. 64 - timeoutId = setTimeout(filterPanelGroup.bind(panelGroup, text), 500); 65 - 66 - // Finally, enable the search input. 67 - }).prop('disabled', false); 62 + timeoutId = setTimeout($.proxy(filterPanelGroup, panelGroup, text), 500); 63 + }); 68 68 });