mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-14 04:34:07 +02:00
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts: phpBB/install/database_update.php
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
<meta name="keywords" content="" />
|
||||
<meta name="description" content="" />
|
||||
{META}
|
||||
<title><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
|
||||
<title><!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
|
||||
|
||||
<!-- IF S_ENABLE_FEEDS -->
|
||||
<!-- IF S_ENABLE_FEEDS_OVERALL --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {SITENAME}" href="{U_FEED}" /><!-- ENDIF -->
|
||||
@@ -152,6 +152,46 @@ function marklist(id, name, state)
|
||||
<table width="100%" cellspacing="0">
|
||||
<tr>
|
||||
<td class="genmed">
|
||||
<!-- IF S_NOTIFICATIONS_DISPLAY -->
|
||||
[ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button">{NOTIFICATIONS_COUNT}</a> ] •
|
||||
<div id="notification_list" class="notification_list">
|
||||
<div class="row1 header">
|
||||
{L_NOTIFICATIONS}
|
||||
<span class="header_settings"><a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a></span>
|
||||
</div>
|
||||
|
||||
<div class="notification_scroll">
|
||||
<table class="tablebg" width="310px" cellspacing="1">
|
||||
<!-- BEGIN notifications -->
|
||||
<tr class="row<!-- IF notifications.UNREAD -->2<!-- ELSE -->1<!-- ENDIF -->">
|
||||
<!-- IF notifications.AVATAR -->
|
||||
<td width="50px">
|
||||
{notifications.AVATAR}
|
||||
</td>
|
||||
<td valign="top">
|
||||
<!-- ELSE -->
|
||||
<td colspan="2" valign="top">
|
||||
<!-- ENDIF -->
|
||||
<div class="notification_title">
|
||||
<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
|
||||
{notifications.FORMATTED_TITLE}
|
||||
<!-- IF notifications.URL --></a><!-- ENDIF -->
|
||||
<br />» {notifications.TIME}
|
||||
<!-- IF not notifications.URL and notifications.UNREAD -->
|
||||
<br /><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a>
|
||||
<!-- ENDIF -->
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<!-- END notifications -->
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="row1 footer">
|
||||
<a href="{U_VIEW_ALL_NOTIFICATIONS}"><span>{L_SEE_ALL}</span></a>
|
||||
</div>
|
||||
</div>
|
||||
<!-- ENDIF -->
|
||||
<!-- IF not S_IS_BOT --><a href="{U_LOGIN_LOGOUT}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" alt="*" /> {L_LOGIN_LOGOUT}</a> <!-- ENDIF -->
|
||||
<!-- IF U_RESTORE_PERMISSIONS --> <a href="{U_RESTORE_PERMISSIONS}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" alt="*" /> {L_RESTORE_PERMISSIONS}</a><!-- ENDIF -->
|
||||
<!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN --> <span style="color: red;">{L_BOARD_DISABLED}</span><!-- ENDIF -->
|
||||
|
151
phpBB/styles/subsilver2/template/ucp_notifications.html
Normal file
151
phpBB/styles/subsilver2/template/ucp_notifications.html
Normal file
@@ -0,0 +1,151 @@
|
||||
<!-- INCLUDE ucp_header.html -->
|
||||
|
||||
<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
|
||||
|
||||
<table width="100%" cellspacing="1">
|
||||
<tr>
|
||||
<th colspan="4">{TITLE}</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1" colspan="4" align="center"><span class="genmed">{TITLE_EXPLAIN}</span></td>
|
||||
</tr>
|
||||
<!-- IF MODE == 'notification_options' -->
|
||||
<tr>
|
||||
<th>{L_NOTIFICATION_TYPE}</th>
|
||||
<th width="10%">{L_NOTIFICATIONS}</th>
|
||||
<!-- BEGIN notification_methods -->
|
||||
<th width="10%">{notification_methods.NAME}</th>
|
||||
<!-- END notification_methods -->
|
||||
</tr>
|
||||
|
||||
<!-- BEGIN notification_types -->
|
||||
<!-- IF notification_types.GROUP_NAME -->
|
||||
<tr>
|
||||
<td class="row3" colspan="3">{notification_types.GROUP_NAME}</td>
|
||||
</tr>
|
||||
<!-- ELSE -->
|
||||
<!-- IF notification_types.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
|
||||
<td>
|
||||
{notification_types.NAME}
|
||||
<!-- IF notification_types.EXPLAIN --><br /> {notification_types.EXPLAIN}<!-- ENDIF -->
|
||||
</td>
|
||||
<td align="center"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td>
|
||||
<!-- BEGIN notification_methods -->
|
||||
<td align="center"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td>
|
||||
<!-- END notification_methods -->
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
<!-- END notification_types -->
|
||||
<tr>
|
||||
<td class="cat" colspan="3" align="center">
|
||||
<input type="hidden" name="form_time" value="{FORM_TIME}" />
|
||||
{S_HIDDEN_FIELDS}
|
||||
<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />
|
||||
<input class="btnlite" type="reset" value="{L_RESET}" name="reset" />
|
||||
{S_FORM_TOKEN}
|
||||
</td>
|
||||
</tr>
|
||||
<!-- ELSE -->
|
||||
<tr>
|
||||
<td>
|
||||
<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
|
||||
<tr>
|
||||
<td class="row1">
|
||||
<table border="0" cellspacing="0" cellpadding="0" width="100%">
|
||||
<tr>
|
||||
<td align="{S_CONTENT_FLOW_BEGIN}">
|
||||
<!-- IF TOTAL_COUNT -->
|
||||
<table width="100%" cellspacing="1">
|
||||
<tr>
|
||||
<td class="nav" valign="middle" nowrap="nowrap"> {PAGE_NUMBER}</td>
|
||||
<td class="gensmall" nowrap="nowrap" width="100%"> [ <b>{TOTAL_COUNT}</b> ] </td>
|
||||
</tr>
|
||||
</table>
|
||||
<!-- ENDIF -->
|
||||
</td>
|
||||
<td align="{S_CONTENT_FLOW_END}"><!-- INCLUDE pagination.html --></td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<div style="padding: 2px;"></div>
|
||||
|
||||
<div class="notification_list">
|
||||
<table class="tablebg" width="100%" cellspacing="1">
|
||||
<tr>
|
||||
<td class="cat" colspan="3">
|
||||
<table width="100%" cellspacing="0">
|
||||
<tr class="nav">
|
||||
<td align="{S_CONTENT_FLOW_END}" valign="middle"><!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}">{L_NOTIFICATIONS_MARK_ALL_READ}</a><!-- ENDIF --></td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th colspan="2">{L_NOTIFICATIONS}</th>
|
||||
<th width="15%">{L_MARK_READ}</th>
|
||||
</tr>
|
||||
<!-- BEGIN notification_list -->
|
||||
<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="50px">
|
||||
{notification_list.AVATAR}
|
||||
</td>
|
||||
<td valign="top">
|
||||
<!-- ELSE -->
|
||||
<td colspan="2" valign="top" height="50px">
|
||||
<!-- 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 -->
|
||||
<strong>{notification_list.FORMATTED_TITLE}</strong>
|
||||
<!-- IF notification_list.URL --></a><!-- ENDIF --><br />
|
||||
» {notification_list.TIME}
|
||||
</span>
|
||||
</td>
|
||||
<td align="center">
|
||||
<!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /><!-- ENDIF -->
|
||||
</td>
|
||||
</tr>
|
||||
<!-- END notification_list -->
|
||||
<tr>
|
||||
<td class="cat" colspan="3" align="center">
|
||||
<input type="hidden" name="form_time" value="{FORM_TIME}" />
|
||||
{S_HIDDEN_FIELDS}
|
||||
<input class="btnmain" type="submit" name="submit" value="{L_MARK_READ}" />
|
||||
{S_FORM_TOKEN}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div style="padding: 2px;"></div>
|
||||
|
||||
<!-- IF .pagination -->
|
||||
<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
|
||||
<tr>
|
||||
<td class="row1">
|
||||
<table border="0" cellspacing="0" cellpadding="0" width="100%">
|
||||
<tr>
|
||||
<td align="{S_CONTENT_FLOW_BEGIN}">
|
||||
<!-- INCLUDE pagination.html -->
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<!-- ENDIF -->
|
||||
</td>
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
</table>
|
||||
|
||||
<!-- IF .notifications -->
|
||||
<div class="gensmall" style="float: {S_CONTENT_FLOW_END}; padding-top: 2px;"><b><a href="#" onclick="$('#ucp input:checkbox').attr('checked', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="$('#ucp input:checkbox').attr('checked', false); return false;">{L_UNMARK_ALL}</a></b></div>
|
||||
<!-- ENDIF -->
|
||||
|
||||
</form>
|
||||
|
||||
<!-- INCLUDE ucp_footer.html -->
|
@@ -37,7 +37,7 @@
|
||||
<td valign="top">
|
||||
<table width="100%" cellspacing="0" cellpadding="2">
|
||||
<tr>
|
||||
<td><div class="postbody">{history_row.MESSAGE}</div><div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div></td>
|
||||
<td><div class="postbody"><!-- IF history_row.MESSAGE -->{history_row.MESSAGE}<!-- ELSE --><span class="error">{L_MESSAGE_REMOVED_FROM_OUTBOX}</span><!-- ENDIF --></div><div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div></td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
|
@@ -29,38 +29,30 @@
|
||||
<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
<tr>
|
||||
<tr>
|
||||
<td class="row1" width="50%"><b class="genmed">{L_SHOW_EMAIL}{L_COLON}</b></td>
|
||||
<td class="row2"><input type="radio" class="radio" name="viewemail" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span> <input type="radio" class="radio" name="viewemail" value="0"<!-- IF not S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr>
|
||||
<td class="row1" width="50%"><b class="genmed">{L_ADMIN_EMAIL}{L_COLON}</b></td>
|
||||
<td class="row2"><input type="radio" class="radio" name="massemail" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span> <input type="radio" class="radio" name="massemail" value="0"<!-- IF not S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr>
|
||||
<td class="row1" width="50%"><b class="genmed">{L_ALLOW_PM}{L_COLON}</b><br /><span class="gensmall">{L_ALLOW_PM_EXPLAIN}</span></td>
|
||||
<td class="row2"><input type="radio" class="radio" name="allowpm" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span> <input type="radio" class="radio" name="allowpm" value="0"<!-- IF not S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
|
||||
</tr>
|
||||
<!-- IF S_CAN_HIDE_ONLINE -->
|
||||
<tr>
|
||||
<tr>
|
||||
<td class="row1" width="50%"><b class="genmed">{L_HIDE_ONLINE}{L_COLON}</b><br /><span class="gensmall">{L_HIDE_ONLINE_EXPLAIN}</span></td>
|
||||
<td class="row2"><input type="radio" class="radio" name="hideonline" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span> <input type="radio" class="radio" name="hideonline" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
<!-- IF S_SELECT_NOTIFY -->
|
||||
<tr>
|
||||
<tr>
|
||||
<td class="row1" width="50%"><b class="genmed">{L_NOTIFY_METHOD}{L_COLON}</b><br /><span class="gensmall">{L_NOTIFY_METHOD_EXPLAIN}</span></td>
|
||||
<td class="row2"><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_EMAIL}</span> <input type="radio" class="radio" name="notifymethod" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_IM}</span> <input type="radio" class="radio" name="notifymethod" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_BOTH}</span></td>
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
<tr>
|
||||
<td class="row1" width="50%"><b class="genmed">{L_NOTIFY_ON_PM}{L_COLON}</b></td>
|
||||
<td class="row2"><input type="radio" class="radio" name="notifypm" value="1"<!-- IF S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span> <input type="radio" class="radio" name="notifypm" value="0"<!-- IF not S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1" width="50%"><b class="genmed">{L_POPUP_ON_PM}{L_COLON}</b></td>
|
||||
<td class="row2"><input type="radio" class="radio" name="popuppm" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span> <input type="radio" class="radio" name="popuppm" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
|
||||
</tr>
|
||||
<!-- IF S_MORE_LANGUAGES -->
|
||||
<tr>
|
||||
<td class="row1" width="50%"><b class="genmed">{L_BOARD_LANGUAGE}{L_COLON}</b></td>
|
||||
|
Reference in New Issue
Block a user