Skip to Content

Changes for page Administration

Last modified by Thomas Coelho (local) on 2024/12/17 09:49
From version 5.1
edited by Thomas Coelho (local)
on 2024/05/16 11:01
Change comment: Install extension [org.xwiki.platform:xwiki-platform-administration-ui/16.3.1]
To version 2.1
edited by Thomas Coelho (local)
on 2022/05/27 15:08
Change comment: Install extension [org.xwiki.platform:xwiki-platform-administration-ui/14.4]

Summary

Details

Page properties
Content
... ... @@ -232,8 +232,7 @@
232 232  
233 233  #macro (verticalNavigation $menu $options)
234 234   {{html clean="false"}}
235 - <nav id="$!options.id" class="panel-group $!options.cssClass"
236 - aria-label="$escapetool.xml($services.localization.render('administration.menu.label'))">
235 + <div id="$!options.id" class="panel-group $!options.cssClass" role="tablist" aria-multiselectable="true">
237 237   <div class="panel xform">
238 238   <label for="adminsearchmenu" class="hidden">$services.localization.render('search')</label>
239 239   <input type="text" class="form-control panel-group-filter" autocomplete="off" id="adminsearchmenu"
... ... @@ -249,7 +249,7 @@
249 249   $escapetool.xml($services.localization.render('administration.menu.search.noResults'))
250 250   </div>
251 251   </div>
252 - </nav>
251 + </div>
253 253   {{/html}}
254 254  #end
255 255  
... ... @@ -265,14 +265,11 @@
265 265   #set ($children = [])
266 266   #sortCollectionOfMapsByField($item.children, 'order', 99999, 'asc', $children)
267 267   <div class="panel panel-default">
268 - <a class="panel-heading#if (!$isActive) collapsed#end" id="panel-heading-$escapedId"
269 - href="$!item.url" data-toggle="collapse"#if ("$!options.id" != '') data-parent="#$options.id" #end
270 - data-target="#panel-body-$escapedId" aria-expanded="$isActive" aria-controls="panel-body-$escapedId"
271 - title="$!escapetool.xml($item.description)">
272 - <span>$!services.icon.renderHTML($item.icon)$escapetool.xml($name)</span>
273 - <div>$services.icon.renderHTML('caret-down')</div>
274 - </a>
275 - <section class="panel-collapse collapse#if ($isActive) in#end" id="panel-body-$escapedId"
267 + <a class="panel-heading#if (!$isActive) collapsed#end" role="tab" id="panel-heading-$escapedId"
268 + href="$!item.url" data-toggle="collapse"#if ("$!options.id" != '') data-parent="#$options.id" #end
269 + data-target="#panel-body-$escapedId" aria-expanded="$isActive" aria-controls="panel-body-$escapedId"
270 + title="$!escapetool.xml($item.description)">$!services.icon.renderHTML($item.icon)$escapetool.xml($name)</a>
271 + <div class="panel-collapse collapse#if ($isActive) in#end" role="tabpanel" id="panel-body-$escapedId"
276 276   aria-labelledby="panel-heading-$escapedId">
277 277   <div class="list-group">
278 278   #foreach ($child in $children)
... ... @@ -279,7 +279,7 @@
279 279   #verticalNavigationItem($child $options)
280 280   #end
281 281   </div>
282 - </section>
278 + </div>
283 283   </div>
284 284   #else
285 285   <a class="list-group-item#if ($isActive) active#end" data-id="$escapedId"
... ... @@ -337,7 +337,7 @@
337 337   #end
338 338  #end
339 339  (% id="document-title" %)(((
340 - = $services.localization.render("administration.sectionTitle$level", 'xwiki/2.1', [$sectionName]) =
336 + = $services.localization.render("administration.sectionTitle$level", [$sectionName]) =
341 341   ## Display the category/section description below the title.
342 342   #set ($categoryOrSectionId = $crtCategory.id)
343 343   #if ("$!crtSection.id" != '')
XWiki.StyleSheetExtension[0]
Code
... ... @@ -15,7 +15,7 @@
15 15  
16 16  #admin-page-content label > input[type="checkbox"],
17 17  #admin-page-content label > input[type="radio"] {
18 - vertical-align: middle;
18 + vertical-align: bottom;
19 19  }
20 20  
21 21  /**
... ... @@ -57,7 +57,7 @@
57 57  /* Override general table styles. */
58 58  /* TODO: Move to livetable.css */
59 59  
60 -#usersandgroupstable td, #alldocstable td {
60 +#userstable td, #groupstable td, #usersandgroupstable td, #alldocstable td {
61 61   border-color: transparent;
62 62  }
63 63  
... ... @@ -89,33 +89,18 @@
89 89  }
90 90  
91 91  .admin-menu .panel-heading.collapsed {
92 - border-bottom-left-radius: 5px;
93 - border-bottom-right-radius: 5px;
92 + border-bottom-left-radius: 3px;
93 + border-bottom-right-radius: 3px;
94 94  }
95 95  
96 96  .admin-menu a.panel-heading {
97 - display: flex;
97 + display: block;
98 98   font-size: 100%;
99 99  }
100 -
101 -.admin-menu a.panel-heading span {
102 - flex-grow: 1;
103 -}
104 -
105 105  .admin-menu a.panel-heading:not(.collapsed) {
106 106   background-color: $theme.menuBackgroundColor;
107 107   color: $theme.menuLinkColor;
108 108  }
109 -
110 -/* Rotate the carret on collapse. */
111 -.admin-menu a.panel-heading.collapsed > *:last-child {
112 - transform: rotate(90deg);
113 -}
114 -
115 -.admin-menu a.panel-heading > *:last-child {
116 - transition: transform 200ms ease-in-out;
117 -}
118 -
119 119  .admin-menu a.panel-heading:active,
120 120  .admin-menu a.panel-heading:focus,
121 121  .admin-menu a.panel-heading:hover {
... ... @@ -122,13 +122,13 @@
122 122   text-decoration: none;
123 123  }
124 124  
125 -.admin-menu .panel-heading > span > *:first-child {
110 +.admin-menu .panel-heading > *:first-child {
126 126   margin-right: .8em;
127 127  }
128 128  
129 129  .admin-menu .panel-collapse > .list-group:last-child .list-group-item.last {
130 - border-bottom-right-radius: 5px;
131 - border-bottom-left-radius: 5px;
115 + border-bottom-right-radius: 3px;
116 + border-bottom-left-radius: 3px;
132 132  }
133 133  
134 134  .admin-menu .panel.noitems > .panel-heading {