Modifications pour le document Message Sender Macro

Modifié par superadmin le 2021/12/12 21:56

Depuis la version 1.1 >

modifié par Administrator
sur 2013/06/04 10:06

À la version < 5.1 >

modifié par superadmin
sur 2019/10/13 21:35

Commentaire de modification : Install extension [org.xwiki.platform:xwiki-platform-messagestream-ui/11.8.1]

Source
Rendu

Résumé

Propriétés de la Page (2 modifications, 0 ajouts, 0 suppressions)
Objets (3 modifications, 0 ajouts, 0 suppressions)

Détails

Propriétés de la Page

Auteur du document

@@ -1,1 +1,1 @@
--XWiki.Admin
++XWiki.superadmin

Masqué

@@ -1,1 +1,1 @@
--false
++true

XWiki.JavaScriptExtension[0]

Code

@@ -1,74 +5,37 @@
--#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();
    },
    prepareTargetInput : function(event, element) {
--    if (event) {
--      element.blur();
--    }
--    $w(element.className).each(function(classname) {
--      element.removeClassName(classname)
--    });
      var targetType = element.options[element.selectedIndex].value;
--    element.addClassName(targetType);
--    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 {
--      element.__targetNameInput.removeClassName('hidden');
--      if (this.suggestParameters[targetType]) {
--        new CustomUserPicker(element.__targetNameInput, this.suggestParameters[targetType]);
--      }
++    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();
++        });
++      }
++    });
    },
    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,30 +1,48 @@
  #template('colorThemeInit.vm')
  .messagestream-tools {
++  display: flex;
    position: relative;
--  margin: 2px 0;
++  margin: .5em 0 1em;
  }
--.messagestream-tools .accepted-suggestions {
--  display: inline;
++.messagestream select {
++  width: auto;
  }
--.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 .message-target {
++  flex-grow: 1;
++  margin-left: .3em;
  }
--.messagestream-tools .accepted-suggestions .target-user {
--  background-image: url("$xwiki.getSkinFile('icons/silk/user.png')");
++
++.messagestream .message-content {
++  padding: .5em 0 .5em 75px;
  }
--.messagestream-tools .accepted-suggestions .target-group {
--  background-image: url("$xwiki.getSkinFile('icons/silk/group.png')");
++
++.messagestream .activitySnapshot {
++  height: 30px;
++  margin: 5px 0 0 -50px;
++  position: absolute;
  }
--.messagestream select {
--  padding: .2em;
--  width: auto;
++
++.messagestream .activitySnapshot img {
++  border-radius: 10px 10px 0 10px;
++  box-shadow: -1px 1px 1px rgba(128,128,128,0.6);
  }
--.messagestream input.targetName {
--  margin-right: .3em;
--  width: auto;
++
++/* User's avatar */
++.messagestream .activitySnapshot .avatar {
++  border-radius: 4px;
++  box-shadow: 0 0 2px 1px rgba(128,128,128,0.6);
  }
++
++.messagestream .activitySnapshot .activityActionAvatar {
++  background: $theme.pageContentBackgroundColor;
++  border-color: $theme.pageContentBackgroundColor;
++  border-style: solid;
++  border-width: 4px 1px 1px 3px;
++  box-sizing: content-box;
++  bottom: -5px;
++  height: 16px;
++  position: absolute;
++  right: -10px;
++  width: 16px;
++}

Content Type

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

XWiki.WikiMacroClass[0]

Code de la macro

@@ -5,11 +5,8 @@
  ## -------------------------------------------------------------
  #set ($config = 'XWiki.MessageStreamConfig')
  #set ($configClass = $xwiki.getDocument($config).getxWikiClass())
--#set ($configObj = $xwiki.getDocument($config).getObject($config))
--#set ($isMessageStreamActive = ("$configObj.getProperty('active').value" == '1'))
++#set ($isMessageStreamActive = $services.messageStream.isActive())
--#set ($currentUser = $services.model.serialize($context.userReference, 'default'))
--
  #set ($activityActionsMap = {
    'publicMessage':    'icons/silk/user_comment.png',
    'personalMessage':  'icons/silk/user_comment.png',
@@ -35,7 +35,6 @@
  ##
  ## Skin Extensions
  ##--------------------------------------------------------------
--#set ($discard = $xwiki.ssx.use('Main.Activity'))
  #set ($discard = $xwiki.ssx.use('Main.MessageSenderMacro'))
  #set ($discard = $xwiki.jsx.use('Main.MessageSenderMacro'))
  {{/velocity}}
@@ -42,7 +42,7 @@
  {{velocity}}
  #if ($isMessageStreamActive)
--  #set ($xredirect = $doc.getURL($context.action, $!{request.queryString}))
++  #set ($xredirect = $doc.getURL($xcontext.action, $!{request.queryString}))
    #set ($errorMessageKeyPrefix = "messageSender.post.error.")
    #set ($errorMessage = $request.session.getAttribute("${errorMessageKeyPrefix}${xredirect}"))
    #if ("$!errorMessage" != '')
@@ -55,47 +55,52 @@
    ##
    #elseif ("$!{request.xaction}" != '')
      #if ("$!{request.xaction}" == 'postMessage')
--      #set ($message = "$!{request.messagestream_message.trim()}")
--      #if ($message == '')
--        ## Do nothing with empty messages
--        #if ("$!{request.xredirect}" != '')
--          $response.sendRedirect(${request.xredirect})
--        #end
++      #if(!$services.csrf.isTokenValid(${request.form_token}))
++        #set($redirectURL = $services.csrf.getResubmissionURL())
++        $response.sendRedirect($redirectURL)
        #else
--        #set ($success = false)
--        #if (!$isGuest)
--          #set ($messageType = "$!{request.visibilityLevel}")
--          #if ($messageType == 'everyone')
--            #set ($success = $services.messageStream.postPublicMessage($message))
--          #elseif ($messageType == 'followers')
--            #set ($success = $services.messageStream.postPersonalMessage($message))
--          #elseif ($messageType == 'group')
--            #set ($success = $services.messageStream.postMessageToGroup($message, $services.model.resolveDocument("$!{request.targetName}")))
--          #elseif ($messageType == 'user')
--            #set ($success = $services.messageStream.postDirectMessageToUser($message, $services.model.resolveDocument("$!{request.targetName}")))
++        #set ($message = "$!{request.messagestream_message.trim()}")
++        #if ($message == '')
++          ## Do nothing with empty messages
++          #if ("$!{request.xredirect}" != '')
++            $response.sendRedirect(${request.xredirect})
            #end
--        #end
--        #if (!$success)
--          #if ($request.xpage == 'plain')
--            #if ($isGuest)
--              $response.setStatus(401)## Unauthorized
++        #else
++          #set ($success = false)
++          #if (!$isGuest)
++            #set ($messageType = "$!{request.visibilityLevel}")
++            #if ($messageType == 'everyone')
++              #set ($success = $services.messageStream.postPublicMessage($message))
++            #elseif ($messageType == 'followers')
++              #set ($success = $services.messageStream.postPersonalMessage($message))
++            #elseif ($messageType == 'group')
++              #set ($success = $services.messageStream.postMessageToGroup($message, $services.model.resolveDocument("$!{request.targetName}")))
++            #elseif ($messageType == 'user')
++              #set ($success = $services.messageStream.postDirectMessageToUser($message, $services.model.resolveDocument("$!{request.targetName}")))
++            #end
++          #end
++          #if (!$success)
++            #if ($request.xpage == 'plain')
++              #if ($isGuest)
++                $response.setStatus(401)## Unauthorized
++              #else
++                $response.setStatus(403)## Forbidden
++              #end
++              $services.localization.render('xe.activity.messages.submit.failed')
++            #elseif ("$!{request.xredirect}" != '')
++              ## Pass the error message in the xredirect so that we display it in the calling page and not in the macro page.
++              $request.session.setAttribute("${errorMessageKeyPrefix}${request.xredirect}", $services.localization.render('xe.activity.messages.submit.failed'))
++              $response.sendRedirect($request.xredirect)
              #else
--              $response.setStatus(403)## Forbidden
++              {{error}}$services.localization.render('xe.activity.messages.submit.failed'){{/error}}
++
              #end
--            $services.localization.render('xe.activity.messages.submit.failed')
            #elseif ("$!{request.xredirect}" != '')
--            ## Pass the error message in the xredirect so that we display it in the calling page and not in the macro page.
--            $request.session.setAttribute("${errorMessageKeyPrefix}${request.xredirect}", $services.localization.render('xe.activity.messages.submit.failed'))
--            $response.sendRedirect($request.xredirect)
--          #else
--            {{error}}$services.localization.render('xe.activity.messages.submit.failed'){{/error}}
--
++            $response.sendRedirect(${request.xredirect})
++          #elseif ($request.xpage == 'plain')
++            ## Just print something for confirmation.
++            $services.localization.render('xe.activity.messages.submit.success')
            #end
--        #elseif ("$!{request.xredirect}" != '')
--          $response.sendRedirect(${request.xredirect})
--        #elseif ($request.xpage == 'plain')
--          ## Just print something for confirmation.
--          $services.localization.render('xe.activity.messages.submit.success')
          #end
        #end
      #end
@@ -109,48 +109,44 @@
      #set ($actionQueryString = "xredirect=$escapetool.url($xredirect)")
      {{html}}
      ## Wrap the form in a div so that the layout is preserved in inline mode (where the form is stripped by the rendering).
--    <div class='messagestream activityUser xform'>
++    <div class='messagestream xform'>
      #if (!$inEditMode)
      <form action="${xwiki.getURL('Main.MessageSenderMacro', 'view', $!{actionQueryString})}" method='post'>
      #end
--      <div class='activityContent'>
++      <div class='message-content'>
          #if(!$inEditMode)
--        <input type='hidden' name='xaction' value='postMessage' />
++          ## CSRF prevention
++          <input type="hidden" name="form_token" value="$!{services.csrf.getToken()}" />
++          <input type='hidden' name='xaction' value='postMessage' />
          #end
--        #activitySnapshot($context.user, 'personalMessage')
++        #activitySnapshot($xcontext.user, 'personalMessage')
          <div class='messagestream-data'>
            <textarea name='messagestream_message' rows='3' cols='40'#if($inEditMode) disabled='disabled'#end></textarea>
          </div>
          <div class='messagestream-tools'>
--          #set ($targetClassName = '')
--          ##
--          #set ($possibleTargets = $context.macro.params.get('visibilityOptions').split('\s*,\s*'))
++          #set ($possibleTargets = $xcontext.macro.params.get('visibilityOptions').split('\s*,\s*'))
            #if (!$possibleTargets)
              #set ($possibleTargets = $configClass.get('visibilityLevel').getListValues())
            #end
            ##
--          #set ($targetName = $context.macro.params.get('visibilityParameter'))
++          #set ($targetName = $xcontext.macro.params.get('visibilityParameter'))
            ##
--          #set ($defaultTarget = $context.macro.params.get('visibility'))
++          #set ($defaultTarget = $xcontext.macro.params.get('visibility'))
            #if (!$defaultTarget)
              #if ($doc.getObject('XWiki.XWikiGroups'))
                #set ($defaultTarget = 'group')
--              #set ($targetName = $doc.prefixedFullName)
++              #set ($targetName = $doc.fullName)
              #elseif ($doc.getObject('XWiki.XWikiUsers'))
--              #if ($doc.prefixedFullName == $currentUser)
++              #if ($doc.documentReference == $xcontext.userReference)
                  #set ($defaultTarget = 'followers')
                #else
                  #set ($defaultTarget = 'user')
--                #set ($targetName = $doc.prefixedFullName)
++                #set ($targetName = $doc.fullName)
                #end
              #else
                #set ($defaultTarget = 'everyone')
              #end
            #end
--          #if (!$targetName)
--            #set ($targetName = ${services.localization.render('xe.activity.messages.visibility.targetName.tip')})
--            #set ($targetClassName = 'withTip')
--          #end
            <label>$services.localization.render('xe.activity.messages.visibility')
              <select name='visibilityLevel'#if($inEditMode) disabled='disabled'#end>
              #foreach ($target in $possibleTargets)
@@ -158,15 +158,31 @@
              #end
              </select>
            </label>
--          <label for="targetName$!{targetNameCounter}">
--            <span class='hidden'>Name:</span>
--            <input type='text' name='targetName' id="targetName$!{targetNameCounter}" class="targetName $!{targetClassName}" value="$!{targetName}" size='15'#if($inEditMode) disabled='disabled'#end/>
--          </label>
--          #if (!$targetNameCounter)
--            #set ($targetNameCounter = 1)
--          #else
--            #set ($targetNameCounter = $targetNameCounter + 1)
++          #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
            #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>