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

Merge pull request #1789 from VSEphpbb/ticket/11936

Browse source 
[Ticket/11936] Notification Avatars - Fixes and Restyling
This commit is contained in:
Nils Adermann 2013-10-20 15:42:49 -07:00
commit 1aa80b47b1
11 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
phpBB/adm/images/no_avatar.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 474 B

After

Width:  |  Height:  |  Size: 930 B

4
phpBB/styles/prosilver/template/overall_header.html
View file

@ -118,8 +118,8 @@
<!-- BEGIN notifications --> <!-- BEGIN notifications -->
<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->"> <li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF --> <!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
{notifications.AVATAR} <!-- IF notifications.AVATAR -->{notifications.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
<div> <div class="notification_text">
<p>{notifications.FORMATTED_TITLE}</p> <p>{notifications.FORMATTED_TITLE}</p>
<p>&raquo; {notifications.TIME}</p> <p>&raquo; {notifications.TIME}</p>

23
phpBB/styles/prosilver/template/ucp_notifications.html
View file

@ -68,18 +68,17 @@
<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF -->"> <li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF -->">
<dl> <dl>
<dt> <dt>
<div class="list-inner"> <div class="list-inner">
<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF --> <!-- IF notification_list.AVATAR -->{notification_list.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
{notification_list.AVATAR} <div class="notifications">
<div class="notifications"> <!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
<p class="notifications_title">{notification_list.FORMATTED_TITLE}</p> <p class="notifications_title">{notification_list.FORMATTED_TITLE}</p>
<p class="notifications_time">&raquo; {notification_list.TIME}</p> <!-- IF notification_list.URL --></a><!-- ENDIF -->
<p class="notifications_time">{notification_list.TIME}</p>
<!-- IF not notification_list.URL and notification_list.U_MARK_READ --> <!-- IF not notification_list.URL and notification_list.U_MARK_READ -->
<p><a href="{notification_list.U_MARK_READ}">{L_MARK_READ}</a></p> <p><a href="{notification_list.U_MARK_READ}">{L_MARK_READ}</a></p>
<!-- ENDIF --> <!-- ENDIF -->
</div> </div>
<!-- IF notification_list.URL --></a><!-- ENDIF -->
</div> </div>
</dt> </dt>

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

@ -875,6 +875,7 @@ form > p.post-notice strong {
#notification_list ul li a, .notification_list dt > a, #notification_list > .footer > a { #notification_list ul li a, .notification_list dt > a, #notification_list > .footer > a {
display: block; display: block;
text-decoration: none;
} }
.notification_list ul li img { .notification_list ul li img {
@ -918,11 +919,19 @@ form > p.post-notice strong {
} }
.notification_list p.notifications_title { .notification_list p.notifications_title {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
font-size: 13px !important;
font-weight: bold; font-weight: bold;
} }
.notification_list p.notifications_time { .notification_list p.notifications_time {
font-size: 11px; font-size: 11px !important;
}
.notification_text:after {
content: '';
clear: both;
display: block;
} }
.compact .icon-notification > a > span, .compact .icon-pm > a > span { .compact .icon-notification > a > span, .compact .icon-pm > a > span {
@ -932,4 +941,3 @@ form > p.post-notice strong {
.compact .icon-notification > a > strong, .compact .icon-pm > a > strong { .compact .icon-notification > a > strong, .compact .icon-pm > a > strong {
padding-left: 2px; padding-left: 2px;
} }

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 614 B

After

Width:  |  Height:  |  Size: 551 B

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 576 B

After

Width:  |  Height:  |  Size: 576 B

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 474 B

After

Width:  |  Height:  |  Size: 930 B

14
phpBB/styles/subsilver2/template/overall_header.html
View file

@ -160,17 +160,13 @@ function marklist(id, name, state)
</div> </div>
<div class="notification_scroll"> <div class="notification_scroll">
<table class="tablebg" width="310px" cellspacing="1"> <table class="tablebg" width="310" cellspacing="1">
<!-- BEGIN notifications --> <!-- BEGIN notifications -->
<tr class="row<!-- IF notifications.UNREAD -->2<!-- ELSE -->1<!-- ENDIF -->"> <tr class="row<!-- IF notifications.UNREAD -->2<!-- ELSE -->1<!-- ENDIF -->">
<!-- IF notifications.AVATAR --> <td width="50">
<td width="50px"> <!-- IF notifications.AVATAR -->{notifications.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
{notifications.AVATAR} </td>
</td> <td valign="top">
<td valign="top">
<!-- ELSE -->
<td colspan="2" valign="top">
<!-- ENDIF -->
<div class="notification_title"> <div class="notification_title">
<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF --> <!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
{notifications.FORMATTED_TITLE} {notifications.FORMATTED_TITLE}

14
phpBB/styles/subsilver2/template/ucp_notifications.html
View file

@ -86,19 +86,15 @@
</tr> </tr>
<!-- BEGIN notification_list --> <!-- BEGIN notification_list -->
<tr class="row<!-- IF notification_list.UNREAD -->3<!-- ELSEIF notification_list.S_ROW_COUNT is even -->1<!-- ELSE -->2<!-- ENDIF -->"> <tr class="row<!-- IF notification_list.UNREAD -->3<!-- ELSEIF notification_list.S_ROW_COUNT is even -->1<!-- ELSE -->2<!-- ENDIF -->">
<!-- IF notification_list.AVATAR --> <td width="50">
<td width="50px"> <!-- IF notification_list.AVATAR -->{notification_list.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
{notification_list.AVATAR} </td>
</td> <td valign="top">
<td valign="top">
<!-- ELSE -->
<td colspan="2" valign="top" height="50px">
<!-- ENDIF -->
<span class="gen"> <span class="gen">
<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF --> <!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
<strong>{notification_list.FORMATTED_TITLE}</strong> <strong>{notification_list.FORMATTED_TITLE}</strong>
<!-- IF notification_list.URL --></a><!-- ENDIF --><br /> <!-- IF notification_list.URL --></a><!-- ENDIF --><br />
&raquo; {notification_list.TIME} {notification_list.TIME}
</span> </span>
</td> </td>
<td align="center"> <td align="center">

BIN
phpBB/styles/subsilver2/theme/images/icon_mini_notification.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 321 B

After

Width:  |  Height:  |  Size: 543 B

BIN
phpBB/styles/subsilver2/theme/images/no_avatar.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 474 B

After

Width:  |  Height:  |  Size: 930 B