Commit e1403bca authored by Stefan Busemann's avatar Stefan Busemann

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

Resolve "Localize labels for privacy settings"

Closes #40

See merge request !141
parents 5261bfe6 07ee896b
Pipeline #6625 passed with stages
in 2 minutes and 31 seconds
......@@ -15,6 +15,39 @@
<trans-unit id="old-users.email">
<source>Email</source>
</trans-unit>
<trans-unit id="tx_userprofile.firstname">
<source>Firstname</source>
</trans-unit>
<trans-unit id="tx_userprofile.lastname">
<source>Lastname</source>
</trans-unit>
<trans-unit id="tx_userprofile.address">
<source>Street</source>
</trans-unit>
<trans-unit id="tx_userprofile.zip">
<source>Zip</source>
</trans-unit>
<trans-unit id="tx_userprofile.city">
<source>City</source>
</trans-unit>
<trans-unit id="tx_userprofile.phone">
<source>Phone</source>
</trans-unit>
<trans-unit id="tx_userprofile.country">
<source>Country</source>
</trans-unit>
<trans-unit id="tx_userprofile.www">
<source>WWW</source>
</trans-unit>
<trans-unit id="tx_userprofile.name">
<source>Name</source>
</trans-unit>
<trans-unit id="tx_userprofile.email">
<source>Email</source>
</trans-unit>
<trans-unit id="tx_userprofile.about_me">
<source>About me</source>
</trans-unit>
</body>
</file>
</xliff>
......@@ -4,44 +4,44 @@
<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: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 />
<br/>
<br/>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'address', user:user)} AND {user.address}">
<span>{user.address}</span><br />
<span>{user.address}</span><br/>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'zip', user:user)} AND {user.zip}">
<span>{user.zip}</span><br />
<span>{user.zip}</span><br/>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'city', user:user)} AND {user.city}">
<span>{user.city}</span><br />
<span>{user.city}</span><br/>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'telephone', user:user)} AND {user.telephone}">
<span>{user.telephone}</span><br />
<span>{user.telephone}</span><br/>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'email', user:user)} AND {user.email}">
<span>{user.email}</span><br />
<span>{user.email}</span><br/>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'country', user:user)} AND {user.country}">
<span>{user.country}</span><br />
<span>{user.country}</span><br/>
</f:if>
<f:if condition="{userprofile:isPropertyVisible(propertyName:'www', user:user)} AND {user.www}">
<span> {user.www}</span><br />
<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 />
<span><f:format.raw><slack:showSlackLink frontendUserUID="{user.uid}"/></f:format.raw></span><br/>
</f:if>
</div>
\ No newline at end of file
</div>
<section class="container">
<f:form action="privacyUpdate" objectName="user" object="{user}">
<h1>My privacy settings</h1>
<p>You can control, which data are shown to whom:</p>
<ul>
<li><strong>everyone</strong>: Everyone in the web</li>
<li><strong>community</strong>: Everyone who is logged in with a typo3.org user account</li>
<li><strong>teams</strong>: Only the members of the teams, you are belonging to</li>
</ul>
<table class="table table-striped">
<thead>
<td>show your data to</td>
<td>everyone</td>
<td>community</td>
<td>teams</td>
</thead>
<f:for each="{privacySettings}" as="privacySetting" key="privacySettingValue">
<tr>
<td>{privacySettingValue}</td>
<td>
<f:form.checkbox
checked="{privacySetting.public}"
value="1"
id="userprofile_{privacySettingValue}_public"
name="privacy[{privacySettingValue}][public]" />
</td>
<td>
<f:form.checkbox
checked="{privacySetting.authenticated}"
value="1"
id="userprofile_{privacySettingValue}_authenticated"
name="privacy[{privacySettingValue}][authenticated]" />
</td>
<td>
<f:form.checkbox
checked="{privacySetting.groups}"
value="1"
id="userprofile_{privacySettingValue}_groups"
name="privacy[{privacySettingValue}][groups]" />
</td>
</tr>
</f:for>
</table>
<f:form.submit value="Update" class="btn btn-success">Update</f:form.submit>
</f:form>
</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