makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-20 10:18:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [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.
This commit is contained in:
Nils Adermann 2014-05-02 18:30:29 +02:00
commit 0d22f8d0af
22 changed files with 229 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/assets/javascript/core.js
View file

@ -918,9 +918,10 @@ phpbb.toggleDropdown = function() {
// Check dimensions when showing dropdown // Check dimensions when showing dropdown
// !visible because variable shows state of dropdown before it was toggled // !visible because variable shows state of dropdown before it was toggled
if (!visible) { if (!visible) {
var windowWidth = $(window).width();
options.dropdown.find('.dropdown-contents').each(function() { options.dropdown.find('.dropdown-contents').each(function() {
var $this = $(this), var $this = $(this);
windowWidth = $(window).width();
$this.css({ $this.css({
marginLeft: 0, marginLeft: 0,
@ -938,6 +939,13 @@ phpbb.toggleDropdown = function() {
$this.css('margin-left', (windowWidth - offset - width - 2) + 'px'); $this.css('margin-left', (windowWidth - offset - width - 2) + 'px');
} }
}); });
var freeSpace = parent.offset().left - 4;
if (direction == 'left') {
options.dropdown.css('margin-left', '-' + freeSpace + 'px');
} else {
options.dropdown.css('margin-right', '-' + (windowWidth + freeSpace) + 'px');
}
} }
// Prevent event propagation // Prevent event propagation

51
phpBB/includes/ucp/ucp_pm_viewmessage.php
View file

@ -177,6 +177,18 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
} }
} }
$u_pm = $u_jabber = '';
if ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_')))
{
$u_pm = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $author_id);
}
if ($user_info['user_jabber'] && $auth->acl_get('u_sendim'))
{
$u_jabber = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=jabber&u=' . $author_id);
}
$msg_data = array( $msg_data = array(
'MESSAGE_AUTHOR_FULL' => get_username_string('full', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']), 'MESSAGE_AUTHOR_FULL' => get_username_string('full', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
'MESSAGE_AUTHOR_COLOUR' => get_username_string('colour', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']), 'MESSAGE_AUTHOR_COLOUR' => get_username_string('colour', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
@ -208,8 +220,8 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
'EDITED_MESSAGE' => $l_edited_by, 'EDITED_MESSAGE' => $l_edited_by,
'MESSAGE_ID' => $message_row['msg_id'], 'MESSAGE_ID' => $message_row['msg_id'],
'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $author_id) : '', 'U_PM' => $u_pm,
'U_JABBER' => ($user_info['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=jabber&u=' . $author_id) : '', 'U_JABBER' => $u_jabber,
'U_DELETE' => ($auth->acl_get('u_pm_delete')) ? "$url&mode=compose&action=delete&f=$folder_id&p=" . $message_row['msg_id'] : '', 'U_DELETE' => ($auth->acl_get('u_pm_delete')) ? "$url&mode=compose&action=delete&f=$folder_id&p=" . $message_row['msg_id'] : '',
'U_EMAIL' => $user_info['email'], 'U_EMAIL' => $user_info['email'],
@ -264,6 +276,32 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
$template->assign_vars($msg_data); $template->assign_vars($msg_data);
$contact_fields = array(
array(
'ID' => 'pm',
'NAME' => $user->lang['PRIVATE_MESSAGE'],
'U_CONTACT' => $u_pm,
),
array(
'ID' => 'email',
'NAME' => $user->lang['SEND_EMAIL'],
'U_CONTACT' => $user_info['email'],
),
array(
'ID' => 'jabber',
'NAME' => $user->lang['JABBER'],
'U_CONTACT' => $u_jabber,
),
);
foreach ($contact_fields as $field)
{
if ($field['U_CONTACT'])
{
$template->assign_block_vars('contact', $field);
}
}
// Display the custom profile fields // Display the custom profile fields
if (!empty($cp_row['row'])) if (!empty($cp_row['row']))
{ {
@ -272,6 +310,15 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
foreach ($cp_row['blockrow'] as $cp_block_row) foreach ($cp_row['blockrow'] as $cp_block_row)
{ {
$template->assign_block_vars('custom_fields', $cp_block_row); $template->assign_block_vars('custom_fields', $cp_block_row);
if ($cp_block_row['S_PROFILE_CONTACT'])
{
$template->assign_block_vars('contact', array(
'ID' => $cp_block_row['PROFILE_FIELD_IDENT'],
'NAME' => $cp_block_row['PROFILE_FIELD_NAME'],
'U_CONTACT' => $cp_block_row['PROFILE_FIELD_CONTACT'],
));
}
} }
} }

1
phpBB/language/en/common.php
View file

@ -167,6 +167,7 @@ $lang = array_merge($lang, array(
'CONGRATULATIONS' => 'Congratulations to', 'CONGRATULATIONS' => 'Congratulations to',
'CONNECTION_FAILED' => 'Connection failed.', 'CONNECTION_FAILED' => 'Connection failed.',
'CONNECTION_SUCCESS' => 'Connection was successful!', 'CONNECTION_SUCCESS' => 'Connection was successful!',
'CONTACT_USER' => 'Contact',
'COOKIES_DELETED' => 'All board cookies successfully deleted.', 'COOKIES_DELETED' => 'All board cookies successfully deleted.',
'CURRENT_TIME' => 'It is currently %s', 'CURRENT_TIME' => 'It is currently %s',

1
phpBB/language/en/memberlist.php
View file

@ -47,7 +47,6 @@ $lang = array_merge($lang, array(
'BEFORE' => 'Before', 'BEFORE' => 'Before',
'CC_EMAIL' => 'Send a copy of this email to yourself.', 'CC_EMAIL' => 'Send a copy of this email to yourself.',
'CONTACT_USER' => 'Contact',
'DEST_LANG' => 'Language', 'DEST_LANG' => 'Language',
'DEST_LANG_EXPLAIN' => 'Select an appropriate language (if available) for the recipient of this message.', 'DEST_LANG_EXPLAIN' => 'Select an appropriate language (if available) for the recipient of this message.',

37
phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
View file

@ -34,24 +34,29 @@
<!-- EVENT ucp_pm_viewmessage_custom_fields_after --> <!-- EVENT ucp_pm_viewmessage_custom_fields_after -->
<!-- IF U_PM or U_EMAIL or U_JABBER --> <!-- IF .contact -->
<dd class="profile-contact"> <dd class="profile-contact">
<ul class="profile-icons"> <strong>{L_CONTACT_USER}{L_COLON}</strong>
<!-- EVENT ucp_pm_viewmessage_contact_fields_before --> <div class="dropdown-container dropdown-left">
<!-- IF U_PM --><li class="pm-icon"><a href="{U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF --> <a href="#" class="dropdown-trigger"><span class="imageset icon_contact"></span></a>
<!-- 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 --> <div class="dropdown hidden">
<!-- 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 --> <div class="pointer"><div class="pointer-inner"></div></div>
<!-- BEGIN custom_fields --> <div class="dropdown-contents contact-icons">
<!-- IF custom_fields.S_PROFILE_CONTACT --> <!-- BEGIN contact -->
<li class="{custom_fields.PROFILE_FIELD_IDENT}-icon"> {% set REMAINDER = contact.S_ROW_COUNT % 4 %}
<a href="<!-- IF custom_fields.PROFILE_FIELD_CONTACT -->{custom_fields.PROFILE_FIELD_CONTACT}<!-- ELSE -->{U_MESSAGE_AUTHOR}<!-- ENDIF -->"> <!-- DEFINE $S_LAST_CELL = ((REMAINDER eq 3) or (contact.S_LAST_ROW and contact.S_NUM_ROWS < 4)) -->
<span>{custom_fields.PROFILE_FIELD_NAME}</span> <!-- IF REMAINDER eq 0 -->
</a> <div>
</li>
<!-- ENDIF --> <!-- ENDIF -->
<!-- END custom_fields --> <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 -->>
<!-- EVENT ucp_pm_viewmessage_contact_fields_after --> <span class="contact-icon {contact.ID}-icon"></span>
</ul> </a>
<!-- IF REMAINDER eq 3 or contact.S_LAST_ROW -->
</div>
<!-- ENDIF -->
<!-- END contact -->
</div>
</div>
</dd> </dd>
<!-- ENDIF --> <!-- ENDIF -->
</dl> </dl>

36
phpBB/styles/prosilver/template/viewtopic_body.html
View file

@ -143,26 +143,32 @@
<!-- END custom_fields --> <!-- END custom_fields -->
<!-- EVENT viewtopic_body_postrow_custom_fields_after --> <!-- EVENT viewtopic_body_postrow_custom_fields_after -->
<!-- IF not S_IS_BOT --> <!-- IF not S_IS_BOT and .postrow.contact -->
<!-- IF postrow.U_PM or postrow.U_EMAIL or postrow.U_JABBER -->
<dd class="profile-contact"> <dd class="profile-contact">
<ul class="profile-icons"> <strong>{L_CONTACT_USER}{L_COLON}</strong>
<!-- 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 --> <div class="dropdown-container dropdown-left">
<!-- 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 --> <a href="#" class="dropdown-trigger"><span class="imageset icon_contact"></span></a>
<!-- 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 --> <div class="dropdown hidden">
<!-- BEGIN custom_fields --> <div class="pointer"><div class="pointer-inner"></div></div>
<!-- IF postrow.custom_fields.S_PROFILE_CONTACT --> <div class="dropdown-contents contact-icons">
<li class="{postrow.custom_fields.PROFILE_FIELD_IDENT}-icon"> <!-- BEGIN contact -->
<a href="<!-- IF postrow.custom_fields.PROFILE_FIELD_CONTACT -->{postrow.custom_fields.PROFILE_FIELD_CONTACT}<!-- ELSE -->{postrow.U_POST_AUTHOR}<!-- ENDIF -->"> {% set REMAINDER = postrow.contact.S_ROW_COUNT % 4 %}
<span>{postrow.custom_fields.PROFILE_FIELD_NAME}</span> <!-- 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> </a>
</li> <!-- IF REMAINDER eq 3 or postrow.contact.S_LAST_ROW -->
</div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- END custom_fields --> <!-- END contact -->
</ul> </div>
</div>
</div>
</dd> </dd>
<!-- ENDIF --> <!-- ENDIF -->
<!-- ENDIF -->
</dl> </dl>

59
phpBB/styles/prosilver/theme/buttons.css
View file

@ -214,20 +214,53 @@ ul.profile-icons.responsive a.responsive-menu-link:before {
max-width: 40%; max-width: 40%;
} }
.contact-icons.dropdown-contents {
min-width: 0;
padding: 0;
}
.contact-icon {
background-repeat: no-repeat;
display: block;
height: 16px;
width: 16px;
}
.contact-icons a {
border-bottom: 1px dotted;
border-right: 1px dotted;
display: block;
float: left;
padding: 8px;
}
.contact-icons .last-cell {
border-right: none;
}
.contact-icons div:last-child a {
border-bottom: none;
}
.contact-icons div {
clear: left;
}
/* Profile & navigation icons */ /* Profile & navigation icons */
.email-icon, .email-icon a { background: none top left no-repeat; } .pm-icon { background-position: 0 0; }
.aim-icon, .aim-icon a { background: none top left no-repeat; } .email-icon { background-position: -21px 0; }
.phpbb_aol-icon, .phpbb_aol-icon a { background: none top left no-repeat; } .jabber-icon { background-position: -80px 0; }
.yahoo-icon, .yahoo-icon a { background: none top left no-repeat; } .phpbb_icq-icon { background-position: -61px 0 ; }
.phpbb_yahoo-icon, .phpbb_yahoo-icon a { background: none top left no-repeat; } .phpbb_wlm-icon { background-position: -182px 0; }
.web-icon, .web-icon a { background: none top left no-repeat; } .phpbb_aol-icon { background-position: -244px 0; }
.phpbb_website-icon, .phpbb_website-icon a { background: none top left no-repeat; } .phpbb_website-icon { background-position: -40px 0; }
.msnm-icon, .msnm-icon a { background: none top left no-repeat; } .phpbb_youtube-icon { background-position: -98px 0; }
.phpbb_wlm-icon, .phpbb_wlm-icon a { background: none top left no-repeat; } .phpbb_facebook-icon { background-position: -119px 0; }
.icq-icon, .icq-icon a { background: none top left no-repeat; } .phpbb_google_plus-icon { background-position: -140px 0; }
.phpbb_icq-icon, .phpbb_icq-icon a { background: none top left no-repeat; } .phpbb_skype-icon { background-position: -161px 0; }
.jabber-icon, .jabber-icon a { background: none top left no-repeat; } .phpbb_twitter-icon { background-position: -203px 0; }
.pm-icon, .pm-icon a { background: none top left no-repeat; } .phpbb_yahoo-icon { background-position: -224px 0; }
.quote-icon, .quote-icon a { background: none top left no-repeat; } .quote-icon, .quote-icon a { background: none top left no-repeat; }
/* Moderator icons */ /* Moderator icons */

23
phpBB/styles/prosilver/theme/colours.css
View file

@ -710,6 +710,14 @@ Colours and backgrounds for buttons.css
background-image: url("images/buttons.png"); background-image: url("images/buttons.png");
} }
.contact-icons a {
border-color: #DCDCDC;
}
.contact-icons a:hover {
background-color: #F2F6F9;
}
/* Icon images /* Icon images
---------------------------------------- */ ---------------------------------------- */
.icon-faq { background-image: url("./images/icon_faq.gif"); } .icon-faq { background-image: url("./images/icon_faq.gif"); }
@ -732,19 +740,8 @@ Colours and backgrounds for buttons.css
.icon-print { background-image: url("./images/icon_print.gif"); } .icon-print { background-image: url("./images/icon_print.gif"); }
/* Profile & navigation icons */ /* Profile & navigation icons */
.email-icon, .email-icon a { background-image: url("./images/icon_contact_email.gif"); } .contact-icon { background-image: url("./images/icons_contact.png"); }
.phpbb_aol-icon, .phpbb_aol-icon a { background-image: url("./images/icon_contact_aim.gif"); }
.aim-icon, .aim-icon a { background-image: url("./images/icon_contact_aim.gif"); }
.yahoo-icon, .yahoo-icon a { background-image: url("./images/icon_contact_yahoo.gif"); }
.phpbb_yahoo-icon, .phpbb_yahoo-icon a { background-image: url("./images/icon_contact_yahoo.gif"); }
.web-icon, .web-icon a { background-image: url("./images/icon_contact_www.gif"); }
.phpbb_website-icon, .phpbb_website-icon a { background-image: url("./images/icon_contact_www.gif"); }
.msnm-icon, .msnm-icon a { background-image: url("./images/icon_contact_msnm.gif"); }
.phpbb_wlm-icon, .phpbb_wlm-icon a { background-image: url("./images/icon_contact_msnm.gif"); }
.icq-icon, .icq-icon a { background-image: url("./images/icon_contact_icq.gif"); }
.phpbb_icq-icon, .phpbb_icq-icon a { background-image: url("./images/icon_contact_icq.gif"); }
.jabber-icon, .jabber-icon a { background-image: url("./images/icon_contact_jabber.gif"); }
.pm-icon, .pm-icon a { background-image: url("./en/icon_contact_pm.gif"); }
.quote-icon, .quote-icon a { background-image: url("./en/icon_post_quote.gif"); } .quote-icon, .quote-icon a { background-image: url("./en/icon_post_quote.gif"); }
ul.profile-icons.responsive a.responsive-menu-link { background-image: url("./images/icon_post_menu.png"); } ul.profile-icons.responsive a.responsive-menu-link { background-image: url("./images/icon_post_menu.png"); }

3
phpBB/styles/prosilver/theme/common.css
View file

@ -470,6 +470,7 @@ ul.linklist.bulletin li.no-bulletin:before {
border: 1px solid transparent; border: 1px solid transparent;
border-radius: 5px; border-radius: 5px;
padding: 9px 0 0; padding: 9px 0 0;
margin-right: -500px;
} }
.dropdown-container.topic-tools { .dropdown-container.topic-tools {
@ -485,6 +486,8 @@ ul.linklist.bulletin li.no-bulletin:before {
.dropdown-left .dropdown, .nojs .rightside .dropdown { .dropdown-left .dropdown, .nojs .rightside .dropdown {
left: auto; left: auto;
right: 0; right: 0;
margin-left: -500px;
margin-right: 0;
} }
.dropdown-button-control .dropdown { .dropdown-button-control .dropdown {

14
phpBB/styles/prosilver/theme/content.css
View file

@ -731,6 +731,20 @@ fieldset.polls dd div {
height: auto !important; height: auto !important;
} }
dd.profile-contact {
overflow: visible;
}
.profile-contact .dropdown-container {
display: inline-block;
text-align: left;
width: 30px;
}
.profile-contact .icon_contact {
vertical-align: middle;
}
.online { .online {
background-image: none; background-image: none;
background-position: 100% 0; background-position: 100% 0;

6
phpBB/styles/prosilver/theme/en/stylesheet.css
View file

@ -7,16 +7,10 @@ ul.profile-icons li.edit-icon { width: 42px; height: 20px; }
.online { background-image: url("./icon_user_online.gif"); } .online { background-image: url("./icon_user_online.gif"); }
/* Icon images */ /* Icon images */
.pm-icon, .pm-icon a { background-image: url("./icon_contact_pm.gif"); }
.quote-icon, .quote-icon a { background-image: url("./icon_post_quote.gif"); } .quote-icon, .quote-icon a { background-image: url("./icon_post_quote.gif"); }
.edit-icon, .edit-icon a { background-image: url("./icon_post_edit.gif"); } .edit-icon, .edit-icon a { background-image: url("./icon_post_edit.gif"); }
/* EN Language Pack */ /* EN Language Pack */
.imageset.icon_contact_pm {
background-image: url("./icon_contact_pm.gif");
padding-left: 28px;
padding-top: 20px;
}
.imageset.icon_post_edit { .imageset.icon_post_edit {
background-image: url("./icon_post_edit.gif"); background-image: url("./icon_post_edit.gif");
padding-left: 42px; padding-left: 42px;

BIN
phpBB/styles/prosilver/theme/images/icon_contact.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 340 B

BIN
phpBB/styles/prosilver/theme/images/icon_contact_aim.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 546 B

BIN
phpBB/styles/prosilver/theme/images/icon_contact_email.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 523 B

BIN
phpBB/styles/prosilver/theme/images/icon_contact_icq.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 562 B

BIN
phpBB/styles/prosilver/theme/images/icon_contact_jabber.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1,014 B

BIN
phpBB/styles/prosilver/theme/images/icon_contact_msnm.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
phpBB/styles/prosilver/theme/images/icon_contact_www.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 590 B

BIN
phpBB/styles/prosilver/theme/images/icon_contact_yahoo.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 541 B

BIN
phpBB/styles/prosilver/theme/images/icons_contact.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

11
phpBB/styles/prosilver/theme/imageset.css
View file

@ -356,13 +356,14 @@ span.imageset {
padding-top: 20px; padding-top: 20px;
} }
.imageset.icon_contact {
background-image: url("./images/icon_contact.png");
padding-left: 16px;
padding-top: 12px;
}
/* English images for fallback */ /* English images for fallback */
.imageset.icon_contact_pm {
background-image: url("./en/icon_contact_pm.gif");
padding-left: 28px;
padding-top: 20px;
}
.imageset.icon_post_edit { .imageset.icon_post_edit {
background-image: url("./en/icon_post_edit.gif"); background-image: url("./en/icon_post_edit.gif");
padding-left: 42px; padding-left: 42px;

44
phpBB/viewtopic.php
View file

@ -1621,6 +1621,13 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
(($auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_')) || $data['user_allow_pm']) (($auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_')) || $data['user_allow_pm'])
); );
$u_pm = '';
if ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && $can_receive_pm)
{
$u_pm = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;action=quotepost&amp;p=' . $row['post_id']);
}
// //
$post_row = array( $post_row = array(
'POST_AUTHOR_FULL' => ($poster_id != ANONYMOUS) ? $user_cache[$poster_id]['author_full'] : get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), 'POST_AUTHOR_FULL' => ($poster_id != ANONYMOUS) ? $user_cache[$poster_id]['author_full'] : get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
@ -1660,7 +1667,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
'U_DELETE' => ($delete_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=delete&amp;f=$forum_id&amp;p={$row['post_id']}") : '', 'U_DELETE' => ($delete_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=delete&amp;f=$forum_id&amp;p={$row['post_id']}") : '',
'U_SEARCH' => $user_cache[$poster_id]['search'], 'U_SEARCH' => $user_cache[$poster_id]['search'],
'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && $can_receive_pm) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;action=quotepost&amp;p=' . $row['post_id']) : '', 'U_PM' => $u_pm,
'U_EMAIL' => $user_cache[$poster_id]['email'], 'U_EMAIL' => $user_cache[$poster_id]['email'],
'U_JABBER' => $user_cache[$poster_id]['jabber'], 'U_JABBER' => $user_cache[$poster_id]['jabber'],
@ -1744,11 +1751,46 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
// Dump vars into template // Dump vars into template
$template->assign_block_vars('postrow', $post_row); $template->assign_block_vars('postrow', $post_row);
$contact_fields = array(
array(
'ID' => 'pm',
'NAME' => $user->lang['PRIVATE_MESSAGES'],
'U_CONTACT' => $u_pm,
),
array(
'ID' => 'email',
'NAME' => $user->lang['SEND_EMAIL'],
'U_CONTACT' => $user_cache[$poster_id]['email'],
),
array(
'ID' => 'jabber',
'NAME' => $user->lang['JABBER'],
'U_CONTACT' => $user_cache[$poster_id]['jabber'],
),
);
foreach ($contact_fields as $field)
{
if ($field['U_CONTACT'])
{
$template->assign_block_vars('postrow.contact', $field);
}
}
if (!empty($cp_row['blockrow'])) if (!empty($cp_row['blockrow']))
{ {
foreach ($cp_row['blockrow'] as $field_data) foreach ($cp_row['blockrow'] as $field_data)
{ {
$template->assign_block_vars('postrow.custom_fields', $field_data); $template->assign_block_vars('postrow.custom_fields', $field_data);
if ($field_data['S_PROFILE_CONTACT'])
{
$template->assign_block_vars('postrow.contact', array(
'ID' => $field_data['PROFILE_FIELD_IDENT'],
'NAME' => $field_data['PROFILE_FIELD_NAME'],
'U_CONTACT' => $field_data['PROFILE_FIELD_CONTACT'],
));
}
} }
} }