Zum Inhalt springen

Änderungen von Dokument Team

Zuletzt geändert von xwikiadmin am 2025/05/21 09:56
Von Version 6.1
bearbeitet von xwikiadmin
am 2025/05/21 09:56
Änderungskommentar: Install extension [com.xwiki.pro:xwiki-pro-macros-ui/1.26.19]
Auf Version 2.1
bearbeitet von xwikiadmin
am 2023/10/26 09:30
Änderungskommentar: Migrated property [type] from class [XWiki.WikiMacroParameterClass]

Zusammenfassung

Details

Seiteneigenschaften
Inhalt
... ... @@ -4,7 +4,6 @@
4 4  
5 5  |= Parameter |= Name |= Description |= Default
6 6  | tag | {{translation key='rendering.macro.team.parameter.tag.name'/}} | {{translation key='rendering.macro.team.parameter.tag.description'/}} |
7 -| users | {{translation key='rendering.macro.team.parameter.users.name'/}} | {{translation key='rendering.macro.team.parameter.users.description'/}} |
8 8  | size | {{translation key='rendering.macro.team.parameter.size.name'/}} | {{translation key='rendering.macro.team.parameter.size.description'/}} | 60
9 9  | showUsernames | {{translation key='rendering.macro.team.parameter.showUsernames.name'/}} | {{translation key='rendering.macro.team.parameter.showUsernames.description'/}} | false
10 10  | letterAvatarBgColor | {{translation key='rendering.macro.team.parameter.letterAvatarBgColor.name'/}} | {{translation key='rendering.macro.team.parameter.letterAvatarBgColor.description'/}} | #0A6
XWiki.StyleSheetExtension[0]
Code
... ... @@ -1,4 +1,4 @@
1 -.xwikiteam-ul {
1 +.xwikiteam .xwikiteam-ul {
2 2   list-style: none;
3 3   padding: 0;
4 4   margin: 0;
... ... @@ -7,10 +7,6 @@
7 7   flex-direction: row;
8 8  }
9 9  
10 -.xwikiteam {
11 - display: inline-block;
12 -}
13 -
14 14  .xwikiteam .xwikiteam-user, .xwikiteam-tools-link {
15 15   padding: 0;
16 16   margin: 0;
XWiki.WikiMacroClass[0]
Makro-Code
... ... @@ -3,11 +3,13 @@
3 3   #set($escapedSize = $escapetool.xml($size))
4 4   #set($escapedLetterAvatarFontColor = $escapetool.xml($letterAvatarFontColor))
5 5   #set($escapedLetterAvatarBgColor = $escapetool.xml($letterAvatarBgColor))
6 - <span class="xwikiteam-avatar xwikiteam-avatar-initials"
7 - style="height:${escapedSize}px; width:${escapedSize}px; border-radius: ${escapedSize}px; background-color: $escapedLetterAvatarBgColor">
6 + <span
7 + class="xwikiteam-avatar xwikiteam-avatar-initials"
8 + style="height:${escapedSize}px; width:${escapedSize}px; border-radius: ${escapedSize}px; background-color: $escapedLetterAvatarBgColor"
9 + >
8 8   <span class="xwikiteam-avatar-initials-inner">
9 9   <span class="xwikiteam-avatar-initials-letters" style="color: $escapedLetterAvatarFontColor">
10 - #foreach($firstLetter in $name.toUpperCase().split("[\s\[\]-]+"))$escapetool.xml($firstLetter.charAt(0))#end
12 + #foreach($firstLetter in $name.toUpperCase().split("[\s-]"))$escapetool.xml($firstLetter.charAt(0))#end
11 11   </span>
12 12   </span>
13 13   </span>
... ... @@ -17,11 +17,13 @@
17 17   #set($url = $xwiki.getURL($username))
18 18   #set($escapedDisplayUser = $escapetool.xml($displayUser))
19 19   #set($fontSize = $size / 3)
20 - <span class="xwikiteam-user"
22 + <li
23 + class="xwikiteam-user"
21 21   data-name-without-accents="$util.clearAccents($escapedDisplayUser.toLowerCase())"
22 22   title="$escapedDisplayUser"
23 23   data-username="$escapetool.xml($username)"
24 - style="font-size: ${fontSize}px">
27 + style="font-size: ${fontSize}px"
28 + >
25 25   <a href="$url">
26 26   #getUserAvatarURL($username $return $size)
27 27   #if(!$return.specified && !$disableLetterAvatars)
... ... @@ -29,7 +29,7 @@
29 29   #else
30 30   #set($escapedSize = $escapetool.xml($size))
31 31   <img
32 - class='xwikiteam-avatar fixedSize-$escapedSize'
36 + class='xwikiteam-avatar'
33 33   src='$escapetool.xml($return.url)'
34 34   alt='$escapedDisplayUser'
35 35   title='$escapedDisplayUser'
... ... @@ -39,17 +39,10 @@
39 39   #end
40 40   <span class='xwikiteam-username'>$escapedDisplayUser</span>
41 41   </a>
42 - </span>
46 + </li>
43 43  #end
44 -#macro (addUsersFromWiki $list $wiki $limit $tag $userList)
45 - #set($q = $services.query.hql($hql).setLimit($limit).setWiki($wiki))
46 - #if ("$!tag" != "")
47 - #set($q = $q.bindValue('tag', $tag))
48 - #end
49 - #if(!$userList.empty)
50 - #set($q = $q.bindValue('users', $userList))
51 - #end
52 - #set($l = $q.execute())
48 +#macro (addUsersFromWiki $list $wiki $limit)
49 + #set($l = $services.query.hql($hql).setLimit($limit).setWiki($wiki).execute())
53 53   #foreach($username in $l)
54 54   #set($discard = $list.add("$wiki:$username"))
55 55   #end
... ... @@ -58,13 +58,11 @@
58 58   #set($discard = $xwiki.ssx.use('xwiki:XWiki.Macros.Team'))
59 59   #set($discard = $xwiki.jsx.use('xwiki:XWiki.Macros.Team'))
60 60   #set($pictureList = {})
61 - #set($tag = $xcontext.macro.params.tag)
58 + #set($tag = $wikimacro.parameters.tag)
62 62   #set($size = $wikimacro.parameters.size)
63 63   #set($scope = $wikimacro.parameters.scope)
64 - ## I need the raw value to avoid XWIKI-18965
65 - #set($users = $xcontext.macro.params.users)
66 - #set($letterAvatarBgColor = $xcontext.macro.params.letterAvatarBgColor)
67 - #set($letterAvatarFontColor = $xcontext.macro.params.letterAvatarFontColor)
61 + #set($letterAvatarBgColor = $wikimacro.parameters.letterAvatarBgColor)
62 + #set($letterAvatarFontColor = $wikimacro.parameters.letterAvatarFontColor)
68 68   #set($requireExternalAuth = $wikimacro.parameters.requireExternalAuth)
69 69   #set($showUsernames = $wikimacro.parameters.showUsernames)
70 70   #set($disableTools = $wikimacro.parameters.disableTools)
... ... @@ -114,19 +114,6 @@
114 114   #if("$!limit" == "")
115 115   #set($limit = 100)
116 116   #end
117 - #if(!$users || $users == "")
118 - #set($userList = [])
119 - #set($userswhere = '')
120 - #else
121 - #set ($userswhere = 'and doc.fullName in :users')
122 - #set ($userReferencesList = $users.split(","))
123 - #set ($userList = [])
124 - #foreach ($user in $userReferencesList)
125 - #set ($resolvedRef = $services.model.resolveDocument($user))
126 - #set ($username = $xwiki.getUser($resolvedRef).getUser().getFullName())
127 - #set ($discard = $userList.add($username))
128 - #end
129 - #end
130 130   #if(!$tag || $tag == "")
131 131   #set($tagselect = "")
132 132   #set($tagwhere = "")
... ... @@ -142,7 +142,7 @@
142 142   obj3.className = 'XWiki.TagClass' and
143 143   obj3.id = tagprop.id.id and
144 144   tagprop.id.name = 'tags' and
145 - list = :tag
127 + list = '$tag'
146 146   ")
147 147   #end
148 148   #set($hql = ",
... ... @@ -163,84 +163,66 @@
163 163   prop.id.name = 'active' and
164 164   prop.value = 1
165 165   $tagwhere
166 - $userswhere
167 167   ORDER BY doc.name
168 168   ")
169 169   #set($list = [])
170 170   #if ($scope == "global")
171 - #addUsersFromWiki($list $xcontext.mainWikiName $limit $tag $userList)
152 + #addUsersFromWiki($list $xcontext.mainWikiName $limit)
172 172   #elseif ($scope == "local")
173 - #addUsersFromWiki($list $services.wiki.currentWikiId $limit $tag $userList)
154 + #addUsersFromWiki($list $services.wiki.currentWikiId $limit)
174 174   #elseif ($scope == "both")
175 - #addUsersFromWiki($list $services.wiki.currentWikiId $limit $tag $userList)
156 + #addUsersFromWiki($list $services.wiki.currentWikiId $limit)
176 176   #if($list.size() < $limit)
177 177   #set($limit = $limit - $list.size())
178 - #addUsersFromWiki($list $xcontext.mainWikiName $limit $tag $userList)
159 + #addUsersFromWiki($list $xcontext.mainWikiName $limit)
179 179   #end
180 180   #end
181 - #set ($elem = 'div')
182 - #set ($clean = true)
183 - #if ($wikimacro.context.isInline())
184 - #set ($elem = 'span')
185 - #set ($clean = false)
186 - #end
187 - #if ($xcontext.getAction()=='edit')
188 - #set ($clean = true)
189 - #end
190 - {{html clean="$clean"}}
191 - ## Starting with XWiki 13.10.4 and 14.1, img tags have a 'height: auto' style set, see XWIKI-19432: Image not to scale
192 - ## on mobile. Since this breaks the macro fixed size feature, a specific size is added.
193 - #set ($escapedSize = $escapetool.xml($size))
194 - <$elem>
195 - <style>
196 - .fixedSize-$escapedSize {
197 - height: ${escapedSize}px;
198 - }
199 - </style>
200 - </$elem>
201 - <$elem class="xwikiteam #if(!$showUsernames)xwikiteam-usernames-hidden#end">
162 + {{html wiki=false clean=false}}
163 + <div class="xwikiteam #if(!$showUsernames)xwikiteam-usernames-hidden#end">
202 202   #if ($list.size() > 0)
203 - <span class="xwikiteam-ul">
165 + <ul class="xwikiteam-ul">
204 204   #foreach($user in $list)
205 205   #avatar($user $size $disableLetterAvatars $letterAvatarBgColor $letterAvatarFontColor)
206 206   #end
207 - #if (!$disableTools && !$wikimacro.context.isInline())
208 - <span class="xwikiteam-tools-link" hidden="hidden">
169 + #if(!$disableTools)
170 + <li class="xwikiteam-tools-link" hidden="hidden">
209 209   <a href="#" role="button" title="$escapetool.xml($services.localization.render('rendering.macro.team.content.options'))">
210 210   <span class="fa fa-wrench"></span>
211 211   <span class="sr-only">$escapetool.xml($services.localization.render('rendering.macro.team.content.options'))</span>
212 212   </a>
213 - </span>
175 + </li>
214 214   #end
215 - </span>
216 - #if (!$disableTools && !$wikimacro.context.isInline())
217 - <span class="xwikiteam-tools" hidden="hidden">
218 - <input class="xwikiteam-filter" type="text" placeholder="$escapetool.xml($services.localization.render('rendering.macro.team.content.filter'))" />
219 - <label>
220 - <input
221 - class="xwikiteam-show-username-checkbox"
222 - type="checkbox"
223 - #if($showUsernames)checked="checked"#end
224 - />
225 - $escapetool.xml($services.localization.render('rendering.macro.team.content.showUsernames'))
226 - </label>
227 - </span>
228 - #end
177 + </ul>
178 + <div class="xwikiteam-tools" hidden="hidden">
179 + <input class="xwikiteam-filter" type="text" placeholder="$escapetool.xml($services.localization.render('rendering.macro.team.content.filter'))" />
180 + <label>
181 + <input
182 + class="xwikiteam-show-username-checkbox"
183 + type="checkbox"
184 + #if($showUsernames)checked="checked"#end
185 + />
186 + $escapetool.xml($services.localization.render('rendering.macro.team.content.showUsernames'))
187 + </label>
188 + </div>
229 229   #else
230 - <$elem>$escapetool.xml($services.localization.render('rendering.macro.team.content.noUsers'))</$elem>
190 + <p>$escapetool.xml($services.localization.render('rendering.macro.team.content.noUsers'))</p>
231 231   #end
232 - </$elem>
192 + </div>
233 233   {{/html}}
234 234  #end
235 235  {{/velocity}}
236 236  
197 +{{include reference="Licenses.Code.VelocityMacros"/}}
198 +
237 237  {{velocity}}
238 238  ## We need to check if there is a valid license because the macro is registered even if the user doesn't have view right
239 239  ## on the macro definition page. See XWIKI-14828: Rendering macros defined in wiki pages are available to users that
240 240  ## don't have view right on those pages.
241 -#if ($services.promacrolicensing.hasLicensureForEntity($xcontext.macro.doc.documentReference))
203 +#if ($services.licensing.licensor.hasLicensureForEntity($xcontext.macro.doc.documentReference))
242 242   #executeMacro
243 243  #else
244 - {{missingLicenseMessage extensionName="proMacros.extension.name"/}}
206 + {{error}}
207 + #getMissingLicenseMessage('proMacros.extension.name')
208 + {{/error}}
245 245  #end
246 246  {{/velocity}}
Standardkategorie
... ... @@ -1,0 +1,1 @@
1 +content
Makrobeschreibung
... ... @@ -1,0 +1,1 @@
1 +This macro displays the team members which have a specific tag
Unterstützt Inline-Modus
... ... @@ -1,1 +1,1 @@
1 -Ja
1 +Nein
XWiki.WikiMacroParameterClass[0]
Parameter-Beschreibung
... ... @@ -1,0 +1,1 @@
1 +Tag that users need to have to be shown
Parameter-Typ
... ... @@ -1,1 +1,0 @@
1 -com.xwiki.pickers.TagReference
XWiki.WikiMacroParameterClass[2]
Parameter-Beschreibung
... ... @@ -1,0 +1,1 @@
1 +The size of a user icon
XWiki.WikiMacroParameterClass[3]
Parameter-Beschreibung
... ... @@ -1,0 +1,1 @@
1 +If true, the user should be searched in LDAP or OAuth
XWiki.WikiMacroParameterClass[4]
Parameter-Beschreibung
... ... @@ -1,0 +1,1 @@
1 +The name of users should be displayed under their avatars
XWiki.WikiMacroParameterClass[5]
Parameter-Beschreibung
... ... @@ -1,0 +1,1 @@
1 +The background color of the letter avatars
Parameter-Typ
... ... @@ -1,1 +1,0 @@
1 -java.awt.Color
XWiki.WikiMacroParameterClass[6]
Parameter-Beschreibung
... ... @@ -1,0 +1,1 @@
1 +The font color of the letter avatars
Parameter-Typ
... ... @@ -1,1 +1,0 @@
1 -java.awt.Color
XWiki.WikiMacroParameterClass[7]
Parameter-Beschreibung
... ... @@ -1,0 +1,1 @@
1 +Don't use letter avatars and display a default avatar instead
XWiki.WikiMacroParameterClass[8]
Parameter-Beschreibung
... ... @@ -1,0 +1,1 @@
1 +The maximum number of users to show
XWiki.WikiMacroParameterClass[9]
Parameter-Beschreibung
... ... @@ -1,0 +1,1 @@
1 +In which wiki to find users (global: in the main wiki. local: in the current wiki. both: in both the main wiki and the local wiki. auto: find out from the wiki settings). Has no effect in the main wiki.
Parameter-Typ
... ... @@ -1,1 +1,0 @@
1 -com.xwiki.pickers.teams.Scope
XWiki.WikiMacroParameterClass[10]
Parameter-Name
... ... @@ -1,1 +1,0 @@
1 -users
Parameter-Typ
... ... @@ -1,1 +1,0 @@
1 -com.xwiki.pickers.UsersReference
Parameter verpflichtend
... ... @@ -1,1 +1,0 @@
1 -Nein