Commit 07ee896b authored by Stefan Busemann's avatar Stefan Busemann
Browse files

Merge branch 'develop' into 40-localize-labels-for-privacy-settings

# Conflicts:
#	extensions/t3omy/Resources/Private/Templates/UserProfile/UserProfile/Show.html
parents 31f44cc5 0b8e65c7
Pipeline #6583 passed with stages
in 2 minutes and 28 seconds
{namespace userprofile=In2code\Userprofile\ViewHelpers}
{namespace t3omy=T3o\T3omy\ViewHelpers}
<f:comment>
<f:debug>{frontendUser.uid}</f:debug>
<f:debug title="FE USer:{frontendUser.uid}">{t3omy:isSlackOnline(frontendUserUID:'{frontendUser.uid}')}</f:debug>
</f:comment>
<f:link.action class="user-box" controller="UserProfile" action="show" arguments="{user:frontendUser}">
<div class="user-box-image ">
......
<f:if condition="{isOwnProfile}">
<f:render partial="ShowEdit" arguments="{_all}" />
</f:if>
\ No newline at end of file
{namespace userprofile=In2code\Userprofile\ViewHelpers}
{namespace t3omy=T3o\T3omy\ViewHelpers}
<div class="user-profile-data">
<f:if condition="{userprofile:isPropertyVisible(propertyName:'image', user:user)}">
<f:for each="{user.image}" as="image">
<f:image class="img-fluid rounded-circle" image="{image}" width="300" height="300"/>
</f:for>
</f:if>
<f:comment>
Here should be the Carma Display
</f:comment>
<br/>
<br/>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'address', user:user)} AND {user.address}">
<span>{user.address}</span><br/>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'zip', user:user)} AND {user.zip}">
<span>{user.zip}</span><br/>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'city', user:user)} AND {user.city}">
<span>{user.city}</span><br/>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'telephone', user:user)} AND {user.telephone}">
<span>{user.telephone}</span><br/>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'email', user:user)} AND {user.email}">
<span>{user.email}</span><br/>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'country', user:user)} AND {user.country}">
<span>{user.country}</span><br/>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'www', user:user)} AND {user.www}">
<span> {user.www}</span><br/>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'slack_id', user:user)} AND {user.slack_id}">
<span><f:format.raw><slack:showSlackLink frontendUserUID="{user.uid}"/></f:format.raw></span><br/>
</f:if>
</div>
{namespace userprofile=In2code\Userprofile\ViewHelpers}
{namespace t3omy=T3o\T3omy\ViewHelpers}
<div class="user-profile-text">
<h1>{user.name}</h1>
<f:if condition="{t3omy:isSlackOnline(frontendUserUID: '{user.uid}')}">
<div class="user-profile {t3omy:isSlackOnline(frontendUserUID: '{user.uid}')}">
<i class="fa fa-2x fa-slack"></i>
<span></span>
</div>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'about_me', user:user)}">
<p>{user.aboutMe}</p>
</f:if>
</div>
{namespace userprofile=In2code\Userprofile\ViewHelpers}
{namespace slack=T3o\T3oSlack\ViewHelpers}
<section class="container">
<h1>{user.name}</h1>
<ul>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'name', user:user)}">
<li><f:translate key="tx_userprofile.name" extensionName="t3omy" />: {user.name}</li>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'firstname', user:user)}">
<li><f:translate key="tx_userprofile.firstname" extensionName="t3omy" />: {user.firstname}</li>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'lastname', user:user)}">
<li><f:translate key="tx_userprofile.lastname" extensionName="t3omy" />: {user.lastname}</li>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'address', user:user)}">
<li><f:translate key="tx_userprofile.address" extensionName="t3omy" />: {user.address}</li>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'zip', user:user)}">
<li><f:translate key="tx_userprofile.zip" extensionName="t3omy" />: {user.zip}</li>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'city', user:user)}">
<li><f:translate key="tx_userprofile.city" extensionName="t3omy" />: {user.city}</li>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'telephone', user:user)}">
<li><f:translate key="tx_userprofile.phone" extensionName="t3omy" />: {user.telephone}</li>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'email', user:user)}">
<li><f:translate key="tx_userprofile.email" extensionName="t3omy" />: {user.email}</li>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'country', user:user)}">
<li><f:translate key="tx_userprofile.country" extensionName="t3omy" />: {user.country}</li>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'www', user:user)}">
<li><f:translate key="tx_userprofile.www" extensionName="t3omy" />: {user.www}</li>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'image', user:user)}">
<f:for each="{user.image}" as="image">
<f:image image="{image}" maxWidth="800" />
</f:for>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'about_me', user:user)}">
<li><f:translate key="tx_userprofile.about_me" extensionName="t3omy" />: {user.aboutMe}</li>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'slack_id', user:user)}">
<li><f:format.raw><slack:showSlackLink frontendUserUID="{user.uid}" /></f:format.raw> </li>
</f:if>
<div class="row">
<div class="col-sm-3">
<f:render partial="ShowUserData" arguments="{_all}"/>
</div>
<div class="{f:if(condition:isOwnProfile , then:'col-sm-6' , else:'col-sm-9')}">
<f:render partial="ShowUserText" arguments="{_all}"/>
</div>
<f:if condition="{isOwnProfile}">
<f:render partial="ShowEdit" arguments="{_all}" />
<div class="col-sm-3">
<f:render partial="ShowSidebar" arguments="{_all}"/>
</div>
</f:if>
</ul>
</div>
</section>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment