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

Merge remote-tracking branch 'remotes/VSE/ticket/11103-VSEphpbb' into ticket/11103

Browse source 
# By Matt Friedman
# Via Matt Friedman
* remotes/VSE/ticket/11103-VSEphpbb:
  [ticket/11103] Remove padding from notifications for now.
  [ticket/11103] Add newlines to bottom of css file
  [ticket/11103] HTML encode double arrow character
  [ticket/11103] Update styling of UCP Notifications in subsilver2
  [ticket/11103] Update styling of UCP Notifications in prosilver
  [ticket/11103] Update styling of subsilver2 notification modal
  [ticket/11103] Update styling of prosilver notification modal
  [ticket/11103] Remove title attribute from notification link
This commit is contained in:
Nathan Guse 2013-02-28 09:56:37 -06:00
commit e5417ec123
6 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -138,7 +138,7 @@
<ul class="linklist leftside"> <ul class="linklist leftside">
<!-- IF S_NOTIFICATIONS_DISPLAY --> <!-- IF S_NOTIFICATIONS_DISPLAY -->
<li> <li>
[ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull; [ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button">{NOTIFICATIONS_COUNT}</a> ] &bull;
<div id="notification_list" class="notification_list"> <div id="notification_list" class="notification_list">
<div class="pointer"><div class="pointer_inner"></div></div> <div class="pointer"><div class="pointer_inner"></div></div>
<div class="header"> <div class="header">
@ -158,7 +158,7 @@
{notifications.AVATAR} {notifications.AVATAR}
<div> <div>
<p>{notifications.FORMATTED_TITLE}</p> <p>{notifications.FORMATTED_TITLE}</p>
<p>{notifications.TIME}</p> <p>&raquo; {notifications.TIME}</p>
<!-- IF not notifications.URL and notifications.U_MARK_READ --> <!-- IF not notifications.URL and notifications.U_MARK_READ -->
<p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p> <p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p>

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

@ -83,9 +83,9 @@
<dt> <dt>
<!-- 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 -->
{notification_list.AVATAR} {notification_list.AVATAR}
<div> <div class="notifications">
<p>{notification_list.FORMATTED_TITLE}</p> <p class="notifications_title">{notification_list.FORMATTED_TITLE}</p>
<p>{notification_list.TIME}</p> <p class="notifications_time">&raquo; {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>

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

@ -767,3 +767,16 @@ p.rules a {
bottom: -11px; bottom: -11px;
left: -10px; left: -10px;
} }
.notification_list div.notifications {
padding: 5px;
}
.notification_list p.notifications_title {
font-weight: bold;
}
.notification_list p.notifications_time {
font-size: 11px;
}

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

@ -153,7 +153,7 @@ function marklist(id, name, state)
<tr> <tr>
<td class="genmed"> <td class="genmed">
<!-- IF S_NOTIFICATIONS_DISPLAY --> <!-- IF S_NOTIFICATIONS_DISPLAY -->
[ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] &bull; [ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button">{NOTIFICATIONS_COUNT}</a> ] &bull;
<div id="notification_list" class="notification_list"> <div id="notification_list" class="notification_list">
<div class="row1 header"> <div class="row1 header">
{L_NOTIFICATIONS} {L_NOTIFICATIONS}
@ -176,7 +176,7 @@ function marklist(id, name, state)
<!-- 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}
<!-- IF notifications.URL --></a><!-- ENDIF --> <!-- IF notifications.URL --></a><!-- ENDIF -->
<br />{notifications.TIME} <br />&raquo; {notifications.TIME}
<!-- IF not notifications.URL and notifications.UNREAD --> <!-- IF not notifications.URL and notifications.UNREAD -->
<br /><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a> <br /><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
<!-- ENDIF --> <!-- ENDIF -->

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

@ -97,10 +97,12 @@
<!-- ELSE --> <!-- ELSE -->
<td colspan="2" valign="top" height="50px"> <td colspan="2" valign="top" height="50px">
<!-- ENDIF --> <!-- ENDIF -->
<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 -->
{notification_list.FORMATTED_TITLE} <strong>{notification_list.FORMATTED_TITLE}</strong>
<!-- IF notification_list.URL --></a><!-- ENDIF --><br /> <!-- IF notification_list.URL --></a><!-- ENDIF --><br />
{notification_list.TIME} &raquo; {notification_list.TIME}
</span>
</td> </td>
<td align="center"> <td align="center">
<!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /><!-- ENDIF --> <!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /><!-- ENDIF -->

1
phpBB/styles/subsilver2/theme/stylesheet.css
View file

@ -1147,6 +1147,7 @@ a.imageset {
position: absolute; position: absolute;
width: 310px; width: 310px;
z-index: 1; z-index: 1;
box-shadow: 3px 3px 5px darkgray;
} }
#notification_list .notification_scroll { #notification_list .notification_scroll {