XWIKI-12573: Adapt Children section from Information viewer for nested spaces.

xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/shortcuts.vm

@@ -6,11 +6,15 @@
 #if (!$docextralinks && !$docextras)
   #set($docextralinks = [])
   ## Children
-  #if ($doc.name == 'WebHome')
-    #set ($discard = $docextralinks.add(['children', $services.localization.render('docextra.children'), -1, 'folder-open']))
+  #if ($services.parentchild.isParentChildMechanismEnabled())
+    #set ($discard = $docextralinks.add(['children', $services.localization.render('docextra.children'), -1, 'folder-open', {'hierarchy': 'parentchild'}]))
   #else
-    ## Terminal document
-    #set ($discard = $docextralinks.add(['siblings', $services.localization.render('docextra.siblings'), -1, 'folder-open']))
+    #if ($doc.name == 'WebHome')
+      #set ($discard = $docextralinks.add(['children', $services.localization.render('docextra.children'), -1, 'folder-open']))
+    #else
+      ## Terminal document
+      #set ($discard = $docextralinks.add(['siblings', $services.localization.render('docextra.siblings'), -1, 'folder-open']))
+    #end
   #end
   #if($xcontext.action == 'view' && $viewer != 'content')
     #set ($discard = $docextralinks.add(['content', $services.localization.render('core.links.content'), -1, 'file']))
@@ -46,10 +50,20 @@
   #if ($docextralink.size()>3)
     #set ($glyphIcon = $docextralink.get(3))
   #end
+  #set ($extraParams = '')
+  #if ($docextralink.size() > 4)
+    #set ($extraParams = $docextralink.get(4))
+  #end
   #if ($extraCount > 0)
     #set ($extraText = "$extraText ($extraCount)")
   #end
-  #submenuitem($doc.getURL('view', "viewer=$!{escapetool.url(${extraAnchor})}"), ${escapetool.xml(${extraText})}, '', '', $glyphIcon)
+  #if ("$!extraParams" != '')
+    #set ($discard = $extraParams.put('viewer', $extraAnchor))
+    #set ($url = $doc.getURL('view', $escapetool.url($extraParams)))
+  #else
+    #set ($url = $doc.getURL('view', "viewer=$escapetool.url($extraAnchor)"))
+  #end
+  #submenuitem($url, $escapetool.xml($extraText), '', '', $glyphIcon)
 #end
 
 ###########################################

xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties

@@ -1083,7 +1083,9 @@ core.viewers.information.creationData=by {0} on {1}
 core.viewers.information.translationCreation=Translated into {0}
 core.viewers.information.translationCreationData=by {0} on {1}
 core.viewers.information.includedPages=Included pages
+core.viewers.information.noIncludedPages=No included pages
 core.viewers.information.backlinks=Backlinks
+core.viewers.information.noBacklinks=No backlinks
 
 core.viewers.code.title=Wiki source code of <a href="{1}">{0}</a>
 core.viewers.code.hideLineNumbers=Hide line numbers

xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/informationinline.vm

@@ -4,50 +4,38 @@
 <div id="informationcontent" class="xwikiintracontent">
 <div id="_information">
   <div id="informationleft" class="half column">
-    <dl>
-      <dt>$services.localization.render('core.viewers.information.parent')</dt>
-      <dd>
-        ## <input type="text" id="xwikidocparentinput2" name="parent" value="$!tdoc.parent" size="30"/>
-        #if("$!tdoc.parent" != '')
-          #displayDocumentList([$tdoc.parent] false [])
-        #else
-          $services.localization.render('core.viewers.information.noParent')
-        #end
-      </dd>
-      <dt>$services.localization.render('core.viewers.information.children')</dt>
-      <dd>
-        #set($children = $doc.getChildren())
-        #if($children.size() > 0)
-          #displayDocumentList($children true $blacklistedSpaces)
-        #else
-          $services.localization.render('core.viewers.information.noChildren')
-        #end
-      </dd>
-    </dl>
-  </div>## informationleft
-  <div id="informationright" class="half column">
     <dl>
       #if($tdoc.realLanguage != $doc.realLanguage)
         <dt>$services.localization.render('core.viewers.information.translationCreation', [$tdoc.realLanguage])</dt>
         <dd>$services.localization.render('core.viewers.information.translationCreationData', [$xwiki.getUserName($tdoc.creator), $xwiki.formatDate($tdoc.creationDate)])</dd>
       #end
       #if($isAdvancedUser)
-        #set($pages = $tdoc.includedPages)
-        #if($pages.size() > 0)
-          <dt>$services.localization.render('core.viewers.information.includedPages')</dt>
-          <dd>
-            #displayDocumentList($pages true $blacklistedSpaces)
-          </dd>
-      #end
-      #end
-      #set($blinks = $sorttool.sort($doc.getBacklinks()))
-      #if($blinks.size()>0)
-        <dt>$services.localization.render('core.viewers.information.backlinks')</dt>
+        <dt>$services.localization.render('core.viewers.information.includedPages')</dt>
         <dd>
-          #displayDocumentList($blinks true $blacklistedSpaces)
+          #set($pages = $tdoc.includedPages)
+          #if ($pages.isEmpty())
+            ## We display a "no included pages" message to avoid having a blank information panel when there is nothing
+            $services.localization.render('core.viewers.information.noIncludedPages')
+          #else
+            #displayDocumentList($pages true $blacklistedSpaces)
+          #end
         </dd>
       #end
     </dl>
+  </div>## informationleft
+  <div id="informationright" class="half column">
+    <dl>
+      <dt>$services.localization.render('core.viewers.information.backlinks')</dt>
+      <dd>
+        #set($blinks = $sorttool.sort($doc.getBacklinks()))
+        #if ($blinks.isEmpty())
+          ## We display a "no backlinks" message to avoid having a blank information panel when there is nothing
+          $services.localization.render('core.viewers.information.noBacklinks')
+        #else
+          #displayDocumentList($blinks true $blacklistedSpaces)
+        #end
+      </dd>
+    </dl>
   </div>## informationright
   <div class="clearfloats">&nbsp;</div>
 </div>## _information