Skip to Content

Changes for page Administration

Last modified by Leon Poon on 2025/05/12 14:26
From version 9.1
edited by Leon Poon
on 2025/05/12 14:26
Change comment: Install extension [org.xwiki.platform:xwiki-platform-administration-ui/16.10.7]
To version 7.1
edited by Leon Poon
on 2023/05/16 13:31
Change comment: Install extension [org.xwiki.platform:xwiki-platform-administration-ui/14.10.10]

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
... ... @@ -13,17 +13,10 @@
13 13   margin-top: 0;
14 14  }
15 15  
16 -#admin-page-content label > input[type="checkbox"] {
17 - vertical-align: middle;
18 -}
19 -
16 +#admin-page-content label > input[type="checkbox"],
20 20  #admin-page-content label > input[type="radio"] {
21 - vertical-align: baseline;
18 + vertical-align: bottom;
22 22  }
23 -
24 -#admin-page-content .usersorgroupsnames label > input[type="radio"] {
25 - vertical-align: unset;
26 -}
27 27  
28 28  /**
29 29   * Category Overview
... ... @@ -64,23 +64,10 @@
64 64  /* Override general table styles. */
65 65  /* TODO: Move to livetable.css */
66 66  
67 -#usersandgroupstable td, #alldocstable td {
60 +#userstable td, #groupstable td, #usersandgroupstable td, #alldocstable td {
68 68   border-color: transparent;
69 69  }
70 70  
71 -#admin-page-content .usersorgroupsnames {
72 - white-space: nowrap;
73 - /* Triple of the value for the .right column. This is useful to make sure the columns are somewhat balanced when
74 - there is only one right (e.g., extension rights with a default flavor).
75 - Keeping them balanced is useful to make sure the filters are displayed properly, which is especially important
76 - on a subwiki where we have to find a place to display the scope selector. */
77 - width: 27%;
78 -}
79 -
80 -#usersandgroupstable-filters-scope {
81 - white-space: nowrap;
82 -}
83 -
84 84  #usersandgroupstable-filters #name {
85 85   width: 65%;
86 86  }
... ... @@ -99,10 +99,6 @@
99 99   vertical-align: top;
100 100  }
101 101  
102 -.xform #usersandgroupstable select {
103 - width: unset;
104 -}
105 -
106 106  /**
107 107   * Bootstrap's Accordion Menu
108 108   */
... ... @@ -113,33 +113,18 @@
113 113  }
114 114  
115 115  .admin-menu .panel-heading.collapsed {
116 - border-bottom-left-radius: 5px;
117 - border-bottom-right-radius: 5px;
92 + border-bottom-left-radius: 3px;
93 + border-bottom-right-radius: 3px;
118 118  }
119 119  
120 120  .admin-menu a.panel-heading {
121 - display: flex;
97 + display: block;
122 122   font-size: 100%;
123 123  }
124 -
125 -.admin-menu a.panel-heading span {
126 - flex-grow: 1;
127 -}
128 -
129 129  .admin-menu a.panel-heading:not(.collapsed) {
130 130   background-color: $theme.menuBackgroundColor;
131 131   color: $theme.menuLinkColor;
132 132  }
133 -
134 -/* Rotate the carret on collapse. */
135 -.admin-menu a.panel-heading.collapsed > *:last-child {
136 - transform: rotate(90deg);
137 -}
138 -
139 -.admin-menu a.panel-heading > *:last-child {
140 - transition: transform 200ms ease-in-out;
141 -}
142 -
143 143  .admin-menu a.panel-heading:active,
144 144  .admin-menu a.panel-heading:focus,
145 145  .admin-menu a.panel-heading:hover {
... ... @@ -146,13 +146,13 @@
146 146   text-decoration: none;
147 147  }
148 148  
149 -.admin-menu .panel-heading > span > *:first-child {
110 +.admin-menu .panel-heading > *:first-child {
150 150   margin-right: .8em;
151 151  }
152 152  
153 153  .admin-menu .panel-collapse > .list-group:last-child .list-group-item.last {
154 - border-bottom-right-radius: 5px;
155 - border-bottom-left-radius: 5px;
115 + border-bottom-right-radius: 3px;
116 + border-bottom-left-radius: 3px;
156 156  }
157 157  
158 158  .admin-menu .panel.noitems > .panel-heading {