diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-03-05 11:49:11 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-03-05 11:49:11 +0100 |
| commit | 0e35a8515598b6cdf38c2b98ecde9e8cc984e594 (patch) | |
| tree | c1250a6fc14fcd1eb7b539a3df8d66790d0bc460 /phpBB/styles/prosilver/template/viewtopic_body.html | |
| parent | 4e144005f0ecca45601f2a90b066144f75c6f165 (diff) | |
| parent | 83a7e632b9b21fed88a3dbea679580d0740664f7 (diff) | |
| download | forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar.gz forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar.bz2 forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar.xz forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into develop
* github-nickvergessen/ticket/12235:
[ticket/12235] Convert WLM to custom profile field
[ticket/12187] Do not make clickable when using as contact field
[ticket/12187] Split generate_profile_fields_template() into 2 methods
[ticket/12187] Remove user_website field
[ticket/12187] Remove user_website functionality
[ticket/12187] Convert website field data to custom profile field
[ticket/12187] Add URL type for profile fields
[ticket/12234] Replace ICQ with custom profile field
[ticket/12233] Update schema file
[ticket/12233] Add images back to subsilver2
[ticket/12233] Allow profile fields to be contact fields
Conflicts:
phpBB/adm/style/acp_prune_users.html
Diffstat (limited to 'phpBB/styles/prosilver/template/viewtopic_body.html')
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index d5c45e1dfe..a09d044bc1 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -137,22 +137,30 @@ <!-- EVENT viewtopic_body_postrow_custom_fields_before --> <!-- BEGIN custom_fields --> - <dd><strong>{postrow.custom_fields.PROFILE_FIELD_NAME}{L_COLON}</strong> {postrow.custom_fields.PROFILE_FIELD_VALUE}</dd> + <!-- IF not postrow.custom_fields.S_PROFILE_CONTACT --> + <dd><strong>{postrow.custom_fields.PROFILE_FIELD_NAME}{L_COLON}</strong> {postrow.custom_fields.PROFILE_FIELD_VALUE}</dd> + <!-- ENDIF --> <!-- END custom_fields --> <!-- EVENT viewtopic_body_postrow_custom_fields_after --> <!-- IF not S_IS_BOT --> - <!-- IF postrow.U_PM or postrow.U_EMAIL or postrow.U_WWW or postrow.U_MSN or postrow.U_ICQ or postrow.U_YIM or postrow.U_AIM or postrow.U_JABBER --> + <!-- IF postrow.U_PM or postrow.U_EMAIL or postrow.U_YIM or postrow.U_AIM or postrow.U_JABBER --> <dd> <ul class="profile-icons"> <!-- IF postrow.U_PM --><li class="pm-icon"><a href="{postrow.U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF --> <!-- IF postrow.U_EMAIL --><li class="email-icon"><a href="{postrow.U_EMAIL}" title="{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}"><span>{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}</span></a></li><!-- ENDIF --> - <!-- IF postrow.U_WWW --><li class="web-icon"><a href="{postrow.U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {postrow.U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF --> - <!-- IF postrow.U_MSN --><li class="msnm-icon"><a href="{postrow.U_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF --> - <!-- IF postrow.U_ICQ --><li class="icq-icon"><a href="{postrow.U_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF --> <!-- IF postrow.U_YIM --><li class="yahoo-icon"><a href="{postrow.U_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF --> <!-- IF postrow.U_AIM --><li class="aim-icon"><a href="{postrow.U_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF --> <!-- IF postrow.U_JABBER --><li class="jabber-icon"><a href="{postrow.U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF --> + <!-- BEGIN custom_fields --> + <!-- IF postrow.custom_fields.S_PROFILE_CONTACT --> + <li class="{postrow.custom_fields.PROFILE_FIELD_IDENT}-icon"> + <a href="<!-- IF postrow.custom_fields.PROFILE_FIELD_CONTACT -->{postrow.custom_fields.PROFILE_FIELD_CONTACT}<!-- ELSE -->{postrow.U_POST_AUTHOR}<!-- ENDIF -->"> + <span>{postrow.custom_fields.PROFILE_FIELD_NAME}</span> + </a> + </li> + <!-- ENDIF --> + <!-- END custom_fields --> </ul> </dd> <!-- ENDIF --> |