Changes for page Message Sender Macro

Last modified by Thomas Mistelbauer on 2021/12/13 06:26
<
From version < 6.1
edited by Thomas Mistelbauer
on 2021/12/13 06:26
To version < 2.1 >
edited by Thomas Mistelbauer
on 2019/05/10 05:57
Change comment: Migrated property [type] from class [XWiki.WikiMacroParameterClass]

Summary

Details

XWiki.StyleSheetExtension[0]
Code
... ... @@ -1,5 +3,3 @@
1 -#template('colorThemeInit.vm')
2 -
3 3  .messagestream-tools {
4 4   display: flex;
5 5   position: relative;
... ... @@ -12,37 +12,3 @@
12 12   flex-grow: 1;
13 13   margin-left: .3em;
14 14  }
15 -
16 -.messagestream .message-content {
17 - padding: .5em 0 .5em 75px;
18 -}
19 -
20 -.messagestream .activitySnapshot {
21 - height: 30px;
22 - margin: 5px 0 0 -50px;
23 - position: absolute;
24 -}
25 -
26 -.messagestream .activitySnapshot img {
27 - border-radius: 10px 10px 0 10px;
28 - box-shadow: -1px 1px 1px rgba(128,128,128,0.6);
29 -}
30 -
31 -/* User's avatar */
32 -.messagestream .activitySnapshot .avatar {
33 - border-radius: 4px;
34 - box-shadow: 0 0 2px 1px rgba(128,128,128,0.6);
35 -}
36 -
37 -.messagestream .activitySnapshot .activityActionAvatar {
38 - background: $theme.pageContentBackgroundColor;
39 - border-color: $theme.pageContentBackgroundColor;
40 - border-style: solid;
41 - border-width: 4px 1px 1px 3px;
42 - box-sizing: content-box;
43 - bottom: -5px;
44 - height: 16px;
45 - position: absolute;
46 - right: -10px;
47 - width: 16px;
48 -}
Parse content
... ... @@ -1,1 +1,1 @@
1 -Yes
1 +No
XWiki.WikiMacroClass[0]
Macro code
... ... @@ -7,6 +7,8 @@
7 7  #set ($configClass = $xwiki.getDocument($config).getxWikiClass())
8 8  #set ($isMessageStreamActive = $services.messageStream.isActive())
9 9  
10 +#set ($currentUser = $services.model.serialize($xcontext.userReference, 'default'))
11 +
10 10  #set ($activityActionsMap = {
11 11   'publicMessage': 'icons/silk/user_comment.png',
12 12   'personalMessage': 'icons/silk/user_comment.png',
... ... @@ -32,6 +32,7 @@
32 32  ##
33 33  ## Skin Extensions
34 34  ##--------------------------------------------------------------
37 +#set ($discard = $xwiki.ssx.use('Main.Activity'))
35 35  #set ($discard = $xwiki.ssx.use('Main.MessageSenderMacro'))
36 36  #set ($discard = $xwiki.jsx.use('Main.MessageSenderMacro'))
37 37  {{/velocity}}
... ... @@ -110,11 +110,11 @@
110 110   #set ($actionQueryString = "xredirect=$escapetool.url($xredirect)")
111 111   {{html}}
112 112   ## Wrap the form in a div so that the layout is preserved in inline mode (where the form is stripped by the rendering).
113 - <div class='messagestream xform'>
116 + <div class='messagestream activityUser xform'>
114 114   #if (!$inEditMode)
115 115   <form action="${xwiki.getURL('Main.MessageSenderMacro', 'view', $!{actionQueryString})}" method='post'>
116 116   #end
117 - <div class='message-content'>
120 + <div class='activityContent'>
118 118   #if(!$inEditMode)
119 119   ## CSRF prevention
120 120   <input type="hidden" name="form_token" value="$!{services.csrf.getToken()}" />
... ... @@ -136,13 +136,13 @@
136 136   #if (!$defaultTarget)
137 137   #if ($doc.getObject('XWiki.XWikiGroups'))
138 138   #set ($defaultTarget = 'group')
139 - #set ($targetName = $doc.fullName)
142 + #set ($targetName = $doc.prefixedFullName)
140 140   #elseif ($doc.getObject('XWiki.XWikiUsers'))
141 - #if ($doc.documentReference == $xcontext.userReference)
144 + #if ($doc.prefixedFullName == $currentUser)
142 142   #set ($defaultTarget = 'followers')
143 143   #else
144 144   #set ($defaultTarget = 'user')
145 - #set ($targetName = $doc.fullName)
148 + #set ($targetName = $doc.prefixedFullName)
146 146   #end
147 147   #else
148 148   #set ($defaultTarget = 'everyone')
... ... @@ -155,28 +155,25 @@
155 155   #end
156 156   </select>
157 157   </label>
158 - #set ($suggestPickerParams = {
161 + #set ($userPickerParams = {
159 159   'name': 'targetName',
163 + 'value': $targetName,
160 160   'title': $services.localization.render('xe.activity.messages.visibility.targetName.tip')
161 161   })
162 - #foreach ($target in ['user', 'group'])
163 - #if ($possibleTargets.contains($target))
164 - #set ($notDefaultTarget = $target != $defaultTarget)
165 - <div class="message-target message-target-$target#if ($notDefaultTarget) hidden#end">
166 - #set ($discard = $suggestPickerParams.put('class', 'targetName'))
167 - #set ($suggestPickerParams.disabled = $inEditMode || $notDefaultTarget)
168 - #set ($suggestPickerParams.value = $targetName)
169 - #if ($notDefaultTarget)
170 - #set ($suggestPickerParams.value = '')
171 - #end
172 - #if ($target == 'user')
173 - #userPicker(false, $suggestPickerParams)
174 - #else
175 - #groupPicker(false, $suggestPickerParams)
176 - #end
177 - </div>
178 - #end
166 + #if ($possibleTargets.contains('user'))
167 + <div class="message-target message-target-user#if ($defaultTarget != 'user') hidden#end">
168 + #set ($discard = $userPickerParams.put('class', 'targetName'))
169 + #set ($userPickerParams.disabled = $inEditMode || $defaultTarget != 'user')
170 + #userPicker(true, $userPickerParams)
171 + </div>
179 179   #end
173 + #if ($possibleTargets.contains('group'))
174 + <div class="message-target message-target-group#if ($defaultTarget != 'group') hidden#end">
175 + #set ($discard = $userPickerParams.put('class', 'targetName'))
176 + #set ($userPickerParams.disabled = $inEditMode || $defaultTarget != 'group')
177 + #groupPicker(true, $userPickerParams)
178 + </div>
179 + #end
180 180   <div class="message-target message-target-default">
181 181   <input type="hidden" name="targetName" value="$!escapetool.xml($targetName)" class="targetName" />
182 182   </div>