makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 10:58:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

oh my god - what did he do? Adding attachment display to post/topic review, queue, reports, post details, mcp topic view... fixing other tiny things along the line.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7642 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-05-19 12:04:22 +00:00
parent e242a73a6f
commit 456586475b
34 changed files with 441 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/adm/style/acp_ban.html
View file

@ -89,15 +89,15 @@
</dl>
<dl>
<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt>
<dd><input style="border: 0px;" type="text" class="text full" disabled="disabled" name="unbanlength" id="unbanlength" /></dd>
<dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbanlength" id="unbanlength" /></dd>
</dl>
<dl>
<dt><label for="unbanreason">{L_BAN_REASON}:</label></dt>
<dd><input style="border: 0px;" type="text" class="text full" disabled="disabled" name="unbanreason" id="unbanreason" /></dd>
<dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbanreason" id="unbanreason" /></dd>
</dl>
<dl>
<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt>
<dd><input style="border: 0px;" type="text" class="text full" disabled="disabled" name="unbangivereason" id="unbangivereason" /></dd>
<dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbangivereason" id="unbangivereason" /></dd>
</dl>
<p class="submit-buttons">

23
phpBB/adm/style/admin.css
View file

@ -172,7 +172,7 @@ a:active {
#content h1 {
color: #115098;
line-height: 1.2em;
margin-bottom: 0px;
margin-bottom: 0;
}
#main {
@ -191,6 +191,11 @@ a:active {
height: 350px;
}
.simple-page-body {
padding: 0;
padding-right: 10px;
min-width: 0;
}
/* Tabbed menu
Based on: http://www.alistapart.com/articles/slidingdoors2/
@ -257,12 +262,12 @@ a:active {
}
#tabs #activetab a {
background-position: 0 0px;
background-position: 0 0;
border-bottom: 1px solid #DCDEE2;
}
#tabs #activetab a span {
background-position: 100% 0px;
background-position: 100% 0;
padding-bottom: 5px;
color: #23649F;
}
@ -510,7 +515,7 @@ table.type2 th {
}
table.type2 td {
padding: 0px;
padding: 0;
font-size: 1em;
}
@ -640,7 +645,7 @@ legend {
position: relative;
text-transform: none;
line-height: 1.2em;
top: 0em;
top: 0;
vertical-align: middle;
}
@ -1229,7 +1234,7 @@ input.disabled {
font-weight: bold;
line-height: 1.20em;
text-align: right;
padding: 0px;
padding: 0;
}
.rtl .sourcenum {
@ -1240,7 +1245,7 @@ input.disabled {
font-family: Monaco, 'Courier New', monospace;
font-size: 1.25em;
line-height: 1.20em;
padding: 0px;
padding: 0;
}
.syntaxbg {
@ -1392,11 +1397,11 @@ fieldset.permissions .permissions-switch {
.permissions-category .activetab a:hover span.tabbg {
color: #333333;
background-position: 100% 0px;
background-position: 100% 0;
}
.permissions-category .activetab a:hover {
background-position: 0 0px;
background-position: 0 0;
}
.permissions-category a span.colour {

2
phpBB/adm/style/simple_header.html
View file

@ -101,4 +101,4 @@ function swatch(field)
<body class="{S_CONTENT_DIRECTION}">
<div id="page-body" style="padding: 0; padding-right: 10px; min-width: 0px;">
<div id="page-body" class="simple-page-body">

6
phpBB/includes/db/dbal.php
View file

@ -504,7 +504,7 @@ class dbal
if (!$this->return_on_error)
{
$message = '<u>SQL ERROR</u> [ ' . $this->sql_layer . ' ]<br /><br />' . $error['message'] . ' [' . $error['code'] . ']';
$message = 'SQL ERROR [ ' . $this->sql_layer . ' ]<br /><br />' . $error['message'] . ' [' . $error['code'] . ']';
// Show complete SQL error and path to administrators only
// Additionally show complete error on installation or if extended debug mode is enabled
@ -514,8 +514,8 @@ class dbal
// Print out a nice backtrace...
$backtrace = get_backtrace();
$message .= ($sql) ? '<br /><br /><u>SQL</u><br /><br />' . htmlspecialchars($sql) : '';
$message .= ($backtrace) ? '<br /><br /><u>BACKTRACE</u><br />' . $backtrace : '';
$message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : '';
$message .= ($backtrace) ? '<br /><br />BACKTRACE<br />' . $backtrace : '';
$message .= '<br />';
}
else

51
phpBB/includes/functions_posting.php
View file

@ -899,7 +899,7 @@ function load_drafts($topic_id = 0, $forum_id = 0, $id = 0)
*/
function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id = 0, $show_quote_button = true)
{
global $user, $auth, $db, $template, $bbcode;
global $user, $auth, $db, $template, $bbcode, $cache;
global $config, $phpbb_root_path, $phpEx;
// Go ahead and pull all data for this topic
@ -941,10 +941,16 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
$bbcode_bitfield = '';
$rowset = array();
$has_attachments = false;
while ($row = $db->sql_fetchrow($result))
{
$rowset[$row['post_id']] = $row;
$bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']);
if ($row['post_attachment'])
{
$has_attachments = true;
}
}
$db->sql_freeresult($result);
@ -955,6 +961,27 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
$bbcode = new bbcode(base64_encode($bbcode_bitfield));
}
// Grab extensions
$extensions = $attachments = array();
if ($has_attachments && $auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id))
{
$extensions = $cache->obtain_attach_extensions($forum_id);
// Get attachments...
$sql = 'SELECT *
FROM ' . ATTACHMENTS_TABLE . '
WHERE ' . $db->sql_in_set('post_msg_id', $post_list) . '
AND in_message = 0
ORDER BY filetime DESC, post_msg_id ASC';
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
$attachments[$row['post_msg_id']][] = $row;
}
$db->sql_freeresult($result);
}
for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
{
// A non-existing rowset only happens if there was no user present for the entered poster_id
@ -990,6 +1017,12 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
$message = smiley_text($message, !$row['enable_smilies']);
if (!empty($attachments[$row['post_id']]))
{
$update_count = array();
parse_attachments($forum_id, $message, $attachments[$row['post_id']], $update_count);
}
$post_subject = censor_text($post_subject);
$template->assign_block_vars($mode . '_row', array(
@ -998,16 +1031,30 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
'POST_AUTHOR' => get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
'U_POST_AUTHOR' => get_username_string('profile', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? true : false,
'POST_SUBJECT' => $post_subject,
'MINI_POST_IMG' => $user->img('icon_post_target', $user->lang['POST']),
'POST_DATE' => $user->format_date($row['post_time']),
'MESSAGE' => $message,
'DECODED_MESSAGE' => $decoded_message,
'U_POST_ID' => $row['post_id'],
'POST_ID' => $row['post_id'],
'U_MINI_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'],
'U_MCP_DETAILS' => ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&amp;mode=post_details&amp;f=' . $forum_id . '&amp;p=' . $row['post_id'], true, $user->session_id) : '',
'POSTER_QUOTE' => ($show_quote_button && $auth->acl_get('f_reply', $forum_id)) ? addslashes(get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '')
);
// Display not already displayed Attachments for this post, we already parsed them. ;)
if (!empty($attachments[$row['post_id']]))
{
foreach ($attachments[$row['post_id']] as $attachment)
{
$template->assign_block_vars($mode . '_row.attachment', array(
'DISPLAY_ATTACHMENT' => $attachment)
);
}
}
unset($rowset[$i]);
}

43
phpBB/includes/mcp/mcp_post.php
View file

@ -14,7 +14,7 @@
function mcp_post_details($id, $mode, $action)
{
global $phpEx, $phpbb_root_path, $config;
global $template, $db, $user, $auth;
global $template, $db, $user, $auth, $cache;
$user->add_lang('posting');
@ -92,6 +92,7 @@ function mcp_post_details($id, $mode, $action)
// Set some vars
$users_ary = $usernames_ary = array();
$attachments = $extensions = array();
$post_id = $post_info['post_id'];
$topic_tracking_info = array();
@ -120,6 +121,43 @@ function mcp_post_details($id, $mode, $action)
}
$message = smiley_text($message);
if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
{
$extensions = $cache->obtain_attach_extensions($post_info['forum_id']);
$sql = 'SELECT *
FROM ' . ATTACHMENTS_TABLE . '
WHERE post_msg_id = ' . $post_id . '
AND in_message = 0
ORDER BY filetime DESC, post_msg_id ASC';
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
$attachments[] = $row;
}
$db->sql_freeresult($result);
if (sizeof($attachments))
{
$update_count = array();
parse_attachments($post_info['forum_id'], $message, $attachments, $update_count);
}
// Display not already displayed Attachments for this post, we already parsed them. ;)
if (!empty($attachments))
{
$template->assign_var('S_HAS_ATTACHMENTS', true);
foreach ($attachments as $attachment)
{
$template->assign_block_vars('attachment', array(
'DISPLAY_ATTACHMENT' => $attachment)
);
}
}
}
$template->assign_vars(array(
'U_MCP_ACTION' => "$url&amp;i=main&amp;quickmod=1", // Use this for mode paramaters
'U_POST_ACTION' => "$url&amp;i=$id&amp;mode=post_details", // Use this for action parameters
@ -163,9 +201,10 @@ function mcp_post_details($id, $mode, $action)
'POST_SUBJECT' => $post_info['post_subject'],
'POST_DATE' => $user->format_date($post_info['post_time']),
'POST_IP' => $post_info['poster_ip'],
'POST_IPADDR' => @gethostbyaddr($post_info['poster_ip']),
'POST_IPADDR' => ($auth->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '',
'POST_ID' => $post_info['post_id'],
'U_LOOKUP_IP' => ($auth->acl_get('m_info', $post_info['forum_id'])) ? "$url&amp;i=$id&amp;mode=$mode&amp;lookup={$post_info['poster_ip']}#ip" : '',
'U_WHOIS' => ($auth->acl_get('m_info', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&amp;mode=$mode&amp;action=whois&amp;p=$post_id&amp;ip={$post_info['poster_ip']}") : '',
));

50
phpBB/includes/mcp/mcp_queue.php
View file

@ -25,7 +25,7 @@ class mcp_queue
function main($id, $mode)
{
global $auth, $db, $user, $template;
global $auth, $db, $user, $template, $cache;
global $config, $phpbb_root_path, $phpEx, $action;
include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
@ -101,7 +101,8 @@ class mcp_queue
);
}
$topic_tracking_info = array();
$extensions = $attachments = $topic_tracking_info = array();
// Get topic tracking info
if ($config['load_db_lastread'])
{
@ -127,6 +128,43 @@ class mcp_queue
}
$message = smiley_text($message);
if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
{
$extensions = $cache->obtain_attach_extensions($post_info['forum_id']);
$sql = 'SELECT *
FROM ' . ATTACHMENTS_TABLE . '
WHERE post_msg_id = ' . $post_id . '
AND in_message = 0
ORDER BY filetime DESC, post_msg_id ASC';
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
$attachments[] = $row;
}
$db->sql_freeresult($result);
if (sizeof($attachments))
{
$update_count = array();
parse_attachments($post_info['forum_id'], $message, $attachments, $update_count);
}
// Display not already displayed Attachments for this post, we already parsed them. ;)
if (!empty($attachments))
{
$template->assign_var('S_HAS_ATTACHMENTS', true);
foreach ($attachments as $attachment)
{
$template->assign_block_vars('attachment', array(
'DISPLAY_ATTACHMENT' => $attachment)
);
}
}
}
$post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&amp;p=' . $post_info['post_id'] . '#p' . $post_info['post_id']);
$topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&amp;t=' . $post_info['topic_id']);
@ -165,9 +203,11 @@ class mcp_queue
'POST_SUBJECT' => $post_info['post_subject'],
'POST_DATE' => $user->format_date($post_info['post_time']),
'POST_IP' => $post_info['poster_ip'],
'POST_IPADDR' => @gethostbyaddr($post_info['poster_ip']),
'POST_ID' => $post_info['post_id'])
);
'POST_IPADDR' => ($auth->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '',
'POST_ID' => $post_info['post_id'],
'U_LOOKUP_IP' => ($auth->acl_get('m_info', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&amp;mode=approve_details&amp;f=' . $post_info['forum_id'] . '&amp;p=' . $post_id . '&amp;lookup=' . $post_info['poster_ip']) . '#ip' : '',
));
break;

51
phpBB/includes/mcp/mcp_reports.php
View file

@ -25,7 +25,7 @@ class mcp_reports
function main($id, $mode)
{
global $auth, $db, $user, $template;
global $auth, $db, $user, $template, $cache;
global $config, $phpbb_root_path, $phpEx, $action;
include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
@ -111,7 +111,7 @@ class mcp_reports
);
}
$topic_tracking_info = array();
$topic_tracking_info = $extensions = $attachments = array();
// Get topic tracking info
if ($config['load_db_lastread'])
{
@ -137,9 +137,46 @@ class mcp_reports
}
$message = smiley_text($message);
if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
{
$extensions = $cache->obtain_attach_extensions($post_info['forum_id']);
$sql = 'SELECT *
FROM ' . ATTACHMENTS_TABLE . '
WHERE post_msg_id = ' . $post_id . '
AND in_message = 0
ORDER BY filetime DESC, post_msg_id ASC';
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
$attachments[] = $row;
}
$db->sql_freeresult($result);
if (sizeof($attachments))
{
$update_count = array();
parse_attachments($post_info['forum_id'], $message, $attachments, $update_count);
}
// Display not already displayed Attachments for this post, we already parsed them. ;)
if (!empty($attachments))
{
$template->assign_var('S_HAS_ATTACHMENTS', true);
foreach ($attachments as $attachment)
{
$template->assign_block_vars('attachment', array(
'DISPLAY_ATTACHMENT' => $attachment)
);
}
}
}
$template->assign_vars(array(
'S_MCP_REPORT' => true,
'S_CLOSE_ACTION' => $this->u_action . '&amp;p=' . $post_id . 'f=' . $forum_id,
'S_CLOSE_ACTION' => $this->u_action . '&amp;p=' . $post_id . '&amp;f=' . $forum_id,
'S_CAN_VIEWIP' => $auth->acl_get('m_info', $post_info['forum_id']),
'S_POST_REPORTED' => $post_info['post_reported'],
'S_POST_UNAPPROVED' => !$post_info['post_approved'],
@ -182,9 +219,11 @@ class mcp_reports
'POST_SUBJECT' => ($post_info['post_subject']) ? $post_info['post_subject'] : $user->lang['NO_SUBJECT'],
'POST_DATE' => $user->format_date($post_info['post_time']),
'POST_IP' => $post_info['poster_ip'],
'POST_IPADDR' => @gethostbyaddr($post_info['poster_ip']),
'POST_ID' => $post_info['post_id'])
);
'POST_IPADDR' => ($auth->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '',
'POST_ID' => $post_info['post_id'],
'U_LOOKUP_IP' => ($auth->acl_get('m_info', $post_info['forum_id'])) ? $this->u_action . '&amp;r=' . $report_id . '&amp;p=' . $post_id . '&amp;f=' . $forum_id . '&amp;lookup=' . $post_info['poster_ip'] . '#ip' : '',
));
$this->tpl_name = 'mcp_post';

47
phpBB/includes/mcp/mcp_topic.php
View file

@ -14,7 +14,7 @@
function mcp_topic_view($id, $mode, $action)
{
global $phpEx, $phpbb_root_path, $config;
global $template, $db, $user, $auth;
global $template, $db, $user, $auth, $cache;
$url = append_sid("{$phpbb_root_path}mcp.$phpEx?" . extra_url());
@ -104,11 +104,12 @@ function mcp_topic_view($id, $mode, $action)
ORDER BY ' . $sort_order_sql;
$result = $db->sql_query_limit($sql, $posts_per_page, $start);
$rowset = array();
$rowset = $post_id_list = array();
$bbcode_bitfield = '';
while ($row = $db->sql_fetchrow($result))
{
$rowset[] = $row;
$post_id_list[] = $row['post_id'];
$bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']);
}
$db->sql_freeresult($result);
@ -135,6 +136,30 @@ function mcp_topic_view($id, $mode, $action)
$has_unapproved_posts = false;
// Grab extensions
$extensions = $attachments = array();
if ($topic_info['topic_attachment'] && sizeof($post_id_list))
{
$extensions = $cache->obtain_attach_extensions($topic_info['forum_id']);
// Get attachments...
if ($auth->acl_get('u_download') && $auth->acl_get('f_download', $topic_info['forum_id']))
{
$sql = 'SELECT *
FROM ' . ATTACHMENTS_TABLE . '
WHERE ' . $db->sql_in_set('post_msg_id', $post_id_list) . '
AND in_message = 0
ORDER BY filetime DESC, post_msg_id ASC';
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
$attachments[$row['post_msg_id']][] = $row;
}
$db->sql_freeresult($result);
}
}
foreach ($rowset as $i => $row)
{
$message = $row['post_text'];
@ -148,6 +173,12 @@ function mcp_topic_view($id, $mode, $action)
$message = smiley_text($message);
if (!empty($attachments[$row['post_id']]))
{
$update_count = array();
parse_attachments($topic_info['forum_id'], $message, $attachments[$row['post_id']], $update_count);
}
if (!$row['post_approved'])
{
$has_unapproved_posts = true;
@ -172,12 +203,24 @@ function mcp_topic_view($id, $mode, $action)
'S_POST_REPORTED' => ($row['post_reported']) ? true : false,
'S_POST_UNAPPROVED' => ($row['post_approved']) ? false : true,
'S_CHECKED' => ($post_id_list && in_array(intval($row['post_id']), $post_id_list)) ? true : false,
'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? true : false,
'U_POST_DETAILS' => "$url&amp;i=$id&amp;p={$row['post_id']}&amp;mode=post_details",
'U_MCP_APPROVE' => ($auth->acl_get('m_approve', $topic_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&amp;mode=approve_details&amp;f=' . $topic_info['forum_id'] . '&amp;p=' . $row['post_id']) : '',
'U_MCP_REPORT' => ($auth->acl_get('m_report', $topic_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&amp;mode=report_details&amp;f=' . $topic_info['forum_id'] . '&amp;p=' . $row['post_id']) : '')
);
// Display not already displayed Attachments for this post, we already parsed them. ;)
if (!empty($attachments[$row['post_id']]))
{
foreach ($attachments[$row['post_id']] as $attachment)
{
$template->assign_block_vars('postrow.attachment', array(
'DISPLAY_ATTACHMENT' => $attachment)
);
}
}
unset($rowset[$i]);
}

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

@ -345,7 +345,7 @@ function message_history($msg_id, $user_id, $message_row, $folder)
'S_CURRENT_MSG' => ($row['msg_id'] == $msg_id),
'S_AUTHOR_DELETED' => ($author_id == ANONYMOUS) ? true : false,
'U_MSG_ID' => $row['msg_id'],
'MSG_ID' => $row['msg_id'],
'U_VIEW_MESSAGE' => "$url&amp;f=$folder_id&amp;p=" . $row['msg_id'],
'U_QUOTE' => ($auth->acl_get('u_sendpm') && $author_id != ANONYMOUS && $author_id != $user->data['user_id']) ? "$url&amp;mode=compose&amp;action=quote&amp;f=" . $folder_id . "&amp;p=" . $row['msg_id'] : '',
'U_POST_REPLY_PM' => ($author_id != $user->data['user_id'] && $author_id != ANONYMOUS && $auth->acl_get('u_sendpm')) ? "$url&amp;mode=compose&amp;action=reply&amp;f=$folder_id&amp;p=" . $row['msg_id'] : '')

6
phpBB/language/en/acp/common.php
View file

@ -46,10 +46,8 @@ $lang = array_merge($lang, array(
'ACP_BAN_EMAILS' => 'Ban e-mails',
'ACP_BAN_IPS' => 'Ban IPs',
'ACP_BAN_USERNAMES' => 'Ban usernames',
'ACP_BASIC_PERMISSIONS' => 'Basic permissions',
'ACP_BBCODES' => 'BBCodes',
'ACP_BOARD_CONFIGURATION' => 'Board configuration',
'ACP_BOARD_DEFAULTS' => 'Board defaults',
'ACP_BOARD_FEATURES' => 'Board features',
'ACP_BOARD_MANAGEMENT' => 'Board management',
'ACP_BOARD_SETTINGS' => 'Board settings',
@ -128,7 +126,6 @@ $lang = array_merge($lang, array(
'ACP_PERMISSIONS' => 'Permissions',
'ACP_PERMISSION_MASKS' => 'Permission masks',
'ACP_PERMISSION_ROLES' => 'Permission roles',
'ACP_PERMISSION_SETTINGS' => 'Permission settings',
'ACP_PERMISSION_TRACE' => 'Permission trace',
'ACP_PHP_INFO' => 'PHP information',
'ACP_POST_SETTINGS' => 'Post settings',
@ -153,7 +150,6 @@ $lang = array_merge($lang, array(
'ACP_SERVER_SETTINGS' => 'Server settings',
'ACP_SIGNATURE_SETTINGS' => 'Signature settings',
'ACP_SMILIES' => 'Smilies',
'ACP_SPECIAL_PERMISSIONS' => 'Special permissions',
'ACP_STYLE_COMPONENTS' => 'Style components',
'ACP_STYLE_MANAGEMENT' => 'Style management',
'ACP_STYLES' => 'Styles',
@ -204,7 +200,6 @@ $lang = array_merge($lang, array(
'CONFIG_UPDATED' => 'Configuration updated successfully.',
'DEACTIVATE' => 'Deactivate',
'DIMENSIONS' => 'Dimensions',
'DIRECTORY_DOES_NOT_EXIST' => 'The entered path “%s” does not exist.',
'DIRECTORY_NOT_DIR' => 'The entered path “%s” is not a directory.',
'DIRECTORY_NOT_WRITABLE' => 'The entered path “%s” is not writable.',
@ -256,7 +251,6 @@ $lang = array_merge($lang, array(
'PROCEED_TO_ACP' => '%sProceed to the ACP%s',
'REMIND' => 'Remind',
'REORDER' => 'Reorder',
'RESYNC' => 'Resynchronise',
'RETURN_TO' => 'Return to…',

4
phpBB/language/en/acp/styles.php
View file

@ -108,11 +108,9 @@ $lang = array_merge($lang, array(
'HIDE_CSS' => 'Hide raw CSS',
'IMAGE_CONFIGURATION' => 'Image configuration',
'IMAGE_WIDTH' => 'Image width',
'IMAGE_HEIGHT' => 'Image height',
'IMAGE' => 'Image',
'IMAGE_LOCATION' => 'Image location',
'IMAGE_NAME' => 'Image name',
'IMAGE_PARAMETER' => 'Parameter',
'IMAGE_VALUE' => 'Value',
@ -280,8 +278,6 @@ $lang = array_merge($lang, array(
'LINE_SPACING' => 'Line spacing',
'LOCALISED_IMAGES' => 'Localised',
'EDITED_IMAGESET' => 'Edited imageset',
'NO_CLASS' => 'Cannot find class in stylesheet.',
'NO_IMAGESET' => 'Cannot find imageset on filesystem.',
'NO_IMAGE' => 'No image',

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

@ -21,8 +21,8 @@
<!-- BEGIN b_open --><strong><!-- END b_open -->
<!-- BEGIN b_close --></strong><!-- END b_close -->
<!-- BEGIN u_open --><u><!-- END u_open -->
<!-- BEGIN u_close --></u><!-- END u_close -->
<!-- BEGIN u_open --><span style="text-decoration: underline"><!-- END u_open -->
<!-- BEGIN u_close --></span><!-- END u_close -->
<!-- BEGIN i_open --><em><!-- END i_open -->
<!-- BEGIN i_close --></em><!-- END i_close -->

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

@ -37,13 +37,13 @@
<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC});">
<dt <!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG});"<!-- ENDIF -->>
<!-- IF topicrow.S_SELECT_TOPIC --><a href="{topicrow.U_SELECT_TOPIC}" class="topictitle">[ {L_SELECT_MERGE} ]</a>&nbsp;&nbsp; <!-- ENDIF -->
<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> {topicrow.ATTACH_ICON_IMG}
<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF -->
<!-- IF topicrow.S_MOVED_TOPIC and S_CAN_DELETE -->&nbsp;<a href="{topicrow.U_DELETE_TOPIC}" class="topictitle">[ {L_DELETE_SHADOW_TOPIC} ]</a><!-- ENDIF -->
<br />
<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} </dt>
<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} </dt>
<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} {L_POSTED_ON_DATE}<br />{topicrow.LAST_POST_TIME}</span>
</dd>

12
phpBB/styles/prosilver/template/mcp_post.html
View file

@ -90,7 +90,11 @@
<!-- IF S_MCP_REPORT and S_CAN_VIEWIP -->
<hr />
<div>{L_THIS_POST_IP}: {POST_IP} [ {POST_IPADDR} ]</div>
<div>{L_THIS_POST_IP}: <!-- IF U_WHOIS -->
<a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->)
<!-- ELSE -->
<!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF -->
<!-- ENDIF --></div>
<!-- ENDIF -->
</div>
@ -219,7 +223,11 @@
<div class="panel" id="ip">
<div class="inner"><span class="corners-top"><span></span></span>
<p>{L_THIS_POST_IP}: <!-- IF U_WHOIS --><a href="{U_WHOIS}"><!-- ENDIF -->{POST_IP} [ {POST_IPADDR} ]<!-- IF U_WHOIS --></a><!-- ENDIF --></p>
<p>{L_THIS_POST_IP}: <!-- IF U_WHOIS -->
<a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->)
<!-- ELSE -->
<!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF -->
<!-- ENDIF --></p>
<table class="table1" cellspacing="1">
<thead>

12
phpBB/styles/prosilver/template/mcp_topic.html
View file

@ -110,7 +110,7 @@ onload_functions.push('subPanels()');
<div class="right-box"><a href="{postrow.U_POST_DETAILS}">{L_POST_DETAILS}</a> | {L_SELECT}: <input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> /></div>
<h3><a href="{postrow.U_POST_DETAILS}">{postrow.POST_SUBJECT}</a></h3>
<p class="author"><a href="#pr{postrow.U_POST_ID}">{postrow.MINI_POST_IMG}</a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></p>
<p class="author"><a href="#pr{postrow.POST_ID}">{postrow.MINI_POST_IMG}</a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></p>
<!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_REPORTED -->
<p class="rules">
@ -120,6 +120,16 @@ onload_functions.push('subPanels()');
<!-- ENDIF -->
<div class="content" id="message_{postrow.POST_ID}">{postrow.MESSAGE}</div>
<!-- IF postrow.S_HAS_ATTACHMENTS -->
<dl class="attachbox">
<dt>{L_ATTACHMENTS}</dt>
<!-- BEGIN attachment -->
<dd>{postrow.attachment.DISPLAY_ATTACHMENT}</dd>
<!-- END attachment -->
</dl>
<!-- ENDIF -->
</div>
<span class="corners-bottom"><span></span></span></div>

14
phpBB/styles/prosilver/template/posting_review.html
View file

@ -9,9 +9,17 @@
<div class="postbody">
<h3><a href="#ppr{post_review_row.POST_ID}">{post_review_row.POST_SUBJECT}</a></h3>
<p class="author"><!-- IF S_IS_BOT -->{post_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{post_review_row.U_MINI_POST}">{post_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR}<strong> {post_review_row.POST_AUTHOR_FULL}</strong> {L_POSTED_ON_DATE} {post_review_row.POST_DATE}</p>
<div class="content">
{post_review_row.MESSAGE}
</div>
<div class="content">{post_review_row.MESSAGE}</div>
<!-- IF post_review_row.S_HAS_ATTACHMENTS -->
<dl class="attachbox">
<dt>{L_ATTACHMENTS}</dt>
<!-- BEGIN attachment -->
<dd>{post_review_row.attachment.DISPLAY_ATTACHMENT}</dd>
<!-- END attachment -->
</dl>
<!-- ENDIF -->
</div>
<span class="corners-bottom"><span></span></span></div>

22
phpBB/styles/prosilver/template/posting_topic_review.html
View file

@ -9,20 +9,28 @@
<div class="post <!-- IF topic_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
<div class="inner"><span class="corners-top"><span></span></span>
<div class="postbody" id="pr{topic_review_row.U_POST_ID}">
<div class="postbody" id="pr{topic_review_row.POST_ID}">
<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE -->
<ul class="profile-icons">
<li class="quote-icon"><a href="#postingbox" onclick="addquote({topic_review_row.U_POST_ID}, '{topic_review_row.POSTER_QUOTE}');" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}"><span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span></a></li>
<li class="quote-icon"><a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}');" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}"><span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span></a></li>
</ul>
<!-- ENDIF -->
<!-- IF topic_review_row.U_MCP_DETAILS --><div class="right-box"><a href="{topic_review_row.U_MCP_DETAILS}">{L_POST_DETAILS}</a></div><!-- ENDIF -->
<h3><a href="#pr{topic_review_row.U_POST_ID}">{topic_review_row.POST_SUBJECT}</a></h3>
<h3><a href="#pr{topic_review_row.POST_ID}">{topic_review_row.POST_SUBJECT}</a></h3>
<p class="author"><!-- IF S_IS_BOT -->{topic_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR} <strong>{topic_review_row.POST_AUTHOR_FULL}</strong> {L_POSTED_ON_DATE} {topic_review_row.POST_DATE} </p>
<div class="content">
{topic_review_row.MESSAGE}
</div>
<div class="content">{topic_review_row.MESSAGE}</div>
<!-- IF topic_review_row.S_HAS_ATTACHMENTS -->
<dl class="attachbox">
<dt>{L_ATTACHMENTS}</dt>
<!-- BEGIN attachment -->
<dd>{topic_review_row.attachment.DISPLAY_ATTACHMENT}</dd>
<!-- END attachment -->
</dl>
<!-- ENDIF -->
<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE -->
<div id="message_{topic_review_row.U_POST_ID}" style="display: none;">{topic_review_row.DECODED_MESSAGE}</div>
<div id="message_{topic_review_row.POST_ID}" style="display: none;">{topic_review_row.DECODED_MESSAGE}</div>
<!-- ENDIF -->
</div>
<span class="corners-bottom"><span></span></span></div>

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

@ -76,7 +76,7 @@ a.sendemail {
}
a.sendemail:hover {
background-position: 0px -18px;
background-position: 0 -18px;
}
a.fontsize {
@ -86,7 +86,7 @@ a.fontsize {
}
a.fontsize:hover {
background-position: 0px -20px;
background-position: 0 -20px;
text-decoration: none;
}

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

@ -74,12 +74,12 @@ p {
}
img {
border-width: 0px;
border-width: 0;
}
hr {
/* Also see tweaks.css */
border: 0px none #FFFFFF;
border: 0 none #FFFFFF;
border-top: 1px solid #CCCCCC;
height: 1px;
margin: 5px 0;

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

@ -74,7 +74,7 @@ li.row:hover dd {
li.header dt, li.header dd {
line-height: 1em;
border-left-width: 0px;
border-left-width: 0;
margin: 2px 0 4px 0;
color: #FFFFFF;
padding-top: 2px;
@ -269,7 +269,7 @@ div[class].topic-actions {
}
#topicreview h2 {
border-bottom-width: 0px;
border-bottom-width: 0;
}
/* Content container styles
@ -648,7 +648,7 @@ fieldset.polls dd div {
font-family: Arial, Helvetica, sans-serif;
color: #FFFFFF;
font-weight: bold;
padding: 0px 2px;
padding: 0 2px;
overflow: visible;
min-width: 2%;
}

4
phpBB/styles/prosilver/theme/cp.css
View file

@ -92,7 +92,7 @@ ul.cplist {
}
#cp-main .buttons {
margin-left: 0px;
margin-left: 0;
}
#cp-main ul.linklist {
@ -402,7 +402,7 @@ ol.def-rules li {
.pm-legend {
border-left-width: 10px;
border-left-style: solid;
border-right-width: 0px;
border-right-width: 0;
margin-bottom: 3px;
padding-left: 3px;
}

10
phpBB/styles/prosilver/theme/forms.css
View file

@ -4,7 +4,7 @@
/* General form styles
----------------------------------------*/
fieldset {
border-width: 0px;
border-width: 0;
font-family: Verdana, Helvetica, Arial, sans-serif;
font-size: 1.1em;
}
@ -76,12 +76,12 @@ fieldset dd {
/* Specific layout 1 */
fieldset.fields1 dt {
width: 10em;
border-right-width: 0px;
border-right-width: 0;
}
fieldset.fields1 dd {
margin-left: 10em;
border-left-width: 0px;
border-left-width: 0;
}
fieldset.fields1 {
@ -95,12 +95,12 @@ fieldset.fields1 div {
/* Specific layout 2 */
fieldset.fields2 dt {
width: 15em;
border-right-width: 0px;
border-right-width: 0;
}
fieldset.fields2 dd {
margin-left: 16em;
border-left-width: 0px;
border-left-width: 0;
}
/* Form elements */

2
phpBB/styles/prosilver/theme/links.css
View file

@ -161,7 +161,7 @@ a.right { background: none no-repeat 95% 60%; }
a.up, a.up:link, a.up:active, a.up:visited {
padding-left: 10px;
text-decoration: none;
border-bottom-width: 0px;
border-bottom-width: 0;
}
a.up:hover {

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

@ -40,8 +40,8 @@
<!-- BEGIN b_open --><strong><!-- END b_open -->
<!-- BEGIN b_close --></strong><!-- END b_close -->
<!-- BEGIN u_open --><u><!-- END u_open -->
<!-- BEGIN u_close --></u><!-- END u_close -->
<!-- BEGIN u_open --><span style="text-decoration: underline"><!-- END u_open -->
<!-- BEGIN u_close --></span><!-- END u_close -->
<!-- BEGIN i_open --><em><!-- END i_open -->
<!-- BEGIN i_close --></em><!-- END i_close -->

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

@ -84,15 +84,15 @@
</tr>
<tr>
<td class="row1" valign="top"><b>{L_BAN_LENGTH}:</b></td>
<td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbanlength" disabled="disabled" /></td>
<td class="row2"><input style="border: 0; width: 100%" type="text" name="unbanlength" disabled="disabled" /></td>
</tr>
<tr>
<td class="row1" valign="top"><b>{L_BAN_REASON}:</b></td>
<td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbanreason" disabled="disabled" /></td>
<td class="row2"><input style="border: 0; width: 100%" type="text" name="unbanreason" disabled="disabled" /></td>
</tr>
<tr>
<td class="row1" valign="top"><b>{L_BAN_GIVE_REASON}:</b></td>
<td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbangivereason" disabled="disabled" /></td>
<td class="row2"><input style="border: 0; width: 100%" type="text" name="unbangivereason" disabled="disabled" /></td>
</tr>
<tr>
<td class="cat" colspan="2" align="center"><input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="btnmain" />&nbsp; <input type="reset" value="{L_RESET}" class="btnlite" />&nbsp;</td>

2
phpBB/styles/subsilver2/template/mcp_header.html
View file

@ -31,7 +31,7 @@
<!-- IF l_block1.S_SELECTED -->
<td class="row1"><b class="nav">{l_block1.L_TITLE}</b>
<ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
<ul class="nav" style="margin: 0; padding: 0; list-style-type: none; line-height: 175%;">
<!-- BEGIN l_block2 -->
<li>&#187; <!-- IF l_block1.l_block2.S_SELECTED --><b>{l_block1.l_block2.L_TITLE}</b><!-- ELSE --><a href="{l_block1.l_block2.U_TITLE}">{l_block1.l_block2.L_TITLE}</a><!-- ENDIF --></li>
<!-- END l_block2 -->

30
phpBB/styles/subsilver2/template/mcp_post.html
View file

@ -58,7 +58,13 @@
<!-- IF S_CAN_VIEWIP -->
<tr>
<td class="row1"><b class="gen">{L_THIS_POST_IP}: </b></td>
<td class="row2"><span class="gen"><!-- IF U_WHOIS --><a href="{U_WHOIS}">{POST_IP}</a><!-- ELSE -->{POST_IP}<!-- ENDIF --> [ {POST_IPADDR} ]</span></td>
<td class="row2"><span class="gen">
<!-- IF U_WHOIS -->
<a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->)
<!-- ELSE -->
<!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF -->
<!-- ENDIF -->
</span></td>
</tr>
<!-- ENDIF -->
<tr>
@ -69,7 +75,27 @@
<th colspan="2" align="center">{L_PREVIEW}</th>
</tr>
<tr>
<td class="row1" colspan="2"><div class="gen" style="overflow: auto; width: 100%; height: 80pt; border: 1px;">{POST_PREVIEW}</div><!-- IF U_EDIT --><div class="gen" style="float: {S_CONTENT_FLOW_END};"><a href="{U_EDIT}">{EDIT_IMG}</a></div><!-- ENDIF --></td>
<td class="row1" colspan="2">
<!-- IF U_EDIT --><div class="gen" style="float: {S_CONTENT_FLOW_END};"><a href="{U_EDIT}">{EDIT_IMG}</a></div><!-- ENDIF -->
<div class="postbody">{POST_PREVIEW}</div>
<!-- IF S_HAS_ATTACHMENTS -->
<br clear="all" /><br />
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td>
</tr>
<!-- BEGIN attachment -->
<tr>
<!-- IF attachment.S_ROW_COUNT is even --><td class="row2"><!-- ELSE --><td class="row1"><!-- ENDIF -->{attachment.DISPLAY_ATTACHMENT}</td>
</tr>
<!-- END attachment -->
</table>
<!-- ENDIF -->
</td>
</tr>
<!-- IF S_POST_UNAPPROVED and S_MCP_QUEUE -->
<tr>

19
phpBB/styles/subsilver2/template/mcp_topic.html
View file

@ -96,7 +96,24 @@
<td width="100%" valign="top">
<table width="100%" cellspacing="0" cellpadding="2" border="0">
<tr>
<td class="postbody" valign="top">{postrow.MESSAGE}<br /><br /></td>
<td valign="top">
<div class="postbody">{postrow.MESSAGE}</div>
<!-- IF postrow.S_HAS_ATTACHMENTS -->
<br clear="all" /><br />
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td>
</tr>
<!-- BEGIN attachment -->
<tr>
<!-- IF postrow.attachment.S_ROW_COUNT is even --><td class="row2"><!-- ELSE --><td class="row1"><!-- ENDIF -->{postrow.attachment.DISPLAY_ATTACHMENT}</td>
</tr>
<!-- END attachment -->
</table>
<!-- ENDIF -->
</td>
</tr>
<tr>
<td valign="bottom">

21
phpBB/styles/subsilver2/template/posting_review.html
View file

@ -20,7 +20,7 @@
<!-- IF post_review_row.S_ROW_COUNT is even --> <tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a id="pr{post_review_row.U_POST_ID}"></a>
<td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a id="pr{post_review_row.POST_ID}"></a>
<table width="150" cellspacing="0" cellpadding="4" border="0">
<tr>
<td align="center"><b class="postauthor">{post_review_row.POST_AUTHOR_FULL}</b></td>
@ -47,7 +47,24 @@
<td valign="top">
<table width="100%" cellspacing="0" cellpadding="2">
<tr>
<td class="postbody">{post_review_row.MESSAGE}</td>
<td><div class="postbody">{post_review_row.MESSAGE}</div>
<!-- IF post_review_row.S_HAS_ATTACHMENTS -->
<br clear="all" /><br />
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td>
</tr>
<!-- BEGIN attachment -->
<tr>
<!-- IF post_review_row.attachment.S_ROW_COUNT is even --><td class="row2"><!-- ELSE --><td class="row1"><!-- ENDIF -->{post_review_row.attachment.DISPLAY_ATTACHMENT}</td>
</tr>
<!-- END attachment -->
</table>
<!-- ENDIF -->
</td>
</tr>
</table>
</td>

22
phpBB/styles/subsilver2/template/posting_topic_review.html
View file

@ -15,7 +15,7 @@
<!-- IF topic_review_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a id="pr{topic_review_row.U_POST_ID}"></a>
<td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a id="pr{topic_review_row.POST_ID}"></a>
<table width="150" cellspacing="0">
<tr>
<td align="center"><b class="postauthor"<!-- IF topic_review_row.POST_AUTHOR_COLOUR --> style="color: {topic_review_row.POST_AUTHOR_COLOUR}"<!-- ENDIF -->>{topic_review_row.POST_AUTHOR}</b></td>
@ -28,7 +28,7 @@
<td>&nbsp;</td>
<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}:</b>&nbsp;</td>
<td class="gensmall" width="100%" valign="middle">{topic_review_row.POST_SUBJECT}</td>
<td valign="top" nowrap="nowrap">&nbsp;<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE --><a href="#" onclick="addquote({topic_review_row.U_POST_ID},'{topic_review_row.POSTER_QUOTE}'); return false;">{QUOTE_IMG}</a><!-- ENDIF --></td>
<td valign="top" nowrap="nowrap">&nbsp;<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE --><a href="#" onclick="addquote({topic_review_row.POST_ID},'{topic_review_row.POSTER_QUOTE}'); return false;">{QUOTE_IMG}</a><!-- ENDIF --></td>
</tr>
</table>
</td>
@ -44,8 +44,24 @@
<tr>
<td>
<div class="postbody">{topic_review_row.MESSAGE}</div>
<!-- IF topic_review_row.S_HAS_ATTACHMENTS -->
<br clear="all" /><br />
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td>
</tr>
<!-- BEGIN attachment -->
<tr>
<!-- IF topic_review_row.attachment.S_ROW_COUNT is even --><td class="row2"><!-- ELSE --><td class="row1"><!-- ENDIF -->{topic_review_row.attachment.DISPLAY_ATTACHMENT}</td>
</tr>
<!-- END attachment -->
</table>
<!-- ENDIF -->
<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE -->
<div id="message_{topic_review_row.U_POST_ID}" style="display: none;">{topic_review_row.DECODED_MESSAGE}</div>
<div id="message_{topic_review_row.POST_ID}" style="display: none;">{topic_review_row.DECODED_MESSAGE}</div>
<!-- ENDIF -->
</td>
</tr>

8
phpBB/styles/subsilver2/template/ucp_header.html
View file

@ -63,7 +63,7 @@
<!-- the ! at the beginning of the loop name forces the loop to be not a nested one of l_block1 (it gets parsed separately) -->
<!-- BEGIN !folder -->
<!-- IF folder.S_FIRST_ROW -->
<ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
<ul class="nav" style="margin: 0; padding: 0; list-style-type: none; line-height: 175%;">
<!-- ENDIF -->
<!-- IF folder.S_CUR_FOLDER -->
@ -80,7 +80,7 @@
<!-- ENDIF -->
<ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
<ul class="nav" style="margin: 0; padding: 0; list-style-type: none; line-height: 175%;">
<!-- BEGIN l_block2 -->
<li>&#187; <!-- IF l_block1.l_block2.S_SELECTED --><b>{l_block1.l_block2.L_TITLE}</b><!-- ELSE --><a href="{l_block1.l_block2.U_TITLE}">{l_block1.l_block2.L_TITLE}</a><!-- ENDIF --></li>
<!-- END l_block2 -->
@ -125,7 +125,7 @@
<b class="genmed" style="color:green">{L_FRIENDS_ONLINE}</b>
<ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
<ul class="nav" style="margin: 0; padding: 0; list-style-type: none; line-height: 175%;">
<!-- BEGIN friends_online -->
<li>{friends_online.USERNAME_FULL}
<!-- IF S_SHOW_PM_BOX -->
@ -141,7 +141,7 @@
<b class="genmed" style="color:red">{L_FRIENDS_OFFLINE}</b>
<ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
<ul class="nav" style="margin: 0; padding: 0; list-style-type: none; line-height: 175%;">
<!-- BEGIN friends_offline -->
<li>{friends_offline.USERNAME_FULL}
<!-- IF S_SHOW_PM_BOX -->

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

@ -13,7 +13,7 @@
</tr>
<!-- BEGIN history_row -->
<!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a name="{history_row.U_POST_ID}"></a>
<td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a name="{history_row.MSG_ID}"></a>
<table width="150" cellspacing="0">
<tr>
<td align="center" colspan="2"><span class="postauthor">{history_row.MESSAGE_AUTHOR_FULL}</span></td>
@ -32,7 +32,7 @@
<td valign="top">
<table width="100%" cellspacing="0" cellpadding="2">
<tr>
<td><div id="message_{history_row.U_POST_ID}"><div class="postbody">{history_row.MESSAGE}</div></div></td>
<td><div id="message_{history_row.MSG_ID}"><div class="postbody">{history_row.MESSAGE}</div></div></td>
</tr>
</table>
</td>

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

@ -78,9 +78,9 @@ body {
#findbar {
width: 100%;
margin: 0px;
padding: 0px;
border: 0px;
margin: 0;
padding: 0;
border: 0;
}
.forumrules {
@ -129,7 +129,7 @@ h3 {
}
h4 {
margin: 0px;
margin: 0;
font-size: 1.1em;
font-weight: bold;
}
@ -139,7 +139,7 @@ p {
}
p.moderators {
margin: 0px;
margin: 0;
float: left;
color: black;
font-weight: bold;
@ -150,7 +150,7 @@ p.moderators {
}
p.linkmcp {
margin: 0px;
margin: 0;
float: right;
white-space: nowrap;
}
@ -160,7 +160,7 @@ p.linkmcp {
}
p.breadcrumbs {
margin: 0px;
margin: 0;
float: left;
color: black;
font-weight: bold;
@ -173,7 +173,7 @@ p.breadcrumbs {
}
p.datetime {
margin: 0px;
margin: 0;
float: right;
white-space: nowrap;
font-size: 1em;
@ -189,7 +189,7 @@ p.searchbar {
}
p.searchbarreg {
margin: 0px;
margin: 0;
float: right;
white-space: nowrap;
}
@ -203,15 +203,15 @@ p.forumdesc {
}
p.topicauthor {
margin: 1px 0px;
margin: 1px 0;
}
p.topicdetails {
margin: 1px 0px;
margin: 1px 0;
}
.postreported, .postreported a:visited, .postreported a:hover, .postreported a:link, .postreported a:active {
margin: 1px 0px;
margin: 1px 0;
color: red;
font-weight:bold;
}
@ -252,7 +252,7 @@ p.topicdetails {
}
.nav {
margin: 0px;
margin: 0;
color: black;
font-weight: bold;
}
@ -326,9 +326,9 @@ td.profile {
.catdiv {
height: 28px;
margin: 0px;
padding: 0px;
border: 0px;
margin: 0;
padding: 0;
border: 0;
background: white url('./images/cellpic2.jpg') repeat-y scroll top left;
}
.rtl .catdiv {
@ -337,9 +337,9 @@ td.profile {
.cat {
height: 28px;
margin: 0px;
padding: 0px;
border: 0px;
margin: 0;
padding: 0;
border: 0;
background-color: #C7D0D7;
background-image: url('./images/cellpic1.gif');
text-indent: 4px;
@ -381,7 +381,7 @@ td.profile {
hr {
height: 1px;
border-width: 0px;
border-width: 0;
background-color: #D1D7DC;
color: #D1D7DC;
}
@ -417,7 +417,7 @@ a.forumlink {
}
a.topictitle {
margin: 1px 0px;
margin: 1px 0;
font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
font-weight: bold;
font-size: 1.2em;
@ -442,9 +442,9 @@ th a:hover {
/* Form Elements
------------ */
form {
margin: 0px;
padding: 0px;
border: 0px;
margin: 0;
padding: 0;
border: 0;
}
input {
@ -541,9 +541,9 @@ input.radio {
/* BBCode
------------ */
.quotetitle, .attachtitle {
margin: 10px 5px 0px 5px;
margin: 10px 5px 0 5px;
padding: 4px;
border-width: 1px 1px 0px 1px;
border-width: 1px 1px 0 1px;
border-style: solid;
border-color: #A9B8C2;
color: #333333;
@ -557,10 +557,10 @@ input.radio {
}
.quotecontent, .attachcontent {
margin: 0px 5px 10px 5px;
margin: 0 5px 10px 5px;
padding: 5px;
border-color: #A9B8C2;
border-width: 0px 1px 1px 1px;
border-width: 0 1px 1px 1px;
border-style: solid;
font-weight: normal;
font-size: 1em;
@ -575,9 +575,9 @@ input.radio {
}
.codetitle {
margin: 10px 5px 0px 5px;
margin: 10px 5px 0 5px;
padding: 2px 4px;
border-width: 1px 1px 0px 1px;
border-width: 1px 1px 0 1px;
border-style: solid;
border-color: #A9B8C2;
color: #333333;
@ -588,10 +588,10 @@ input.radio {
.codecontent {
direction: ltr;
margin: 0px 5px 10px 5px;
margin: 0 5px 10px 5px;
padding: 5px;
border-color: #A9B8C2;
border-width: 0px 1px 1px 1px;
border-width: 0 1px 1px 1px;
border-style: solid;
font-weight: normal;
color: #006600;