Changes for page Message Sender Macro

Last modified by Ludovic Dubost on 2024/07/22 15:51

From 8.1 to 7.1

From version 7.1

edited by Ludovic Dubost
on 2018/12/09 12:24

Change comment: Install extension [org.xwiki.platform:xwiki-platform-messagestream-ui/10.10]

To version 1.1

edited by Ludovic Dubost
on 2014/03/30 19:46

Change comment: Imported from XAR

Raw
Rendered

Summary

Objects (3 modified, 0 added, 0 removed)

Details

XWiki.JavaScriptExtension[0]

Code

@@ -1,6 +1,41 @@
++#set ($userSuggestScope = 'local')
++#if ($services.workspace && $services.workspace.isWorkspace($xcontext.database))
++  #set ($userSuggestScope = 'global')
++#end
  var XWiki = (function (XWiki) {
  // Start XWiki augmentation.
++/**
++ * Extends the UserPicker in order to display the selected user/group inline after the target text input.
++ */
++var CustomUserPicker = Class.create(XWiki.widgets.UserPicker, {
++  // @Override
++  _createSelectionManager: function($super, options) {
++    var selectionManager = $super(Object.extend(options, {
++      listInsertionPosition : 'after',
++      acceptFreeText : false
++    }));
++    // Overwrite the way the selected item is displayed.
++    selectionManager.displayItem = function(suggestion) {
++      var targetInfo = new Element('span').update(suggestion.info).insert(this.createDeleteTool());
++      var targetClass = this.suggest.sources[0].script.indexOf('uorg=group') > 0 ? 'target-group' : 'target-user';
++      return new Element('li', {'class': targetClass}).insert(targetInfo).insert(this.createItemInput(suggestion));
++    }.bind(selectionManager);
++    return selectionManager;
++  }
++});
++
  XWiki.MessageStream = Class.create({
++  targetsWithName : ['user', 'group'],
++  suggestParameters : {
++    user : {
++      script: '$doc.getURL("get", "xpage=uorgsuggest&uorg=user&wiki=${userSuggestScope}")&',
++      noresults: "$escapetool.javascript($services.localization.render('core.widgets.userPicker.noResults'))"
++    },
++    group : {
++      script: "$doc.getURL('get', 'xpage=uorgsuggest&uorg=group')&",
++      noresults: "$escapetool.javascript($services.localization.render('core.widgets.groupPicker.noResults'))"
++    }
++  },
    initialize : function() {
      this.prepareForms();
      this.enhanceSelect();
@@ -8,30 +8,30 @@
    prepareTargetInput : function(event, element) {
      var targetType = element.options[element.selectedIndex].value;
      element.className = targetType;
--    var messageStream = element.up('.messagestream');
--    var targetInputContainer = messageStream.down('.message-target-' + targetType);
--    if (!targetInputContainer) {
--      targetInputContainer = messageStream.down('.message-target-default');
--    }
--    messageStream.select('.message-target').forEach(function(messageTargetContainer) {
--      var fields = messageTargetContainer.select('input, select, textarea');
--      if (messageTargetContainer === targetInputContainer) {
--        messageTargetContainer.removeClassName('hidden');
--        fields.forEach(function(field) {
--          field.enable();
--          field.hasClassName('selectized') && field.selectize.enable();
--        });
--      } else {
--        messageTargetContainer.addClassName('hidden');
--        fields.forEach(function(field) {
--          field.disable();
--          field.hasClassName('selectized') && field.selectize.disable();
--        });
++    if (!element.__targetNameInput) {return;}
++    if (this.targetsWithName.indexOf(targetType) < 0) {
++      element.__targetNameInput.addClassName('hidden');
++      if (element.__targetNameInput.__x_suggest) {
++        element.__targetNameInput.__x_suggest.detach();
        }
--    });
++    } else {
++      // Focus the text input so that the place-holder value is cleared if present. Otherwise the user picker will treat
++      // the place-holder value as if it was typed by the user and will automatically select the corresponding suggestion.
++      element.__targetNameInput.removeClassName('hidden').activate();
++      // Defer the creation of the user picker to allow the focus listeners to be called first (in order to clear the
++      // place-holder value).
++      this.suggestParameters[targetType] && function() {
++        new CustomUserPicker(element.__targetNameInput, this.suggestParameters[targetType]);
++      }.bind(this).defer();
++    }
    },
    enhanceSelect: function () {
      $$('.messagestream select[name="visibilityLevel"]').each(function(element) {
++      element.addClassName(element.options[element.selectedIndex].value);
++      element.__targetNameInput = element.up('.messagestream').down('input[name="targetName"]');
++      if (element.__targetNameInput && this.targetsWithName.indexOf(element.options[element.selectedIndex].value) < 0) {
++        element.__targetNameInput.addClassName('hidden');
++      }
        element.observe('change', this.prepareTargetInput.bindAsEventListener(this, element));
        this.prepareTargetInput(null, element);
      }.bind(this));

XWiki.StyleSheetExtension[0]

Code

@@ -1,12 +1,30 @@
++#template('colorThemeInit.vm')
++
  .messagestream-tools {
--  display: flex;
    position: relative;
--  margin: .5em 0 1em;
++  margin: 2px 0;
  }
++.messagestream-tools .accepted-suggestions {
++  display: inline;
++}
++.messagestream-tools .accepted-suggestions .target-user,
++.messagestream-tools .accepted-suggestions .target-group {
++  background: none no-repeat scroll left center transparent;
++  display: inline-block;
++  margin-right: 1em;
++  padding: 0 1px 0 18px;
++}
++.messagestream-tools .accepted-suggestions .target-user {
++  background-image: url("$xwiki.getSkinFile('icons/silk/user.png')");
++}
++.messagestream-tools .accepted-suggestions .target-group {
++  background-image: url("$xwiki.getSkinFile('icons/silk/group.png')");
++}
  .messagestream select {
++  padding: .2em;
    width: auto;
  }
--.messagestream .message-target {
--  flex-grow: 1;
--  margin-left: .3em;
++.messagestream input.targetName {
++  margin-right: .3em;
++  width: auto;
  }

Parse content

@@ -1,1 +1,1 @@
--No
++Yes

Content Type

...	...	@@ -1,1 +1,0 @@
1		-CSS

XWiki.WikiMacroClass[0]

Macro code

@@ -5,8 +5,11 @@
  ## -------------------------------------------------------------
  #set ($config = 'XWiki.MessageStreamConfig')
  #set ($configClass = $xwiki.getDocument($config).getxWikiClass())
--#set ($isMessageStreamActive = $services.messageStream.isActive())
++#set ($configObj = $xwiki.getDocument($config).getObject($config))
++#set ($isMessageStreamActive = ("$configObj.getProperty('active').value" == '1'))
++#set ($currentUser = $services.model.serialize($xcontext.userReference, 'default'))
++
  #set ($activityActionsMap = {
    'publicMessage':    'icons/silk/user_comment.png',
    'personalMessage':  'icons/silk/user_comment.png',
@@ -137,13 +137,13 @@
            #if (!$defaultTarget)
              #if ($doc.getObject('XWiki.XWikiGroups'))
                #set ($defaultTarget = 'group')
--              #set ($targetName = $doc.fullName)
++              #set ($targetName = $doc.prefixedFullName)
              #elseif ($doc.getObject('XWiki.XWikiUsers'))
--              #if ($doc.documentReference == $xcontext.userReference)
++              #if ($doc.prefixedFullName == $currentUser)
                  #set ($defaultTarget = 'followers')
                #else
                  #set ($defaultTarget = 'user')
--                #set ($targetName = $doc.fullName)
++                #set ($targetName = $doc.prefixedFullName)
                #end
              #else
                #set ($defaultTarget = 'everyone')
@@ -156,31 +156,16 @@
              #end
              </select>
            </label>
--          #set ($suggestPickerParams = {
--            'name': 'targetName',
--            'title': $services.localization.render('xe.activity.messages.visibility.targetName.tip')
--          })
--          #foreach ($target in ['user', 'group'])
--            #if ($possibleTargets.contains($target))
--              #set ($notDefaultTarget = $target != $defaultTarget)
--              <div class="message-target message-target-$target#if ($notDefaultTarget) hidden#end">
--                #set ($discard = $suggestPickerParams.put('class', 'targetName'))
--                #set ($suggestPickerParams.disabled = $inEditMode || $notDefaultTarget)
--                #set ($suggestPickerParams.value = $targetName)
--                #if ($notDefaultTarget)
--                  #set ($suggestPickerParams.value = '')
--                #end
--                #if ($target == 'user')
--                  #userPicker(false, $suggestPickerParams)
--                #else
--                  #groupPicker(false, $suggestPickerParams)
--                #end
--              </div>
--            #end
++          <label for="targetName$!{targetNameCounter}">
++            <span class='hidden'>Name:</span>
++            <input type="text" name="targetName" id="targetName$!targetNameCounter" class="targetName withTip useTitleAsTip" value="$!targetName" size="15"
++              title="$services.localization.render('xe.activity.messages.visibility.targetName.tip')" #if ($inEditMode) disabled="disabled"#end/>
++          </label>
++          #if (!$targetNameCounter)
++            #set ($targetNameCounter = 1)
++          #else
++            #set ($targetNameCounter = $targetNameCounter + 1)
            #end
--          <div class="message-target message-target-default">
--            <input type="hidden" name="targetName" value="$!escapetool.xml($targetName)" class="targetName" />
--          </div>
          </div>
          <div class='messagestream-buttons'>
            <span class='butonwrapper'><input type='submit' value="$services.localization.render('xe.activity.messages.submit')" class='button'#if($inEditMode) disabled='disabled'#end/></span>