Merge branch '2.0'

Conflicts:
	com.woltlab.wcf/templates/user.tpl

diff --cc com.woltlab.wcf/templates/user.tpl
index 32e75d42f3307a4a32d4b6ee9f12334c06fd4535,8f177e5d2812d5dc3b3aa5ae2db0a387970a48ce..d7cf39a496a691f41c950f68de2cb758e7b61d7b
--- 1/com.woltlab.wcf/templates/user.tpl
--- 2/com.woltlab.wcf/templates/user.tpl
+++ b/com.woltlab.wcf/templates/user.tpl
@@@ -179,24 -135,8 +179,28 @@@
                                        </ul>
                                </li>
                        {/hascontent}
 -                      {if $user->userID != $__wcf->user->userID}{if $user->isAccessible('canViewEmailAddress') || $__wcf->session->getPermission('admin.general.canViewPrivateUserOptions')}<li><a class="button jsTooltip" href="mailto:{@$user->getEncodedEmail()}" title="{lang}wcf.user.button.mail{/lang}"><span class="icon icon16 icon-envelope-alt"></span> <span class="invisible">{lang}wcf.user.button.mail{/lang}</span></a></li>{elseif $user->isAccessible('canMail') && $__wcf->session->getPermission('user.profile.canMail')}<li><a class="button jsTooltip" href="{link controller='Mail' object=$user}{/link}" title="{lang}wcf.user.button.mail{/lang}"><span class="icon icon16 icon-envelope-alt"></span> <span class="invisible">{lang}wcf.user.button.mail{/lang}</span></a></li>{/if}{/if}
 +                      
 +                      {if $__wcf->session->getPermission('user.profile.canReportContent')}
 +                              <li class="jsReportUser jsOnly" data-object-id="{@$user->userID}"><a title="{lang}wcf.user.profile.report{/lang}" class="button jsTooltip"><span class="icon icon16 icon-warning-sign"></span> <span class="invisible">{lang}wcf.user.profile.report{/lang}</span></a></li>
 +                      {/if}
 +                      
-                       {if $user->userID != $__wcf->user->userID && $user->isAccessible('canViewEmailAddress')}
-                               <li><a class="button jsTooltip" href="mailto:{@$user->getEncodedEmail()}" title="{lang}wcf.user.button.mail{/lang}"><span class="icon icon16 icon-envelope-alt"></span> <span class="invisible">{lang}wcf.user.button.mail{/lang}</span></a></li>{elseif $user->isAccessible('canMail') && $__wcf->session->getPermission('user.profile.canMail')}<li><a class="button jsTooltip" href="{link controller='Mail' object=$user}{/link}" title="{lang}wcf.user.button.mail{/lang}"><span class="icon icon16 icon-envelope-alt"></span> <span class="invisible">{lang}wcf.user.button.mail{/lang}</span></a></li>
++                      {if $user->userID != $__wcf->user->userID}
++                              {if $user->isAccessible('canViewEmailAddress') || $__wcf->session->getPermission('admin.general.canViewPrivateUserOptions')}
++                                      <li><a class="button jsTooltip" href="mailto:{@$user->getEncodedEmail()}" title="{lang}wcf.user.button.mail{/lang}"><span class="icon icon16 icon-envelope-alt"></span> <span class="invisible">{lang}wcf.user.button.mail{/lang}</span></a></li>
++                              {elseif $user->isAccessible('canMail') && $__wcf->session->getPermission('user.profile.canMail')}
++                                      <li><a class="button jsTooltip" href="{link controller='Mail' object=$user}{/link}" title="{lang}wcf.user.button.mail{/lang}"><span class="icon icon16 icon-envelope-alt"></span> <span class="invisible">{lang}wcf.user.button.mail{/lang}</span></a></li>
++                              {/if}
 +                      {/if}
 +                      
                        {event name='buttons'}
 +                      
 +                      {if $isAccessible && $__wcf->user->userID != $user->userID && ($__wcf->session->getPermission('admin.user.canBanUser') || $__wcf->session->getPermission('admin.user.canDisableAvatar') || $__wcf->session->getPermission('admin.user.canDisableSignature') || ($__wcf->session->getPermission('admin.general.canUseAcp') && $__wcf->session->getPermission('admin.user.canEditUser')))}
 +                              <li class="dropdown">
 +                                      {* todo: better icon? *}
 +                                      <a href="{link controller='UserEdit' object=$user isACP=true}{/link}" class="button jsTooltip jsUserInlineEditor" title="{lang}wcf.user.moderate{/lang}"><span class="icon icon16 fa-wrench"></span> <span class="invisible">{lang}wcf.acp.user.edit{/lang}</span></a>
 +                                      <ul class="dropdownMenu"></ul>
 +                              </li>
 +                      {/if}
                </ul>
        </nav>
  </header>