aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/prosilver/template
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-05-02 18:29:50 +0200
committerNils Adermann <naderman@naderman.de>2014-05-02 18:29:50 +0200
commitb187031082aa41e5d2da5537ca403677dc7e05ce (patch)
tree39a0d07cf8d7454ee3586f7896450a95ddad8708 /phpBB/styles/prosilver/template
parentf0be9549ac14c49cad44b1476382aedf2a6f4af8 (diff)
parented4b72d1f2e1cc96ebec845f9af97db406065c6b (diff)
downloadforums-b187031082aa41e5d2da5537ca403677dc7e05ce.tar
forums-b187031082aa41e5d2da5537ca403677dc7e05ce.tar.gz
forums-b187031082aa41e5d2da5537ca403677dc7e05ce.tar.bz2
forums-b187031082aa41e5d2da5537ca403677dc7e05ce.tar.xz
forums-b187031082aa41e5d2da5537ca403677dc7e05ce.zip
Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus
* github-prototech/ticket/12265: [ticket/12265] Actually use $u_pm. [ticket/12265] Ensure that dropdown is always at the very left of the container [ticket/12265] Define a loop for contact icons. [ticket/12265] Break the icons that aren't in loop in case extensions add more [ticket/12265] Fix modulo logic. [ticket/12265] Adjust alignment of AIM and Jabber icons. [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera. [ticket/12265] Add contact icon and remove border from last row & cells. [ticket/12265] Fix issue with dropdown being restricted by the width of parent [ticket/12265] Remove ugly logic. [ticket/12265] Simplify contact icon design and move to dropdown. Conflicts: phpBB/viewtopic.php
Diffstat (limited to 'phpBB/styles/prosilver/template')
-rw-r--r--phpBB/styles/prosilver/template/ucp_pm_viewmessage.html43
-rw-r--r--phpBB/styles/prosilver/template/viewtopic_body.html40
2 files changed, 47 insertions, 36 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index f14e4708e7..627b5aa6ed 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -34,25 +34,30 @@
<!-- EVENT ucp_pm_viewmessage_custom_fields_after -->
- <!-- IF U_PM or U_EMAIL or U_JABBER -->
- <dd class="profile-contact">
- <ul class="profile-icons">
- <!-- EVENT ucp_pm_viewmessage_contact_fields_before -->
- <!-- IF U_PM --><li class="pm-icon"><a href="{U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->
- <!-- IF U_EMAIL --><li class="email-icon"><a href="{U_EMAIL}" title="{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}"><span>{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}</span></a></li><!-- ENDIF -->
- <!-- IF U_JABBER --><li class="jabber-icon"><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->
- <!-- BEGIN custom_fields -->
- <!-- IF custom_fields.S_PROFILE_CONTACT -->
- <li class="{custom_fields.PROFILE_FIELD_IDENT}-icon">
- <a href="<!-- IF custom_fields.PROFILE_FIELD_CONTACT -->{custom_fields.PROFILE_FIELD_CONTACT}<!-- ELSE -->{U_MESSAGE_AUTHOR}<!-- ENDIF -->">
- <span>{custom_fields.PROFILE_FIELD_NAME}</span>
- </a>
- </li>
- <!-- ENDIF -->
- <!-- END custom_fields -->
- <!-- EVENT ucp_pm_viewmessage_contact_fields_after -->
- </ul>
- </dd>
+ <!-- IF .contact -->
+ <dd class="profile-contact">
+ <strong>{L_CONTACT_USER}{L_COLON}</strong>
+ <div class="dropdown-container dropdown-left">
+ <a href="#" class="dropdown-trigger"><span class="imageset icon_contact"></span></a>
+ <div class="dropdown hidden">
+ <div class="pointer"><div class="pointer-inner"></div></div>
+ <div class="dropdown-contents contact-icons">
+ <!-- BEGIN contact -->
+ {% set REMAINDER = contact.S_ROW_COUNT % 4 %}
+ <!-- DEFINE $S_LAST_CELL = ((REMAINDER eq 3) or (contact.S_LAST_ROW and contact.S_NUM_ROWS < 4)) -->
+ <!-- IF REMAINDER eq 0 -->
+ <div>
+ <!-- ENDIF -->
+ <a href="<!-- IF contact.U_CONTACT -->{contact.U_CONTACT}<!-- ELSE -->{contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF contact.ID eq 'jabber' --> onclick="popup(this.href, 550, 320); return false;"<!-- ENDIF -->>
+ <span class="contact-icon {contact.ID}-icon"></span>
+ </a>
+ <!-- IF REMAINDER eq 3 or contact.S_LAST_ROW -->
+ </div>
+ <!-- ENDIF -->
+ <!-- END contact -->
+ </div>
+ </div>
+ </dd>
<!-- ENDIF -->
</dl>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 01a49d6888..485083a2ba 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -143,26 +143,32 @@
<!-- 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_JABBER -->
+ <!-- IF not S_IS_BOT and .postrow.contact -->
<dd class="profile-contact">
- <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_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>
+ <strong>{L_CONTACT_USER}{L_COLON}</strong>
+ <div class="dropdown-container dropdown-left">
+ <a href="#" class="dropdown-trigger"><span class="imageset icon_contact"></span></a>
+ <div class="dropdown hidden">
+ <div class="pointer"><div class="pointer-inner"></div></div>
+ <div class="dropdown-contents contact-icons">
+ <!-- BEGIN contact -->
+ {% set REMAINDER = postrow.contact.S_ROW_COUNT % 4 %}
+ <!-- DEFINE $S_LAST_CELL = ((REMAINDER eq 3) or (postrow.contact.S_LAST_ROW and postrow.contact.S_NUM_ROWS < 4)) -->
+ <!-- IF REMAINDER eq 0 -->
+ <div>
+ <!-- ENDIF -->
+ <a href="<!-- IF postrow.contact.U_CONTACT -->{postrow.contact.U_CONTACT}<!-- ELSE -->{postrow.contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{postrow.contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF postrow.contact.ID eq 'jabber' --> onclick="popup(this.href, 550, 320); return false;"<!-- ENDIF -->>
+ <span class="contact-icon {postrow.contact.ID}-icon"></span>
+ </a>
+ <!-- IF REMAINDER eq 3 or postrow.contact.S_LAST_ROW -->
+ </div>
+ <!-- ENDIF -->
+ <!-- END contact -->
+ </div>
+ </div>
+ </div>
</dd>
<!-- ENDIF -->
- <!-- ENDIF -->
</dl>
generated by cgit v1.2.1 (git 2.21.0) at 2026-02-07 23:20:57 +0000