diff options
Diffstat (limited to 'phpBB')
144 files changed, 4223 insertions, 4104 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 9401473353..4bfc05a595 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -108,7 +108,7 @@ function adm_page_header($page_title) // gzip_compression if ($config['gzip_compress']) { - if (extension_loaded('zlib') && !headers_sent()) + if (@extension_loaded('zlib') && !headers_sent()) { ob_start('ob_gzhandler'); } @@ -135,6 +135,12 @@ function adm_page_header($page_title) 'T_RANKS_PATH' => "{$phpbb_root_path}{$config['ranks_path']}/", 'T_UPLOAD_PATH' => "{$phpbb_root_path}{$config['upload_path']}/", + 'ICON_MOVE_UP' => '<img src="' . $phpbb_admin_path . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />', + 'ICON_MOVE_DOWN' => '<img src="' . $phpbb_admin_path . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />', + 'ICON_EDIT' => '<img src="' . $phpbb_admin_path . 'images/icon_edit.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />', + 'ICON_DELETE' => '<img src="' . $phpbb_admin_path . 'images/icon_delete.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />', + 'ICON_SYNC' => '<img src="' . $phpbb_admin_path . 'images/icon_sync.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />', + 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], 'S_CONTENT_ENCODING' => $user->lang['ENCODING'], 'S_CONTENT_DIR_LEFT' => $user->lang['LEFT'], diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index d09f8a9e65..7a0f4922a2 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -87,7 +87,7 @@ <!-- BEGIN bbcodes --> <!-- IF bbcodes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td style="text-align: center;">{bbcodes.BBCODE_TAG}</td> - <td style="text-align: center;"><a href="{bbcodes.U_EDIT}">{L_EDIT}</a> | <a href="{bbcodes.U_DELETE}">{L_DELETE}</a></td> + <td style="text-align: center;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}">{ICON_DELETE}</a></td> </tr> <!-- END bbcodes --> </tbody> diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index c2a4dd3efb..bf4434d972 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -316,11 +316,11 @@ <!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <b>{forums.FORUM_TOPICS}</b> / {L_POSTS}: <b>{forums.FORUM_POSTS}</b></span><!-- ENDIF --> </td> <td style="width: 15%; text-align: right; white-space: nowrap;"> - <!-- IF not forums.S_FIRST_ROW --><a href="{forums.U_MOVE_UP}"><img src="images/icon_up.gif" alt="{L_MOVE_UP}" title="{L_MOVE_UP}" width="16" height="16" /></a> <!-- ENDIF --> - <!-- IF not forums.S_LAST_ROW --><a href="{forums.U_MOVE_DOWN}"><img src="images/icon_down.gif" alt="{L_MOVE_DOWN}" title="{L_MOVE_DOWN}" width="16" height="16" /></a> <!-- ENDIF --> - <a href="{forums.U_EDIT}"><img src="images/icon_edit.gif" alt="{L_EDIT}" title="{L_EDIT}" width="16" height="16" /></a> - <!-- IF not forums.S_LINK --><a href="{forums.U_SYNC}"><img src="images/icon_sync.gif" alt="{L_RESYNC}" title="{L_RESYNC}" width="16" height="16" /></a> <!-- ENDIF --> - <a href="{forums.U_DELETE}"><img src="images/icon_delete.gif" alt="{L_DELETE}" title="{L_DELETE}" width="16" height="16" /></a> + <!-- IF not forums.S_FIRST_ROW --><a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a> <!-- ENDIF --> + <!-- IF not forums.S_LAST_ROW --><a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> <!-- ENDIF --> + <a href="{forums.U_EDIT}">{ICON_EDIT}</a> + <!-- IF not forums.S_LINK --><a href="{forums.U_SYNC}">{ICON_SYNC}</a> <!-- ENDIF --> + <a href="{forums.U_DELETE}">{ICON_DELETE}</a> </td> </tr> <!-- END forums --> diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index 4cfcc2a4e5..ca4c39004a 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -145,10 +145,10 @@ <td style="text-align: center;">{items.EMOTION}</td> <!-- ENDIF --> <td style="width: 15%; text-align: right; white-space: nowrap;"> - <!-- IF not items.S_FIRST_ROW --><a href="{items.U_MOVE_UP}"><img src="images/icon_up.gif" alt="{L_MOVE_UP}" title="{L_MOVE_UP}" width="16" height="16" /></a> <!-- ENDIF --> - <!-- IF not items.S_LAST_ROW --><a href="{items.U_MOVE_DOWN}"><img src="images/icon_down.gif" alt="{L_MOVE_DOWN}" title="{L_MOVE_DOWN}" width="16" height="16" /></a> <!-- ENDIF --> - <a href="{items.U_EDIT}"><img src="images/icon_edit.gif" alt="{L_EDIT}" title="{L_EDIT}" width="16" height="16" /></a> - <a href="{items.U_DELETE}"><img src="images/icon_delete.gif" alt="{L_DELETE}" title="{L_DELETE}" width="16" height="16" /></a> + <!-- IF not items.S_FIRST_ROW --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a> <!-- ENDIF --> + <!-- IF not items.S_LAST_ROW --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> <!-- ENDIF --> + <a href="{items.U_EDIT}">{ICON_EDIT}</a> + <a href="{items.U_DELETE}">{ICON_DELETE}</a> </td> </tr> <!-- END items --> diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index ea4c7bd169..5e27958a24 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -144,11 +144,13 @@ <tr> <td style="width: 5%;">{modules.MODULE_IMAGE}</td> <td style="width: 50%;"><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td> - <td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;"><a href="{modules.U_MOVE_UP}">{L_MOVE_UP}</a><br /><a href="{modules.U_MOVE_DOWN}">{L_MOVE_DOWN}</a></td> - <td style="width: 20%; white-space: nowrap; text-align: center; vertical-align: middle;"> - <a href="{modules.U_EDIT}">{L_EDIT}</a> | <a href="{modules.U_DELETE}">{L_DELETE}</a> | - <!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF --> - </td> + <td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;"> <!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF --> </td> + <td style="width: 20%; white-space: nowrap; text-align: center; vertical-align: middle;"> + <!-- IF not modules.S_FIRST_ROW --><a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a> <!-- ENDIF --> + <!-- IF not modules.S_LAST_ROW --><a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> <!-- ENDIF --> + <a href="{modules.U_EDIT}">{ICON_EDIT}</a> + <a href="{modules.U_DELETE}">{ICON_DELETE}</a> + </td> </tr> <!-- END modules --> </tbody> diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 5ea2a3cfec..6cbbcde8d2 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -188,10 +188,10 @@ </td> <td style="vertical-align: top; white-space: nowrap;"><!-- IF roles.U_DISPLAY_ITEMS --><a href="{roles.U_DISPLAY_ITEMS}">{L_VIEW_ASSIGNED_ITEMS}</a><!-- ELSE -->{L_VIEW_ASSIGNED_ITEMS}<!-- ENDIF --></td> <td style="vertical-align: top; white-space: nowrap;"> - <!-- IF not roles.S_FIRST_ROW --><a href="{roles.U_MOVE_UP}"><img src="images/icon_up.gif" alt="{L_MOVE_UP}" title="{L_MOVE_UP}" width="16" height="16" /></a> <!-- ENDIF --> - <!-- IF not roles.S_LAST_ROW --><a href="{roles.U_MOVE_DOWN}"><img src="images/icon_down.gif" alt="{L_MOVE_DOWN}" title="{L_MOVE_DOWN}" width="16" height="16" /></a> <!-- ENDIF --> - <a href="{roles.U_EDIT}"><img src="images/icon_edit.gif" alt="{L_EDIT_ROLE}" title="{L_EDIT_ROLE}" width="16" height="16" /></a> - <a href="{roles.U_REMOVE}"><img src="images/icon_delete.gif" alt="{L_REMOVE_ROLE}" title="{L_REMOVE_ROLE}" width="16" height="16" /></a> + <!-- IF not roles.S_FIRST_ROW --><a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a> <!-- ENDIF --> + <!-- IF not roles.S_LAST_ROW --><a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> <!-- ENDIF --> + <a href="{roles.U_EDIT}" title="{L_EDIT_ROLE}">{ICON_EDIT}</a> + <a href="{roles.U_REMOVE}" title="{L_REMOVE_ROLE}">{ICON_DELETE}</a> </td> </tr> <!-- END roles --> diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index d6cb44b272..51f62d2199 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -167,10 +167,10 @@ <td><a href="{fields.U_ACTIVATE_DEACTIVATE}">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_EDIT}"><span style="color:red;">{L_EDIT}</span><!-- ENDIF --></td> <td style="width: 15%; text-align: right; white-space: nowrap;"> - <!-- IF not fields.S_FIRST_ROW --><a href="{fields.U_MOVE_UP}"><img src="images/icon_up.gif" alt="{L_MOVE_UP}" title="{L_MOVE_UP}" width="16" height="16" /></a> <!-- ENDIF --> - <!-- IF not fields.S_LAST_ROW --><a href="{fields.U_MOVE_DOWN}"><img src="images/icon_down.gif" alt="{L_MOVE_DOWN}" title="{L_MOVE_DOWN}" width="16" height="16" /></a> <!-- ENDIF --> - <!-- IF not fields.S_NEED_EDIT --><a href="{fields.U_EDIT}"><img src="images/icon_edit.gif" alt="{L_EDIT}" title="{L_EDIT}" width="16" height="16" /></a> <!-- ENDIF --> - <a href="{fields.U_DELETE}"><img src="images/icon_delete.gif" alt="{L_DELETE}" title="{L_DELETE}" width="16" height="16" /></a> + <!-- IF not fields.S_FIRST_ROW --><a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a> <!-- ENDIF --> + <!-- IF not fields.S_LAST_ROW --><a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> <!-- ENDIF --> + <!-- IF not fields.S_NEED_EDIT --><a href="{fields.U_EDIT}">{ICON_EDIT}</a> <!-- ENDIF --> + <a href="{fields.U_DELETE}">{ICON_DELETE}</a> </td> </tr> diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index 924e2d4fb3..b79ac9cf6b 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -75,7 +75,7 @@ <td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}" /><!-- ELSE --> - <!-- ENDIF --></td> <td style="text-align: center;">{ranks.RANK_TITLE}</td> <td style="text-align: center;"><!-- IF ranks.S_SPECIAL_RANK --> - <!-- ELSE -->{ranks.MIN_POSTS}<!-- ENDIF --></td> - <td style="text-align: center;"><a href="{ranks.U_EDIT}">{L_EDIT}</a> | <a href="{ranks.U_DELETE}">{L_DELETE}</a></td> + <td style="text-align: center;"><a href="{ranks.U_EDIT}">{ICON_EDIT}</a> <a href="{ranks.U_DELETE}">{ICON_DELETE}</a></td> </tr> <!-- END ranks --> </tbody> diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html index 8011542447..93d23563e2 100644 --- a/phpBB/adm/style/acp_reasons.html +++ b/phpBB/adm/style/acp_reasons.html @@ -65,10 +65,10 @@ </td> <td style="width: 100px;">{reasons.REASON_COUNT}</td> <td style="width: 15%; text-align: right; white-space: nowrap;"> - <!-- IF not reasons.S_FIRST_ROW --><a href="{reasons.U_MOVE_UP}"><img src="images/icon_up.gif" alt="{L_MOVE_UP}" title="{L_MOVE_UP}" width="16" height="16" /></a> <!-- ENDIF --> - <!-- IF not reasons.S_LAST_ROW --><a href="{reasons.U_MOVE_DOWN}"><img src="images/icon_down.gif" alt="{L_MOVE_DOWN}" title="{L_MOVE_DOWN}" width="16" height="16" /></a> <!-- ENDIF --> - <a href="{reasons.U_EDIT}"><img src="images/icon_edit.gif" alt="{L_EDIT}" title="{L_EDIT}" width="16" height="16" /></a> - <!-- IF reasons.U_DELETE --><a href="{reasons.U_DELETE}"><img src="images/icon_delete.gif" alt="{L_DELETE}" title="{L_DELETE}" width="16" height="16" /></a><!-- ENDIF --> + <!-- IF not reasons.S_FIRST_ROW --><a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a> <!-- ENDIF --> + <!-- IF not reasons.S_LAST_ROW --><a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> <!-- ENDIF --> + <a href="{reasons.U_EDIT}">{ICON_EDIT}</a> + <!-- IF reasons.U_DELETE --><a href="{reasons.U_DELETE}">{ICON_DELETE}</a><!-- ENDIF --> </td> </tr> <!-- END reasons --> diff --git a/phpBB/includes/acm/acm_db.php b/phpBB/includes/acm/acm_db.php deleted file mode 100644 index cbb8af31fc..0000000000 --- a/phpBB/includes/acm/acm_db.php +++ /dev/null @@ -1,227 +0,0 @@ -<?php -/** -* -* @package acm -* @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License -* -*/ - -/** -* @package acm -* ACM Database Caching -*/ -class acm -{ - // Contains all loaded variables - var $vars = ''; - - // Contains the names of the variables that are ready to be used - // (iow, variables that have been unserialized) - var $var_ready = array(); - - // Contains variables that have been updated or destroyed this session - var $var_expires = array(); - - // Contains variables that have already been requested - // If a variable has been requested but not loaded, it simply means it - // wasn't found in the db - var $var_requested = array(); - - function load($var_names = '') - { - global $db; - $this->vars = array(); - - if (is_array($var_names)) - { - $var_requested = $var_names; - $sql_condition = "var_name IN ('" . implode("', '", $var_names) . "')"; - } - else - { -// $sql_condition = "var_name NOT LIKE '\_%'"; - $sql_condition = "LEFT(var_name, 1) <> '_'"; - } - - $sql = 'SELECT var_name, var_data - FROM ' . CACHE_TABLE . ' - WHERE var_expires > ' . time() . " - AND $sql_condition"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $this->vars[$row['var_name']] = $row['var_data']; - - if (!$var_names) - { - $this->var_requested[] = $row['var_name']; - } - } - } - - function unload() - { - $this->save(); - unset($this->vars); - } - - function save() - { - global $db; - - $delete = $insert = array(); - foreach ($this->var_expires as $var_name => $expires) - { - if ($expires == 'now') - { - $delete[] = $var_name; - } - else - { - $delete[] = $var_name; - $insert[] = "'$var_name', $expires, '" . $db->sql_escape(serialize($this->vars[$var_name])) . "'"; - } - } - $this->var_expires = array(); - - if (sizeof($delete)) - { - $sql = 'DELETE FROM ' . CACHE_TABLE . " - WHERE var_name IN ('" . implode("', '", $delete) . "')"; - $db->sql_query($sql); - } - - if (sizeof($insert)) - { - switch (SQL_LAYER) - { - case 'mysql': - case 'mysql4': - case 'mysqli': - $sql = 'INSERT INTO ' . CACHE_TABLE . ' (var_name, var_expires, var_data) - VALUES (' . implode('), (', $insert) . ')'; - $db->sql_query($sql); - break; - - default: - foreach ($insert as $values) - { - $sql = 'INSERT INTO ' . CACHE_TABLE . " (var_name, var_expires, var_data) - VALUES ($values)"; - $db->sql_query($sql); - } - } - } - } - - function tidy() - { - global $db; - - $sql = 'DELETE FROM ' . CACHE_TABLE . ' - WHERE var_expires < ' . time(); - $db->sql_query($sql); - - set_config('cache_last_gc', time(), true); - } - - function get($var_name) - { - if (!is_array($this->vars)) - { - $this->load(); - } - - if ($var_name{0} == '_') - { - if (!in_array($var_name, $this->var_requested)) - { - $this->var_requested[] = $var_name; - - global $db; - $sql = 'SELECT var_data - FROM ' . CACHE_TABLE . " - WHERE var_name = '$var_name' - AND var_expires > " . time(); - $result = $db->sql_query($sql); - if ($row = $db->sql_fetchrow($result)) - { - $this->vars[$var_name] = $row['var_data']; - } - } - } - - if ($this->_exists($var_name)) - { - if (empty($this->var_ready[$var_name])) - { - $this->vars[$var_name] = unserialize($this->vars[$var_name]); - $this->var_ready[$var_name] = true; - } - - return $this->vars[$var_name]; - } - else - { - return false; - } - } - - function put($var_name, $var_data, $ttl = 31536000) - { - $this->vars[$var_name] = $var_data; - - if ($var_name{0} == '_') - { - global $db; - - switch (SQL_LAYER) - { - case 'mysql': - case 'mysql4': - case 'mysqli': - $INSERT = 'REPLACE'; - break; - - default: - $sql = 'DELETE FROM ' . CACHE_TABLE . " - WHERE var_name = '$var_name'"; - $db->sql_query($sql); - - $INSERT = 'INSERT'; - } - - $sql = "$INSERT INTO " . CACHE_TABLE . " (var_name, var_expires, var_data) - VALUES ('$var_name', " . (time() + $ttl) . ", '" . $db->sql_escape(serialize($var_data)) . "')"; - $db->sql_query($sql); - } - else - { - $this->var_expires[$var_name] = time() + $ttl; - } - } - - function destroy($var_name, $void = NULL) - { - if (isset($this->vars[$var_name])) - { - $this->var_expires[$var_name] = 'now'; - unset($this->vars[$var_name]); - } - } - - function _exists($var_name) - { - if (!is_array($this->vars)) - { - $this->load(); - } - - return isset($this->vars[$var_name]); - } -} - -?>
\ No newline at end of file diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 976c2b2257..85480756ca 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -256,7 +256,6 @@ class acp_attachments { if ($submit) { - // Change Extensions ? $extension_change_list = (isset($_POST['extension_change_list'])) ? array_map('intval', $_POST['extension_change_list']) : array(); $group_select_list = (isset($_POST['group_select'])) ? array_map('intval', $_POST['group_select']) : array(); @@ -282,6 +281,7 @@ class acp_attachments SET group_id = ' . (int) $extensions[$row['extension_id']]['group_id'] . ' WHERE extension_id = ' . $row['extension_id']; $db->sql_query($sql); + add_log('admin', 'LOG_ATTACH_EXT_UPDATE', $row['extension']); } } @@ -312,7 +312,7 @@ class acp_attachments add_log('admin', 'LOG_ATTACH_EXT_DEL', $extension_list); } } - + // Add Extension? $add_extension = strtolower(request_var('add_extension', '')); $add_extension_group = request_var('add_group_select', 0); @@ -400,7 +400,7 @@ class acp_attachments { $action = request_var('action', ''); $group_id = request_var('g', 0); - + if ($action != 'add' && $action != 'edit') { trigger_error('WRONG_MODE'); @@ -439,6 +439,7 @@ class acp_attachments FROM ' . EXTENSION_GROUPS_TABLE . " WHERE LOWER(group_name) = '" . $db->sql_escape(strtolower($new_group_name)) . "'"; $result = $db->sql_query($sql); + if ($db->sql_fetchrow($result)) { $error[] = sprintf($user->lang['EXTENSION_GROUP_EXIST'], $new_group_name); @@ -461,7 +462,7 @@ class acp_attachments if ($max_filesize == $config['max_filesize']) { $max_filesize = 0; - } + } if (!sizeof($allowed_forums)) { @@ -484,7 +485,7 @@ class acp_attachments $sql .= ($action == 'edit') ? " WHERE group_id = $group_id" : ''; $db->sql_query($sql); - + if ($action == 'add') { $group_id = $db->sql_nextid(); @@ -580,7 +581,8 @@ class acp_attachments trigger_error($user->lang['NO_EXTENSION_GROUP'] . adm_back_link($this->u_action)); } - $sql = 'SELECT * FROM ' . EXTENSION_GROUPS_TABLE . " + $sql = 'SELECT * + FROM ' . EXTENSION_GROUPS_TABLE . " WHERE group_id = $group_id"; $result = $db->sql_query($sql); $ext_group_row = $db->sql_fetchrow($result); @@ -588,6 +590,8 @@ class acp_attachments $forum_ids = (!$ext_group_row['allowed_forums']) ? array() : unserialize(trim($ext_group_row['allowed_forums'])); + // no break; + case 'add': if ($action == 'add') @@ -607,8 +611,10 @@ class acp_attachments $extensions = array(); - $sql = 'SELECT * FROM ' . EXTENSIONS_TABLE . " - WHERE group_id = $group_id OR group_id = 0 + $sql = 'SELECT * + FROM ' . EXTENSIONS_TABLE . " + WHERE group_id = $group_id + OR group_id = 0 ORDER BY extension"; $result = $db->sql_query($sql); $extensions = $db->sql_fetchrowset($result); @@ -674,7 +680,7 @@ class acp_attachments 'UPLOAD_ICON_SRC' => $phpbb_root_path . $img_path . '/' . $ext_group_row['upload_icon'], 'EXTGROUP_FILESIZE' => $ext_group_row['max_filesize'], 'ASSIGNED_EXTENSIONS' => $assigned_extensions, - + 'S_CATEGORY_SELECT' => $this->category_select('special_category', $group_id, 'category'), 'S_DOWNLOAD_SELECT' => $this->download_select('download_mode', $group_id, 'download_mode'), 'S_EXT_GROUP_SIZE_OPTIONS' => size_select_options($size_format), @@ -756,7 +762,7 @@ class acp_attachments case 'deactivate': case 'activate': - + if (!$group_id) { trigger_error($user->lang['NO_EXTENSION_GROUP'] . adm_back_link($this->u_action)); @@ -781,9 +787,9 @@ class acp_attachments while ($row = $db->sql_fetchrow($result)) { $s_add_spacer = ($row['allow_group'] == 0 && $act_deact == 'deactivate') ? true : false; - + $act_deact = ($row['allow_group']) ? 'deactivate' : 'activate'; - + $template->assign_block_vars('groups', array( 'S_ADD_SPACER' => $s_add_spacer, 'S_ALLOWED_IN_PM' => ($row['allow_in_pm']) ? true : false, @@ -792,7 +798,7 @@ class acp_attachments 'U_EDIT' => $this->u_action . "&action=edit&g={$row['group_id']}", 'U_DELETE' => $this->u_action . "&action=delete&g={$row['group_id']}", 'U_ACT_DEACT' => $this->u_action . "&action=$act_deact&g={$row['group_id']}", - + 'L_ACT_DEACT' => $user->lang[strtoupper($act_deact)], 'GROUP_NAME' => $row['group_name'], 'CATEGORY' => $cat_lang[$row['cat_id']], @@ -808,7 +814,6 @@ class acp_attachments if ($submit) { - $delete_files = (isset($_POST['delete'])) ? array_keys(request_var('delete', array('' => 0))) : array(); $add_files = (isset($_POST['add'])) ? array_keys(request_var('add', array('' => 0))) : array(); $post_ids = request_var('post_id', array('' => 0)); @@ -862,15 +867,15 @@ class acp_attachments { $return = true; - if ($auth->acl_gets('f_attach', 'u_attach', $row['forum_id'])) + if ($auth->acl_get('f_attach', $row['forum_id'])) { $return = $this->upload_file($row['post_id'], $row['topic_id'], $row['forum_id'], $config['upload_path'], $upload_list[$row['post_id']]); } - + $template->assign_block_vars('upload', array( 'FILE_INFO' => sprintf($user->lang['UPLOADING_FILE_TO'], $upload_list[$row['post_id']], $row['post_id']), - 'S_DENIED' => (!$auth->acl_gets('f_attach', 'u_attach', $row['forum_id'])) ? true : false, - 'L_DENIED' => (!$auth->acl_gets('f_attach', 'u_attach', $row['forum_id'])) ? sprintf($user->lang['UPLOAD_DENIED_FORUM'], $forum_names[$row['forum_id']]) : '', + 'S_DENIED' => (!$auth->acl_get('f_attach', $row['forum_id'])) ? true : false, + 'L_DENIED' => (!$auth->acl_get('f_attach', $row['forum_id'])) ? sprintf($user->lang['UPLOAD_DENIED_FORUM'], $forum_names[$row['forum_id']]) : '', 'ERROR_MSG' => ($return === true) ? false : $return) ); } @@ -883,7 +888,7 @@ class acp_attachments $template->assign_vars(array( 'S_ORPHAN' => true) ); - + $attach_filelist = array(); $dir = @opendir($phpbb_root_path . $config['upload_path']); @@ -939,7 +944,6 @@ class acp_attachments 'NOTIFY_MSG' => implode('<br />', $notify)) ); } - } /** @@ -962,7 +966,7 @@ class acp_attachments FROM ' . EXTENSION_GROUPS_TABLE . ' WHERE group_id = ' . (int) $group_id; $result = $db->sql_query($sql); - + $cat_type = (!($row = $db->sql_fetchrow($result))) ? ATTACHMENT_CATEGORY_NONE : $row['cat_id']; $db->sql_freeresult($result); @@ -1037,8 +1041,8 @@ class acp_attachments global $db, $user; $types = array( - INLINE_LINK => $user->lang['MODE_INLINE'], - PHYSICAL_LINK => $user->lang['MODE_PHYSICAL'] + INLINE_LINK => $user->lang['MODE_INLINE'], + PHYSICAL_LINK => $user->lang['MODE_PHYSICAL'] ); if ($group_id) @@ -1047,7 +1051,7 @@ class acp_attachments FROM " . EXTENSION_GROUPS_TABLE . " WHERE group_id = " . (int) $group_id; $result = $db->sql_query($sql); - + $download_mode = (!($row = $db->sql_fetchrow($result))) ? INLINE_LINK : $row['download_mode']; $db->sql_freeresult($result); @@ -1072,7 +1076,6 @@ class acp_attachments /** * Upload already uploaded file... huh? are you kidding? - * @todo integrate into upload class */ function upload_file($post_id, $topic_id, $forum_id, $upload_dir, $filename) { @@ -1141,7 +1144,7 @@ class acp_attachments function search_imagemagick() { $imagick = ''; - + $exe = ((defined('PHP_OS')) && (preg_match('#win#i', PHP_OS))) ? '.exe' : ''; $magic_home = getenv('MAGICK_HOME'); @@ -1150,7 +1153,7 @@ class acp_attachments { $locations = array('C:/WINDOWS/', 'C:/WINNT/', 'C:/WINDOWS/SYSTEM/', 'C:/WINNT/SYSTEM/', 'C:/WINDOWS/SYSTEM32/', 'C:/WINNT/SYSTEM32/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/', '/usr/local/sbin/', '/opt/', '/usr/imagemagick/', '/usr/bin/imagemagick/'); $path_locations = str_replace('\\', '/', (explode(($exe) ? ';' : ':', getenv('PATH')))); - + $locations = array_merge($path_locations, $locations); foreach ($locations as $location) @@ -1198,13 +1201,13 @@ class acp_attachments $error[] = sprintf($user->lang['NO_UPLOAD_DIR'], $upload_dir); return; } - + if (!is_dir($phpbb_root_path . $upload_dir)) { $error[] = sprintf($user->lang['UPLOAD_NOT_DIR'], $upload_dir); return; } - + if (!is_writable($phpbb_root_path . $upload_dir)) { $error[] = sprintf($user->lang['NO_WRITE_UPLOAD'], $upload_dir); @@ -1332,6 +1335,7 @@ class acp_attachments unset($iplist_tmp); unset($hostlist_tmp); } + $db->sql_freeresult($result); if (sizeof($iplist)) { @@ -1380,6 +1384,7 @@ class acp_attachments { $l_unip_list .= (($l_unip_list != '') ? ', ' : '') . (($row['site_ip']) ? $row['site_ip'] : $row['site_hostname']); } + $db->sql_freeresult($result); $sql = 'DELETE FROM ' . SITELIST_TABLE . " WHERE site_id IN ($unip_sql)"; @@ -1416,12 +1421,12 @@ class acp_attachments $extensions[$extension]['max_filesize'] = (int) $row['max_filesize']; $allowed_forums = ($row['allowed_forums']) ? unserialize(trim($row['allowed_forums'])) : array(); - + if ($row['allow_in_pm']) { $allowed_forums = array_merge($allowed_forums, array(0)); } - + // Store allowed extensions forum wise $extensions['_allowed_'][$extension] = (!sizeof($allowed_forums)) ? 0 : $allowed_forums; } diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php index 834fdd19a8..4923b64a71 100644 --- a/phpBB/includes/acp/acp_ban.php +++ b/phpBB/includes/acp/acp_ban.php @@ -96,6 +96,9 @@ class acp_ban ); } + /** + * Display ban options + */ function display_ban_options($mode) { global $user, $db, $template; diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 4dfcaf7e8a..382a836a63 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -42,12 +42,13 @@ class acp_bbcodes FROM ' . BBCODES_TABLE . ' WHERE bbcode_id = ' . $bbcode_id; $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); - if (!$row = $db->sql_fetchrow($result)) + if (!$row) { trigger_error('BBCODE_NOT_EXIST'); } - $db->sql_freeresult($result); $bbcode_match = $row['bbcode_match']; $bbcode_tpl = htmlspecialchars($row['bbcode_tpl']); @@ -59,14 +60,15 @@ class acp_bbcodes FROM ' . BBCODES_TABLE . ' WHERE bbcode_id = ' . $bbcode_id; $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); - if (!$row = $db->sql_fetchrow($result)) + if (!$row) { trigger_error('BBCODE_NOT_EXIST'); } - $db->sql_freeresult($result); - // No break here + // No break here case 'create': $display_on_posting = request_var('display_on_posting', 0); @@ -151,12 +153,17 @@ class acp_bbcodes $sql_ary['bbcode_id'] = (int) $bbcode_id; $db->sql_query('INSERT INTO ' . BBCODES_TABLE . $db->sql_build_array('INSERT', $sql_ary)); + $lang = 'BBCODE_ADDED'; $log_action = 'LOG_BBCODE_ADD'; } else { - $db->sql_query('UPDATE ' . BBCODES_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE bbcode_id = ' . $bbcode_id); + $sql = 'UPDATE ' . BBCODES_TABLE . ' + SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' + WHERE bbcode_id = ' . $bbcode_id; + $db->sql_query($sql); + $lang = 'BBCODE_EDITED'; $log_action = 'LOG_BBCODE_EDIT'; } @@ -173,13 +180,14 @@ class acp_bbcodes FROM ' . BBCODES_TABLE . " WHERE bbcode_id = $bbcode_id"; $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + if ($row) { $db->sql_query('DELETE FROM ' . BBCODES_TABLE . " WHERE bbcode_id = $bbcode_id"); add_log('admin', 'LOG_BBCODE_DELETE', $row['bbcode_tag']); } - $db->sql_freeresult($result); break; } diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 5c60f7099f..da424d1131 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -498,7 +498,6 @@ class acp_board // Output relevant page foreach ($display_vars['vars'] as $config_key => $vars) { - if (!is_array($vars) && strpos($config_key, 'legend') === false) { continue; @@ -564,6 +563,9 @@ class acp_board } } + /** + * Select auth method + */ function select_auth_method($selected_method, $key = '') { global $phpbb_root_path, $phpEx; @@ -591,6 +593,9 @@ class acp_board return $auth_select; } + /** + * Select mail authentication method + */ function mail_auth_select($selected_method, $key = '') { global $user; @@ -606,6 +611,9 @@ class acp_board return $s_smtp_auth_options; } + /** + * Select full folder action + */ function full_folder_select($value, $key = '') { global $user; @@ -613,6 +621,9 @@ class acp_board return '<option value="1"' . (($value == 1) ? ' selected="selected"' : '') . '>' . $user->lang['DELETE_OLDEST_MESSAGES'] . '</option><option value="2"' . (($value == 2) ? ' selected="selected"' : '') . '>' . $user->lang['HOLD_NEW_MESSAGES_SHORT'] . '</option>'; } + /** + * Select captcha pixel noise + */ function captcha_pixel_noise_select($value, $key = '') { global $user; @@ -620,6 +631,9 @@ class acp_board return '<option value="0"' . (($value == 0) ? ' selected="selected"' : '') . '>' . $user->lang['NONE'] . '</option><option value="1"' . (($value == 1) ? ' selected="selected"' : '') . '>' . $user->lang['LIGHT'] . '</option><option value="2"' . (($value == 2) ? ' selected="selected"' : '') . '>' . $user->lang['MEDIUM'] . '</option><option value="3"' . (($value == 3) ? ' selected="selected"' : '') . '>' . $user->lang['HEAVY'] . '</option>'; } + /** + * Select ip validation + */ function select_ip_check($value, $key = '') { $radio_ary = array(4 => 'ALL', 3 => 'CLASS_C', 2 => 'CLASS_B', 0 => 'NONE'); @@ -627,6 +641,9 @@ class acp_board return h_radio('config[ip_check]', $radio_ary, $value, $key); } + /** + * Select account activation method + */ function select_acc_activation($value, $key = '') { global $user, $config; @@ -640,6 +657,9 @@ class acp_board return h_radio('config[require_activation]', $radio_ary, $value, $key); } + /** + * Maximum/Minimum username length + */ function username_length($value, $key = '') { global $user; @@ -647,6 +667,9 @@ class acp_board return '<input id="' . $key . '" type="text" size="3" maxlength="3" name="config[min_name_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . ' <input type="text" size="3" maxlength="3" name="config[max_name_chars]" value="' . $this->new_config['max_name_chars'] . '" /> ' . $user->lang['MAX_CHARS']; } + /** + * Allowed chars in usernames + */ function select_username_chars($selected_value, $key) { global $user; @@ -662,6 +685,9 @@ class acp_board return $user_char_options; } + /** + * Maximum/Minimum password length + */ function password_length($value, $key) { global $user; @@ -669,6 +695,9 @@ class acp_board return '<input id="' . $key . '" type="text" size="3" maxlength="3" name="config[min_pass_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . ' <input type="text" size="3" maxlength="3" name="config[max_pass_chars]" value="' . $this->new_config['max_pass_chars'] . '" /> ' . $user->lang['MAX_CHARS']; } + /** + * Required chars in passwords + */ function select_password_chars($selected_value, $key) { global $user; @@ -684,6 +713,9 @@ class acp_board return $pass_char_options; } + /** + * Select bump interval + */ function bump_interval($value, $key) { global $user; @@ -699,6 +731,9 @@ class acp_board return '<input id="' . $key . '" type="text" size="3" maxlength="4" name="config[bump_interval]" value="' . $value . '" /> <select name="config[bump_type]">' . $s_bump_type . '</select>'; } + /** + * Board disable option and message + */ function board_disable($value, $key) { global $user; @@ -708,6 +743,9 @@ class acp_board return h_radio('config[board_disable]', $radio_ary, $value) . '<br /><input id="' . $key . '" type="text" name="config[board_disable_msg]" maxlength="255" size="40" value="' . $this->new_config['board_disable_msg'] . '" />'; } + /** + * Select default dateformat + */ function dateformat_select($value, $key) { global $user; diff --git a/phpBB/includes/acp/acp_bots.php b/phpBB/includes/acp/acp_bots.php index 407bf554a5..a57283e3ea 100644 --- a/phpBB/includes/acp/acp_bots.php +++ b/phpBB/includes/acp/acp_bots.php @@ -111,6 +111,8 @@ class acp_bots case 'edit': case 'add': + include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx); + $bot_row = array( 'bot_name' => request_var('bot_name', '', true), 'bot_agent' => request_var('bot_agent', ''), @@ -160,25 +162,18 @@ class acp_bots trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action . "&id=$bot_id&action=$action")); } - $sql = 'INSERT INTO ' . USERS_TABLE . ' ' . $db->sql_build_array('INSERT', array( + $user_id = user_add(array( + 'user_type' => (int) USER_IGNORE, 'group_id' => (int) $group_row['group_id'], 'username' => (string) $bot_row['bot_name'], - 'user_type' => (int) USER_IGNORE, + 'user_regdate' => time(), + 'user_password' => '', 'user_colour' => (string) $group_row['group_colour'], + 'user_email' => '', 'user_lang' => (string) $bot_row['bot_lang'], 'user_style' => (int) $bot_row['bot_style'], 'user_options' => 0) ); - $db->sql_query($sql); - - $user_id = $db->sql_nextid(); - - // Add to Bots usergroup - $sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'user_id' => $user_id, - 'group_id' => $group_row['group_id']) - ); - $db->sql_query($sql); $sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array( 'user_id' => (int) $user_id, @@ -225,7 +220,7 @@ class acp_bots $db->sql_transaction('commit'); $cache->destroy('bots'); - + add_log('admin', 'LOG_BOT_' . $log, $bot_row['bot_name']); trigger_error($user->lang['BOT_' . $log] . adm_back_link($this->u_action . "&id=$bot_id&action=$action")); } diff --git a/phpBB/includes/acp/acp_disallow.php b/phpBB/includes/acp/acp_disallow.php index 3065b8cceb..1fdc2f8551 100644 --- a/phpBB/includes/acp/acp_disallow.php +++ b/phpBB/includes/acp/acp_disallow.php @@ -33,7 +33,7 @@ class acp_disallow if ($disallow) { - $disallowed_user = str_replace('*', '%', request_var('disallowed_user', '')); + $disallowed_user = str_replace('*', '%', request_var('disallowed_user', '', true)); if (!$disallowed_user) { diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 2109011014..ec15d4e0df 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -84,14 +84,16 @@ class acp_email } } $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); - if (!($row = $db->sql_fetchrow($result))) + if (!$row) { trigger_error($user->lang['NO_USER'] . adm_back_link($this->u_action)); } - $db->sql_freeresult($result); $i = $j = 0; + // Send with BCC, no more than 50 recipients for one mail (to not exceed the limit) $max_chunk_size = 50; $email_list = array(); @@ -175,8 +177,7 @@ class acp_email } else { - // Not great but the logging routine doesn't cope well with localising - // on the fly + // Not great but the logging routine doesn't cope well with localising on the fly $group_name = $user->lang['ALL_USERS']; } diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 379df056d4..ac4112a773 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -253,7 +253,7 @@ class acp_forums trigger_error($user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id)); } - $sql = 'SELECT parent_id, left_id, right_id + $sql = 'SELECT * FROM ' . FORUMS_TABLE . " WHERE forum_id = $forum_id"; $result = $db->sql_query($sql); @@ -265,91 +265,14 @@ class acp_forums trigger_error($user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id)); } - $forum_info = array($forum_id => $row); + $move_forum_name = $this->move_forum_by($row, $action, 1); - // Get the adjacent forum - $sql = 'SELECT forum_id, forum_name, left_id, right_id - FROM ' . FORUMS_TABLE . " - WHERE parent_id = $this->parent_id - AND " . (($action == 'move_up') ? "right_id < {$row['right_id']} ORDER BY right_id DESC" : "left_id > {$row['left_id']} ORDER BY left_id ASC"); - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - // already on top or at bottom - break; - } - - if ($action == 'move_up') - { - $log_action = 'LOG_FORUM_MOVE_UP'; - $up_id = $forum_id; - $down_id = $row['forum_id']; - } - else - { - $log_action = 'LOG_FORUM_MOVE_DOWN'; - $up_id = $row['forum_id']; - $down_id = $forum_id; - } - - $move_forum_name = $row['forum_name']; - $forum_info[$row['forum_id']] = $row; - $diff_up = $forum_info[$up_id]['right_id'] - $forum_info[$up_id]['left_id']; - $diff_down = $forum_info[$down_id]['right_id'] - $forum_info[$down_id]['left_id']; - - $forum_ids = array(); - - $sql = 'SELECT forum_id - FROM ' . FORUMS_TABLE . ' - WHERE left_id > ' . $forum_info[$up_id]['left_id'] . ' - AND right_id < ' . $forum_info[$up_id]['right_id']; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) + if ($move_forum_name !== false) { - $forum_ids[] = $row['forum_id']; - } - $db->sql_freeresult($result); - - // Start transaction - $db->sql_transaction('begin'); - - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET left_id = left_id + ' . ($diff_up + 1) . ', right_id = right_id + ' . ($diff_up + 1) . ' - WHERE left_id > ' . $forum_info[$down_id]['left_id'] . ' - AND right_id < ' . $forum_info[$down_id]['right_id']; - $db->sql_query($sql); - - if (sizeof($forum_ids)) - { - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET left_id = left_id - ' . ($diff_down + 1) . ', right_id = right_id - ' . ($diff_down + 1) . ' - WHERE forum_id IN (' . implode(', ', $forum_ids) . ')'; - $db->sql_query($sql); + add_log('admin', 'LOG_FORUM_' . strtoupper($action), $row['forum_name'], $move_forum_name); + $cache->destroy('sql', FORUMS_TABLE); } - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET left_id = ' . $forum_info[$down_id]['left_id'] . ', right_id = ' . ($forum_info[$down_id]['left_id'] + $diff_up) . ' - WHERE forum_id = ' . $up_id; - $db->sql_query($sql); - - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET left_id = ' . ($forum_info[$up_id]['right_id'] - $diff_down) . ', right_id = ' . $forum_info[$up_id]['right_id'] . ' - WHERE forum_id = ' . $down_id; - $db->sql_query($sql); - - $db->sql_transaction('commit'); - - $forum_data = $this->get_forum_info($forum_id); - - add_log('admin', $log_action, $forum_data['forum_name'], $move_forum_name); - unset($forum_data); - - $cache->destroy('sql', FORUMS_TABLE); - break; case 'sync': @@ -1439,15 +1362,91 @@ class acp_forums $db->sql_query("UPDATE $table SET forum_id = 0 WHERE forum_id = $forum_id"); } - /** - * @todo run cron for optimize table or redirect to database management screen - */ - $db->sql_transaction('commit'); return array(); } + /** + * Move forum position by $steps up/down + */ + function move_forum_by($forum_row, $action = 'move_up', $steps = 1) + { + global $db; + + /** + * Fetch all the siblings between the module's current spot + * and where we want to move it to. If there are less than $steps + * siblings between the current spot and the target then the + * module will move as far as possible + */ + $sql = 'SELECT forum_id, forum_name, left_id, right_id + FROM ' . FORUMS_TABLE . " + WHERE parent_id = {$forum_row['parent_id']} + AND " . (($action == 'move_up') ? "right_id < {$forum_row['right_id']} ORDER BY right_id DESC" : "left_id > {$forum_row['left_id']} ORDER BY left_id ASC"); + $result = $db->sql_query_limit($sql, $steps); + + $target = array(); + while ($row = $db->sql_fetchrow($result)) + { + $target = $row; + } + $db->sql_freeresult($result); + + if (!sizeof($target)) + { + // The forum is already on top or bottom + return false; + } + + /** + * $left_id and $right_id define the scope of the nodes that are affected by the move. + * $diff_up and $diff_down are the values to substract or add to each node's left_id + * and right_id in order to move them up or down. + * $move_up_left and $move_up_right define the scope of the nodes that are moving + * up. Other nodes in the scope of ($left_id, $right_id) are considered to move down. + */ + if ($action == 'move_up') + { + $left_id = $target['left_id']; + $right_id = $forum_row['right_id']; + + $diff_up = $forum_row['left_id'] - $target['left_id']; + $diff_down = $forum_row['right_id'] + 1 - $forum_row['left_id']; + + $move_up_left = $forum_row['left_id']; + $move_up_right = $forum_row['right_id']; + } + else + { + $left_id = $forum_row['left_id']; + $right_id = $target['right_id']; + + $diff_up = $forum_row['right_id'] + 1 - $forum_row['left_id']; + $diff_down = $target['right_id'] - $forum_row['right_id']; + + $move_up_left = $forum_row['right_id'] + 1; + $move_up_right = $target['right_id']; + } + + // Now do the dirty job + $sql = 'UPDATE ' . FORUMS_TABLE . " + SET left_id = left_id + CASE + WHEN left_id BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up} + ELSE {$diff_down} + END, + right_id = right_id + CASE + WHEN right_id BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up} + ELSE {$diff_down} + END, + forum_parents = '' + WHERE + left_id BETWEEN {$left_id} AND {$right_id} + AND right_id BETWEEN {$left_id} AND {$right_id}"; + $db->sql_query($sql); + + return $target['forum_name']; + } } ?>
\ No newline at end of file diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index d0560bae13..5aee176524 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -66,7 +66,7 @@ class acp_groups { trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action)); } - + // Approve, demote or promote group_user_attributes($action, $group_id, $mark_ary, false, ($group_id) ? $group_row['group_name'] : false); @@ -75,11 +75,11 @@ class acp_groups case 'demote': $message = 'GROUP_MODS_DEMOTED'; break; - + case 'promote': $message = 'GROUP_MODS_PROMOTED'; break; - + case 'approve': $message = 'USERS_APPROVED'; break; @@ -99,7 +99,7 @@ class acp_groups if (!sizeof($mark_ary)) { $start = 0; - + do { $sql = 'SELECT user_id @@ -320,7 +320,7 @@ class acp_groups // Only set the rank, colour, etc. if it's changed or if we're adding a new // group. This prevents existing group members being updated if no changes // were made. - + $group_attributes = array(); $test_variables = array('rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'receive_pm', 'legend', 'message_limit'); foreach ($test_variables as $test) @@ -449,10 +449,11 @@ class acp_groups { case AVATAR_UPLOAD: $avatar_img = $phpbb_root_path . $config['avatar_path'] . '/'; - break; + break; + case AVATAR_GALLERY: $avatar_img = $phpbb_root_path . $config['avatar_gallery_path'] . '/'; - break; + break; } $avatar_img .= $group_row['group_avatar']; @@ -505,7 +506,7 @@ class acp_groups 'S_DESC_BBCODE_CHECKED' => $group_desc_data['allow_bbcode'], 'S_DESC_URLS_CHECKED' => $group_desc_data['allow_urls'], 'S_DESC_SMILIES_CHECKED'=> $group_desc_data['allow_smilies'], - + 'S_RANK_OPTIONS' => $rank_options, 'S_GROUP_OPTIONS' => group_select_options(0), 'AVATAR_IMAGE' => $avatar_img, diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 23bd86ea3b..b74e5f8b4f 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -97,6 +97,8 @@ class acp_icons unset($_images); $_images = array(); + // no break; + case 'add': $order_list = ''; @@ -269,9 +271,10 @@ class acp_icons { $update = true; - $result = $db->sql_query("SELECT {$fields}_order + $sql = "SELECT {$fields}_order FROM $table - WHERE {$fields}_id = " . $image_id[$image]); + WHERE {$fields}_id = " . $image_id[$image]; + $result = $db->sql_query($sql); $order_old = (int) $db->sql_fetchfield($fields . '_order'); $db->sql_freeresult($result); @@ -403,8 +406,9 @@ class acp_icons )); } - $db->sql_query("UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql) . " - WHERE $field_sql = '" . $db->sql_escape($replace_sql) . "'"); + $sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql) . " + WHERE $field_sql = '" . $db->sql_escape($replace_sql) . "'"; + $db->sql_query($sql); } else { @@ -638,7 +642,6 @@ class acp_icons } } $db->sql_freeresult($result); - } } diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php index 2977859b2f..2799c97959 100644 --- a/phpBB/includes/acp/acp_jabber.php +++ b/phpBB/includes/acp/acp_jabber.php @@ -65,11 +65,10 @@ class acp_jabber { if (!$jabber->connect()) { - trigger_error('Could not connect to Jabber server' . adm_back_link($this->u_action)); + trigger_error($user->lang['ERR_JAB_CONNECT'] . adm_back_link($this->u_action)); } - // First we'll try to authorise using this account, if that fails we'll - // try to create it. + // First we'll try to authorise using this account, if that fails we'll try to create it. if (!($result = $jabber->send_auth())) { if (($result = $jabber->account_registration($config['board_email'], $config['sitename'])) <> 2) @@ -95,12 +94,12 @@ class acp_jabber { if (!$jabber->connect()) { - trigger_error('Could not connect to Jabber server' . adm_back_link($this->u_action)); + trigger_error($user->lang['ERR_JAB_CONNECT'] . adm_back_link($this->u_action)); } if (!$jabber->send_auth()) { - trigger_error('Could not authorise on Jabber server' . adm_back_link($this->u_action)); + trigger_error($user->lang['ERR_JAB_AUTH'] . adm_back_link($this->u_action)); } $jabber->send_presence(NULL, NULL, 'online'); diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php index 63b3c0dcdd..668422a90b 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -60,9 +60,7 @@ class acp_language if ($action == 'upload_data' && request_var('test_connection', '')) { $test_connection = false; - $action = 'upload_file'; - $method = request_var('method', ''); include_once($phpbb_root_path . 'includes/functions_transfer.' . $phpEx); @@ -72,6 +70,7 @@ class acp_language case 'ftp': $transfer = new ftp(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', '')); break; + default: trigger_error($user->lang['INVALID_UPLOAD_METHOD']); } diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php index 038a3b0d3c..3f1a2436cf 100644 --- a/phpBB/includes/acp/acp_logs.php +++ b/phpBB/includes/acp/acp_logs.php @@ -109,7 +109,6 @@ class acp_logs 'S_SORT_KEY' => $s_sort_key, 'S_SORT_DIR' => $s_sort_dir, 'S_CLEARLOGS' => $auth->acl_get('a_clearlogs'), - ) ); diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index 3913527043..ce14694adf 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -31,11 +31,10 @@ class acp_modules global $db, $user, $auth, $template; global $config, $phpbb_admin_path, $phpbb_root_path, $phpEx; - // Set a global define for modules we might include (the author is able to prevent executing of code with this) + // Set a global define for modules we might include (the author is able to prevent execution of code by checking this constant) define('MODULE_INCLUDE', true); $user->add_lang('acp/modules'); - $this->tpl_name = 'acp_modules'; // module class @@ -560,6 +559,7 @@ class acp_modules WHERE module_class = '" . $db->sql_escape($this->module_class) . "' ORDER BY left_id ASC"; break; + default: $sql = 'SELECT module_id, module_enabled, module_name, parent_id, module_langname, left_id, right_id, module_auth FROM ' . MODULES_TABLE . " @@ -649,6 +649,7 @@ class acp_modules default: $condition = 'm2.left_id BETWEEN m1.left_id AND m1.right_id OR m1.left_id BETWEEN m2.left_id AND m2.right_id'; + break; } $rows = array(); @@ -934,14 +935,11 @@ class acp_modules /** * Move module position by $steps up/down - * @todo support more than one step up/down (at the moment $steps needs to be 1)! */ function move_module_by($module_row, $action = 'move_up', $steps = 1) { global $db; - $module_id = $module_row['module_id']; - /** * Fetch all the siblings between the module's current spot * and where we want to move it to. If there are less than $steps @@ -955,14 +953,14 @@ class acp_modules AND " . (($action == 'move_up') ? "right_id < {$module_row['right_id']} ORDER BY right_id DESC" : "left_id > {$module_row['left_id']} ORDER BY left_id ASC"); $result = $db->sql_query_limit($sql, $steps); - $target_module = array(); + $target = array(); while ($row = $db->sql_fetchrow($result)) { - $target_module = $row; + $target = $row; } $db->sql_freeresult($result); - if (!sizeof($target_module)) + if (!sizeof($target)) { // The module is already on top or bottom return false; @@ -977,10 +975,10 @@ class acp_modules */ if ($action == 'move_up') { - $left_id = $target_module['left_id']; + $left_id = $target['left_id']; $right_id = $module_row['right_id']; - $diff_up = $module_row['left_id'] - $target_module['left_id']; + $diff_up = $module_row['left_id'] - $target['left_id']; $diff_down = $module_row['right_id'] + 1 - $module_row['left_id']; $move_up_left = $module_row['left_id']; @@ -989,13 +987,13 @@ class acp_modules else { $left_id = $module_row['left_id']; - $right_id = $target_module['right_id']; + $right_id = $target['right_id']; $diff_up = $module_row['right_id'] + 1 - $module_row['left_id']; - $diff_down = $target_module['right_id'] - $module_row['right_id']; + $diff_down = $target['right_id'] - $module_row['right_id']; $move_up_left = $module_row['right_id'] + 1; - $move_up_right = $target_module['right_id']; + $move_up_right = $target['right_id']; } // Now do the dirty job @@ -1015,7 +1013,7 @@ class acp_modules $this->remove_cache_file(); - return $this->lang_name($target_module['module_langname']); + return $this->lang_name($target['module_langname']); } } diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/includes/acp/acp_permission_roles.php index 8022498f67..1681986a36 100644 --- a/phpBB/includes/acp/acp_permission_roles.php +++ b/phpBB/includes/acp/acp_permission_roles.php @@ -128,6 +128,8 @@ class acp_permission_roles trigger_error($user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action)); } + // no break; + case 'add': $role_name = request_var('role_name', '', true); @@ -178,7 +180,7 @@ class acp_permission_roles $db->sql_freeresult($result); $sql_ary['role_order'] = $max_order + 1; - + $sql = 'INSERT INTO ' . ACL_ROLES_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); $db->sql_query($sql); @@ -193,7 +195,6 @@ class acp_permission_roles trigger_error($user->lang['ROLE_' . strtoupper($action) . '_SUCCESS'] . adm_back_link($this->u_action)); break; - } } @@ -243,6 +244,8 @@ class acp_permission_roles $db->sql_freeresult($result); } + // no break; + case 'edit': if ($action == 'edit') @@ -284,13 +287,13 @@ class acp_permission_roles 'U_ACTION' => $this->u_action . "&action={$action}&role_id={$role_id}", 'U_BACK' => $this->u_action, - + 'ROLE_NAME' => $role_row['role_name'], 'ROLE_DESCRIPTION' => $role_row['role_description'], 'L_ACL_TYPE' => $user->lang['ACL_TYPE_' . strtoupper($permission_type)], ) ); - + // We need to fill the auth options array with ACL_UNSET options ;) $sql = 'SELECT auth_option_id, auth_option FROM ' . ACL_OPTIONS_TABLE . " @@ -348,7 +351,7 @@ class acp_permission_roles break; } - // By default, check that image_order is valid and fix it if necessary + // By default, check that role_order is valid and fix it if necessary $sql = 'SELECT role_id, role_order FROM ' . ACL_ROLES_TABLE . " WHERE role_type = '" . $db->sql_escape($permission_type) . "' @@ -430,12 +433,12 @@ class acp_permission_roles $content_array = $categories = array(); $key_sort_array = array(0); $auth_options = array(0 => $auth_options); - + // Making use of auth_admin method here (we do not really want to change two similar code fragments) auth_admin::build_permission_array($auth_options, $content_array, $categories, $key_sort_array); $content_array = $content_array[0]; - + $template->assign_var('S_NUM_PERM_COLS', sizeof($categories)); // Assign to template @@ -448,7 +451,7 @@ class acp_permission_roles 'S_NO' => ($cat_array['S_NO'] && !$cat_array['S_YES'] && !$cat_array['S_UNSET']) ? true : false, 'S_UNSET' => ($cat_array['S_UNSET'] && !$cat_array['S_NO'] && !$cat_array['S_YES']) ? true : false) ); - + foreach ($cat_array['permissions'] as $permission => $allowed) { $template->assign_block_vars('auth.mask', array( @@ -471,7 +474,7 @@ class acp_permission_roles global $db; $auth_admin = new auth_admin(); - + // Get complete auth array $sql = 'SELECT auth_option, auth_option_id FROM ' . ACL_OPTIONS_TABLE . " diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index 758959f241..00722255c1 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -129,13 +129,14 @@ class acp_permissions // Define some common variables for every mode $error = array(); - + $permission_scope = (strpos($mode, '_global') !== false) ? 'global' : 'local'; // Showing introductionary page? if ($mode == 'intro') { $this->page_title = 'ACP_PERMISSIONS'; + $template->assign_vars(array( 'S_INTRO' => true) ); @@ -263,7 +264,7 @@ class acp_permissions ); break; - + case 'forums': if (sizeof($forum_id)) @@ -362,9 +363,9 @@ class acp_permissions ), 'WHERE' => "(a.auth_option_id = o.auth_option_id OR r.auth_option_id = o.auth_option_id) - $sql_permission_option - $sql_forum_id - AND u.user_id = a.user_id", + $sql_permission_option + $sql_forum_id + AND u.user_id = a.user_id", 'ORDER_BY' => 'u.username, u.user_regdate ASC' )); @@ -599,7 +600,7 @@ class acp_permissions FROM $table WHERE $sql_id IN (" . implode(', ', $ids) . ')'; $result = $db->sql_query($sql); - + $ids = array(); while ($row = $db->sql_fetchrow($result)) { @@ -709,7 +710,7 @@ class acp_permissions { trigger_error($user->lang['NO_ADMIN'] . adm_back_link($this->u_action)); } - + $auth_settings = (isset($_POST['setting'])) ? $_POST['setting'] : array(); $auth_roles = (isset($_POST['role'])) ? $_POST['role'] : array(); $ug_ids = $forum_ids = array(); @@ -719,7 +720,7 @@ class acp_permissions { $ug_id = (int) $ug_id; $ug_ids[] = $ug_id; - + foreach ($forum_auth_row as $forum_id => $auth_options) { $forum_id = (int) $forum_id; @@ -824,7 +825,7 @@ class acp_permissions } $this->log_action($mode, 'del', $permission_type, $ug_type, (($ug_type == 'user') ? $user_id : $group_id), (sizeof($forum_id) ? $forum_id : array(0 => 0))); - + trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action)); } @@ -942,7 +943,7 @@ class acp_permissions FROM ' . FORUMS_TABLE . " WHERE forum_id = $forum_id"; $result = $db->sql_query($sql, 3600); - $forum_name = $db->sql_fetchfield('forum_name', false, $result); + $forum_name = $db->sql_fetchfield('forum_name'); $db->sql_freeresult($result); } diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php index cb9cf02573..56bd735de0 100644 --- a/phpBB/includes/acp/acp_prune.php +++ b/phpBB/includes/acp/acp_prune.php @@ -142,7 +142,7 @@ class acp_prune 'U_ACTION' => $this->u_action, 'S_SELECT_FORUM' => true, 'S_FORUM_OPTIONS' => make_forum_select(false, false, false)) - ); + ); } else { @@ -150,9 +150,11 @@ class acp_prune FROM ' . FORUMS_TABLE . ' WHERE forum_id IN (' . implode(', ', $forum_id) . ')'; $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); - if (!($row = $db->sql_fetchrow($result))) + if (!$row) { + $db->sql_freeresult($result); trigger_error($user->lang['NO_FORUM'] . adm_back_link($this->u_action)); } @@ -175,9 +177,7 @@ class acp_prune 'FORUM_LIST' => $forum_list, 'S_HIDDEN_FIELDS' => $s_hidden_fields) ); - } - } /** @@ -361,7 +361,6 @@ class acp_prune 'S_COUNT_OPTIONS' => $s_find_count, 'U_FIND_USER' => append_sid($phpbb_root_path . "memberlist.$phpEx", 'mode=searchuser&form=acp_prune&field=users')) ); - } } diff --git a/phpBB/includes/acp/acp_reasons.php b/phpBB/includes/acp/acp_reasons.php index 450f2d5332..d6e15435ee 100644 --- a/phpBB/includes/acp/acp_reasons.php +++ b/phpBB/includes/acp/acp_reasons.php @@ -30,7 +30,6 @@ class acp_reasons $this->tpl_name = 'acp_reasons'; $this->page_title = 'ACP_REASONS'; - // dumdidum... do i really need to do something mom? $error = array(); switch ($action) diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 0448b7e568..a30078d7bf 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -31,7 +31,7 @@ class acp_users $username = request_var('username', '', true); $user_id = request_var('u', 0); $action = request_var('action', ''); - + $submit = (isset($_POST['update'])) ? true : false; // Whois (special case) @@ -57,7 +57,7 @@ class acp_users return; } - + // Show user selection mask if (!$username && !$user_id) { @@ -130,6 +130,12 @@ class acp_users 'S_FORM_OPTIONS' => $s_form_options) ); + // Prevent normal users/admins change/view founders if they are not a founder by themselves + if ($user->data['user_type'] != USER_FOUNDER && $user_row['user_type'] == USER_FOUNDER) + { + trigger_error($user->lang['NOT_MANAGE_FOUNDER'] . adm_back_link($this->u_action)); + } + switch ($mode) { case 'overview': @@ -1502,9 +1508,9 @@ class acp_users 'SIGNATURE' => $signature, 'SIGNATURE_PREVIEW' => $signature_preview, - 'S_BBCODE_CHECKED' => (!$enable_bbcode) ? 'checked="checked"' : '', - 'S_SMILIES_CHECKED' => (!$enable_smilies) ? 'checked="checked"' : '', - 'S_MAGIC_URL_CHECKED' => (!$enable_urls) ? 'checked="checked"' : '', + 'S_BBCODE_CHECKED' => (!$enable_bbcode) ? 'checked="checked"' : '', + 'S_SMILIES_CHECKED' => (!$enable_smilies) ? 'checked="checked"' : '', + 'S_MAGIC_URL_CHECKED' => (!$enable_urls) ? 'checked="checked"' : '', 'BBCODE_STATUS' => ($config['allow_sig_bbcode']) ? sprintf($user->lang['BBCODE_IS_ON'], '<a href="' . append_sid("{$phpbb_root_path}faq.$phpEx", 'mode=bbcode') . '" onclick="target=\'_phpbbcode\';">', '</a>') : sprintf($user->lang['BBCODE_IS_OFF'], '<a href="' . append_sid("{$phpbb_root_path}faq.$phpEx", 'mode=bbcode') . '" onclick="target=\'_phpbbcode\';">', '</a>'), 'SMILIES_STATUS' => ($config['allow_sig_smilies']) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'], diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index 0888cae128..b92030b123 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -124,6 +124,7 @@ class auth_admin extends auth FROM ' . USERS_TABLE . ' WHERE user_id IN (' . implode(',', $ug_id) . ')'; $result = $db->sql_query($sql); + while ($userdata = $db->sql_fetchrow($result)) { if ($user->data['user_id'] != $user_id) @@ -148,6 +149,7 @@ class auth_admin extends auth } } $db->sql_freeresult($result); + unset($userdata); unset($auth2); } @@ -393,9 +395,9 @@ class auth_admin extends auth $groups[$row['group_id']] = $row; } $db->sql_freeresult($result); - + $memberships = group_memberships(false, array_keys($hold_ary), false); - + // User is not a member of any group? Bad admin, bad bad admin... if ($memberships) { @@ -546,6 +548,7 @@ class auth_admin extends auth default: $folder_image = ($forum_names_ary[$forum_id]['left_id'] + 1 != $forum_names_ary[$forum_id]['right_id']) ? '<img src="images/icon_folder_sub_small.gif" width="22" height="18" alt="' . $user->lang['SUBFORUM'] . '" />' : '<img src="images/icon_folder_small.gif" width="19" height="18" alt="' . $user->lang['FOLDER'] . '" />'; + break; } } } @@ -596,7 +599,7 @@ class auth_admin extends auth 'NAME' => ($forum_id == 0) ? $user->lang['GLOBAL_MASK'] : $forum_names[$forum_id], 'FORUM_ID' => $forum_id) ); - + if (isset($auth_ary['users']) && sizeof($auth_ary['users'])) { $sql = 'SELECT user_id, username @@ -740,6 +743,7 @@ class auth_admin extends auth } $cache->destroy('acl_options'); + $this->acl_clear_prefetch(); return true; } @@ -762,7 +766,7 @@ class auth_admin extends auth { $ug_id = array($ug_id); } - + $ug_id_sql = 'IN (' . implode(', ', array_map('intval', $ug_id)) . ')'; $forum_sql = 'IN (' . implode(', ', array_map('intval', $forum_id)) . ') '; @@ -1181,7 +1185,7 @@ class auth_admin extends auth * The other user is always able to revert back to his permission set. * This function does not check for lower/higher permissions, it is possible for the user to gain * "more" permissions by this. - * + * Admin permissions will not be copied. */ function ghost_permissions($from_user_id, $to_user_id) { diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php index 7a09d2d212..262c1ffaf7 100644 --- a/phpBB/includes/auth.php +++ b/phpBB/includes/auth.php @@ -53,7 +53,6 @@ class auth $db->sql_freeresult($result); $cache->put('acl_options', $this->acl_options); - $this->acl_clear_prefetch(); $this->acl_cache($userdata); } else if (!trim($userdata['user_permissions'])) diff --git a/phpBB/includes/auth/auth_apache.php b/phpBB/includes/auth/auth_apache.php index ac362bdeb0..410bf1abdb 100644 --- a/phpBB/includes/auth/auth_apache.php +++ b/phpBB/includes/auth/auth_apache.php @@ -28,7 +28,7 @@ function login_apache(&$username, &$password) $php_auth_user = $_SERVER['PHP_AUTH_USER']; $php_auth_pw = $_SERVER['PHP_AUTH_PW']; - if ((!empty($php_auth_user)) && (!empty($php_auth_pw))) + if (!empty($php_auth_user) && !empty($php_auth_pw)) { $sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type FROM ' . USERS_TABLE . " @@ -85,16 +85,17 @@ function autologin_apache() $php_auth_user = $_SERVER['PHP_AUTH_USER']; $php_auth_pw = $_SERVER['PHP_AUTH_PW']; - if ((!empty($php_auth_user)) && (!empty($php_auth_pw))) + if (!empty($php_auth_user) && !empty($php_auth_pw)) { $sql = 'SELECT * FROM ' . USERS_TABLE . " WHERE username = '" . $db->sql_escape($php_auth_user) . "'"; $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); - if ($row = $db->sql_fetchrow($result)) + if ($row) { - $db->sql_freeresult($result); return ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) ? array() : $row; } } @@ -109,7 +110,7 @@ function autologin_apache() */ function validate_session_apache(&$user) { - return ($_SERVER['PHP_AUTH_USER'] == $user['username']) ? true : false; + return ($_SERVER['PHP_AUTH_USER'] === $user['username']) ? true : false; } ?>
\ No newline at end of file diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php index 071b61fdfe..55465ab762 100644 --- a/phpBB/includes/auth/auth_db.php +++ b/phpBB/includes/auth/auth_db.php @@ -103,7 +103,10 @@ function login_db(&$username, &$password) if (md5($password) == $row['user_password']) { // Successful, reset login attempts (the user passed all stages) - $db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_login_attempts = 0 WHERE user_id = ' . $row['user_id']); + $sql = 'UPDATE ' . USERS_TABLE . ' + SET user_login_attempts = 0 + WHERE user_id = ' . $row['user_id']; + $db->sql_query($sql); // User inactive... if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) @@ -124,8 +127,11 @@ function login_db(&$username, &$password) } // Password incorrect - increase login attempts - $db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_login_attempts = user_login_attempts + 1 WHERE user_id = ' . $row['user_id']); - + $sql = 'UPDATE ' . USERS_TABLE . ' + SET user_login_attempts = user_login_attempts + 1 + WHERE user_id = ' . $row['user_id']; + $db->sql_query($sql); + // Give status about wrong password... return array( 'status' => LOGIN_ERROR_PASSWORD, diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php index e6d783313f..e9b87bcf44 100644 --- a/phpBB/includes/auth/auth_ldap.php +++ b/phpBB/includes/auth/auth_ldap.php @@ -20,13 +20,15 @@ */ /** +* Connect to ldap server * Only allow changing authentication to ldap if we can connect to the ldap server +* Called in acp_board while setting authentication plugins */ function init_ldap() { global $config, $user; - if (!extension_loaded('ldap')) + if (!@extension_loaded('ldap')) { return $user->lang['LDAP_NO_LDAP_EXTENSION']; } @@ -38,13 +40,10 @@ function init_ldap() @ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3); - // We'll get a notice here that we don't want, if we cannot connect to the server. // ldap_connect only checks whether the specified server is valid, so the connection might still fail - ob_start(); - $search = @ldap_search($ldap, $config['ldap_base_dn'], $config['ldap_uid'] . '=' . $user->data['username'], array($config['ldap_uid'])); - if (ob_get_clean()) + if ($search === false) { return $user->lang['LDAP_NO_SERVER_CONNECTION']; } @@ -68,7 +67,7 @@ function login_ldap(&$username, &$password) { global $db, $config; - if (!extension_loaded('ldap')) + if (!@extension_loaded('ldap')) { return array( 'status' => LOGIN_ERROR_EXTERNAL_AUTH, @@ -115,7 +114,7 @@ function login_ldap(&$username, &$password) 'user_row' => $row, ); } - + // Successful login... set user_login_attempts to zero... return array( 'status' => LOGIN_SUCCESS, @@ -155,7 +154,7 @@ function admin_ldap(&$new) global $user; /** - * @todo Using same approach with cfg_build_template? + * @todo Using same approach as with cfg_build_template? */ $tpl = ' diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index f39c004747..ea800e533b 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -375,14 +375,17 @@ class bbcode { if (empty($bbcode_hardtpl)) { - static $bbcode_hardtpl = array( + global $user; + static $bbcode_hardtpl = array(); + + $bbcode_hardtpl = array( 'b_open' => '<span style="font-weight: bold">', 'b_close' => '</span>', 'i_open' => '<span style="font-style: italic">', 'i_close' => '</span>', 'u_open' => '<span style="text-decoration: underline">', 'u_close' => '</span>', - 'img' => '<img src="$1" border="0" />', + 'img' => '<img src="$1" alt="' . $user->lang['IMAGE'] . '" />', 'size' => '<span style="font-size: $1px; line-height: normal">$2</span>', 'color' => '<span style="color: $1">$2</span>', 'email' => '<a href="mailto:$1">$2</a>' diff --git a/phpBB/includes/captcha/captcha_non_gd.php b/phpBB/includes/captcha/captcha_non_gd.php index a019628e4b..e247823a5e 100644 --- a/phpBB/includes/captcha/captcha_non_gd.php +++ b/phpBB/includes/captcha/captcha_non_gd.php @@ -25,7 +25,7 @@ class captcha // If we can we will generate a single filtered png, we avoid nastiness via emulation of some Zlib stuff $this->define_filtered_pngs(); } - + /** * Create the image containing $code */ diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 8aa1f9117b..5bf505243b 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -143,7 +143,6 @@ define('BANLIST_TABLE', $table_prefix . 'banlist'); define('BBCODES_TABLE', $table_prefix . 'bbcodes'); define('BOOKMARKS_TABLE', $table_prefix . 'bookmarks'); define('BOTS_TABLE', $table_prefix . 'bots'); -define('CACHE_TABLE', $table_prefix . 'cache'); define('CONFIG_TABLE', $table_prefix . 'config'); define('CONFIRM_TABLE', $table_prefix . 'confirm'); define('PROFILE_FIELDS_TABLE', $table_prefix . 'profile_fields'); diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 0ba6315b5b..7b36c36548 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2357,7 +2357,7 @@ function page_header($page_title = '', $display_online_list = true) // gzip_compression if ($config['gzip_compress']) { - if (extension_loaded('zlib') && !headers_sent()) + if (@extension_loaded('zlib') && !headers_sent()) { ob_start('ob_gzhandler'); } diff --git a/phpBB/includes/functions_compress.php b/phpBB/includes/functions_compress.php index 1dc95bc509..09ad1f4e8f 100644 --- a/phpBB/includes/functions_compress.php +++ b/phpBB/includes/functions_compress.php @@ -474,7 +474,7 @@ class compress_tar extends compress */ function extract($dst) { - $fzread = ($this->isbz && function_exists('bzread')) ? 'bzread' : (($this->isgz && extension_loaded('zlib')) ? 'gzread' : 'fread'); + $fzread = ($this->isbz && function_exists('bzread')) ? 'bzread' : (($this->isgz && @extension_loaded('zlib')) ? 'gzread' : 'fread'); // Run through the file and grab directory entries while ($buffer = $fzread($this->fp, 512)) @@ -536,11 +536,11 @@ class compress_tar extends compress */ function close() { - $fzclose = ($this->isbz && function_exists('bzclose')) ? 'bzclose' : (($this->isgz && extension_loaded('zlib')) ? 'gzclose' : 'fclose'); + $fzclose = ($this->isbz && function_exists('bzclose')) ? 'bzclose' : (($this->isgz && @extension_loaded('zlib')) ? 'gzclose' : 'fclose'); if ($this->wrote) { - $fzwrite = ($this->isbz && function_exists('bzwrite')) ? 'bzwrite' : (($this->isgz && extension_loaded('zlib')) ? 'gzwrite' : 'fwrite'); + $fzwrite = ($this->isbz && function_exists('bzwrite')) ? 'bzwrite' : (($this->isgz && @extension_loaded('zlib')) ? 'gzwrite' : 'fwrite'); // Symbolizes that there are no more files $fzwrite($this->fp, pack("a512", "")); @@ -555,7 +555,7 @@ class compress_tar extends compress function data($name, $data, $is_dir = false, $stat) { $this->wrote = true; - $fzwrite = ($this->isbz && function_exists('bzwrite')) ? 'bzwrite' : (($this->isgz && extension_loaded('zlib')) ? 'gzwrite' : 'fwrite'); + $fzwrite = ($this->isbz && function_exists('bzwrite')) ? 'bzwrite' : (($this->isgz && @extension_loaded('zlib')) ? 'gzwrite' : 'fwrite'); $typeflag = ($is_dir) ? '5' : ''; @@ -600,7 +600,7 @@ class compress_tar extends compress */ function open() { - $fzopen = ($this->isbz && function_exists('bzopen')) ? 'bzopen' : (($this->isgz && extension_loaded('zlib')) ? 'gzopen' : 'fopen'); + $fzopen = ($this->isbz && function_exists('bzopen')) ? 'bzopen' : (($this->isgz && @extension_loaded('zlib')) ? 'gzopen' : 'fopen'); $this->fp = @$fzopen($this->file, $this->mode . 'b' . (($fzopen == 'gzopen') ? '9' : '')); if (!$this->fp) diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php index 2a9293a8e0..9910d58e5b 100644 --- a/phpBB/includes/functions_profile_fields.php +++ b/phpBB/includes/functions_profile_fields.php @@ -114,7 +114,7 @@ class custom_profile return 'FIELD_INVALID_DATE'; } - if (!checkdate($month, $day, $year) === false) + if (checkdate($month, $day, $year) === false) { return 'FIELD_INVALID_DATE'; } diff --git a/phpBB/includes/mcp/mcp_ban.php b/phpBB/includes/mcp/mcp_ban.php index 7435c3054e..7878e4912c 100644 --- a/phpBB/includes/mcp/mcp_ban.php +++ b/phpBB/includes/mcp/mcp_ban.php @@ -25,9 +25,9 @@ class mcp_ban // Include the admin banning interface... include($phpbb_root_path . 'includes/acp/acp_ban.' . $phpEx); - $bansubmit = (isset($_POST['bansubmit'])) ? true : false; - $unbansubmit= (isset($_POST['unbansubmit'])) ? true : false; - $current_time = time(); + $bansubmit = (isset($_POST['bansubmit'])) ? true : false; + $unbansubmit = (isset($_POST['unbansubmit'])) ? true : false; + $current_time = time(); $user->add_lang('acp/ban'); $this->tpl_name = 'mcp_ban'; diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 659baffee0..ceb2dcbff7 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -24,11 +24,11 @@ function mcp_forum_view($id, $mode, $action, $forum_info) unset($_POST['sk'], $_POST['sd'], $_REQUEST['sk'], $_REQUEST['sd']); } - $forum_id = $forum_info['forum_id']; - $start = request_var('start', 0); - $topic_id_list = request_var('topic_id_list', array(0)); - $post_id_list = request_var('post_id_list', array(0)); - $topic_id = request_var('t', 0); + $forum_id = $forum_info['forum_id']; + $start = request_var('start', 0); + $topic_id_list = request_var('topic_id_list', array(0)); + $post_id_list = request_var('post_id_list', array(0)); + $topic_id = request_var('t', 0); // Resync Topics if ($action == 'resync') @@ -180,12 +180,12 @@ function mcp_forum_view($id, $mode, $action, $forum_info) 'TOPIC_ICON_IMG_HEIGHT' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '', 'UNAPPROVED_IMG' => ($topic_unapproved || $posts_unapproved) ? $user->img('icon_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '', - 'TOPIC_TYPE' => $topic_type, - 'TOPIC_TITLE' => $topic_title, - 'REPLIES' => ($auth->acl_get('m_approve', $row['forum_id'])) ? $row['topic_replies_real'] : $row['topic_replies'], - 'LAST_POST_TIME' => $user->format_date($row['topic_last_post_time']), - 'TOPIC_ID' => $row['topic_id'], - 'S_TOPIC_CHECKED' => ($topic_id_list && in_array($row['topic_id'], $topic_id_list)) ? 'checked="checked" ' : '', + 'TOPIC_TYPE' => $topic_type, + 'TOPIC_TITLE' => $topic_title, + 'REPLIES' => ($auth->acl_get('m_approve', $row['forum_id'])) ? $row['topic_replies_real'] : $row['topic_replies'], + 'LAST_POST_TIME' => $user->format_date($row['topic_last_post_time']), + 'TOPIC_ID' => $row['topic_id'], + 'S_TOPIC_CHECKED' => ($topic_id_list && in_array($row['topic_id'], $topic_id_list)) ? 'checked="checked" ' : '', 'S_TOPIC_REPORTED' => (!empty($row['topic_reported']) && $auth->acl_gets('m_report', $row['forum_id'])) ? true : false, 'S_TOPIC_UNAPPROVED' => $topic_unapproved, @@ -228,6 +228,7 @@ function mcp_resync_topics($topic_ids) { add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_TOPIC_RESYNC', $row['topic_title']); } + $db->sql_freeresult($result); $msg = (sizeof($topic_ids) == 1) ? $user->lang['TOPIC_RESYNC_SUCCESS'] : $user->lang['TOPICS_RESYNC_SUCCESS']; diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php index db38df42ae..3fe9b60018 100644 --- a/phpBB/includes/mcp/mcp_front.php +++ b/phpBB/includes/mcp/mcp_front.php @@ -56,6 +56,7 @@ function mcp_front_view($id, $mode, $action) AND post_approved = 0 ORDER BY post_id DESC'; $result = $db->sql_query_limit($sql, 5); + while ($row = $db->sql_fetchrow($result)) { $post_list[] = $row['post_id']; @@ -79,12 +80,12 @@ function mcp_front_view($id, $mode, $action) } $template->assign_block_vars('unapproved', array( - 'U_POST_DETAILS'=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=post_details&f=' . $row['forum_id'] . '&p=' . $row['post_id']), - 'U_MCP_FORUM' => (!$global_topic) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=forum_view&f=' . $row['forum_id']) : '', - 'U_MCP_TOPIC' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=topic_view&f=' . $row['forum_id'] . '&t=' . $row['topic_id']), - 'U_FORUM' => (!$global_topic) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : '', - 'U_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&t=' . $row['topic_id']), - 'U_AUTHOR' => ($row['poster_id'] == ANONYMOUS) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['poster_id']), + 'U_POST_DETAILS' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=post_details&f=' . $row['forum_id'] . '&p=' . $row['post_id']), + 'U_MCP_FORUM' => (!$global_topic) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=forum_view&f=' . $row['forum_id']) : '', + 'U_MCP_TOPIC' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=topic_view&f=' . $row['forum_id'] . '&t=' . $row['topic_id']), + 'U_FORUM' => (!$global_topic) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : '', + 'U_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&t=' . $row['topic_id']), + 'U_AUTHOR' => ($row['poster_id'] == ANONYMOUS) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['poster_id']), 'FORUM_NAME' => (!$global_topic) ? $forum_names[$row['forum_id']] : $user->lang['GLOBAL_ANNOUNCEMENT'], 'TOPIC_TITLE' => $row['topic_title'], @@ -116,6 +117,7 @@ function mcp_front_view($id, $mode, $action) $forum_list = get_forum_list('m_'); $template->assign_var('S_SHOW_REPORTS', (!empty($forum_list)) ? true : false); + if (!empty($forum_list)) { $sql = 'SELECT COUNT(r.report_id) AS total @@ -124,8 +126,8 @@ function mcp_front_view($id, $mode, $action) AND r.report_closed = 0 AND p.forum_id IN (0, ' . implode(', ', $forum_list) . ')'; $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $total = $row['total']; + $total = (int) $db->sql_fetchfield('total'); + $db->sql_freeresult($result); if ($total) { @@ -140,7 +142,6 @@ function mcp_front_view($id, $mode, $action) TOPICS_TABLE => 't', USERS_TABLE => 'u', POSTS_TABLE => 'p' - ), 'LEFT_JOIN' => array( @@ -151,11 +152,11 @@ function mcp_front_view($id, $mode, $action) ), 'WHERE' => 'r.post_id = p.post_id - AND r.report_closed = 0 - AND r.reason_id = rr.reason_id - AND p.topic_id = t.topic_id - AND r.user_id = u.user_id - AND p.forum_id IN (0, ' . implode(', ', $forum_list) . ')', + AND r.report_closed = 0 + AND r.reason_id = rr.reason_id + AND p.topic_id = t.topic_id + AND r.user_id = u.user_id + AND p.forum_id IN (0, ' . implode(', ', $forum_list) . ')', 'ORDER_BY' => 'p.post_id DESC' )); @@ -170,12 +171,12 @@ function mcp_front_view($id, $mode, $action) } $template->assign_block_vars('report', array( - 'U_POST_DETAILS'=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'f=' . $row['forum_id'] . '&p=' . $row['post_id'] . "&i=reports&mode=report_details"), - 'U_MCP_FORUM' => (!$global_topic) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'f=' . $row['forum_id'] . "&i=$id&mode=forum_view") : '', - 'U_MCP_TOPIC' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'f=' . $row['forum_id'] . '&t=' . $row['topic_id'] . "&i=$id&mode=topic_view"), - 'U_FORUM' => (!$global_topic) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : '', - 'U_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&t=' . $row['topic_id']), - 'U_REPORTER' => ($row['user_id'] == ANONYMOUS) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['user_id']), + 'U_POST_DETAILS' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'f=' . $row['forum_id'] . '&p=' . $row['post_id'] . "&i=reports&mode=report_details"), + 'U_MCP_FORUM' => (!$global_topic) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'f=' . $row['forum_id'] . "&i=$id&mode=forum_view") : '', + 'U_MCP_TOPIC' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'f=' . $row['forum_id'] . '&t=' . $row['topic_id'] . "&i=$id&mode=topic_view"), + 'U_FORUM' => (!$global_topic) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : '', + 'U_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&t=' . $row['topic_id']), + 'U_REPORTER' => ($row['user_id'] == ANONYMOUS) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['user_id']), 'FORUM_NAME' => (!$global_topic) ? $row['forum_name'] : $user->lang['GLOBAL_ANNOUNCEMENT'], 'TOPIC_TITLE' => $row['topic_title'], @@ -221,8 +222,8 @@ function mcp_front_view($id, $mode, $action) 'IP' => $row['ip'], 'TIME' => $user->format_date($row['time']), 'ACTION' => $row['action'], - 'U_VIEWTOPIC' => isset($row['viewtopic']) ? $row['viewtopic'] : '', - 'U_VIEWLOGS' => isset($row['viewlogs']) ? $row['viewlogs'] : '') + 'U_VIEWTOPIC' => (!empty($row['viewtopic'])) ? $row['viewtopic'] : '', + 'U_VIEWLOGS' => (!empty($row['viewlogs'])) ? $row['viewlogs'] : '') ); } } diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php index 77837006c9..2850505e66 100755 --- a/phpBB/includes/mcp/mcp_logs.php +++ b/phpBB/includes/mcp/mcp_logs.php @@ -17,7 +17,7 @@ class mcp_logs { var $u_action; var $p_master; - + function mcp_main(&$p_master) { $this->p_master = &$p_master; @@ -121,12 +121,12 @@ class mcp_logs 'TOTAL' => ($log_count == 1) ? $user->lang['TOTAL_LOG'] : sprintf($user->lang['TOTAL_LOGS'], $log_count), 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param", $log_count, $config['topics_per_page'], $start), - 'U_POST_ACTION' => $this->u_action, - 'S_CLEAR_ALLOWED' => ($auth->acl_get('a_clearlogs')) ? true : false, - 'S_SELECT_SORT_DIR' => $s_sort_dir, - 'S_SELECT_SORT_KEY' => $s_sort_key, - 'S_SELECT_SORT_DAYS'=> $s_limit_days, - 'S_LOGS' => ($log_count > 0), + 'U_POST_ACTION' => $this->u_action, + 'S_CLEAR_ALLOWED' => ($auth->acl_get('a_clearlogs')) ? true : false, + 'S_SELECT_SORT_DIR' => $s_sort_dir, + 'S_SELECT_SORT_KEY' => $s_sort_key, + 'S_SELECT_SORT_DAYS' => $s_limit_days, + 'S_LOGS' => ($log_count > 0), ) ); diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index eb77e68585..abae0d55d4 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -180,7 +180,7 @@ class mcp_main break; default: - trigger_error("Unknown mode: $mode"); + trigger_error("Unknown mode: $mode", E_USER_ERROR); } } } @@ -543,7 +543,9 @@ function mcp_delete_topic($topic_ids) $return = delete_topics('topic_id', $topic_ids, true); - // TODO: Adjust total post count... + /** + * @todo Adjust total post count (mcp_delete_topic) + */ } else { @@ -778,7 +780,7 @@ function mcp_fork_topic($topic_ids) $new_topic_id_list[$topic_id] = $new_topic_id; /** - * @todo enable + * @todo enable? (is this still needed?) * markread('topic', $to_forum_id, $new_topic_id); */ @@ -793,9 +795,14 @@ function mcp_fork_topic($topic_ids) while ($row = $db->sql_fetchrow($result)) { - $sql = 'INSERT INTO ' . POLL_OPTIONS_TABLE . ' (poll_option_id, topic_id, poll_option_text, poll_option_total) - VALUES (' . $row['poll_option_id'] . ', ' . $new_topic_id . ", '" . $db->sql_escape($row['poll_option_text']) . "', 0)"; - $db->sql_query($sql); + $sql_ary = array( + 'poll_option_id' => (int) $row['poll_option_id'], + 'topic_id' => (int) $new_topic_id, + 'poll_option_text' => (string) $row['poll_option_text'], + 'poll_option_total' => 0 + ); + + $db->sql_query('INSERT INTO ' . POLL_OPTIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); } } @@ -810,7 +817,7 @@ function mcp_fork_topic($topic_ids) { $post_rows[] = $row; } - $db->sql_freeresult(); + $db->sql_freeresult($result); if (!sizeof($post_rows)) { diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index da7b31f7d9..560431ce87 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -39,7 +39,7 @@ class mcp_queue { case 'approve': case 'disapprove': - include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx); + include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); $post_id_list = request_var('post_id_list', array(0)); @@ -111,7 +111,7 @@ class mcp_queue $message = $post_info['post_text']; if ($post_info['bbcode_bitfield']) { - include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); + include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); $bbcode = new bbcode($post_info['bbcode_bitfield']); $bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']); } @@ -179,7 +179,7 @@ class mcp_queue $forum_list[] = $row['forum_id']; } - if (!$forum_list = implode(', ', $forum_list)) + if (!($forum_list = implode(', ', $forum_list))) { trigger_error('NOT_MODERATOR'); } @@ -244,6 +244,7 @@ class mcp_queue $post_ids[] = $row['post_id']; $row_num[$row['post_id']] = $i++; } + $db->sql_freeresult($result); if (sizeof($post_ids)) { @@ -252,8 +253,8 @@ class mcp_queue WHERE p.post_id IN (" . implode(', ', $post_ids) . ") AND t.topic_id = p.topic_id AND u.user_id = p.poster_id"; - $result = $db->sql_query($sql); + $post_data = $rowset = array(); while ($row = $db->sql_fetchrow($result)) { @@ -311,6 +312,7 @@ class mcp_queue { $forum_names[$row['forum_id']] = $row['forum_name']; } + $db->sql_freeresult($result); } foreach ($rowset as $row) @@ -324,8 +326,6 @@ class mcp_queue $poster = $row['username']; } - $s_checkbox = '<input type="checkbox" class="radio" name="post_id_list[]" value="' . $row['post_id'] . '" />'; - $global_topic = ($row['forum_id']) ? false : true; if ($global_topic) { @@ -333,22 +333,21 @@ class mcp_queue } $template->assign_block_vars('postrow', array( - 'U_VIEWFORUM' => (!$global_topic) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : '', + 'U_VIEWFORUM' => (!$global_topic) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : '', // Q: Why accessing the topic by a post_id instead of its topic_id? // A: To prevent the post from being hidden because of wrong encoding or different charset - 'U_VIEWTOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&p=' . $row['post_id']) . (($mode == 'unapproved_posts') ? '#p' . $row['post_id'] : ''), - 'U_VIEW_DETAILS'=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&start=$start&mode=approve_details&f={$row['forum_id']}&p={$row['post_id']}" . (($mode == 'unapproved_topics') ? "&t={$row['topic_id']}" : '')), - 'U_VIEWPROFILE' => ($row['poster_id'] != ANONYMOUS) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['poster_id']) : '', + 'U_VIEWTOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&p=' . $row['post_id']) . (($mode == 'unapproved_posts') ? '#p' . $row['post_id'] : ''), + 'U_VIEW_DETAILS' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&start=$start&mode=approve_details&f={$row['forum_id']}&p={$row['post_id']}" . (($mode == 'unapproved_topics') ? "&t={$row['topic_id']}" : '')), + 'U_VIEWPROFILE' => ($row['poster_id'] != ANONYMOUS) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['poster_id']) : '', + 'POST_ID' => $row['post_id'], 'FORUM_NAME' => (!$global_topic) ? $forum_names[$row['forum_id']] : $user->lang['GLOBAL_ANNOUNCEMENT'], 'TOPIC_TITLE' => $row['topic_title'], 'POSTER' => $poster, - 'POST_TIME' => $user->format_date($row['post_time']), - 'S_CHECKBOX' => $s_checkbox) + 'POST_TIME' => $user->format_date($row['post_time'])) ); } - unset($rowset); - unset($forum_names); + unset($rowset, $forum_names); // Now display the page $template->assign_vars(array( @@ -372,7 +371,9 @@ class mcp_queue } } -// Approve Post/Topic +/** +* Approve Post/Topic +*/ function approve_post($post_id_list, $mode) { global $db, $template, $user, $config; @@ -588,7 +589,9 @@ function approve_post($post_id_list, $mode) } } -// Disapprove Post/Topic +/** +* Disapprove Post/Topic +*/ function disapprove_post($post_id_list, $mode) { global $db, $template, $user, $config; @@ -627,7 +630,7 @@ function disapprove_post($post_id_list, $mode) if (!$row || (!$reason && $row['reason_title'] == 'other')) { - $additional_msg = 'Please give an appropiate reason for disapproval'; + $additional_msg = $user->lang['NO_REASON_DISAPPROVAL']; unset($_POST['confirm']); } else @@ -698,7 +701,7 @@ function disapprove_post($post_id_list, $mode) { if (!function_exists('delete_posts')) { - include_once($phpbb_root_path . 'includes/functions_admin.'.$phpEx); + include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); } // We do not check for permissions here, because the moderator allowed approval/disapproval should be allowed to delete the disapproved posts diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 6900c74879..8614e0cdd2 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -39,7 +39,7 @@ class mcp_reports { case 'close': case 'delete': - include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx); + include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); $post_id_list = request_var('post_id_list', array(0)); @@ -76,14 +76,14 @@ class mcp_reports AND rr.reason_id = r.reason_id AND r.user_id = u.user_id"; $result = $db->sql_query($sql); + $report = $db->sql_fetchrow($result); + $db->sql_freeresult($result); - if (!($report = $db->sql_fetchrow($result))) + if (!$report) { trigger_error('NO_POST_REPORT'); } - $db->sql_freeresult($result); - $reason = array('title' => $report['reason_title'], 'description' => $report['reason_description']); if (isset($user->lang['report_reasons']['TITLE'][strtoupper($reason['title'])]) && isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($reason['title'])])) { @@ -111,7 +111,8 @@ class mcp_reports $message = $post_info['post_text']; if ($post_info['bbcode_bitfield']) { - include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); + include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); + $bbcode = new bbcode($post_info['bbcode_bitfield']); $bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']); } @@ -126,27 +127,26 @@ class mcp_reports 'S_POST_LOCKED' => $post_info['post_edit_locked'], 'S_USER_NOTES' => true, - 'U_EDIT' => ($auth->acl_get('m_edit', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&f={$post_info['forum_id']}&p={$post_info['post_id']}") : '', - 'U_MCP_APPROVE' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $post_info['forum_id'] . '&p=' . $post_id), - 'U_MCP_REPORT' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=report_details&f=' . $post_info['forum_id'] . '&p=' . $post_id), - 'U_MCP_REPORTER_NOTES' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $report['user_id']), - 'U_MCP_USER_NOTES' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $post_info['user_id']), - 'U_MCP_WARN_REPORTER' => ($auth->acl_getf_global('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $report['user_id']) : '', - 'U_MCP_WARN_USER' => ($auth->acl_getf_global('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $post_info['user_id']) : '', - 'U_VIEW_PROFILE' => ($post_info['user_id'] != ANONYMOUS) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $post_info['user_id']) : '', + 'U_EDIT' => ($auth->acl_get('m_edit', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&f={$post_info['forum_id']}&p={$post_info['post_id']}") : '', + 'U_MCP_APPROVE' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $post_info['forum_id'] . '&p=' . $post_id), + 'U_MCP_REPORT' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=report_details&f=' . $post_info['forum_id'] . '&p=' . $post_id), + 'U_MCP_REPORTER_NOTES' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $report['user_id']), + 'U_MCP_USER_NOTES' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $post_info['user_id']), + 'U_MCP_WARN_REPORTER' => ($auth->acl_getf_global('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $report['user_id']) : '', + 'U_MCP_WARN_USER' => ($auth->acl_getf_global('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $post_info['user_id']) : '', + 'U_VIEW_PROFILE' => ($post_info['user_id'] != ANONYMOUS) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $post_info['user_id']) : '', 'U_VIEW_REPORTER_PROFILE' => ($report['user_id'] != ANONYMOUS) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $report['user_id']) : '', 'EDIT_IMG' => $user->img('btn_edit', $user->lang['EDIT_POST']), + 'UNAPPROVED_IMG' => $user->img('icon_unapproved', $user->lang['POST_UNAPPROVED']), - 'RETURN_REPORTS' => sprintf($user->lang['RETURN_REPORTS'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports' . (($post_info['post_reported']) ? '&mode=reports' : '&mode=reports_closed') . '&start=' . $start) . '">', '</a>'), - 'REPORTED_IMG' => $user->img('icon_reported', $user->lang['POST_REPORTED']), - 'REPORT_REASON_TITLE' => $reason['title'], + 'RETURN_REPORTS' => sprintf($user->lang['RETURN_REPORTS'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports' . (($post_info['post_reported']) ? '&mode=reports' : '&mode=reports_closed') . '&start=' . $start) . '">', '</a>'), + 'REPORTED_IMG' => $user->img('icon_reported', $user->lang['POST_REPORTED']), + 'REPORT_REASON_TITLE' => $reason['title'], 'REPORT_REASON_DESCRIPTION' => $reason['description'], - 'REPORTER_NAME' => ($report['user_id'] == ANONYMOUS) ? $user->lang['GUEST'] : $report['username'], - 'REPORT_DATE' => $user->format_date($report['report_time']), - 'REPORT_TEXT' => $report['report_text'], - - 'UNAPPROVED_IMG' => $user->img('icon_unapproved', $user->lang['POST_UNAPPROVED']), + 'REPORTER_NAME' => ($report['user_id'] == ANONYMOUS) ? $user->lang['GUEST'] : $report['username'], + 'REPORT_DATE' => $user->format_date($report['report_time']), + 'REPORT_TEXT' => $report['report_text'], 'POSTER_NAME' => $poster, 'POST_PREVIEW' => $message, @@ -189,7 +189,7 @@ class mcp_reports $forum_list[] = $row['forum_id']; } - if (!$forum_list = implode(', ', $forum_list)) + if (!($forum_list = implode(', ', $forum_list))) { trigger_error('NOT_MODERATOR'); } @@ -200,7 +200,6 @@ class mcp_reports $result = $db->sql_query($sql); $forum_info['forum_topics'] = (int) $db->sql_fetchfield('sum_forum_topics'); $db->sql_freeresult($result); - } else { @@ -263,6 +262,7 @@ class mcp_reports $post_ids[] = $row['post_id']; $row_num[$row['post_id']] = $i++; } + $db->sql_freeresult($result); if (sizeof($post_ids)) { @@ -273,8 +273,8 @@ class mcp_reports AND r.post_id = p.post_id AND u.user_id = p.poster_id AND ru.user_id = r.user_id"; - $result = $db->sql_query($sql); + $post_data = $rowset = array(); while ($row = $db->sql_fetchrow($result)) { @@ -295,8 +295,6 @@ class mcp_reports $poster = $row['username']; } - $s_checkbox = '<input type="checkbox" class="radio" name="post_id_list[]" value="' . $row['post_id'] . '" />'; - $template->assign_block_vars('postrow', array( 'U_VIEWFORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']), // Q: Why accessing the topic by a post_id instead of its topic_id? @@ -306,10 +304,9 @@ class mcp_reports 'U_VIEW_POSTER_PROFILE' => ($row['poster_id'] != ANONYMOUS) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['poster_id']) : '', 'U_VIEW_REPORTER_PROFILE' => ($row['reporter_id'] != ANONYMOUS) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['reporter_id']) : '', - 'S_CHECKBOX' => $s_checkbox, - 'FORUM_NAME' => ($row['forum_id']) ? $forum_data[$row['forum_id']]['forum_name'] : $user->lang['ALL_FORUMS'], 'POSTER' => $poster, + 'POST_ID' => $row['post_id'], 'POST_SUBJECT' => $row['post_subject'], 'POST_TIME' => $user->format_date($row['post_time']), 'REPORTER' => ($row['reporter_id'] == ANONYMOUS) ? $user->lang['GUEST'] : $row['reporter_name'], @@ -383,12 +380,9 @@ function close_report($post_id_list, $mode, $action) { $reports[$report['post_id']] = $report; } - $db->sql_freeresult($result); - $close_report_posts = array(); - $close_report_topics = array(); - $notify_reporters = array(); + $close_report_posts = $close_report_topics = $notify_reporters = array(); foreach ($post_info as $post_id => $post_data) { if (isset($reports[$post_id])) @@ -420,6 +414,7 @@ function close_report($post_id_list, $mode, $action) { $keep_report_topics[] = $row['topic_id']; } + $db->sql_freeresult($result); $close_report_topics = array_diff($close_report_topics, $keep_report_topics); unset($keep_report_topics); diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index 1c0c1d9a68..92125cd14d 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -31,12 +31,12 @@ function mcp_topic_view($id, $mode, $action) $topic_info = $topic_info[$topic_id]; // Set up some vars - $icon_id = request_var('icon', 0); - $subject = request_var('subject', '', true); - $start = request_var('start', 0); - $to_topic_id = request_var('to_topic_id', 0); - $to_forum_id = request_var('to_forum_id', 0); - $post_id_list = request_var('post_id_list', array(0)); + $icon_id = request_var('icon', 0); + $subject = request_var('subject', '', true); + $start = request_var('start', 0); + $to_topic_id = request_var('to_topic_id', 0); + $to_forum_id = request_var('to_forum_id', 0); + $post_id_list = request_var('post_id_list', array(0)); // Split Topic? if ($action == 'split_all' || $action == 'split_beyond') @@ -60,8 +60,7 @@ function mcp_topic_view($id, $mode, $action) // Jumpbox, sort selects and that kind of things make_jumpbox($url . "&i=$id&mode=forum_view", $topic_info['forum_id'], false, 'm_'); $where_sql = ($action == 'reports') ? 'WHERE post_reported = 1 AND ' : 'WHERE'; - - + $sort_days = $total = 0; $sort_key = $sort_dir = ''; $sort_by_sql = $sort_order_sql = array(); @@ -73,6 +72,7 @@ function mcp_topic_view($id, $mode, $action) { $total = $topic_info['topic_replies'] + 1; } + $posts_per_page = max(0, request_var('posts_per_page', intval($config['posts_per_page']))); if ($posts_per_page == 0) { @@ -94,6 +94,7 @@ function mcp_topic_view($id, $mode, $action) $rowset[] = $row; $bbcode_bitfield |= $row['bbcode_bitfield']; } + $db->sql_freeresult($result); if ($bbcode_bitfield) { @@ -118,9 +119,6 @@ function mcp_topic_view($id, $mode, $action) $message = smiley_text($message); $message = str_replace("\n", '<br />', $message); - $checked = ($post_id_list && in_array(intval($row['post_id']), $post_id_list)) ? 'checked="checked" ' : ''; - $s_checkbox = '<input type="checkbox" class="radio" name="post_id_list[]" value="' . $row['post_id'] . '" ' . $checked . '/>'; - if (!$row['post_approved']) { $has_unapproved_posts = true; @@ -136,9 +134,9 @@ function mcp_topic_view($id, $mode, $action) 'MINI_POST_IMG' => ($row['post_time'] > $user->data['user_lastvisit'] && $user->data['is_registered']) ? $user->img('icon_post_new', $user->lang['NEW_POST']) : $user->img('icon_post', $user->lang['POST']), - 'S_CHECKBOX' => $s_checkbox, '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, 'U_POST_DETAILS' => "$url&i=$id&p={$row['post_id']}&mode=post_details", 'U_MCP_APPROVE' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $topic_info['forum_id'] . '&p=' . $row['post_id']), @@ -200,8 +198,8 @@ function mcp_topic_view($id, $mode, $action) 'S_CAN_LOCK' => ($auth->acl_get('m_lock', $topic_info['forum_id'])) ? true : false, 'S_REPORT_VIEW' => ($action == 'reports') ? true : false, - 'S_SHOW_TOPIC_ICONS'=> $s_topic_icons, - 'S_TOPIC_ICON' => $icon_id, + 'S_SHOW_TOPIC_ICONS' => $s_topic_icons, + 'S_TOPIC_ICON' => $icon_id, 'U_SELECT_TOPIC' => "$url&i=$id&mode=forum_view&action=merge_select", @@ -344,6 +342,7 @@ function split_topic($action, $topic_id, $to_forum_id, $subject) $post_id_list[] = $row['post_id']; } } + $db->sql_freeresult($result); } if (!sizeof($post_id_list)) diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index a40e53649a..13de52c457 100755 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -42,19 +42,22 @@ class mcp_warn case 'front': mcp_warn_front_view($id, $mode); $this->tpl_name = 'mcp_warn_front'; - break; + break; + case 'list': mcp_warn_list_view($id, $mode, $action); $this->tpl_name = 'mcp_warn_list'; - break; + break; + case 'warn_post': mcp_warn_post_view($id, $mode, $action); $this->tpl_name = 'mcp_warn_post'; - break; + break; + case 'warn_user': mcp_warn_user_view($id, $mode, $action); $this->tpl_name = 'mcp_warn_user'; - break; + break; } } } @@ -127,10 +130,10 @@ function mcp_warn_list_view($id, $mode, $action) $user->add_lang('memberlist'); - $start = request_var('start', 0); - $st = request_var('st', 0); - $sk = request_var('sk', 'b'); - $sd = request_var('sd', 'd'); + $start = request_var('start', 0); + $st = request_var('st', 0); + $sk = request_var('sk', 'b'); + $sd = request_var('sd', 'd'); $limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); $sort_by_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_DATE'], 'c' => $user->lang['SORT_WARNINGS']); @@ -162,11 +165,11 @@ function mcp_warn_list_view($id, $mode, $action) } $template->assign_vars(array( - 'U_POST_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&mode=$mode"), - 'S_CLEAR_ALLOWED' => ($auth->acl_get('a_clearlogs')) ? true : false, - 'S_SELECT_SORT_DIR' => $s_sort_dir, - 'S_SELECT_SORT_KEY' => $s_sort_key, - 'S_SELECT_SORT_DAYS' => $s_limit_days, + 'U_POST_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&mode=$mode"), + 'S_CLEAR_ALLOWED' => ($auth->acl_get('a_clearlogs')) ? true : false, + 'S_SELECT_SORT_DIR' => $s_sort_dir, + 'S_SELECT_SORT_KEY' => $s_sort_key, + 'S_SELECT_SORT_DAYS' => $s_limit_days, 'PAGE_NUMBER' => on_page($user_count, $config['topics_per_page'], $start), 'PAGINATION' => generate_pagination(append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&mode=$mode&st=$st&sk=$sk&sd=$sd"), $user_count, $config['topics_per_page'], $start), @@ -188,16 +191,18 @@ function mcp_warn_post_view($id, $mode, $action) $notify = (isset($_REQUEST['notify_user'])) ? true : false; $warning = request_var('warning', '', true); - $sql = 'SELECT u.*, p.* FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u + $sql = 'SELECT u.*, p.* + FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u WHERE post_id = $post_id - AND u.user_id = p.poster_id"; + AND u.user_id = p.poster_id"; $result = $db->sql_query($sql); + $userrow = $db->sql_fetchrow($result); + $db->sql_freeresult($result); - if (!$userrow = $db->sql_fetchrow($result)) + if (!$userrow) { trigger_error($user->lang['NO_POST']); } - $db->sql_freeresult($result); // There is no point issuing a warning to ignored users (ie anonymous and bots) if ($userrow['user_type'] == USER_IGNORE) @@ -207,16 +212,18 @@ function mcp_warn_post_view($id, $mode, $action) // Check if there is already a warning for this post to prevent multiple // warnings for the same offence - $sql = 'SELECT * FROM ' . WARNINGS_TABLE . " + $sql = 'SELECT post_id + FROM ' . WARNINGS_TABLE . " WHERE post_id = $post_id"; $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); - if ($row = $db->sql_fetchrow($result)) + if ($row) { trigger_error($user->lang['ALREADY_WARNED']); } - $db->sql_freeresult($result); - + $user_id = $userrow['user_id']; if ($warning && $action == 'add_warning') @@ -237,7 +244,8 @@ function mcp_warn_post_view($id, $mode, $action) // Second parse bbcode here if ($userrow['bbcode_bitfield']) { - include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); + include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); + $bbcode = new bbcode($userrow['bbcode_bitfield']); $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); } @@ -259,14 +267,15 @@ function mcp_warn_post_view($id, $mode, $action) { case AVATAR_UPLOAD: $avatar_img = $config['avatar_path'] . '/'; - break; + break; + case AVATAR_GALLERY: $avatar_img = $config['avatar_gallery_path'] . '/'; - break; + break; } $avatar_img .= $userrow['user_avatar']; - $avatar_img = '<img src="' . $avatar_img . '" width="' . $userrow['user_avatar_width'] . '" height="' . $userrow['user_avatar_height'] . '" border="0" alt="" />'; + $avatar_img = '<img src="' . $avatar_img . '" width="' . $userrow['user_avatar_width'] . '" height="' . $userrow['user_avatar_height'] . '" alt="" />'; } $template->assign_vars(array( @@ -307,6 +316,11 @@ function mcp_warn_user_view($id, $mode, $action) $userrow = $db->sql_fetchrow($result); $db->sql_freeresult($result); + if (!$userrow) + { + trigger_error('NO_USER'); + } + $user_id = $userrow['user_id']; if ($warning && $action == 'add_warning') @@ -329,14 +343,15 @@ function mcp_warn_user_view($id, $mode, $action) { case AVATAR_UPLOAD: $avatar_img = $config['avatar_path'] . '/'; - break; + break; + case AVATAR_GALLERY: $avatar_img = $config['avatar_gallery_path'] . '/'; - break; + break; } $avatar_img .= $userrow['user_avatar']; - $avatar_img = '<img src="' . $avatar_img . '" width="' . $userrow['user_avatar_width'] . '" height="' . $userrow['user_avatar_height'] . '" border="0" alt="" />'; + $avatar_img = '<img src="' . $avatar_img . '" width="' . $userrow['user_avatar_width'] . '" height="' . $userrow['user_avatar_height'] . '" alt="" />'; } // OK, they didn't submit a warning so lets build the page for them to do so @@ -366,13 +381,14 @@ function add_warning($userrow, $warning, $send_pm = true, $post_id = 0) if ($send_pm) { - include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx); - include($phpbb_root_path . 'includes/message_parser.'.$phpEx); + include_once($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx); + include_once($phpbb_root_path . 'includes/message_parser.' . $phpEx); $userrow['user_lang'] = (file_exists($phpbb_root_path . 'language/' . $userrow['user_lang'] . "/mcp.$phpEx")) ? $userrow['user_lang'] : $config['default_lang']; - include($phpbb_root_path . 'language/' . $userrow['user_lang'] . "/mcp.$phpEx"); + include($phpbb_root_path . 'language/' . basename($userrow['user_lang']) . "/mcp.$phpEx"); $message_parser = new parse_message(); + $message_parser->message = sprintf($lang['WARNING_PM_BODY'], $warning); $message_parser->parse(true, true, true, false, false, true); @@ -412,4 +428,5 @@ function add_warning($userrow, $warning, $send_pm = true, $post_id = 0) WHERE user_id = ' . $userrow['user_id']; $db->sql_query($sql); } + ?>
\ No newline at end of file diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 8c9ecf6754..a0dcd821fd 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -258,14 +258,21 @@ class bbcode_firstpass extends bbcode { $stats = @getimagesize($in); - if ($config['max_' . $this->mode . '_img_height'] && $config['max_' . $this->mode . '_img_height'] < $stats[1]) + if ($stats === false) { - $this->warn_msg[] = sprintf($user->lang['MAX_IMG_HEIGHT_EXCEEDED'], $config['max_' . $this->mode . '_img_height']); + $this->warn_msg[] = $user->lang['UNABLE_GET_IMAGE_SIZE']; } - - if ($config['max_' . $this->mode . '_img_width'] && $config['max_' . $this->mode . '_img_width'] < $stats[0]) + else { - $this->warn_msg[] = sprintf($user->lang['MAX_IMG_WIDTH_EXCEEDED'], $config['max_' . $this->mode . '_img_width']); + if ($config['max_' . $this->mode . '_img_height'] && $config['max_' . $this->mode . '_img_height'] < $stats[1]) + { + $this->warn_msg[] = sprintf($user->lang['MAX_IMG_HEIGHT_EXCEEDED'], $config['max_' . $this->mode . '_img_height']); + } + + if ($config['max_' . $this->mode . '_img_width'] && $config['max_' . $this->mode . '_img_width'] < $stats[0]) + { + $this->warn_msg[] = sprintf($user->lang['MAX_IMG_WIDTH_EXCEEDED'], $config['max_' . $this->mode . '_img_width']); + } } } @@ -282,7 +289,7 @@ class bbcode_firstpass extends bbcode */ function bbcode_flash($width, $height, $in) { - global $config; + global $user, $config, $phpEx; if (!$this->check_bbcode('flash', $in)) { diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index 781bafd41d..b65818dad7 100644 --- a/phpBB/includes/search/fulltext_mysql.php +++ b/phpBB/includes/search/fulltext_mysql.php @@ -52,7 +52,7 @@ class fulltext_mysql extends search_backend } $result = $db->sql_query('SELECT VERSION() AS mysql_version'); - $version = $db->sql_fetchfield('mysql_version', 0, $result); + $version = $db->sql_fetchfield('mysql_version'); $db->sql_freeresult($result); if (!preg_match('#^4|5|6#s', $version)) @@ -248,9 +248,11 @@ class fulltext_mysql extends search_backend $id_ary = array(); $join_topic = ($type == 'posts') ? false : true; + // Build sql strings for sorting $sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC'); $sql_sort_table = $sql_sort_join = ''; + switch ($sql_sort[0]) { case 'u': @@ -291,6 +293,7 @@ class fulltext_mysql extends search_backend default: $sql_match = 'p.post_subject, p.post_text'; $sql_match_where = ''; + break; } if (!sizeof($m_approve_fid_ary)) @@ -358,6 +361,7 @@ class fulltext_mysql extends search_backend // Get the ids for the current result block $any_words = (sizeof($any_words)) ? ' +(' . implode(' ', $any_words) . ')' : ''; + $sql = "SELECT $sql_select FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p WHERE MATCH ($sql_match) AGAINST ('" . $db->sql_escape(implode(' ', $words)) . $any_words . "' IN BOOLEAN MODE) @@ -714,7 +718,8 @@ class fulltext_mysql extends search_backend return array( $user->lang['FULLTEXT_MYSQL_TOTAL_POSTS'] => ($this->index_created()) ? $this->stats['total_posts'] : 0, $user->lang['FULLTEXT_MYSQL_TEXT_CARDINALITY'] => isset($this->stats['post_text']['Cardinality']) ? $this->stats['post_text']['Cardinality'] : 0, - $user->lang['FULLTEXT_MYSQL_SUBJECT_CARDINALITY'] => isset($this->stats['post_subject']['Cardinality']) ? $this->stats['post_subject']['Cardinality'] : 0); + $user->lang['FULLTEXT_MYSQL_SUBJECT_CARDINALITY'] => isset($this->stats['post_subject']['Cardinality']) ? $this->stats['post_subject']['Cardinality'] : 0, + ); } function get_stats() diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php index 6bdaaec176..71941f8bfc 100755 --- a/phpBB/includes/search/fulltext_native.php +++ b/phpBB/includes/search/fulltext_native.php @@ -284,9 +284,11 @@ class fulltext_native extends search_backend $id_ary = array(); $join_topic = ($type == 'posts') ? false : true; + // Build sql strings for sorting $sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC'); $sql_sort_table = $sql_sort_join = ''; + switch ($sql_sort[0]) { case 'u': @@ -363,17 +365,21 @@ class fulltext_native extends search_backend { case '-': $bool = 'NOT'; - continue; + continue; + case '+': $bool = 'AND'; - continue; + continue; + case '|': $bool = 'OR'; - continue; + continue; + default: $bool = ($terms != 'all') ? 'OR' : $bool; $sql_words[$bool][] = "'" . $db->sql_escape(preg_replace('#\*+#', '%', trim($word))) . "'"; $bool = ($terms == 'all') ? 'AND' : 'OR'; + break; } } @@ -400,6 +406,7 @@ class fulltext_native extends search_backend if (!($row = $db->sql_fetchrow($result))) { + $db->sql_freeresult($result); $id_ary = array(); return false; } @@ -444,6 +451,7 @@ class fulltext_native extends search_backend if (!($row = $db->sql_fetchrow($result))) { + $db->sql_freeresult($result); $id_ary = array(); return false; } diff --git a/phpBB/includes/ucp/ucp_confirm.php b/phpBB/includes/ucp/ucp_confirm.php index dd33418054..37f9d485f9 100644 --- a/phpBB/includes/ucp/ucp_confirm.php +++ b/phpBB/includes/ucp/ucp_confirm.php @@ -71,7 +71,7 @@ class ucp_confirm } $policy = ''; - if (extension_loaded('gd') && sizeof($policy_modules)) + if (@extension_loaded('gd') && sizeof($policy_modules)) { include($phpbb_root_path . 'includes/captcha/captcha_gd.' . $phpEx); $policy = $policy_modules[array_rand($policy_modules)]; diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 952f969bd6..bc7f22427b 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -17,8 +17,8 @@ function compose_pm($id, $mode, $action) global $template, $db, $auth, $user; global $phpbb_root_path, $phpEx, $config; - include($phpbb_root_path . 'includes/functions_posting.'.$phpEx); - include($phpbb_root_path . 'includes/message_parser.'.$phpEx); + include($phpbb_root_path . 'includes/functions_posting.' . $phpEx); + include($phpbb_root_path . 'includes/message_parser.' . $phpEx); if (!$action) { @@ -35,17 +35,17 @@ function compose_pm($id, $mode, $action) // Do NOT use request_var or specialchars here $address_list = isset($_REQUEST['address_list']) ? $_REQUEST['address_list'] : array(); - $submit = (isset($_POST['post'])); - $preview = (isset($_POST['preview'])); - $save = (isset($_POST['save'])); - $load = (isset($_POST['load'])); - $cancel = (isset($_POST['cancel']) && !isset($_POST['save'])); - $delete = (isset($_POST['delete'])); + $submit = (isset($_POST['post'])) ? true : false; + $preview = (isset($_POST['preview'])) ? true : false; + $save = (isset($_POST['save'])) ? true : false; + $load = (isset($_POST['load'])) ? true : false; + $cancel = (isset($_POST['cancel']) && !isset($_POST['save'])) ? true : false; + $delete = (isset($_POST['delete'])) ? true : false; - $remove_u = (isset($_REQUEST['remove_u'])); - $remove_g = (isset($_REQUEST['remove_g'])); - $add_to = (isset($_REQUEST['add_to'])); - $add_bcc = (isset($_REQUEST['add_bcc'])); + $remove_u = (isset($_REQUEST['remove_u'])) ? true : false; + $remove_g = (isset($_REQUEST['remove_g'])) ? true : false; + $add_to = (isset($_REQUEST['add_to'])) ? true : false; + $add_bcc = (isset($_REQUEST['add_bcc'])) ? true : false; $refresh = isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['edit_comment']) || $save || $load || $remove_u || $remove_g || $add_to || $add_bcc; @@ -273,7 +273,9 @@ function compose_pm($id, $mode, $action) { delete_pm($user->data['user_id'], $msg_id, $folder_id); - // TODO - jump to next message in "history"? + /** + * @todo jump to next message in "history"? + */ $meta_info = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&folder=$folder_id"); $message = $user->lang['MESSAGE_DELETED']; @@ -284,9 +286,9 @@ function compose_pm($id, $mode, $action) else { $s_hidden_fields = array( - 'p' => $msg_id, - 'f' => $folder_id, - 'action'=> 'delete' + 'p' => $msg_id, + 'f' => $folder_id, + 'action' => 'delete' ); // "{$phpbb_root_path}ucp.$phpEx?i=pm&mode=compose" @@ -340,12 +342,13 @@ function compose_pm($id, $mode, $action) AND user_id = ' . $user->data['user_id'] . (($draft_id) ? " AND draft_id <> $draft_id" : ''); $result = $db->sql_query_limit($sql, 1); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); - if ($db->sql_fetchrow($result)) + if ($row) { $drafts = true; } - $db->sql_freeresult($result); } if ($action == 'edit') @@ -353,10 +356,10 @@ function compose_pm($id, $mode, $action) $message_parser->bbcode_uid = $bbcode_uid; } - $bbcode_status = ($config['allow_bbcode'] && $config['auth_bbcode_pm'] && $auth->acl_get('u_pm_bbcode')); - $smilies_status = ($config['allow_smilies'] && $config['auth_smilies_pm'] && $auth->acl_get('u_pm_smilies')); - $img_status = ($config['auth_img_pm'] && $auth->acl_get('u_pm_img')); - $flash_status = ($config['auth_flash_pm'] && $auth->acl_get('u_pm_flash')); + $bbcode_status = ($config['allow_bbcode'] && $config['auth_bbcode_pm'] && $auth->acl_get('u_pm_bbcode')) ? true : false; + $smilies_status = ($config['allow_smilies'] && $config['auth_smilies_pm'] && $auth->acl_get('u_pm_smilies')) ? true : false; + $img_status = ($config['auth_img_pm'] && $auth->acl_get('u_pm_img')) ? true : false; + $flash_status = ($config['auth_flash_pm'] && $auth->acl_get('u_pm_flash')) ? true : false; // Save Draft if ($save && $auth->acl_get('u_savedrafts')) @@ -370,12 +373,13 @@ function compose_pm($id, $mode, $action) if (confirm_box(true)) { $sql = 'INSERT INTO ' . DRAFTS_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'user_id' => $user->data['user_id'], - 'topic_id' => 0, - 'forum_id' => 0, - 'save_time' => $current_time, - 'draft_subject' => $subject, - 'draft_message' => $message)); + 'user_id' => $user->data['user_id'], + 'topic_id' => 0, + 'forum_id' => 0, + 'save_time' => $current_time, + 'draft_subject' => $subject, + 'draft_message' => $message) + ); $db->sql_query($sql); $redirect_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&mode=$mode"); @@ -427,6 +431,7 @@ function compose_pm($id, $mode, $action) { $draft_id = 0; } + $db->sql_freeresult($result); } // Load Drafts @@ -761,7 +766,7 @@ function compose_pm($id, $mode, $action) break; default: - trigger_error('NO_ACTION_MODE'); + trigger_error('NO_ACTION_MODE', E_USER_ERROR); } $s_hidden_fields = '<input type="hidden" name="lastclick" value="' . $current_time . '" />'; @@ -772,9 +777,9 @@ function compose_pm($id, $mode, $action) // Start assigning vars for main posting page ... $template->assign_vars(array( - 'L_POST_A' => $page_title, - 'L_ICON' => $user->lang['PM_ICON'], - 'L_MESSAGE_BODY_EXPLAIN'=> (intval($config['max_post_chars'])) ? sprintf($user->lang['MESSAGE_BODY_EXPLAIN'], intval($config['max_post_chars'])) : '', + 'L_POST_A' => $page_title, + 'L_ICON' => $user->lang['PM_ICON'], + 'L_MESSAGE_BODY_EXPLAIN' => (intval($config['max_post_chars'])) ? sprintf($user->lang['MESSAGE_BODY_EXPLAIN'], intval($config['max_post_chars'])) : '', 'SUBJECT' => (isset($message_subject)) ? $message_subject : '', 'MESSAGE' => $message_text, @@ -788,12 +793,12 @@ function compose_pm($id, $mode, $action) 'S_EDIT_POST' => ($action == 'edit'), 'S_SHOW_PM_ICONS' => $s_pm_icons, 'S_BBCODE_ALLOWED' => $bbcode_status, - 'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '', + 'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '', 'S_SMILIES_ALLOWED' => $smilies_status, - 'S_SMILIES_CHECKED' => ($smilies_checked) ? ' checked="checked"' : '', + 'S_SMILIES_CHECKED' => ($smilies_checked) ? ' checked="checked"' : '', 'S_SIG_ALLOWED' => ($config['allow_sig'] && $auth->acl_get('u_sig')), - 'S_SIGNATURE_CHECKED' => ($sig_checked) ? ' checked="checked"' : '', - 'S_MAGIC_URL_CHECKED' => ($urls_checked) ? ' checked="checked"' : '', + 'S_SIGNATURE_CHECKED' => ($sig_checked) ? ' checked="checked"' : '', + 'S_MAGIC_URL_CHECKED' => ($urls_checked) ? ' checked="checked"' : '', 'S_SAVE_ALLOWED' => $auth->acl_get('u_savedrafts'), 'S_HAS_DRAFTS' => ($auth->acl_get('u_savedrafts') && $drafts), 'S_FORM_ENCTYPE' => $form_enctype, @@ -802,9 +807,9 @@ function compose_pm($id, $mode, $action) 'S_BBCODE_FLASH' => $flash_status, 'S_BBCODE_QUOTE' => true, - 'S_POST_ACTION' => $s_action, - 'S_HIDDEN_ADDRESS_FIELD'=> $s_hidden_address_field, - 'S_HIDDEN_FIELDS' => $s_hidden_fields, + 'S_POST_ACTION' => $s_action, + 'S_HIDDEN_ADDRESS_FIELD' => $s_hidden_address_field, + 'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_CLOSE_PROGRESS_WINDOW' => isset($_POST['add_file']), 'U_PROGRESS_BAR' => append_sid("{$phpbb_root_path}posting.$phpEx", 'f=0&mode=popup'), @@ -901,7 +906,7 @@ function handle_message_list_actions(&$address_list, $remove_u, $remove_g, $add_ { // We need to check their PM status (do they want to receive PM's?) // Only check if not a moderator or admin, since they are allowed to override this user setting - if (!$auth->acl_gets('a_', 'm_')) + if (!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_')) { $sql = 'SELECT user_id FROM ' . USERS_TABLE . ' diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 82234084da..9326e41427 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -340,11 +340,16 @@ class ucp_profile $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); } - $bday_day = $bday_month = $bday_year = 0; - - if ($user->data['user_birthday']) + if (!isset($bday_day)) { - list($bday_day, $bday_month, $bday_year) = explode('-', $user->data['user_birthday']); + if ($user->data['user_birthday']) + { + list($bday_day, $bday_month, $bday_year) = explode('-', $user->data['user_birthday']); + } + else + { + $bday_day = $bday_month = $bday_year = 0; + } } $s_birthday_day_options = '<option value="0"' . ((!$bday_day) ? ' selected="selected"' : '') . '>--</option>'; diff --git a/phpBB/install/index.php b/phpBB/install/index.php index a71d6c9da5..b2e36cd047 100755 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -97,13 +97,13 @@ else @set_time_limit(120); // Include essential scripts -require($phpbb_root_path . 'includes/functions.'.$phpEx); +require($phpbb_root_path . 'includes/functions.' . $phpEx); include($phpbb_root_path . 'includes/auth.' . $phpEx); -include($phpbb_root_path . 'includes/session.'.$phpEx); -include($phpbb_root_path . 'includes/template.'.$phpEx); -include($phpbb_root_path . 'includes/acm/acm_file.'.$phpEx); -include($phpbb_root_path . 'includes/cache.'.$phpEx); -include($phpbb_root_path . 'includes/functions_admin.'.$phpEx); +include($phpbb_root_path . 'includes/session.' . $phpEx); +include($phpbb_root_path . 'includes/template.' . $phpEx); +include($phpbb_root_path . 'includes/acm/acm_file.' . $phpEx); +include($phpbb_root_path . 'includes/cache.' . $phpEx); +include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); // Try and load an appropriate language if required $language = request_var('language', ''); @@ -152,11 +152,11 @@ if (!$language) } // And finally, load the relevant language files -include($phpbb_root_path . 'language/' . $language . '/common.'.$phpEx); -include($phpbb_root_path . 'language/' . $language . '/acp/common.'.$phpEx); -include($phpbb_root_path . 'language/' . $language . '/acp/board.'.$phpEx); -include($phpbb_root_path . 'language/' . $language . '/install.'.$phpEx); -include($phpbb_root_path . 'language/' . $language . '/posting.'.$phpEx); +include($phpbb_root_path . 'language/' . $language . '/common.' . $phpEx); +include($phpbb_root_path . 'language/' . $language . '/acp/common.' . $phpEx); +include($phpbb_root_path . 'language/' . $language . '/acp/board.' . $phpEx); +include($phpbb_root_path . 'language/' . $language . '/install.' . $phpEx); +include($phpbb_root_path . 'language/' . $language . '/posting.' . $phpEx); $mode = request_var('mode', 'overview'); $sub = request_var('sub', ''); @@ -201,7 +201,9 @@ class module var $mode; var $sub; - // Private methods, should not be overwritten + /** + * Private methods, should not be overwritten + */ function create($module_type, $module_url, $selected_mod = false, $selected_submod = false) { global $db, $config, $phpEx; @@ -263,7 +265,9 @@ class module } // END foreach } // END create - // Load and run the relevant module if applicable + /** + * Load and run the relevant module if applicable + */ function load($mode = false, $run = true) { global $phpbb_root_path, $phpEx; @@ -275,13 +279,16 @@ class module $this->mode = $mode; } + /** + * @todo this could be written as $this->module = new $this->filename($this); ... no? (eval statement in install/index.php) + */ eval("\$this->module = new $this->filename(\$this);"); if (method_exists($this->module, 'main')) { $this->module->main($this->mode, $this->sub); } } - } // END load + } /** * Output the standard page header @@ -598,4 +605,5 @@ class module return $tpl; } } + ?>
\ No newline at end of file diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 486e89b233..8fc1c3d7b5 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -14,13 +14,13 @@ if (!empty($setmodules)) { $module[] = array( - 'module_type' => 'install', - 'module_title' => 'INSTALL', - 'module_filename' => substr(basename(__FILE__), 0, -strlen($phpEx)-1), - 'module_order' => 10, - 'module_subs' => '', - 'module_stages' => array('INTRO', 'REQUIREMENTS', 'DATABASE', 'ADMINISTRATOR', 'CONFIG_FILE', 'ADVANCED', 'FINAL'), - 'module_reqs' => '' + 'module_type' => 'install', + 'module_title' => 'INSTALL', + 'module_filename' => substr(basename(__FILE__), 0, -strlen($phpEx)-1), + 'module_order' => 10, + 'module_subs' => '', + 'module_stages' => array('INTRO', 'REQUIREMENTS', 'DATABASE', 'ADMINISTRATOR', 'CONFIG_FILE', 'ADVANCED', 'FINAL'), + 'module_reqs' => '' ); } @@ -124,6 +124,7 @@ class install_install extends module else { $passed['php'] = true; + // We also give feedback on whether we're running in safe mode $result = '<b style="color:green">' . $lang['YES']; if (@ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'on') @@ -132,6 +133,7 @@ class install_install extends module } $result .= '</b>'; } + $template->assign_block_vars('checks', array( 'TITLE' => $lang['PHP_VERSION_REQD'], 'RESULT' => $result, @@ -173,7 +175,7 @@ class install_install extends module { $dll = $db_ary['MODULE']; - if (!extension_loaded($dll)) + if (!@extension_loaded($dll)) { if (!$this->can_load_dll($dll)) { @@ -208,7 +210,7 @@ class install_install extends module foreach ($this->php_dlls_other as $dll) { - if (!extension_loaded($dll)) + if (!@extension_loaded($dll)) { if (!$this->can_load_dll($dll)) { @@ -222,6 +224,7 @@ class install_install extends module continue; } } + $template->assign_block_vars('checks', array( 'TITLE' => $lang['DLL_' . strtoupper($dll)], 'RESULT' => '<b style="color:green">' . $lang['AVAILABLE'] . '</b>', @@ -429,7 +432,7 @@ class install_install extends module $available_dbms_temp = array(); foreach ($this->available_dbms as $type => $dbms_ary) { - if (!extension_loaded($dbms_ary['MODULE'])) + if (!@extension_loaded($dbms_ary['MODULE'])) { if (!$this->can_load_dll($dbms_ary['MODULE'])) { @@ -693,7 +696,7 @@ class install_install extends module foreach ($check_exts as $dll) { - if (!extension_loaded($dll)) + if (!@extension_loaded($dll)) { if (!$this->can_load_dll($dll)) { @@ -907,7 +910,7 @@ class install_install extends module $cookie_domain = ($server_name != '') ? $server_name : (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'); // If we get here and the extension isn't loaded it should be safe to just go ahead and load it - if (!extension_loaded($this->available_dbms[$dbms]['MODULE'])) + if (!@extension_loaded($this->available_dbms[$dbms]['MODULE'])) { @dl($this->available_dbms[$dbms]['MODULE'] . ".$prefix"); } @@ -1264,34 +1267,28 @@ class install_install extends module if ($module_class == 'acp') { // Move main module 4 up... - for ($i = 1; $i <= 4; $i++) - { - $sql = 'SELECT * - FROM ' . MODULES_TABLE . " - WHERE module_name = 'main' - AND module_class = 'acp' - AND module_mode = 'main'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); + $sql = 'SELECT * + FROM ' . MODULES_TABLE . " + WHERE module_name = 'main' + AND module_class = 'acp' + AND module_mode = 'main'"; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); - $_module->move_module_by($row, 'move_up', 1); - } + $_module->move_module_by($row, 'move_up', 4); // Move permissions intro screen module 4 up... - for ($i = 1; $i <= 4; $i++) - { - $sql = 'SELECT * - FROM ' . MODULES_TABLE . " - WHERE module_name = 'permissions' - AND module_class = 'acp' - AND module_mode = 'intro'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); + $sql = 'SELECT * + FROM ' . MODULES_TABLE . " + WHERE module_name = 'permissions' + AND module_class = 'acp' + AND module_mode = 'intro'"; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); - $_module->move_module_by($row, 'move_up', 1); - } + $_module->move_module_by($row, 'move_up', 4); } // And now for the special ones @@ -1374,7 +1371,7 @@ class install_install extends module foreach ($this->bot_list as $bot_name => $bot_ary) { $user_row = array( - 'user_type' => GROUP_HIDDEN, + 'user_type' => USER_IGNORE, 'group_id' => $group_id, 'username' => $bot_name, 'user_regdate' => time(), @@ -1446,7 +1443,7 @@ class install_install extends module if ($config['email_enable']) { - include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx); + include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); $messenger = new messenger(false); @@ -1523,23 +1520,23 @@ class install_install extends module case 'sqlite': $sql = "SHOW TABLES"; $field = "Tables_in_{$dbname}"; - break; + break; case 'mssql': case 'mssql_odbc': $sql = "SELECT name FROM sysobjects WHERE type='U'"; - $field = "name"; - break; + $field = 'name'; + break; case 'postgres': $sql = "SELECT relname FROM pg_class WHERE relkind = 'r' AND relname NOT LIKE 'pg\_%'"; - $field = "relname"; - break; + $field = 'relname'; + break; case 'firebird': $sql = 'SELECT rdb$relation_name @@ -1547,12 +1544,12 @@ class install_install extends module WHERE rdb$view_source is null AND rdb$system_flag = 0'; $field = 'rdb$relation_name'; - break; + break; case 'oracle': $sql = 'SELECT table_name FROM USER_TABLES'; $field = 'table_name'; - break; + break; } $result = $db->sql_query($sql); @@ -1563,8 +1560,7 @@ class install_install extends module do { - // All phpBB installations will at least have config else it won't - // work + // All phpBB installations will at least have config else it won't work if (in_array(strtolower($row[$field]), $table_ary)) { $error[] = $lang['INST_ERR_PREFIX']; @@ -1612,7 +1608,7 @@ class install_install extends module { $path = $phpbb_root_path . 'language/' . $file; - if (is_file($path) || is_link($path) || $file == '.' || $file == '..') + if (is_file($path) || is_link($path) || $file == '.' || $file == '..' || $file == 'CVS') { continue; } diff --git a/phpBB/install/install_main.php b/phpBB/install/install_main.php index 1960db93c8..80516a895f 100755 --- a/phpBB/install/install_main.php +++ b/phpBB/install/install_main.php @@ -14,13 +14,13 @@ if (!empty($setmodules)) { $module[] = array( - 'module_type' => 'install', - 'module_title' => 'OVERVIEW', - 'module_filename' => substr(basename(__FILE__), 0, -strlen($phpEx)-1), - 'module_order' => 0, - 'module_subs' => array('INTRO', 'LICENSE', 'SUPPORT'), - 'module_stages' => '', - 'module_reqs' => '' + 'module_type' => 'install', + 'module_title' => 'OVERVIEW', + 'module_filename' => substr(basename(__FILE__), 0, -strlen($phpEx)-1), + 'module_order' => 0, + 'module_subs' => array('INTRO', 'LICENSE', 'SUPPORT'), + 'module_stages' => '', + 'module_reqs' => '' ); } @@ -45,10 +45,12 @@ class install_main extends module $title = $lang['SUB_INTRO']; $body = $lang['OVERVIEW_BODY']; break; + case 'license' : $title = $lang['GPL']; $body = implode("<br/>\n", file('../docs/COPYING')); break; + case 'support' : $title = $lang['SUB_SUPPORT']; $body = $lang['SUPPORT_BODY']; @@ -64,4 +66,5 @@ class install_main extends module )); } } + ?>
\ No newline at end of file diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index e74dff0f22..a505ed9578 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -204,16 +204,6 @@ BEGIN END;; -# phpbb_cache -CREATE TABLE phpbb_cache ( - var_name VARCHAR(252) NOT NULL, - var_expires INTEGER DEFAULT 0 NOT NULL, - var_data BLOB SUB_TYPE TEXT -);; - -ALTER TABLE phpbb_cache ADD PRIMARY KEY (var_name);; - - # phpbb_config CREATE TABLE phpbb_config ( config_name VARCHAR(252) NOT NULL, @@ -565,6 +555,7 @@ ALTER TABLE phpbb_modules ADD PRIMARY KEY (module_id);; CREATE INDEX phpbb_modules_module_enabled ON phpbb_modules(module_enabled);; CREATE INDEX phpbb_modules_left_right_id ON phpbb_modules(left_id, right_id);; +CREATE INDEX phpbb_modules_class_left_id ON phpbb_modules(module_class, left_id);; CREATE GENERATOR phpbb_modules_gen;; SET GENERATOR phpbb_modules_gen TO 0;; diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index 937c9bf77b..72db08a523 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -330,29 +330,6 @@ GO /* - Table: phpbb_cache -*/ -CREATE TABLE [phpbb_cache] ( - [var_name] [varchar] (255) NOT NULL , - [var_expires] [int] NOT NULL , - [var_data] [text] -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO - -ALTER TABLE [phpbb_cache] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_cache] PRIMARY KEY CLUSTERED - ( - [var_name] - ) ON [PRIMARY] -GO - -ALTER TABLE [phpbb_cache] WITH NOCHECK ADD - CONSTRAINT [DF_phpbb_cache__var_expires] DEFAULT (0) FOR [var_expires], - CONSTRAINT [DF_phpbb_cache__var_name] DEFAULT ('') FOR [var_name] -GO - - -/* Table: phpbb_config */ CREATE TABLE [phpbb_config] ( @@ -895,6 +872,9 @@ GO CREATE INDEX [module_left_right_id] ON [phpbb_modules]([left_id], [right_id]) ON [PRIMARY] GO +CREATE INDEX [module_class_left_id] ON [phpbb_modules]([module_class], [left_id]) ON [PRIMARY] +GO + /* Table: phpbb_poll_options diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql index f03f704820..88d02429ef 100644 --- a/phpBB/install/schemas/mysql_schema.sql +++ b/phpBB/install/schemas/mysql_schema.sql @@ -132,14 +132,6 @@ CREATE TABLE phpbb_bots ( KEY bot_active (bot_active) ); -# Table: 'phpbb_cache' -CREATE TABLE phpbb_cache ( - var_name varchar(255) DEFAULT '' NOT NULL, - var_expires int(10) UNSIGNED DEFAULT '0' NOT NULL, - var_data mediumtext, - PRIMARY KEY (var_name) -); - # Table: 'phpbb_config' CREATE TABLE phpbb_config ( config_name varchar(255) NOT NULL, @@ -362,7 +354,8 @@ CREATE TABLE phpbb_modules ( module_auth varchar(255) DEFAULT '' NOT NULL, PRIMARY KEY (module_id), KEY left_right_id (left_id, right_id), - KEY module_enabled (module_enabled) + KEY module_enabled (module_enabled), + KEY class_left_id (module_class, left_id) ); # Table: 'phpbb_poll_options' diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql index 0137f98f5a..900232b79a 100644 --- a/phpBB/install/schemas/oracle_schema.sql +++ b/phpBB/install/schemas/oracle_schema.sql @@ -308,18 +308,6 @@ CREATE INDEX phpbb_bots_bot_active on phpbb_bots (bot_active) /* - Table: phpbb_cache -*/ -CREATE TABLE phpbb_cache ( - var_name varchar2(255) DEFAULT '', - var_expires number(10) DEFAULT '0' NOT NULL, - var_data clob, - CONSTRAINT pk_phpbb_cache PRIMARY KEY (var_name) -) -/ - - -/* Table: phpbb_config */ CREATE TABLE phpbb_config ( @@ -781,6 +769,8 @@ CREATE INDEX phpbb_modules_module_enabled on phpbb_modules (module_enabled) / CREATE INDEX phpbb_modules_left_right_id on phpbb_modules (left_id, right_id) / +CREATE INDEX phpbb_modules_class_left_id on phpbb_modules (module_class, left_id) +/ /* diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index d24cefacc7..f52d6fe278 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -254,18 +254,6 @@ CREATE TABLE phpbb_bots ( CREATE INDEX phpbb_bots_bot_active ON phpbb_bots (bot_active); - - -/* Table: phpbb_cache */ -CREATE TABLE phpbb_cache ( - var_name varchar(255) DEFAULT '' NOT NULL, - var_expires INT4 DEFAULT '0' NOT NULL, - var_data TEXT, - PRIMARY KEY (var_name), - CHECK (var_expires>=0) -); - - /* Table: phpbb_config */ CREATE TABLE phpbb_config ( config_name varchar(255) NOT NULL, @@ -590,7 +578,7 @@ CREATE TABLE phpbb_modules ( CREATE INDEX phpbb_modules_module_enabled ON phpbb_modules (module_enabled); CREATE INDEX phpbb_modules_left_right_id ON phpbb_modules (left_id, right_id); - +CREATE INDEX phpbb_modules_class_left_id ON phpbb_modules (module_class, left_id); diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql index c989bbd1ef..04394f2d4a 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -146,15 +146,6 @@ CREATE TABLE phpbb_bots ( CREATE INDEX phpbb_bots_bot_active on phpbb_bots (bot_active); -# Table: phpbb_cache -CREATE TABLE phpbb_cache ( - var_name varchar(255) NOT NULL DEFAULT '', - var_expires int(10) NOT NULL DEFAULT '0', - var_data mediumtext(16777215), - PRIMARY KEY (var_name) -); - - # Table: phpbb_config CREATE TABLE phpbb_config ( config_name varchar(255) NOT NULL, @@ -392,6 +383,7 @@ CREATE TABLE phpbb_modules ( CREATE INDEX phpbb_modules_module_enabled on phpbb_modules (module_enabled); CREATE INDEX phpbb_modules_left_right_id on phpbb_modules (left_id, right_id); +CREATE INDEX phpbb_modules_class_left_id on phpbb_modules (module_class, left_id); # Table: phpbb_poll_options diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index e15a69560a..d0dc426dda 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -139,9 +139,9 @@ $lang = array_merge($lang, array( 'MAX_POST_FONT_SIZE' => 'Max font size per post', 'MAX_POST_FONT_SIZE_EXPLAIN' => 'Set to 0 for unlimited font size.', 'MAX_POST_IMG_HEIGHT' => 'Max image height per post', - 'MAX_POST_IMG_HEIGHT_EXPLAIN' => 'Set to 0 for unlimited image height.', + 'MAX_POST_IMG_HEIGHT_EXPLAIN' => 'Maximum height of an image/flash file in postings. Set to 0 for unlimited size.', 'MAX_POST_IMG_WIDTH' => 'Max image width per post', - 'MAX_POST_IMG_WIDTH_EXPLAIN' => 'Set to 0 for unlimited image width.', + 'MAX_POST_IMG_WIDTH_EXPLAIN' => 'Maximum width of an image/flash file in postings. Set to 0 for unlimited size.', 'MAX_POST_URLS' => 'Max links per post', 'MAX_POST_URLS_EXPLAIN' => 'Set to 0 for unlimited links.', 'POSTING' => 'Posting', @@ -160,9 +160,9 @@ $lang = array_merge($lang, array( 'MAX_SIG_FONT_SIZE' => 'Maximum signature font size', 'MAX_SIG_FONT_SIZE_EXPLAIN' => 'Maximum font size allowed in user signatures. Set to 0 for unlimited size.', 'MAX_SIG_IMG_HEIGHT' => 'Maximum signature image height', - 'MAX_SIG_IMG_HEIGHT_EXPLAIN' => 'Maximum height of an image in user signatures. Set to 0 for unlimited size.', + 'MAX_SIG_IMG_HEIGHT_EXPLAIN' => 'Maximum height of an image/flash file in user signatures. Set to 0 for unlimited size.', 'MAX_SIG_IMG_WIDTH' => 'Maximum signature image width', - 'MAX_SIG_IMG_WIDTH_EXPLAIN' => 'Maximum width of an image in user signatures. Set to 0 for unlimited size.', + 'MAX_SIG_IMG_WIDTH_EXPLAIN' => 'Maximum width of an image/flash file in user signatures. Set to 0 for unlimited size.', 'MAX_SIG_LENGTH' => 'Maximum signature length', 'MAX_SIG_LENGTH_EXPLAIN' => 'Maximum number of characters in user signatures.', 'MAX_SIG_SMILIES' => 'Maximum smilies per signature', @@ -395,6 +395,8 @@ $lang = array_merge($lang, array( $lang = array_merge($lang, array( 'ACP_JABBER_SETTINGS_EXPLAIN' => 'Here you can enable and control the use Jabber for instant messaging and board notices. Jabber is an opensource protocol and therefore available for use by anyone. Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Note that it may take several seconds to update Jabber account details, do not stop the script till completed!', + 'ERR_JAB_AUTH' => 'Could not authorise on Jabber server', + 'ERR_JAB_CONNECT' => 'Could not connect to Jabber server', 'ERR_JAB_PASSCHG' => 'Could not change password', 'ERR_JAB_PASSFAIL' => 'Password update failed, %s', 'ERR_JAB_REGISTER' => 'An error occured trying to register this account, %s', diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index a77039f042..a42e0fdd05 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -244,6 +244,7 @@ $lang = array_merge($lang, array( 'PROCEED_TO_ACP' => 'Click %sHere%s to proceed to the ACP', 'REMIND' => 'Remind', 'REORDER' => 'Reorder', + 'RESYNC' => 'Sync', 'RETURN_TO' => 'Return to ...', 'SELECT_ANONYMOUS' => 'Select Anonymous User', diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index ab9e6e524d..ff12e687e8 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -117,7 +117,6 @@ $lang = array_merge($lang, array( 'PRUNE_OLD_POLLS_EXPLAIN' => 'Removes topics with polls not voted in for post age days.', 'REDIRECT_ACL' => 'Now you are able to %sset permissions%s for this forum.', - 'RESYNC' => 'Sync', 'TYPE_CAT' => 'Category', 'TYPE_FORUM' => 'Forum', diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index 0364497f4e..5c326810f7 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -57,6 +57,7 @@ $lang = array_merge($lang, array( 'MOVE_POSTS_EXPLAIN' => 'Please select the forum to which you wish to move all the posts this user has made.', 'NO_SPECIAL_RANK' => 'No special rank assigned', + 'NOT_MANAGE_FOUNDER' => 'You tried to manage a user with founder status. Only founders are allowed to manage other founders.', 'QUICK_TOOLS' => 'Quick tools', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index cc0836a1c2..468c744814 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -207,6 +207,7 @@ $lang = array_merge($lang, array( 'NO_POST' => 'You have to select a post in order to warn the user for a post', 'NO_POST_REPORT' => 'This post was not reported.', 'NO_POST_SELECTED' => 'You must select at least one post to perform this action', + 'NO_REASON_DISAPPROVAL' => 'Please give an appropiate reason for disapproval', 'NO_TOPIC_SELECTED' => 'You must select at least one topic to perform this action', 'OTHER_IPS' => 'Other IP addresses this user has posted from', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 1e24aebe8b..dc63fc41ff 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -180,6 +180,7 @@ $lang = array_merge($lang, array( 'TOO_MANY_USER_OPTIONS' => 'You cannot specify more Options per User than existing poll options', 'TOPIC_BUMPED' => 'Topic has been bumped successfully', + 'UNABLE_GET_IMAGE_SIZE' => 'Accessing the image was impossible or file isn\'t a valid picture.', 'UNAUTHORISED_BBCODE' => 'You cannot use certain bbcodes: ', 'UNGLOBALISE_EXPLAIN' => 'To switch this topic back from being global to a normal topic, you need to select the forum you whish this topic to be displayed', 'UPDATE_COMMENT' => 'Update comment', diff --git a/phpBB/posting.php b/phpBB/posting.php index a5a5558adf..f647b30940 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -379,7 +379,7 @@ if ($mode != 'post' && $config['allow_topic_notify'] && $user->data['is_register } // Do we want to edit our post ? -if ($mode == 'edit') +if ($mode == 'edit' && $post_data['bbcode_uid']) { $message_parser->bbcode_uid = $post_data['bbcode_uid']; } diff --git a/phpBB/styles/subSilver/template/confirm_body.html b/phpBB/styles/subSilver/template/confirm_body.html index 3fd7f27992..af69325446 100644 --- a/phpBB/styles/subSilver/template/confirm_body.html +++ b/phpBB/styles/subSilver/template/confirm_body.html @@ -1,31 +1,35 @@ <!-- INCLUDE overall_header.html --> - <div id="pagecontent"> +<div id="pagecontent"> - <form name="confirm" action="{S_CONFIRM_ACTION}" method="post"><table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th>{MESSAGE_TITLE}</th> - </tr> - <tr> - <td class="row1" align="center"><br /><p class="gen">{MESSAGE_TEXT}</p><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="btnmain" /> <input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></td> - </tr> - </table></form> + <form name="confirm" action="{S_CONFIRM_ACTION}" method="post"> - </div> + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <th>{MESSAGE_TITLE}</th> + </tr> + <tr> + <td class="row1" align="center"><br /><p class="gen">{MESSAGE_TEXT}</p><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="btnmain" /> <input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></td> + </tr> + </table> + + </form> + +</div> - <br clear="all" /> +<br clear="all" /> - <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> - <tr> - <td class="row1"> - <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> - </tr> - </table> +<table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> +<tr> + <td class="row1"> + <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> + <p class="datetime">{S_TIMEZONE}</p> + </td> +</tr> +</table> - <br clear="all" /> +<br clear="all" /> - <div align="right"><!-- INCLUDE jumpbox.html --></div> +<div align="right"><!-- INCLUDE jumpbox.html --></div> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/faq_body.html b/phpBB/styles/subSilver/template/faq_body.html index b00ff8a3a4..55821f289e 100644 --- a/phpBB/styles/subSilver/template/faq_body.html +++ b/phpBB/styles/subSilver/template/faq_body.html @@ -1,6 +1,7 @@ <!-- INCLUDE overall_header.html --> <a name="faqtop"></a> + <div id="pagecontent"> <table class="tablebg" width="100%" cellspacing="1"> @@ -53,17 +54,17 @@ </div> - <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> - <tr> - <td class="row1"> - <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> - </tr> - </table> +<table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> +<tr> + <td class="row1"> + <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> + <p class="datetime">{S_TIMEZONE}</p> + </td> +</tr> +</table> - <br clear="all" /> +<br clear="all" /> - <div align="right"><!-- INCLUDE jumpbox.html --></div> +<div align="right"><!-- INCLUDE jumpbox.html --></div> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/jumpbox.html b/phpBB/styles/subSilver/template/jumpbox.html index 819b6dc506..b45793316f 100644 --- a/phpBB/styles/subSilver/template/jumpbox.html +++ b/phpBB/styles/subSilver/template/jumpbox.html @@ -1,19 +1,19 @@ <!-- IF S_DISPLAY_JUMPBOX --> -<form method="post" name="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(document.jumpbox.f.value == -1){return false;}"> + <form method="post" name="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(document.jumpbox.f.value == -1){return false;}"> -<table cellspacing="0" cellpadding="0" border="0"> + <table cellspacing="0" cellpadding="0" border="0"> <tr> <td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}:</span> <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ forms['jumpbox'].submit() }"> -<!-- BEGIN jumpbox_forums --> - <!-- IF jumpbox_forums.S_FORUM_COUNT eq 2 --><option value="-1">------------------</option><!-- ENDIF --> - <option value="{jumpbox_forums.FORUM_ID}"{jumpbox_forums.SELECTED}><!-- BEGIN level --> <!-- END level -->{jumpbox_forums.FORUM_NAME}</option> -<!-- END jumpbox_forums --> + <!-- BEGIN jumpbox_forums --> + <!-- IF jumpbox_forums.S_FORUM_COUNT eq 2 --><option value="-1">------------------</option><!-- ENDIF --> + <option value="{jumpbox_forums.FORUM_ID}"{jumpbox_forums.SELECTED}><!-- BEGIN level --> <!-- END level -->{jumpbox_forums.FORUM_NAME}</option> + <!-- END jumpbox_forums --> </select> <input class="btnlite" type="submit" value="{L_GO}" /></td> </tr> -</table> + </table> -</form> + </form> <!-- ENDIF -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/login_body.html b/phpBB/styles/subSilver/template/login_body.html index d61e3cf24a..af8b8dbfbe 100644 --- a/phpBB/styles/subSilver/template/login_body.html +++ b/phpBB/styles/subSilver/template/login_body.html @@ -3,46 +3,48 @@ <form action="{S_LOGIN_ACTION}" method="post"> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2">{L_LOGIN}</th> - </tr> - <!-- IF LOGIN_EXPLAIN --> +<tr> + <th colspan="2">{L_LOGIN}</th> +</tr> +<!-- IF LOGIN_EXPLAIN --> <tr> <td class="row3" colspan="2" align="center"><span class="gensmall">{LOGIN_EXPLAIN}</td> </tr> - <!-- ENDIF --> - <tr> - <td class="row1" width="50%"> - <p class="genmed">{L_LOGIN_INFO}</p> +<!-- ENDIF --> +<tr> + <td class="row1" width="50%"> + <p class="genmed">{L_LOGIN_INFO}</p> - <p class="genmed" align="center"> - <a href="{U_TERMS_USE}">{L_TERMS_USE}</a> | <a href="{U_PRIVACY}">{L_PRIVACY}</a> - </p> - </td> - <td class="row2"><table cellspacing="1" cellpadding="4"> - <!-- IF LOGIN_ERROR --> + <p class="genmed" align="center"> + <a href="{U_TERMS_USE}">{L_TERMS_USE}</a> | <a href="{U_PRIVACY}">{L_PRIVACY}</a> + </p> + </td> + <td class="row2"> + + <table cellspacing="1" cellpadding="4"> + <!-- IF LOGIN_ERROR --> <tr> <td class="gensmall" colspan="2" align="center"><span class="error">{LOGIN_ERROR}</span></td> </tr> - <!-- ENDIF --> + <!-- ENDIF --> - <tr> - <td valign="top"><b class="gensmall">{L_USERNAME}:</b></td> - <td><input class="post" type="text" name="username" size="25" maxlength="40" value="{USERNAME}" tabindex="1" /> - <!-- IF not S_ADMIN_AUTH --> - <br /><a class="gensmall" href="{U_REGISTER}">{L_REGISTER}</a> - <!-- ENDIF --> - </td> - </tr> - <tr> - <td valign="top"><b class="gensmall">{L_PASSWORD}:</b></td> - <td> - <input class="post" type="password" name="password" size="25" maxlength="100" tabindex="2" /> - <!-- IF U_SEND_PASSWORD --><br /><a class="gensmall" href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a><!-- ENDIF --> - <!-- IF U_RESEND_ACTIVATION and not S_ADMIN_AUTH --><br /><a class="gensmall" href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a><!-- ENDIF --> - </td> - </tr> - <!-- IF S_DISPLAY_FULL_LOGIN --> + <tr> + <td valign="top"><b class="gensmall">{L_USERNAME}:</b></td> + <td><input class="post" type="text" name="username" size="25" maxlength="40" value="{USERNAME}" tabindex="1" /> + <!-- IF not S_ADMIN_AUTH --> + <br /><a class="gensmall" href="{U_REGISTER}">{L_REGISTER}</a> + <!-- ENDIF --> + </td> + </tr> + <tr> + <td valign="top"><b class="gensmall">{L_PASSWORD}:</b></td> + <td> + <input class="post" type="password" name="password" size="25" maxlength="100" tabindex="2" /> + <!-- IF U_SEND_PASSWORD --><br /><a class="gensmall" href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a><!-- ENDIF --> + <!-- IF U_RESEND_ACTIVATION and not S_ADMIN_AUTH --><br /><a class="gensmall" href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a><!-- ENDIF --> + </td> + </tr> + <!-- IF S_DISPLAY_FULL_LOGIN --> <tr> <td> </td> <td><input type="checkbox" class="radio" name="autologin" tabindex="3" /> <span class="gensmall">{L_LOG_ME_IN}</span></td> @@ -51,10 +53,11 @@ <td> </td> <td><input type="checkbox" class="radio" name="viewonline" tabindex="4" /> <span class="gensmall">{L_HIDE_ME}</span></td> </tr> - <!-- ENDIF --> - </table></td> - </tr> - <!-- IF S_CONFIRM_CODE --> + <!-- ENDIF --> + </table> + </td> +</tr> +<!-- IF S_CONFIRM_CODE --> <tr> <th colspan="2" height="28" valign="middle">{L_LOGIN_CONFIRMATION}</th> </tr> @@ -71,26 +74,27 @@ <td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td> <td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8" /></td> </tr> - <!-- ENDIF --> - <tr> - <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="btnmain" value="{L_LOGIN}" tabindex="5" /></td> - </tr> -</table></form> +<!-- ENDIF --> +<tr> + <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="btnmain" value="{L_LOGIN}" tabindex="5" /></td> +</tr> +</table> -<br clear="all" /> +</form> - <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> - <tr> - <td class="row1"> - <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> - </tr> - </table> +<br clear="all" /> - <br clear="all" /> +<table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> +<tr> + <td class="row1"> + <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> + <p class="datetime">{S_TIMEZONE}</p> + </td> +</tr> +</table> - <div align="right"><!-- INCLUDE jumpbox.html --></div> +<br clear="all" /> +<div align="right"><!-- INCLUDE jumpbox.html --></div> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/login_forum.html b/phpBB/styles/subSilver/template/login_forum.html index fa23bf4604..897631c92a 100644 --- a/phpBB/styles/subSilver/template/login_forum.html +++ b/phpBB/styles/subSilver/template/login_forum.html @@ -1,49 +1,54 @@ <!-- INCLUDE overall_header.html --> - <div id="pagecontent"> - - <form name="login" method="post" action="{S_LOGIN_ACTION}"><table class="tablebg" width="100%" cellspacing="1" align="center"> - <tr> - <th>{L_LOGIN}</th> - </tr> - <tr> - <td class="row3" align="center"><span class="gensmall">{L_LOGIN_FORUM}</td> - </tr> +<div id="pagecontent"> + + <form name="login" method="post" action="{S_LOGIN_ACTION}"> + + <table class="tablebg" width="100%" cellspacing="1" align="center"> + <tr> + <th>{L_LOGIN}</th> + </tr> + <tr> + <td class="row3" align="center"><span class="gensmall">{L_LOGIN_FORUM}</td> + </tr> + <tr> + <td class="row1" align="center"> + + <table cellspacing="1" cellpadding="4" border="0"> + <!-- IF LOGIN_ERROR --> + <tr> + <td class="gensmall" colspan="2" align="center"><span class="error">{LOGIN_ERROR}</span></td> + </tr> + <!-- ENDIF --> <tr> - <td class="row1" align="center"><table cellspacing="1" cellpadding="4" border="0"> - - <!-- IF LOGIN_ERROR --> - <tr> - <td class="gensmall" colspan="2" align="center"><span class="error">{LOGIN_ERROR}</span></td> - </tr> - <!-- ENDIF --> - - <tr> - <td class="gensmall"><b>{L_PASSWORD}:</b></td> - <td><input class="post" type="password" name="password" size="25" maxlength="25" tabindex="2" /></td> - </tr> - </table></td> + <td class="gensmall"><b>{L_PASSWORD}:</b></td> + <td><input class="post" type="password" name="password" size="25" maxlength="25" tabindex="2" /></td> </tr> - <tr> - <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="btnmain" value="{L_LOGIN}" tabindex="3" /></td> - </tr> - </table></form> + </table> + </td> + </tr> + <tr> + <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="btnmain" value="{L_LOGIN}" tabindex="3" /></td> + </tr> + </table> + + </form> - </div> +</div> - <br clear="all" /> +<br clear="all" /> - <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> - <tr> - <td class="row1"> - <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> - </tr> - </table> +<table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> +<tr> + <td class="row1"> + <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> + <p class="datetime">{S_TIMEZONE}</p> + </td> +</tr> +</table> - <br clear="all" /> +<br clear="all" /> - <div align="right"><!-- INCLUDE jumpbox.html --></div> +<div align="right"><!-- INCLUDE jumpbox.html --></div> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/mcp_ban.html b/phpBB/styles/subSilver/template/mcp_ban.html index d404c5c38d..4d554f2c70 100644 --- a/phpBB/styles/subSilver/template/mcp_ban.html +++ b/phpBB/styles/subSilver/template/mcp_ban.html @@ -1,109 +1,109 @@ <!-- INCLUDE mcp_header.html --> - <script type="text/javascript"> - <!-- +<script type="text/javascript"> +<!-- - var ban_length = new Array(); - ban_length[-1] = ""; - <!-- BEGIN ban_length --> - ban_length['{ban_length.BAN_ID}'] = "{ban_length.A_LENGTH}"; - <!-- END ban_length --> + var ban_length = new Array(); + ban_length[-1] = ""; + <!-- BEGIN ban_length --> + ban_length['{ban_length.BAN_ID}'] = "{ban_length.A_LENGTH}"; + <!-- END ban_length --> - var ban_reason = new Array(); - ban_reason[-1] = ""; - <!-- BEGIN ban_reason --> - ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.A_REASON}"; - <!-- END ban_reason --> + var ban_reason = new Array(); + ban_reason[-1] = ""; + <!-- BEGIN ban_reason --> + ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.A_REASON}"; + <!-- END ban_reason --> - var ban_give_reason = new Array(); - ban_give_reason[-1] = ""; - <!-- BEGIN ban_give_reason --> - ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.A_REASON}"; - <!-- END ban_give_reason --> + var ban_give_reason = new Array(); + ban_give_reason[-1] = ""; + <!-- BEGIN ban_give_reason --> + ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.A_REASON}"; + <!-- END ban_give_reason --> - function display_details(option) - { - document.getElementById('mcp_ban').unbangivereason.value = ban_give_reason[option]; - document.getElementById('mcp_ban').unbanreason.value = ban_reason[option]; - document.getElementById('mcp_ban').unbanlength.value = ban_length[option]; - } + function display_details(option) + { + document.getElementById('mcp_ban').unbangivereason.value = ban_give_reason[option]; + document.getElementById('mcp_ban').unbanreason.value = ban_reason[option]; + document.getElementById('mcp_ban').unbanlength.value = ban_length[option]; + } - //--> - </script> +//--> +</script> - <form id="mcp_ban" method="post" action="{U_ACTION}"> +<form id="mcp_ban" method="post" action="{U_ACTION}"> - <table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0"> - <tr> - <th colspan="2" height="28" nowrap="nowrap">{L_TITLE}</th> - </tr> - <tr> - <td class="row3" colspan="2">{L_EXPLAIN}</td> - </tr> +<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0"> +<tr> + <th colspan="2" height="28" nowrap="nowrap">{L_TITLE}</th> +</tr> +<tr> + <td class="row3" colspan="2">{L_EXPLAIN}</td> +</tr> +<tr> + <td class="row1" width="45%" valign="top"><b>{L_BAN_CELL}:</b></td> + <td class="row2"> + <textarea name="ban" id="ban" cols="40" rows="3" class="post"></textarea> + <!-- IF S_USERNAME_BAN --><br />[ <a href="#" onclick="window.open('{U_FIND_USER}', '_phpbbsearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]<!-- ENDIF --> + </td> +</tr> +<tr> + <td class="row1" valign="top"><b>{L_BAN_LENGTH}:</b></td> + <td class="row2"><select name="banlength">{S_BAN_END_OPTIONS}</select><br /><input type="text" name="banlengthother" class="post" /> (YYYY-MM-DD)</td> +</tr> +<tr> + <td class="row1" valign="top"><b>{L_BAN_EXCLUDE}:</b><br /><span class="gensmall">{L_BAN_EXCLUDE_EXPLAIN}</span></td> + <td class="row2"><input type="radio" class="radio" name="banexclude" value="1" /> {L_YES} <input type="radio" class="radio" name="banexclude" value="0" checked="checked" /> {L_NO}</td> +</tr> +<tr> + <td class="row1" valign="top"><b>{L_BAN_REASON}:</b></td> + <td class="row2"><input name="banreason" type="text" class="post" /></td> +</tr> +<tr> + <td class="row1" valign="top"><b>{L_BAN_GIVE_REASON}:</b></td> + <td class="row2"><input name="bangivereason" type="text" class="post" /></td> +</tr> +<tr> + <td class="cat" colspan="2" align="center"><input type="submit" name="bansubmit" value="{L_SUBMIT}" class="btnmain" /> <input type="reset" value="{L_RESET}" class="btnlite" /> </td> +</tr> +</table> + +<br /><br /> + +<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0"> +<tr> + <th colspan="2" height="28" nowrap="nowrap">{L_UNBAN_TITLE}</th> +</tr> +<tr> + <td class="row3" colspan="2">{L_UNBAN_EXPLAIN}</td> +</tr> +<!-- IF S_BANNED_OPTIONS --> <tr> - <td class="row1" width="45%" valign="top"><b>{L_BAN_CELL}:</b></td> - <td class="row2"> - <textarea name="ban" id="ban" cols="40" rows="3" class="post"></textarea> - <!-- IF S_USERNAME_BAN --><br />[ <a href="#" onclick="window.open('{U_FIND_USER}', '_phpbbsearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]<!-- ENDIF --> - </td> + <td class="row1" valign="top" width="45%"><b>{L_BAN_CELL}:</b></td> + <td class="row2"><select name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="if (this.selectedIndex > -1) display_details(this.options[this.selectedIndex].value); else display_details(-1);">{BANNED_OPTIONS}</select></td> </tr> <tr> <td class="row1" valign="top"><b>{L_BAN_LENGTH}:</b></td> - <td class="row2"><select name="banlength">{S_BAN_END_OPTIONS}</select><br /><input type="text" name="banlengthother" class="post" /> (YYYY-MM-DD)</td> - </tr> - <tr> - <td class="row1" valign="top"><b>{L_BAN_EXCLUDE}:</b><br /><span class="gensmall">{L_BAN_EXCLUDE_EXPLAIN}</span></td> - <td class="row2"><input type="radio" class="radio" name="banexclude" value="1" /> {L_YES} <input type="radio" class="radio" name="banexclude" value="0" checked="checked" /> {L_NO}</td> + <td class="row2"><input style="border: 0px; 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 name="banreason" type="text" class="post" /></td> + <td class="row2"><input style="border: 0px; 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 name="bangivereason" type="text" class="post" /></td> - </tr> - <tr> - <td class="cat" colspan="2" align="center"><input type="submit" name="bansubmit" value="{L_SUBMIT}" class="btnmain" /> <input type="reset" value="{L_RESET}" class="btnlite" /> </td> + <td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbangivereason" disabled="disabled" /></td> </tr> - </table> - - <br /><br /> - - <table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0"> <tr> - <th colspan="2" height="28" nowrap="nowrap">{L_UNBAN_TITLE}</th> + <td class="cat" colspan="2" align="center"><input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="btnmain" /> <input type="reset" value="{L_RESET}" class="btnlite" /> </td> </tr> +<!-- ELSE --> <tr> - <td class="row3" colspan="2">{L_UNBAN_EXPLAIN}</td> + <td class="row1" colspan="2"><b>{L_NO_BAN_CELL}</b></td> </tr> - <!-- IF S_BANNED_OPTIONS --> - <tr> - <td class="row1" valign="top" width="45%"><b>{L_BAN_CELL}:</b></td> - <td class="row2"><select name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="if (this.selectedIndex > -1) display_details(this.options[this.selectedIndex].value); else display_details(-1);">{BANNED_OPTIONS}</select></td> - </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> - </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> - </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> - </tr> - <tr> - <td class="cat" colspan="2" align="center"><input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="btnmain" /> <input type="reset" value="{L_RESET}" class="btnlite" /> </td> - </tr> - <!-- ELSE --> - <tr> - <td class="row1" colspan="2"><b>{L_NO_BAN_CELL}</b></td> - </tr> - <!-- ENDIF --> - </table> +<!-- ENDIF --> +</table> - </form> +</form> <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/mcp_footer.html b/phpBB/styles/subSilver/template/mcp_footer.html index dd99e40b70..77bc2c6ee4 100644 --- a/phpBB/styles/subSilver/template/mcp_footer.html +++ b/phpBB/styles/subSilver/template/mcp_footer.html @@ -2,32 +2,33 @@ </td> </tr> </table> + <!-- IF PAGINATION --> - <table width="80%" align="right" cellspacing="1"> + <table width="80%" align="right" cellspacing="1"> <tr> <td class="nav" valign="middle" nowrap="nowrap"> {PAGE_NUMBER}<br /></td> <td class="gensmall" nowrap="nowrap"> [ {TOTAL} ] </td> <td class="gensmall" width="100%" align="right" nowrap="nowrap"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></td> </tr> - </table> - <br /> + </table> + <br /> <!-- ENDIF --> - </div> +</div> - <br clear="all" /> +<br clear="all" /> - <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> - <tr> - <td class="row1"> - <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> - </tr> - </table> +<table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> +<tr> + <td class="row1"> + <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> + <p class="datetime">{S_TIMEZONE}</p> + </td> +</tr> +</table> - <br clear="all" /> +<br clear="all" /> - <div align="right"><!-- INCLUDE jumpbox.html --></div> +<div align="right"><!-- INCLUDE jumpbox.html --></div> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/mcp_forum.html b/phpBB/styles/subSilver/template/mcp_forum.html index 0a09addace..173422b880 100644 --- a/phpBB/styles/subSilver/template/mcp_forum.html +++ b/phpBB/styles/subSilver/template/mcp_forum.html @@ -2,22 +2,24 @@ <!-- IF U_VIEW_FORUM_LOGS --><a href="{U_VIEW_FORUM_LOGS}">{L_VIEW_FORUM_LOGS}</a><!-- ENDIF --> -<form method="post" id="mcp" action="{S_MCP_ACTION}"><table class="tablebg" width="100%" cellspacing="1"> - <tr> - <td class="cat" colspan="6" align="center"><span class="gensmall">{L_DISPLAY_TOPICS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td> - </tr> - <tr> - <th width="4%" nowrap="nowrap"> </th> - <th nowrap="nowrap"> {L_TOPICS} </th> - <th width="8%" nowrap="nowrap"> {L_REPLIES} </th> - <th width="17%" nowrap="nowrap"> {L_LAST_POST} </th> - <th width="5%" nowrap="nowrap"> {L_MARK} </th> - </tr> - <!-- BEGIN topicrow --> +<form method="post" id="mcp" action="{S_MCP_ACTION}"> + +<table class="tablebg" width="100%" cellspacing="1"> +<tr> + <td class="cat" colspan="6" align="center"><span class="gensmall">{L_DISPLAY_TOPICS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td> +</tr> +<tr> + <th width="4%" nowrap="nowrap"> </th> + <th nowrap="nowrap"> {L_TOPICS} </th> + <th width="8%" nowrap="nowrap"> {L_REPLIES} </th> + <th width="17%" nowrap="nowrap"> {L_LAST_POST} </th> + <th width="5%" nowrap="nowrap"> {L_MARK} </th> +</tr> +<!-- BEGIN topicrow --> <tr> <td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td> <!-- IF S_TOPIC_ICONS --> - <!-- td class="row1" width="25" align="center">{topicrow.TOPIC_ICON_IMG}</td --> + <!-- td class="row1" width="25" align="center">{topicrow.TOPIC_ICON_IMG}</td --> <!-- ENDIF --> <td class="row1"> <!-- IF topicrow.S_SELECT_TOPIC --> @@ -35,31 +37,32 @@ <td class="row1" width="50" align="center"><p class="topicdetails">{topicrow.REPLIES}</p></td> <td class="row1" width="120" align="center"><p class="topicdetails">{topicrow.LAST_POST_TIME}</p></td> <td class="row2" align="center"><input type="checkbox" class="radio" name="topic_id_list[]" value="{topicrow.TOPIC_ID}" {topicrow.S_TOPIC_CHECKED}/></td> - </tr> - <!-- BEGINELSE --> +<!-- BEGINELSE --> <tr> <td class="row1" colspan="8" height="28" align="center"><p class="gen">{L_NO_TOPICS}</p></td> </tr> - <!-- END topicrow --> - <tr> - <td class="cat" colspan="6" align="right"> - <select name="action"> - <!-- IF S_CAN_DELETE --><option value="delete_topic">{L_DELETE}</option><!-- ENDIF --> - <!-- IF S_CAN_MOVE --><option value="move">{L_MOVE}</option><!-- ENDIF --> - <!-- IF S_CAN_FORK --><option value="fork">{L_FORK}</option><!-- ENDIF --> - <!-- IF S_CAN_LOCK --><option value="lock">{L_LOCK}</option><option value="unlock">{L_UNLOCK}</option><!-- ENDIF --> - <!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF --> - </select> - <input class="btnmain" type="submit" value="{L_SUBMIT}" /> - </td> - </tr> -</table></form> +<!-- END topicrow --> +<tr> + <td class="cat" colspan="6" align="right"> + <select name="action"> + <!-- IF S_CAN_DELETE --><option value="delete_topic">{L_DELETE}</option><!-- ENDIF --> + <!-- IF S_CAN_MOVE --><option value="move">{L_MOVE}</option><!-- ENDIF --> + <!-- IF S_CAN_FORK --><option value="fork">{L_FORK}</option><!-- ENDIF --> + <!-- IF S_CAN_LOCK --><option value="lock">{L_LOCK}</option><option value="unlock">{L_UNLOCK}</option><!-- ENDIF --> + <!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF --> + </select> + <input class="btnmain" type="submit" value="{L_SUBMIT}" /> + </td> +</tr> +</table> + +</form> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> - <tr> - <td align="right" valign="top" nowrap="nowrap"><b class="gensmall"><a href="javascript:marklist('mcp', 'topic_id_list', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('mcp', 'topic_id_list', false);">{L_UNMARK_ALL}</a></b></td> - </tr> +<tr> + <td align="right" valign="top" nowrap="nowrap"><b class="gensmall"><a href="javascript:marklist('mcp', 'topic_id_list', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('mcp', 'topic_id_list', false);">{L_UNMARK_ALL}</a></b></td> +</tr> </table> <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/mcp_front.html b/phpBB/styles/subSilver/template/mcp_front.html index 1261bd0265..f479983bb7 100644 --- a/phpBB/styles/subSilver/template/mcp_front.html +++ b/phpBB/styles/subSilver/template/mcp_front.html @@ -71,7 +71,7 @@ <!-- ENDIF --> <!-- IF S_SHOW_LOGS --> -<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="right"> + <table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="right"> <tr> <td class="row3" colspan="5" align="center"><b class="gen">{L_LATEST_LOGS}</b></td> </tr> @@ -83,21 +83,21 @@ <th width="18%" nowrap="nowrap">{L_TIME}</th> </tr> <!-- BEGIN log --> - <tr> - <td class="row1" nowrap="nowrap"><span class="gen">{log.USERNAME}</span></td> - <td class="row1" align="center" nowrap="nowrap"><span class="gen">{log.IP}</span></td> - <td class="row1"><span class="genmed">{log.ACTION}</span></td> - <td class="row1" align="center" nowrap="nowrap"><span class="gensmall"><!-- IF log.U_VIEWTOPIC --><a href="{log.U_VIEWTOPIC}">{L_VIEW_TOPIC}</a><!-- IF log.U_VIEWLOGS --> | <!-- ENDIF --><!-- ENDIF --><!-- IF log.U_VIEWLOGS --><a href="{log.U_VIEWLOGS}">{L_VIEW_TOPIC_LOGS}</a><!-- ENDIF --></span></td> - <td class="row1" align="center" nowrap="nowrap"><span class="gensmall">{log.TIME}</span></td> - </tr> + <tr> + <td class="row1" nowrap="nowrap"><span class="gen">{log.USERNAME}</span></td> + <td class="row1" align="center" nowrap="nowrap"><span class="gen">{log.IP}</span></td> + <td class="row1"><span class="genmed">{log.ACTION}</span></td> + <td class="row1" align="center" nowrap="nowrap"><span class="gensmall"><!-- IF log.U_VIEWTOPIC --><a href="{log.U_VIEWTOPIC}">{L_VIEW_TOPIC}</a><!-- IF log.U_VIEWLOGS --> | <!-- ENDIF --><!-- ENDIF --><!-- IF log.U_VIEWLOGS --><a href="{log.U_VIEWLOGS}">{L_VIEW_TOPIC_LOGS}</a><!-- ENDIF --></span></td> + <td class="row1" align="center" nowrap="nowrap"><span class="gensmall">{log.TIME}</span></td> + </tr> <!-- BEGINELSE --> - <tr> - <td class="row1" colspan="5" align="center"><span class="gen">{L_NO_ENTRIES}</span></td> - </tr> + <tr> + <td class="row1" colspan="5" align="center"><span class="gen">{L_NO_ENTRIES}</span></td> + </tr> <!-- END log --> -</table> + </table> -<br clear="all" /> + <br clear="all" /> <!-- ENDIF --> <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/mcp_header.html b/phpBB/styles/subSilver/template/mcp_header.html index 0e26ebe0b9..6d8717a81e 100644 --- a/phpBB/styles/subSilver/template/mcp_header.html +++ b/phpBB/styles/subSilver/template/mcp_header.html @@ -1,6 +1,6 @@ <!-- INCLUDE overall_header.html --> - <!-- IF TOPIC_TITLE or FORUM_NAME --> +<!-- IF TOPIC_TITLE or FORUM_NAME --> <div id="pageheader"> <h2><!-- IF TOPIC_TITLE --><a class="titles" href="{U_VIEWTOPIC}">{TOPIC_TITLE}</a><!-- ELSE --><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a><!-- ENDIF --></h2> @@ -13,63 +13,66 @@ </div> <br clear="all" /> - <!-- ENDIF --> +<!-- ENDIF --> - <div id="pagecontent"> +<div id="pagecontent"> - -<table width="100%" cellspacing="0" cellpadding="0" border="0"> + <table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> <td width="20%" valign="top"> <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <th>{L_OPTIONS}</th> + </tr> + <!-- BEGIN l_block1 --> <tr> - <th>{L_OPTIONS}</th> - </tr> - <!-- BEGIN l_block1 --> - <tr> - <!-- IF l_block1.S_SELECTED --> + <!-- 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%;"> - <!-- BEGIN l_block2 --> + <ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;"> + <!-- BEGIN l_block2 --> <li>» <!-- 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 --> - </ul> - <!-- ELSE --> + <!-- END l_block2 --> + </ul> + <!-- ELSE --> <td class="row2" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'" onclick="location.href='{l_block1.U_TITLE}'"><a class="nav" href="{l_block1.U_TITLE}">{l_block1.L_TITLE}</a> - <!-- ENDIF --> + <!-- ENDIF --> </td> </tr> - <!-- END l_block1 --> + <!-- END l_block1 --> </table> </td> <td><img src="images/spacer.gif" width="4" alt="" /></td> <td width="80%" valign="top"> - <!-- IF MESSAGE --> + <!-- IF MESSAGE --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th>{L_MESSAGE}</th> - </tr> - <tr> - <td class="row1" align="center"><br /><span class="gen">{MESSAGE}<br /><br /><!-- BEGIN return_links -->{return_links.MESSAGE_LINK}<br /><br /><!-- END return_links --></span></td> - </tr> + <tr> + <th>{L_MESSAGE}</th> + </tr> + <tr> + <td class="row1" align="center"><br /><span class="gen">{MESSAGE}<br /><br /><!-- BEGIN return_links -->{return_links.MESSAGE_LINK}<br /><br /><!-- END return_links --></span></td> + </tr> </table> <br /> - <!-- ENDIF --> + <!-- ENDIF --> - <!-- IF CONFIRM_MESSAGE --> - <table class="tablebg" width="100%" cellspacing="1"><form name="confirm" method="post" action="{S_CONFIRM_ACTION}"> - <tr> - <th><b>{L_PLEASE_CONFIRM}</b></th> - </tr> - <tr> - <td class="row1" align="center"><span class="gen"><br />{CONFIRM_MESSAGE}<br /><br />{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="confirm" value="{L_YES}" /> <input class="btnlite" type="submit" name="cancel" value="{L_NO}" /><br /><br /></span></td> - </tr> - </form></table> + <!-- IF CONFIRM_MESSAGE --> + <form name="confirm" method="post" action="{S_CONFIRM_ACTION}"> + + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <th><b>{L_PLEASE_CONFIRM}</b></th> + </tr> + <tr> + <td class="row1" align="center"><span class="gen"><br />{CONFIRM_MESSAGE}<br /><br />{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="confirm" value="{L_YES}" /> <input class="btnlite" type="submit" name="cancel" value="{L_NO}" /><br /><br /></span></td> + </tr> + </table> + + </form> <br /> - <!-- ENDIF --> + <!-- ENDIF --> diff --git a/phpBB/styles/subSilver/template/mcp_jumpbox.html b/phpBB/styles/subSilver/template/mcp_jumpbox.html index d5ff52b627..95a5926f72 100644 --- a/phpBB/styles/subSilver/template/mcp_jumpbox.html +++ b/phpBB/styles/subSilver/template/mcp_jumpbox.html @@ -1,13 +1,17 @@ <!-- Note: no longer in use... --> <form name="jumpbox" method="post" action="{S_JUMPBOX_ACTION}"> -<span class="gensmall">{L_JUMP_TO}:</span> <select name="f" onChange="if(this.options[this.selectedIndex].value != -1 && this.options[this.selectedIndex].value != document.jumpbox.current_f.value){ forms['jumpbox'].submit() }"> + + <span class="gensmall">{L_JUMP_TO}:</span> <select name="f" onChange="if(this.options[this.selectedIndex].value != -1 && this.options[this.selectedIndex].value != document.jumpbox.current_f.value){ forms['jumpbox'].submit() }"> + <!-- IF S_ENABLE_SELECT_ALL --> -<option value="0">{L_ALL_FORUMS}</option> + <option value="0">{L_ALL_FORUMS}</option> <!-- ELSE --> -<option value="-1">{L_SELECT_FORUM}</option> + <option value="-1">{L_SELECT_FORUM}</option> <!-- ENDIF --> -<!-- BEGIN options --><option value="{options.VALUE}"<!-- IF options.VALUE eq -1 --> class="greyed"<!-- ENDIF -->{options.SELECTED}/>{options.TEXT}</option> + +<!-- BEGIN options --> + <option value="{options.VALUE}"<!-- IF options.VALUE eq -1 --> class="greyed"<!-- ENDIF -->{options.SELECTED}/>{options.TEXT}</option> <!-- BEGINELSE --> <!-- END options --> </select> <input type="hidden" name="current_f" value="{S_CURRENT_FORUM}" /><input name="jumpbox" class="btnlite" type="submit" value="{L_GO}" onClick="if(document.jumpbox.f.value == -1){return false;}" /> diff --git a/phpBB/styles/subSilver/template/mcp_logs.html b/phpBB/styles/subSilver/template/mcp_logs.html index 17bbc4a290..d759af5931 100755 --- a/phpBB/styles/subSilver/template/mcp_logs.html +++ b/phpBB/styles/subSilver/template/mcp_logs.html @@ -1,42 +1,43 @@ <!-- INCLUDE mcp_header.html --> - <form method="post" name="mcp" action="{U_POST_ACTION}"> +<form method="post" name="mcp" action="{U_POST_ACTION}"> - <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> - <tr> - <th>{L_USERNAME}</th> - <th>{L_IP}</th> - <th>{L_TIME}</th> - <th>{L_ACTION}</th> - <!-- IF S_CLEAR_ALLOWED --><th>{L_MARK}</th><!-- ENDIF --> - </tr> - <!-- IF S_LOGS --> +<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> +<tr> + <th>{L_USERNAME}</th> + <th>{L_IP}</th> + <th>{L_TIME}</th> + <th>{L_ACTION}</th> + <!-- IF S_CLEAR_ALLOWED --><th>{L_MARK}</th><!-- ENDIF --> +</tr> +<!-- IF S_LOGS --> + <!-- BEGIN log --> - <!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td class="genmed">{log.USERNAME}</td> - <td class="genmed" style="text-align: center;">{log.IP}</td> - <td class="genmed" style="text-align: center;">{log.DATE}</td> - <td class="genmed">{log.ACTION}<br />{log.DATA}</td> - <!-- IF S_CLEAR_ALLOWED --><td width="5%" align="center"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td><!-- ENDIF --> - </tr> + <!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + <td class="genmed">{log.USERNAME}</td> + <td class="genmed" style="text-align: center;">{log.IP}</td> + <td class="genmed" style="text-align: center;">{log.DATE}</td> + <td class="genmed">{log.ACTION}<br />{log.DATA}</td> + <!-- IF S_CLEAR_ALLOWED --><td width="5%" align="center"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td><!-- ENDIF --> + </tr> <!-- END log --> <tr align="center"> <td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td> </tr> <!-- IF S_CLEAR_ALLOWED --> - <tr> - <td class="cat" colspan="5" align="center"><input class="btnlite" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" /> <input class="btnlite" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" /></td> - </tr> - <!-- ENDIF --> - <!-- ELSE --> <tr> - <td class="row1" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td> + <td class="cat" colspan="5" align="center"><input class="btnlite" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" /> <input class="btnlite" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" /></td> </tr> <!-- ENDIF --> - </table> - - </form> +<!-- ELSE --> + <tr> + <td class="row1" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td> + </tr> +<!-- ENDIF --> +</table> + +</form> - <br clear="all" /><br /> +<br clear="all" /><br /> <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/mcp_message.html b/phpBB/styles/subSilver/template/mcp_message.html index 55a49cb604..f31b576753 100644 --- a/phpBB/styles/subSilver/template/mcp_message.html +++ b/phpBB/styles/subSilver/template/mcp_message.html @@ -1,12 +1,12 @@ <!-- INCLUDE mcp_header.html --> <table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center"> - <tr> - <th height="28"><b>{MESSAGE_TITLE}</b></th> - </tr> - <tr> - <td class="row1" align="center"><br /><span class="gen">{MESSAGE_TEXT}</span><br /><br /></td> - </tr> +<tr> + <th height="28"><b>{MESSAGE_TITLE}</b></th> +</tr> +<tr> + <td class="row1" align="center"><br /><span class="gen">{MESSAGE_TEXT}</span><br /><br /></td> +</tr> </table> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/mcp_move.html b/phpBB/styles/subSilver/template/mcp_move.html index f16ac03273..21b01dfa64 100644 --- a/phpBB/styles/subSilver/template/mcp_move.html +++ b/phpBB/styles/subSilver/template/mcp_move.html @@ -1,41 +1,44 @@ <!-- INCLUDE overall_header.html --> - <div id="pagecontent"> +<div id="pagecontent"> - <form name="confirm" action="{S_CONFIRM_ACTION}" method="post"><table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th>{MESSAGE_TITLE}</th> - </tr> - <tr> - <td class="row1" align="center"> - <!-- IF ADDITIONAL_MSG --> - <span class="gen" style="color:red">{ADDITIONAL_MSG}</span><br /> - <!-- ENDIF --> - <span class="gen"><br />{L_SELECT_DESTINATION_FORUM} </span> - <select name="to_forum_id">{S_FORUM_SELECT}</select><br /> - <!-- IF S_CAN_LEAVE_SHADOW --> - <input type="checkbox" class="radio" name="move_leave_shadow" checked="checked" /><span class="gen">{L_LEAVE_SHADOW}</span><br /> - <!-- ENDIF --> - <br />{S_HIDDEN_FIELDS}<span class="gen">{MESSAGE_TEXT}</span><br /><br /> - <input type="submit" name="confirm" value="{YES_VALUE}" class="btnmain" /> <input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></span> - </td> - </tr> - </table></form> + <form name="confirm" action="{S_CONFIRM_ACTION}" method="post"> - </div> + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <th>{MESSAGE_TITLE}</th> + </tr> + <tr> + <td class="row1" align="center"> + <!-- IF ADDITIONAL_MSG --> + <span class="gen" style="color:red">{ADDITIONAL_MSG}</span><br /> + <!-- ENDIF --> + <span class="gen"><br />{L_SELECT_DESTINATION_FORUM} </span> + <select name="to_forum_id">{S_FORUM_SELECT}</select><br /> + <!-- IF S_CAN_LEAVE_SHADOW --> + <input type="checkbox" class="radio" name="move_leave_shadow" checked="checked" /><span class="gen">{L_LEAVE_SHADOW}</span><br /> + <!-- ENDIF --> + <br />{S_HIDDEN_FIELDS}<span class="gen">{MESSAGE_TEXT}</span><br /><br /> + <input type="submit" name="confirm" value="{YES_VALUE}" class="btnmain" /> <input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></span> + </td> + </tr> + </table> + + </form> + +</div> - <br clear="all" /> +<br clear="all" /> - <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> - <tr> - <td class="row1"> - <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> - </tr> - </table> +<table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> +<tr> + <td class="row1"> + <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> + <p class="datetime">{S_TIMEZONE}</p> + </td> +</tr> +</table> - <br clear="all" /> +<br clear="all" /> <!-- INCLUDE overall_footer.html --> - diff --git a/phpBB/styles/subSilver/template/mcp_notes_front.html b/phpBB/styles/subSilver/template/mcp_notes_front.html index c15ea3cac8..930d2130a6 100755 --- a/phpBB/styles/subSilver/template/mcp_notes_front.html +++ b/phpBB/styles/subSilver/template/mcp_notes_front.html @@ -1,20 +1,22 @@ <!-- INCLUDE mcp_header.html --> - <form method="post" name="mcp" action="{U_POST_ACTION}"> - <table class="bg" width="75%" cellspacing="1" cellpadding="4" border="0" align="center"> - <tr> - <th colspan="2"align="center">{L_SELECT_USER}</th> - </tr> - <tr> - <td class="row1" width="40%"><b class="gen">{L_FIND_USERNAME}: </b><br /><span class="gensmall">[ <a href="{U_FIND_MEMBER}" onclick="window.open('{U_FIND_MEMBER}', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;">{L_FIND_USERNAME}</a> ]</span></td> - <td class="row2"><input type="text" class="post" name="username" maxlength="50" size="20" /></td> - </tr> - <tr> - <td class="cat" colspan="2" align="center"><input type="submit" name="submituser" value="{L_SUBMIT}" class="btnmain" /></td> - </tr> - </table> - </form> +<form method="post" name="mcp" action="{U_POST_ACTION}"> - <br clear="all" /><br /> +<table class="bg" width="75%" cellspacing="1" cellpadding="4" border="0" align="center"> +<tr> + <th colspan="2"align="center">{L_SELECT_USER}</th> +</tr> +<tr> + <td class="row1" width="40%"><b class="gen">{L_FIND_USERNAME}: </b><br /><span class="gensmall">[ <a href="{U_FIND_MEMBER}" onclick="window.open('{U_FIND_MEMBER}', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;">{L_FIND_USERNAME}</a> ]</span></td> + <td class="row2"><input type="text" class="post" name="username" maxlength="50" size="20" /></td> +</tr> +<tr> + <td class="cat" colspan="2" align="center"><input type="submit" name="submituser" value="{L_SUBMIT}" class="btnmain" /></td> +</tr> +</table> + +</form> + +<br clear="all" /><br /> <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/mcp_notes_user.html b/phpBB/styles/subSilver/template/mcp_notes_user.html index eece61fa98..402f04da20 100755 --- a/phpBB/styles/subSilver/template/mcp_notes_user.html +++ b/phpBB/styles/subSilver/template/mcp_notes_user.html @@ -1,97 +1,104 @@ <!-- INCLUDE mcp_header.html --> - <form method="post" name="mcp" action="{U_POST_ACTION}"> +<form method="post" name="mcp" action="{U_POST_ACTION}"> - <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> - <tr> - <th colspan="2" height="28" align="center">{USERNAME}</th> - </tr> - <tr> - <td class="row1" align="center"><table cellspacing="1" cellpadding="2" border="0"> - <tr> - <td class="gen" align="center"><!-- IF USER_COLOR --><b style="color: #{USER_COLOR}"><!-- ELSE --><b><!-- ENDIF -->{USERNAME}</b></td> - </tr> - <!-- IF RANK --> +<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> +<tr> + <th colspan="2" height="28" align="center">{USERNAME}</th> +</tr> +<tr> + <td class="row1" align="center"> + <table cellspacing="1" cellpadding="2" border="0"> + <tr> + <td class="gen" align="center"><!-- IF USER_COLOR --><b style="color: #{USER_COLOR}"><!-- ELSE --><b><!-- ENDIF -->{USERNAME}</b></td> + </tr> + <!-- IF RANK --> <tr> <td class="postdetails" align="center">{RANK}</td> </tr> - <!-- ENDIF --> - <!-- IF RANK_IMG --> + <!-- ENDIF --> + <!-- IF RANK_IMG --> <tr> <td align="center">{RANK_IMG}</td> </tr> - <!-- ENDIF --> - <tr> - <td align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></td> - </tr> - </table></td> - <td class="row1"><table width="100%" cellspacing="1" cellpadding="2" border="0"> - <tr> - <td class="gen" align="right" nowrap="nowrap">{L_JOINED}: </td> - <td width="100%"><b class="gen">{JOINED}</b></td> - </tr> - <tr> - <td class="gen" align="right" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}: </td> - <td><b class="gen">{POSTS}</b></td> - </tr> - <tr> - <td class="gen" align="right" valign="top" nowrap="nowrap">{L_WARNINGS}: </td> - <td><b class="gen">{WARNINGS}</b></td> - </tr> - </table></td> - </tr> - </table> - <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> - <tr> - <th colspan="2" height="28" align="center">{L_FEEDBACK}</th> - </tr> - <!-- IF S_USER_NOTES --> - <!-- BEGIN usernotes --> + <!-- ENDIF --> + <tr> + <td align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></td> + </tr> + </table> + </td> + <td class="row1"> + <table width="100%" cellspacing="1" cellpadding="2" border="0"> + <tr> + <td class="gen" align="right" nowrap="nowrap">{L_JOINED}: </td> + <td width="100%"><b class="gen">{JOINED}</b></td> + </tr> + <tr> + <td class="gen" align="right" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}: </td> + <td><b class="gen">{POSTS}</b></td> + </tr> + <tr> + <td class="gen" align="right" valign="top" nowrap="nowrap">{L_WARNINGS}: </td> + <td><b class="gen">{WARNINGS}</b></td> + </tr> + </table> + </td> +</tr> +</table> + +<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> +<tr> + <th colspan="2" height="28" align="center">{L_FEEDBACK}</th> +</tr> +<!-- IF S_USER_NOTES --> + + <!-- BEGIN usernotes --> <!-- IF usernotes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td<!-- IF not S_CLEAR_ALLOWED --> colspan="2"<!-- ENDIF -->><span class="gensmall">{L_REPORT_BY}: <b>{usernotes.REPORT_BY}</b> {L_ON} {usernotes.REPORT_AT}</span><hr /><span class="gen">{usernotes.ACTION}</span></td> <!-- IF S_CLEAR_ALLOWED --><td width="5%" align="center"><input type="checkbox" class="radio" name="marknote[]" value="{usernotes.ID}" /></td><!-- ENDIF --> </tr> - <!-- END usernotes --> - <tr align="center"> - <td class="row3" colspan="2"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td> - </tr> - <!-- IF S_CLEAR_ALLOWED --> + <!-- END usernotes --> + <tr align="center"> + <td class="row3" colspan="2"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td> + </tr> + <!-- IF S_CLEAR_ALLOWED --> <tr> <td class="cat" colspan="2" align="center"><input class="btnlite" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" /> <input class="btnlite" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" /></td> </tr> - <!-- ENDIF --> - <!-- ELSE --> - <tr> - <td class="row1" colspan="2" align="center"><span class="gen">{L_NO_FEEDBACK}</span></td> - </tr> <!-- ENDIF --> - </table> - <br clear="all" /> - - <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> - <tr> - <th colspan="2" height="28" align="center">{L_ADD_FEEDBACK}</th> - </tr> - <tr> - <td class="row3" align="center" colspan="2"><span class="genmed">{L_ADD_FEEDBACK_EXPLAIN}</span></td> - <tr> - <td colspan="2" class="row1" align="center"><textarea name="usernote" rows="10" cols="76"></textarea></td> - </tr> - <tr> - <td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="action[add_feedback]" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" /></td> - </tr> - </table> - <table width="100%" cellspacing="0" cellpadding="0"> +<!-- ELSE --> <tr> - <td class="pagination">{PAGE_NUMBER} [ {TOTAL_REPORTS} ]</td> - <td align="right"><span class="pagination"><!-- IF PAGINATION --><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --><!-- ENDIF --></span></td> + <td class="row1" colspan="2" align="center"><span class="gen">{L_NO_FEEDBACK}</span></td> </tr> - </table> - </table> +<!-- ENDIF --> +</table> + +<br clear="all" /> + +<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> +<tr> + <th colspan="2" height="28" align="center">{L_ADD_FEEDBACK}</th> +</tr> +<tr> + <td class="row3" align="center" colspan="2"><span class="genmed">{L_ADD_FEEDBACK_EXPLAIN}</span></td> +<tr> + <td colspan="2" class="row1" align="center"><textarea name="usernote" rows="10" cols="76"></textarea></td> +</tr> +<tr> + <td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="action[add_feedback]" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" /></td> +</tr> +</table> + +<table width="100%" cellspacing="0" cellpadding="0"> +<tr> + <td class="pagination">{PAGE_NUMBER} [ {TOTAL_REPORTS} ]</td> + <td align="right"><span class="pagination"><!-- IF PAGINATION --><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --><!-- ENDIF --></span></td> +</tr> +</table> - </form> +</form> - <br clear="all" /><br /> +<br clear="all" /><br /> <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/mcp_post.html b/phpBB/styles/subSilver/template/mcp_post.html index f5e85d44c1..4665738cec 100644 --- a/phpBB/styles/subSilver/template/mcp_post.html +++ b/phpBB/styles/subSilver/template/mcp_post.html @@ -1,7 +1,9 @@ <!-- INCLUDE mcp_header.html --> <!-- IF S_MCP_REPORT --> - <form method="post" name="mcp_report" action="{U_CLOSE_ACTION}"><table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> + <form method="post" name="mcp_report" action="{U_CLOSE_ACTION}"> + + <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> <tr> <th colspan="2" height="28" align="center">{L_REPORT_DETAILS}</th> </tr> @@ -18,23 +20,27 @@ <td class="row2"><span class="postdetails">{REPORT_DATE}</span></td> </tr> <!-- IF REPORT_TEXT --> - <tr> - <th colspan="2" height="28" align="center">{L_MORE_INFO}</th> - </tr> - <tr> - <td class="row1" colspan="2"><div class="gen" style="overflow: auto; width: 100%; height: 80pt; border: 1px;">{REPORT_TEXT}</div></td> - </tr> + <tr> + <th colspan="2" height="28" align="center">{L_MORE_INFO}</th> + </tr> + <tr> + <td class="row1" colspan="2"><div class="gen" style="overflow: auto; width: 100%; height: 80pt; border: 1px;">{REPORT_TEXT}</div></td> + </tr> <!-- ENDIF --> <tr> <td class="cat" align="center" colspan="2"><!-- IF S_POST_REPORTED --><input class="btnmain" type="submit" value="{L_CLOSE_REPORT}" name="action[close]" /><!-- ELSE -->{L_REPORT_CLOSED}<!-- ENDIF --> <input class="btnlite" type="submit" value="{L_DELETE_REPORT}" name="action[delete]" /></td> </tr> + </table> + <input type="hidden" name="post_id_list[]" value="{POST_ID}" /> - </table></form> + </form> <br clear="all"/> <!-- ENDIF --> -<!-- IF S_MCP_QUEUE --><form method="post" name="mcp_approve" action="{U_APPROVE_ACTION}"><!-- ELSE --><form method="post" name="mcp_report" action="{U_CLOSE_ACTION}"><!-- ENDIF --><table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> +<!-- IF S_MCP_QUEUE --><form method="post" name="mcp_approve" action="{U_APPROVE_ACTION}"><!-- ELSE --><form method="post" name="mcp_report" action="{U_CLOSE_ACTION}"><!-- ENDIF --> + +<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> <tr> <th colspan="2" height="28" align="center">{L_POST_DETAILS}</th> </tr> @@ -72,6 +78,7 @@ <input type="hidden" name="post_id_list[]" value="{POST_ID}" /> <!-- ENDIF --> </table> + </form> <!-- IF S_MCP_QUEUE --> diff --git a/phpBB/styles/subSilver/template/mcp_queue.html b/phpBB/styles/subSilver/template/mcp_queue.html index 2e04f7afed..566405ca2c 100644 --- a/phpBB/styles/subSilver/template/mcp_queue.html +++ b/phpBB/styles/subSilver/template/mcp_queue.html @@ -1,41 +1,46 @@ <!-- INCLUDE mcp_header.html --> -<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0"><form name="mcp" id="mcp" method="post" action="{S_MCP_ACTION}"> - <tr> - <th colspan="6" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th> - </tr> - <tr> - <td colspan="5" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_ITEMS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select> <!-- IF TOPIC_ID --><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" /> <b>{L_ONLY_TOPIC}</b> <!-- ENDIF --><input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td> - </tr> - <tr> - <th height="28"> {L_TOPIC} </th> - <th> {L_AUTHOR} </th> - <th> {L_POST_TIME} </th> - <th width="5%"> {L_SELECT} </th> - </tr> - <!-- BEGIN postrow --> +<form name="mcp" id="mcp" method="post" action="{S_MCP_ACTION}"> + +<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0"> +<tr> + <th colspan="6" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th> +</tr> +<tr> + <td colspan="5" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_ITEMS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select> <!-- IF TOPIC_ID --><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" /> <b>{L_ONLY_TOPIC}</b> <!-- ENDIF --><input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td> +</tr> +<tr> + <th height="28"> {L_TOPIC} </th> + <th> {L_AUTHOR} </th> + <th> {L_POST_TIME} </th> + <th width="5%"> {L_SELECT} </th> +</tr> +<!-- BEGIN postrow --> + <!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td style="padding: 4px;"><p class="topictitle"><a href="{postrow.U_VIEWTOPIC}">{postrow.TOPIC_TITLE}</a></p> <span class="gensmall"><!-- IF postrow.U_VIEWFORUM -->{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span></td> <td style="padding: 4px;" align="left" valign="top" nowrap="nowrap"><span class="gen"><!-- IF postrow.U_VIEWPROFILE --><a href="{postrow.U_VIEWPROFILE}">{postrow.POSTER}</a><!-- ELSE -->{postrow.POSTER}<!-- ENDIF --></span><br /> <span class="gensmall">[ <a href="{postrow.U_VIEW_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td> <td class="postdetails" style="padding: 4px;" align="left" valign="top" nowrap="nowrap">{postrow.POST_TIME}</td> - <td align="center">{postrow.S_CHECKBOX}</td> + <td align="center"><input type="checkbox" class="radio" name="post_id_list[]" value="{postrow.POST_ID}" /></td> </tr> - <!-- BEGINELSE --> +<!-- BEGINELSE --> <tr> <td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen">{L_NO_POSTS}</span></td> </tr> - <!-- END postrow --> - <tr> - <td class="cat" colspan="6" height="28" align="center"><input class="btnmain" type="submit" name="action[approve]" value="{L_APPROVE}" /> <input class="btnlite" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" /></td> - </tr> -</form></table> +<!-- END postrow --> +<tr> + <td class="cat" colspan="6" height="28" align="center"><input class="btnmain" type="submit" name="action[approve]" value="{L_APPROVE}" /> <input class="btnlite" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" /></td> +</tr> +</table> + +</form> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> - <tr> - <td align="right" valign="top" nowrap="nowrap"><b class="gensmall"><a href="javascript:marklist('mcp', '', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('mcp', '', false);">{L_UNMARK_ALL}</a></b></td> - </tr> +<tr> + <td align="right" valign="top" nowrap="nowrap"><b class="gensmall"><a href="javascript:marklist('mcp', '', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('mcp', '', false);">{L_UNMARK_ALL}</a></b></td> +</tr> </table> <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/mcp_reports.html b/phpBB/styles/subSilver/template/mcp_reports.html index fce5027899..4cf680a601 100644 --- a/phpBB/styles/subSilver/template/mcp_reports.html +++ b/phpBB/styles/subSilver/template/mcp_reports.html @@ -1,20 +1,23 @@ <!-- INCLUDE mcp_header.html --> -<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0"><form name="mcp" id="mcp" method="post" action="{S_MCP_ACTION}"> - <tr> - <th colspan="5" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th> - </tr> - <tr> - <td colspan="5" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select> <!-- IF TOPIC_ID --><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" /> <b>{L_ONLY_TOPIC}</b> <!-- ENDIF --><input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td> - </tr> - <tr> - <th height="28"> {L_POST} </th> - <th> {L_AUTHOR} </th> - <th> {L_REPORTER} </th> - <th> {L_REPORT_TIME} </th> - <th width="5%"> {L_SELECT} </th> - </tr> - <!-- BEGIN postrow --> +<form name="mcp" id="mcp" method="post" action="{S_MCP_ACTION}"> + +<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0"> +<tr> + <th colspan="5" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th> +</tr> +<tr> + <td colspan="5" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select> <!-- IF TOPIC_ID --><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" /> <b>{L_ONLY_TOPIC}</b> <!-- ENDIF --><input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td> +</tr> +<tr> + <th height="28"> {L_POST} </th> + <th> {L_AUTHOR} </th> + <th> {L_REPORTER} </th> + <th> {L_REPORT_TIME} </th> + <th width="5%"> {L_SELECT} </th> +</tr> +<!-- BEGIN postrow --> + <!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td style="padding: 4px;"><p class="topictitle"><a href="{postrow.U_VIEWTOPIC}">{postrow.POST_SUBJECT}</a></p> <span class="gensmall">{L_TOPIC}: <a href="{postrow.U_VIEWTOPIC}">{postrow.TOPIC_TITLE}</a></span><br /> @@ -24,28 +27,30 @@ <td style="padding: 4px;" align="left" valign="top" nowrap="nowrap"><span class="gen"><!-- IF postrow.U_VIEW_REPORTER_PROFILE --><a href="{postrow.U_VIEW_REPOTER_PROFILE}">{postrow.REPORTER}</a><!-- ELSE -->{postrow.REPORTER}<!-- ENDIF --></span></td> <td style="padding: 4px;" align="left" valign="top" nowrap="nowrap"><span class="gen">{postrow.REPORT_TIME}</span><br /> <span class="gensmall">[ <a href="{postrow.U_VIEW_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td> - <td align="center">{postrow.S_CHECKBOX}</td> + <td align="center"><input type="checkbox" class="radio" name="post_id_list[]" value="{postrow.POST_ID}" /></td> </tr> - <!-- BEGINELSE --> +<!-- BEGINELSE --> <tr> <td class="row1" colspan="5" height="30" align="center" valign="middle"><span class="gen">{L_NO_POSTS}</span></td> </tr> - <!-- END postrow --> - <tr> - <td class="cat" colspan="5" height="28" align="center"> - <!-- IF S_CLOSED --> - <input class="btnmain" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]" /> - <!-- ELSE --> - <input class="btnmain" type="submit" name="action[close]" value="{L_CLOSE_REPORTS}" /> <input class="btnlite" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]" /> - <!-- ENDIF --> - </td> - </tr> -</form></table> +<!-- END postrow --> +<tr> + <td class="cat" colspan="5" height="28" align="center"> + <!-- IF S_CLOSED --> + <input class="btnmain" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]" /> + <!-- ELSE --> + <input class="btnmain" type="submit" name="action[close]" value="{L_CLOSE_REPORTS}" /> <input class="btnlite" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]" /> + <!-- ENDIF --> + </td> +</tr> +</table> + +</form> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> - <tr> - <td align="right" valign="top" nowrap="nowrap"><b class="gensmall"><a href="javascript:marklist('mcp', '', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('mcp', '', false);">{L_UNMARK_ALL}</a></b></td> - </tr> +<tr> + <td align="right" valign="top" nowrap="nowrap"><b class="gensmall"><a href="javascript:marklist('mcp', '', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('mcp', '', false);">{L_UNMARK_ALL}</a></b></td> +</tr> </table> <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/mcp_topic.html b/phpBB/styles/subSilver/template/mcp_topic.html index 8e4cc693f2..fa8c727664 100644 --- a/phpBB/styles/subSilver/template/mcp_topic.html +++ b/phpBB/styles/subSilver/template/mcp_topic.html @@ -1,7 +1,9 @@ <!-- INCLUDE mcp_header.html --> -<form name="mcp" id="mcp" method="post" action="{S_MCP_ACTION}"><table class="tablebg" width="100%" cellspacing="1"> - <!-- IF S_CAN_SPLIT --> +<form name="mcp" id="mcp" method="post" action="{S_MCP_ACTION}"> + +<table class="tablebg" width="100%" cellspacing="1"> +<!-- IF S_CAN_SPLIT --> <tr> <th colspan="3" nowrap="nowrap">{L_SPLIT_TOPIC}</th> </tr> @@ -16,18 +18,22 @@ <td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_FORUM}</span></td> <td class="row2" colspan="2">{S_FORUM_SELECT}</td> </tr> + <!-- IF S_SHOW_TOPIC_ICONS --> - <tr> - <td class="row1"><span class="gen">{L_TOPIC_ICON}</span></td> - <td class="row2" colspan="2"><table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td><input type="radio" class="radio" name="icon" value="0"<!-- IF not S_TOPIC_ICON --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NONE}</span> <!-- BEGIN topic_icon --><input type="radio" class="radio" name="icon" value="{topic_icon.ICON_ID}"<!-- IF topic_icon.S_CHECKED --> checked="checked"<!-- ENDIF --> /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /> <!-- END topic_icon --></td> - </tr> - </table></td> - </tr> - <!-- ENDIF --> + <tr> + <td class="row1"><span class="gen">{L_TOPIC_ICON}</span></td> + <td class="row2" colspan="2"> + <table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr> + <td><input type="radio" class="radio" name="icon" value="0"<!-- IF not S_TOPIC_ICON --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NONE}</span> <!-- BEGIN topic_icon --><input type="radio" class="radio" name="icon" value="{topic_icon.ICON_ID}"<!-- IF topic_icon.S_CHECKED --> checked="checked"<!-- ENDIF --> /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /> <!-- END topic_icon --></td> + </tr> + </table> + </td> + </tr> <!-- ENDIF --> - <!-- IF S_CAN_MERGE --> +<!-- ENDIF --> + +<!-- IF S_CAN_MERGE --> <tr> <th colspan="3" nowrap="nowrap">{L_MERGE_TOPIC}</th> </tr> @@ -39,97 +45,96 @@ <td class="row2" colspan="2"><input class="post" type="text" size="6" name="to_topic_id" value="{TO_TOPIC_ID}" /> <a href="{U_SELECT_TOPIC}">{L_SELECT_TOPIC}</a></td> </tr> <!-- IF TO_TOPIC_INFO --> - <tr> - <td class="row3" colspan="3" align="center"><b class="gen">{TO_TOPIC_INFO}</b></td> - </tr> - <!-- ENDIF --> + <tr> + <td class="row3" colspan="3" align="center"><b class="gen">{TO_TOPIC_INFO}</b></td> + </tr> <!-- ENDIF --> - <tr> - <th colspan="3" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th> - </tr> - <tr> - <td class="row1" nowrap="nowrap"><span class="gen">{L_POSTS_PER_PAGE}</span><br /><span class="gensmall">{L_POSTS_PER_PAGE_EXPLAIN}</span</td> - <td class="row2" colspan="2"><input class="post" type="text" name="posts_per_page" size="6" value="{POSTS_PER_PAGE}"></td> - </tr> - <tr> - <td class="cat" colspan="3" height="28" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td> - </tr> - <tr> - <th height="28" nowrap="nowrap">{L_AUTHOR}</th> - <th nowrap="nowrap">{L_MESSAGE}</th> - <th nowrap="nowrap">{L_SELECT}</th> - </tr> - <tr> - <td class="row3" colspan="3" align="center"><span class="gensmall">{RETURN_TOPIC}</span></td> +<!-- ENDIF --> +<tr> + <th colspan="3" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th> +</tr> +<tr> + <td class="row1" nowrap="nowrap"><span class="gen">{L_POSTS_PER_PAGE}</span><br /><span class="gensmall">{L_POSTS_PER_PAGE_EXPLAIN}</span</td> + <td class="row2" colspan="2"><input class="post" type="text" name="posts_per_page" size="6" value="{POSTS_PER_PAGE}"></td> +</tr> +<tr> + <td class="cat" colspan="3" height="28" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td> +</tr> +<tr> + <th height="28" nowrap="nowrap">{L_AUTHOR}</th> + <th nowrap="nowrap">{L_MESSAGE}</th> + <th nowrap="nowrap">{L_SELECT}</th> +</tr> +<tr> + <td class="row3" colspan="3" align="center"><span class="gensmall">{RETURN_TOPIC}</span></td> +</tr> +<!-- BEGIN postrow --> + + <!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + + <td align="center"><b class="postauthor">{postrow.POSTER_NAME}</b></td> + <td width="100%" height="28"> + <table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr valign="top"> + <td class="gensmall" nowrap="nowrap"> <b>{L_POST_SUBJECT}:</b> </td> + <td class="gensmall" width="100%">{postrow.POST_SUBJECT}</td> + </tr> + </table> + </td> + <td rowspan="2" width="5%" align="center"><input type="checkbox" class="radio" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> /></td> </tr> - <!-- BEGIN postrow --> - <!-- IF postrow.S_ROW_COUNT is even --> - <tr class="row1"> - <!-- ELSE --> - <tr class="row2"> - <!-- ENDIF --> - <td align="center"><b class="postauthor">{postrow.POSTER_NAME}</b></td> - <td width="100%" height="28"><table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr valign="top"> - <td class="gensmall" nowrap="nowrap"> <b>{L_POST_SUBJECT}:</b> </td> - <td class="gensmall" width="100%">{postrow.POST_SUBJECT}</td> - </tr> - </table></td> - <td rowspan="2" width="5%" align="center">{postrow.S_CHECKBOX}</td> - </tr> - <!-- IF postrow.S_ROW_COUNT is even --> - <tr class="row1"> - <!-- ELSE --> - <tr class="row2"> - <!-- ENDIF --> - <td valign="bottom"> - <table width="100%" cellspacing="0" cellpadding="0" border="0"> + <!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + + <td valign="bottom"> + <table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr valign="middle"> + <td height="28" align="center"><span class="gensmall">[ <a href="{postrow.U_POST_DETAILS}">{L_POST_DETAILS}</a> ]</span></td> + </tr> + </table> + </td> + <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> + </tr> + <tr> + <td valign="bottom"> + <table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr valign="middle"> - <td height="28" align="center"><span class="gensmall">[ <a href="{postrow.U_POST_DETAILS}">{L_POST_DETAILS}</a> ]</span></td> + <td width="100%"> + <!-- IF postrow.S_POST_UNAPPROVED -->{UNAPPROVED_IMG} <span class="postapprove"><a href="{postrow.U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></span><!-- ENDIF --> + <!-- IF postrow.S_POST_REPORTED -->{REPORTED_IMG}<span class="postreported"><a href="{postrow.U_MCP_REPORT}">{L_POST_REPORTED}</a></span><!-- ENDIF --> + </td> + <td width="10" nowrap="nowrap">{postrow.MINI_POST_IMG}</td> + <td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {postrow.POST_DATE}</td> </tr> - </table> - </td> - <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> - </tr> - <tr> - <td valign="bottom"> - <table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr valign="middle"> - <td width="100%"> - <!-- IF postrow.S_POST_UNAPPROVED -->{UNAPPROVED_IMG} <span class="postapprove"><a href="{postrow.U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></span><!-- ENDIF --> - <!-- IF postrow.S_POST_REPORTED -->{REPORTED_IMG}<span class="postreported"><a href="{postrow.U_MCP_REPORT}">{L_POST_REPORTED}</a></span><!-- ENDIF --> - </td> - <td width="10" nowrap="nowrap">{postrow.MINI_POST_IMG}</td> - <td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {postrow.POST_DATE}</td> - </tr> - </table> - </td> - </tr> - </table></td> - </tr> - <tr> - <td class="row3" colspan="3" height="1"><img src="images/spacer.gif" width="1" height="1" alt="" /></td> - </tr> - <!-- END postrow --> - <tr> - <td class="cat" colspan="3" height="28" align="center"><select name="action"><option value="" selected="selected">{L_SELECT_ACTION}</option> - <!-- IF S_CAN_APPROVE --><option value="approve">{L_APPROVE_POSTS}</option><!-- ENDIF --> - <!-- IF S_CAN_LOCK --><option value="lock_post">{L_LOCK_POST_POSTS} [ {L_LOCK_POST_EXPLAIN} ]</option><option value="unlock_post">{L_UNLOCK_POST_POSTS}</option><!-- ENDIF --> - <!-- IF S_CAN_DELETE --><option value="delete_post">{L_DELETE_POSTS}</option><!-- ENDIF --> - <!-- IF S_CAN_MERGE --><option value="merge_posts"<!-- IF ACTION eq 'merge' --> selected="selected"<!-- ENDIF -->>{L_MERGE_POSTS}</option><!-- ENDIF --> - <!-- IF S_CAN_SPLIT --><option value="split_all"<!-- IF ACTION eq 'split' --> selected="selected"<!-- ENDIF -->>{L_SPLIT_POSTS}</option><option value="split_beyond">{L_SPLIT_AFTER}</option><!-- ENDIF --> - </select> <input class="btnmain" type="submit" name="mcp_topic_submit" value="{L_SUBMIT}"></form></td> - </tr> + </table> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td class="row3" colspan="3" height="1"><img src="images/spacer.gif" width="1" height="1" alt="" /></td> + </tr> +<!-- END postrow --> +<tr> + <td class="cat" colspan="3" height="28" align="center"><select name="action"><option value="" selected="selected">{L_SELECT_ACTION}</option> + <!-- IF S_CAN_APPROVE --><option value="approve">{L_APPROVE_POSTS}</option><!-- ENDIF --> + <!-- IF S_CAN_LOCK --><option value="lock_post">{L_LOCK_POST_POSTS} [ {L_LOCK_POST_EXPLAIN} ]</option><option value="unlock_post">{L_UNLOCK_POST_POSTS}</option><!-- ENDIF --> + <!-- IF S_CAN_DELETE --><option value="delete_post">{L_DELETE_POSTS}</option><!-- ENDIF --> + <!-- IF S_CAN_MERGE --><option value="merge_posts"<!-- IF ACTION eq 'merge' --> selected="selected"<!-- ENDIF -->>{L_MERGE_POSTS}</option><!-- ENDIF --> + <!-- IF S_CAN_SPLIT --><option value="split_all"<!-- IF ACTION eq 'split' --> selected="selected"<!-- ENDIF -->>{L_SPLIT_POSTS}</option><option value="split_beyond">{L_SPLIT_AFTER}</option><!-- ENDIF --> + </select> <input class="btnmain" type="submit" name="mcp_topic_submit" value="{L_SUBMIT}"></form></td> +</tr> </table> </form> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> - <tr> - <td align="right" valign="top" nowrap="nowrap"><b class="gensmall"><a href="javascript:marklist('mcp', '', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('mcp', '', false);">{L_UNMARK_ALL}</a></b></td> - </tr> +<tr> + <td align="right" valign="top" nowrap="nowrap"><b class="gensmall"><a href="javascript:marklist('mcp', '', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('mcp', '', false);">{L_UNMARK_ALL}</a></b></td> +</tr> </table> <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/mcp_viewlogs.html b/phpBB/styles/subSilver/template/mcp_viewlogs.html index 1df45ee8a3..d814222b8d 100644 --- a/phpBB/styles/subSilver/template/mcp_viewlogs.html +++ b/phpBB/styles/subSilver/template/mcp_viewlogs.html @@ -1,28 +1,29 @@ <!-- INCLUDE mcp_header.html --> -<table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0"> <form method="post" name="mcp" action="{S_MCP_ACTION}"> - <tr> - <th colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th> - </tr> - <tr> - <td colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td> - </tr> - <tr> - <th width="15%" height="28" nowrap="nowrap">{L_USERNAME}</th> - <th width="12%" nowrap="nowrap">{L_IP}</th> - <th width="18%" nowrap="nowrap">{L_TIME}</th> - <th width="45%" nowrap="nowrap">{L_ACTION}</th> - <!-- IF not S_TOPIC_ID --> + +<table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0"> +<tr> + <th colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th> +</tr> +<tr> + <td colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td> +</tr> +<tr> + <th width="15%" height="28" nowrap="nowrap">{L_USERNAME}</th> + <th width="12%" nowrap="nowrap">{L_IP}</th> + <th width="18%" nowrap="nowrap">{L_TIME}</th> + <th width="45%" nowrap="nowrap">{L_ACTION}</th> + <!-- IF not S_TOPIC_ID --> <th width="8%" nowrap="nowrap"></th> - <!-- ENDIF --> - </tr> - <!-- IF S_TOPIC_ID --> + <!-- ENDIF --> +</tr> +<!-- IF S_TOPIC_ID --> <tr> <td class="row3" colspan="5"><span class="gensmall">{L_LOGS_CURRENT_TOPIC} <a href="{U_VIEWTOPIC}"><b>{TOPIC_NAME}</b></a></td> </tr> - <!-- ENDIF --> - <!-- BEGIN log --> +<!-- ENDIF --> +<!-- BEGIN log --> <tr> <td class="row1" nowrap="nowrap"><span class="gen">{log.USERNAME}</span></td> <td class="row1" align="center" nowrap="nowrap"><span class="gen">{log.IP}</span></td> @@ -32,19 +33,20 @@ <td class="row1" align="center" nowrap="nowrap"><span class="gensmall"><!-- IF log.U_VIEWTOPIC --><a href="{log.U_VIEWTOPIC}">{L_VIEW_TOPIC}</a><!-- IF log.U_VIEWLOGS --> | <!-- ENDIF --><!-- ENDIF --><!-- IF log.U_VIEWLOGS --><a href="{log.U_VIEWLOGS}">{L_VIEW_TOPIC_LOGS}</a><!-- ENDIF --></span></td> <!-- ENDIF --> </tr> - <!-- BEGINELSE --> +<!-- BEGINELSE --> <tr> <td class="row1" colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td> </tr> - <!-- END log --> +<!-- END log --> </form> + </table> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> - <tr> - <td class="nav" align="left" valign="middle">{PAGE_NUMBER}</td> - <td align="right" valign="top" nowrap="nowrap"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></td> - </tr> +<tr> + <td class="nav" align="left" valign="middle">{PAGE_NUMBER}</td> + <td align="right" valign="top" nowrap="nowrap"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></td> +</tr> </table> <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/mcp_warn_front.html b/phpBB/styles/subSilver/template/mcp_warn_front.html index 0b6c7b2c42..188acd321c 100755 --- a/phpBB/styles/subSilver/template/mcp_warn_front.html +++ b/phpBB/styles/subSilver/template/mcp_warn_front.html @@ -1,72 +1,74 @@ <!-- INCLUDE mcp_header.html --> - <form method="post" name="mcp" action="{U_POST_ACTION}"> - <table class="bg" width="75%" cellspacing="1" cellpadding="4" border="0" align="center"> - <tr> - <th colspan="2"align="center">{L_SELECT_USER}</th> - </tr> - <tr> - <td class="row1" width="40%"><b class="gen">{L_FIND_USERNAME}: </b><br /><span class="gensmall">[ <a href="{U_FIND_MEMBER}" onclick="window.open('{U_FIND_MEMBER}', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;">{L_FIND_USERNAME}</a> ]</span></td> - <td class="row2"><input type="text" class="post" name="username" maxlength="50" size="20" /></td> - </tr> - <tr> - <td class="cat" colspan="2" align="center"><input type="submit" name="submituser" value="{L_SUBMIT}" class="btnmain" /></td> - </tr> - </table> - </form> +<form method="post" name="mcp" action="{U_POST_ACTION}"> - <br clear="all" /><br /> +<table class="bg" width="75%" cellspacing="1" cellpadding="4" border="0" align="center"> +<tr> + <th colspan="2"align="center">{L_SELECT_USER}</th> +</tr> +<tr> + <td class="row1" width="40%"><b class="gen">{L_FIND_USERNAME}: </b><br /><span class="gensmall">[ <a href="{U_FIND_MEMBER}" onclick="window.open('{U_FIND_MEMBER}', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;">{L_FIND_USERNAME}</a> ]</span></td> + <td class="row2"><input type="text" class="post" name="username" maxlength="50" size="20" /></td> +</tr> +<tr> + <td class="cat" colspan="2" align="center"><input type="submit" name="submituser" value="{L_SUBMIT}" class="btnmain" /></td> +</tr> +</table> - <table class="tablebg" width="100%" cellspacing="1"> +</form> + +<br clear="all" /><br /> + +<table class="tablebg" width="100%" cellspacing="1"> +<tr> + <td class="row3" colspan="5" align="center"><b class="gen">{L_MOST_WARNINGS}</b></td> +</tr> +<tr> + <th> {L_USERNAME} </th> + <th> {L_WARNINGS} </th> + <th> {L_LATEST_WARNING_TIME} </th> + <th> </th> +</tr> +<!-- BEGIN highest --> <tr> - <td class="row3" colspan="5" align="center"><b class="gen">{L_MOST_WARNINGS}</b></td> + <td class="row1" width="15%" valign="top"><span class="gen"><a href="{highest.U_USER}">{highest.USERNAME}</a></span></td> + <td class="row2" width="15%" valign="top"><span class="gen">{highest.WARNINGS}</span></td> + <td class="row1" width="15%" valign="top"><span class="gen">{highest.WARNING_TIME}</span></td> + <td class="row2" width="15%" valign="top"><span class="gen"><a href="{highest.U_NOTES}">{L_VIEW_NOTES}</a></span></td> </tr> +<!-- BEGINELSE --> <tr> - <th> {L_USERNAME} </th> - <th> {L_WARNINGS} </th> - <th> {L_LATEST_WARNING_TIME} </th> - <th> </th> + <td class="row1" colspan="5" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td> </tr> - <!-- BEGIN highest --> - <tr> - <td class="row1" width="15%" valign="top"><span class="gen"><a href="{highest.U_USER}">{highest.USERNAME}</a></span></td> - <td class="row2" width="15%" valign="top"><span class="gen">{highest.WARNINGS}</span></td> - <td class="row1" width="15%" valign="top"><span class="gen">{highest.WARNING_TIME}</span></td> - <td class="row2" width="15%" valign="top"><span class="gen"><a href="{highest.U_NOTES}">{L_VIEW_NOTES}</a></span></td> - </tr> - <!-- BEGINELSE --> - <tr> - <td class="row1" colspan="5" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td> - </tr> - <!-- END highest --> - </table> +<!-- END highest --> +</table> - <br clear="all" /><br /> +<br clear="all" /><br /> - <table class="tablebg" width="100%" cellspacing="1"> +<table class="tablebg" width="100%" cellspacing="1"> +<tr> + <td class="row3" colspan="5" align="center"><b class="gen">{L_LATEST_WARNINGS}</b></td> +</tr> +<tr> + <th> {L_USERNAME} </th> + <th> {L_TIME} </th> + <th> {L_TOTAL_WARNINGS} </th> + <th> </th> +</tr> +<!-- BEGIN latest --> <tr> - <td class="row3" colspan="5" align="center"><b class="gen">{L_LATEST_WARNINGS}</b></td> + <td class="row1" width="15%" valign="top"><span class="gen"><a href="{latest.U_USER}">{latest.USERNAME}</a></span></td> + <td class="row2" width="15%" valign="top"><span class="gen">{latest.WARNING_TIME}</span></td> + <td class="row1" width="15%" valign="top"><span class="gen">{latest.WARNINGS}</span></td> + <td class="row2" width="15%" valign="top"><span class="gen"><a href="{latest.U_NOTES}">{L_VIEW_NOTES}</a></span></td> </tr> +<!-- BEGINELSE --> <tr> - <th> {L_USERNAME} </th> - <th> {L_TIME} </th> - <th> {L_TOTAL_WARNINGS} </th> - <th> </th> + <td class="row1" colspan="5" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td> </tr> - <!-- BEGIN latest --> - <tr> - <td class="row1" width="15%" valign="top"><span class="gen"><a href="{latest.U_USER}">{latest.USERNAME}</a></span></td> - <td class="row2" width="15%" valign="top"><span class="gen">{latest.WARNING_TIME}</span></td> - <td class="row1" width="15%" valign="top"><span class="gen">{latest.WARNINGS}</span></td> - <td class="row2" width="15%" valign="top"><span class="gen"><a href="{latest.U_NOTES}">{L_VIEW_NOTES}</a></span></td> - </tr> - <!-- BEGINELSE --> - <tr> - <td class="row1" colspan="5" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td> - </tr> - <!-- END latest --> - </table> +<!-- END latest --> +</table> - <br clear="all" /><br /> +<br clear="all" /><br /> <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/mcp_warn_list.html b/phpBB/styles/subSilver/template/mcp_warn_list.html index 22cce45b1d..9e0e78c103 100755 --- a/phpBB/styles/subSilver/template/mcp_warn_list.html +++ b/phpBB/styles/subSilver/template/mcp_warn_list.html @@ -1,43 +1,43 @@ <!-- INCLUDE mcp_header.html --> - <form method="post" name="mcp" action="{U_POST_ACTION}"> +<form method="post" name="mcp" action="{U_POST_ACTION}"> - <table class="tablebg" width="100%" cellspacing="1"> +<table class="tablebg" width="100%" cellspacing="1"> +<tr> + <td class="row3" colspan="5" align="center"><b class="gen">{L_WARNED_USERS}</b></td> +</tr> +<tr> + <th> {L_USERNAME} </th> + <th> {L_WARNINGS} </th> + <th> {L_LATEST_WARNING_TIME} </th> + <th> </th> +</tr> +<!-- BEGIN user --> <tr> - <td class="row3" colspan="5" align="center"><b class="gen">{L_WARNED_USERS}</b></td> + <td class="row1" width="15%" valign="top"><span class="gen"><a href="{user.U_USER}">{user.USERNAME}</a></span></td> + <td class="row2" width="15%" valign="top"><span class="gen">{user.WARNINGS}</span></td> + <td class="row1" width="15%" valign="top"><span class="gen">{user.WARNING_TIME}</span></td> + <td class="row2" width="15%" valign="top"><span class="gen"><a href="{user.U_NOTES}">{L_VIEW_NOTES}</a></span></td> </tr> +<!-- BEGINELSE --> <tr> - <th> {L_USERNAME} </th> - <th> {L_WARNINGS} </th> - <th> {L_LATEST_WARNING_TIME} </th> - <th> </th> + <td class="row1" colspan="5" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td> </tr> - <!-- BEGIN user --> - <tr> - <td class="row1" width="15%" valign="top"><span class="gen"><a href="{user.U_USER}">{user.USERNAME}</a></span></td> - <td class="row2" width="15%" valign="top"><span class="gen">{user.WARNINGS}</span></td> - <td class="row1" width="15%" valign="top"><span class="gen">{user.WARNING_TIME}</span></td> - <td class="row2" width="15%" valign="top"><span class="gen"><a href="{user.U_NOTES}">{L_VIEW_NOTES}</a></span></td> - </tr> - <!-- BEGINELSE --> - <tr> - <td class="row1" colspan="5" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td> - </tr> - <!-- END user --> - <tr align="center"> - <td class="row3" colspan="4"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td> - </tr> - </table> +<!-- END user --> +<tr align="center"> + <td class="row3" colspan="4"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td> +</tr> +</table> - <table width="100%" cellspacing="0" cellpadding="0"> - <tr> - <td class="pagination">{PAGE_NUMBER} [ {TOTAL_USERS} ]</td> - <td align="right"><span class="pagination"><!-- IF PAGINATION --><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --><!-- ENDIF --></span></td> - </tr> - </table> +<table width="100%" cellspacing="0" cellpadding="0"> +<tr> + <td class="pagination">{PAGE_NUMBER} [ {TOTAL_USERS} ]</td> + <td align="right"><span class="pagination"><!-- IF PAGINATION --><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --><!-- ENDIF --></span></td> +</tr> +</table> - </form> +</form> - <br clear="all" /><br /> +<br clear="all" /><br /> <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/mcp_warn_post.html b/phpBB/styles/subSilver/template/mcp_warn_post.html index 0d454fe645..72fb5eba16 100755 --- a/phpBB/styles/subSilver/template/mcp_warn_post.html +++ b/phpBB/styles/subSilver/template/mcp_warn_post.html @@ -1,55 +1,58 @@ <!-- INCLUDE mcp_header.html --> - <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> - <tr> - <th colspan="2" height="28" align="center">{L_POST}</th> - </tr> - <tr> - <td class="row1" align="center"><table cellspacing="1" cellpadding="2" border="0"> - <tr> - <td class="gen" align="center"><!-- IF USER_COLOR --><b style="color: #{USER_COLOR}"><!-- ELSE --><b><!-- ENDIF -->{USERNAME}</b></td> - </tr> - <!-- IF RANK --> +<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> +<tr> + <th colspan="2" height="28" align="center">{L_POST}</th> +</tr> +<tr> + <td class="row1" align="center"> + <table cellspacing="1" cellpadding="2" border="0"> + <tr> + <td class="gen" align="center"><!-- IF USER_COLOR --><b style="color: #{USER_COLOR}"><!-- ELSE --><b><!-- ENDIF -->{USERNAME}</b></td> + </tr> + <!-- IF RANK --> <tr> <td class="postdetails" align="center">{RANK}</td> </tr> - <!-- ENDIF --> - <!-- IF RANK_IMG --> + <!-- ENDIF --> + <!-- IF RANK_IMG --> <tr> <td align="center">{RANK_IMG}</td> </tr> - <!-- ENDIF --> - <tr> - <td align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></td> - </tr> - </table></td> - <td class="row1"> - <span class="gen">{POST}</span> - </td> - </tr> - </table> + <!-- ENDIF --> + <tr> + <td align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></td> + </tr> + </table> + </td> + <td class="row1"> + <span class="gen">{POST}</span> + </td> +</tr> +</table> + +<br clear="all" /><br /> - <br clear="all" /><br /> +<form method="post" name="mcp" action="{U_POST_ACTION}"> - <form method="post" name="mcp" action="{U_POST_ACTION}"> - <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> - <tr> - <th height="28" align="center">{L_ADD_WARNING}</th> - </tr> - <tr> - <td class="row3" align="center"><span class="genmed">{L_ADD_WARNING_EXPLAIN}</span></td> - <tr> - <td class="row1" align="center"><textarea name="warning" rows="10" cols="76"></textarea></td> - </tr> - <tr> - <td class="row1" align="center"><input type="checkbox" class="radio" name="notify_user" checked="checked" /><span class="genmed">{L_NOTIFY_USER_WARN}</span></td> - </tr> - <tr> - <td class="cat" align="center"><input class="btnmain" type="submit" name="action[add_warning]" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" /></td> - </tr> - </table> - </form> +<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> +<tr> + <th height="28" align="center">{L_ADD_WARNING}</th> +</tr> +<tr> + <td class="row3" align="center"><span class="genmed">{L_ADD_WARNING_EXPLAIN}</span></td> +<tr> + <td class="row1" align="center"><textarea name="warning" rows="10" cols="76"></textarea></td> +</tr> +<tr> + <td class="row1" align="center"><input type="checkbox" class="radio" name="notify_user" checked="checked" /><span class="genmed">{L_NOTIFY_USER_WARN}</span></td> +</tr> +<tr> + <td class="cat" align="center"><input class="btnmain" type="submit" name="action[add_warning]" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" /></td> +</tr> +</table> +</form> - <br clear="all" /><br /> +<br clear="all" /><br /> <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/mcp_warn_user.html b/phpBB/styles/subSilver/template/mcp_warn_user.html index ec6dd7f735..6c01471507 100755 --- a/phpBB/styles/subSilver/template/mcp_warn_user.html +++ b/phpBB/styles/subSilver/template/mcp_warn_user.html @@ -1,66 +1,71 @@ <!-- INCLUDE mcp_header.html --> - <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> - <tr> - <th colspan="2" height="28" align="center">{USERNAME}</th> - </tr> - <tr> - <td class="row1" align="center"><table cellspacing="1" cellpadding="2" border="0"> - <tr> - <td class="gen" align="center"><!-- IF USER_COLOR --><b style="color: #{USER_COLOR}"><!-- ELSE --><b><!-- ENDIF -->{USERNAME}</b></td> - </tr> - <!-- IF RANK --> +<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> +<tr> + <th colspan="2" height="28" align="center">{USERNAME}</th> +</tr> +<tr> + <td class="row1" align="center"> + <table cellspacing="1" cellpadding="2" border="0"> + <tr> + <td class="gen" align="center"><!-- IF USER_COLOR --><b style="color: #{USER_COLOR}"><!-- ELSE --><b><!-- ENDIF -->{USERNAME}</b></td> + </tr> + <!-- IF RANK --> <tr> <td class="postdetails" align="center">{RANK}</td> </tr> - <!-- ENDIF --> - <!-- IF RANK_IMG --> + <!-- ENDIF --> + <!-- IF RANK_IMG --> <tr> <td align="center">{RANK_IMG}</td> </tr> - <!-- ENDIF --> - <tr> - <td align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></td> - </tr> - </table></td> - <td class="row1"><table width="100%" cellspacing="1" cellpadding="2" border="0"> - <tr> - <td class="gen" align="right" nowrap="nowrap">{L_JOINED}: </td> - <td width="100%"><b class="gen">{JOINED}</b></td> - </tr> - <tr> - <td class="gen" align="right" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}: </td> - <td><b class="gen">{POSTS}</b></td> - </tr> - <tr> - <td class="gen" align="right" valign="top" nowrap="nowrap">{L_WARNINGS}: </td> - <td><b class="gen">{WARNINGS}</b></td> - </tr> - </table></td> - </tr> - </table> + <!-- ENDIF --> + <tr> + <td align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></td> + </tr> + </table> + </td> + <td class="row1"> + <table width="100%" cellspacing="1" cellpadding="2" border="0"> + <tr> + <td class="gen" align="right" nowrap="nowrap">{L_JOINED}: </td> + <td width="100%"><b class="gen">{JOINED}</b></td> + </tr> + <tr> + <td class="gen" align="right" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}: </td> + <td><b class="gen">{POSTS}</b></td> + </tr> + <tr> + <td class="gen" align="right" valign="top" nowrap="nowrap">{L_WARNINGS}: </td> + <td><b class="gen">{WARNINGS}</b></td> + </tr> + </table> + </td> +</tr> +</table> + +<br clear="all" /><br /> - <br clear="all" /><br /> +<form method="post" name="mcp" action="{U_POST_ACTION}"> - <form method="post" name="mcp" action="{U_POST_ACTION}"> - <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> - <tr> - <th height="28" align="center">{L_ADD_WARNING}</th> - </tr> - <tr> - <td class="row3" align="center"><span class="genmed">{L_ADD_WARNING_EXPLAIN}</span></td> - <tr> - <td class="row1" align="center"><textarea name="warning" rows="10" cols="76"></textarea></td> - </tr> - <tr> - <td class="row1" align="center"><input type="checkbox" class="radio" name="notify_user" checked="checked" /><span class="genmed">{L_NOTIFY_USER_WARN}</span></td> - </tr> - <tr> - <td class="cat" align="center"><input class="btnmain" type="submit" name="action[add_warning]" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" /></td> - </tr> - </table> - </form> +<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> +<tr> + <th height="28" align="center">{L_ADD_WARNING}</th> +</tr> +<tr> + <td class="row3" align="center"><span class="genmed">{L_ADD_WARNING_EXPLAIN}</span></td> +<tr> + <td class="row1" align="center"><textarea name="warning" rows="10" cols="76"></textarea></td> +</tr> +<tr> + <td class="row1" align="center"><input type="checkbox" class="radio" name="notify_user" checked="checked" /><span class="genmed">{L_NOTIFY_USER_WARN}</span></td> +</tr> +<tr> + <td class="cat" align="center"><input class="btnmain" type="submit" name="action[add_warning]" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" /></td> +</tr> +</table> +</form> - <br clear="all" /><br /> +<br clear="all" /><br /> <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/mcp_whois.html b/phpBB/styles/subSilver/template/mcp_whois.html index be0a6174b7..54b93eec69 100644 --- a/phpBB/styles/subSilver/template/mcp_whois.html +++ b/phpBB/styles/subSilver/template/mcp_whois.html @@ -1,15 +1,15 @@ <!-- INCLUDE mcp_header.html --> - <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th>{L_WHOIS}</th> - </tr> - <tr> - <td class="row3" align="center"><span class="gensmall">{RETURN_POST}</span></td> - </tr> - <tr> - <td class="row1"><pre>{WHOIS}</pre></td> - </tr> - </table> +<table class="tablebg" width="100%" cellspacing="1"> +<tr> + <th>{L_WHOIS}</th> +</tr> +<tr> + <td class="row3" align="center"><span class="gensmall">{RETURN_POST}</span></td> +</tr> +<tr> + <td class="row1"><pre>{WHOIS}</pre></td> +</tr> +</table> <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/memberlist_body.html b/phpBB/styles/subSilver/template/memberlist_body.html index 2d0464ac85..832aec3c36 100644 --- a/phpBB/styles/subSilver/template/memberlist_body.html +++ b/phpBB/styles/subSilver/template/memberlist_body.html @@ -19,38 +19,40 @@ </form> <!-- ENDIF --> - <!-- IF S_SEARCH_USER and S_FORM_NAME --> - <form method="post" name="results" action="{S_MODE_ACTION}" onsubmit="insert_marked(this.user);return false"> - <!-- ELSE --> - <form method="post" action="{S_MODE_ACTION}"> - <!-- ENDIF --> +<!-- IF S_SEARCH_USER and S_FORM_NAME --> + <form method="post" name="results" action="{S_MODE_ACTION}" onsubmit="insert_marked(this.user);return false"> +<!-- ELSE --> + <form method="post" action="{S_MODE_ACTION}"> +<!-- ENDIF --> - <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th nowrap="nowrap">#</th> - <th nowrap="nowrap" width="25%" align="left"><a href="{U_SORT_USERNAME}">{L_USERNAME}</a></th> - <th nowrap="nowrap" width="15%"><a href="{U_SORT_JOINED}">{L_JOINED}</a></th> - <th nowrap="nowrap" width="10%"><a href="{U_SORT_POSTS}">{L_POSTS}</a></th> - <th nowrap="nowrap" width="15%"><a href="{U_SORT_RANK}">{L_RANK}</a></th> - <th nowrap="nowrap" width="11%">{L_SEND_MESSAGE}</th> - <th nowrap="nowrap" width="11%"><a href="{U_SORT_EMAIL}">{L_EMAIL}</a></th> - <th nowrap="nowrap" width="11%"><a href="{U_SORT_WEBSITE}">{L_WEBSITE}</a></th> - <!-- IF S_SEARCH_USER and S_FORM_NAME --><th width="2%" nowrap="nowrap">{L_MARK}</th><!-- ENDIF --> - </tr> - <!-- BEGIN memberrow --> - <!-- IF S_SHOW_GROUP --> - <!-- IF memberrow.S_FIRST_ROW and memberrow.S_GROUP_LEADER --> +<table class="tablebg" width="100%" cellspacing="1"> +<tr> + <th nowrap="nowrap">#</th> + <th nowrap="nowrap" width="25%" align="left"><a href="{U_SORT_USERNAME}">{L_USERNAME}</a></th> + <th nowrap="nowrap" width="15%"><a href="{U_SORT_JOINED}">{L_JOINED}</a></th> + <th nowrap="nowrap" width="10%"><a href="{U_SORT_POSTS}">{L_POSTS}</a></th> + <th nowrap="nowrap" width="15%"><a href="{U_SORT_RANK}">{L_RANK}</a></th> + <th nowrap="nowrap" width="11%">{L_SEND_MESSAGE}</th> + <th nowrap="nowrap" width="11%"><a href="{U_SORT_EMAIL}">{L_EMAIL}</a></th> + <th nowrap="nowrap" width="11%"><a href="{U_SORT_WEBSITE}">{L_WEBSITE}</a></th> + <!-- IF S_SEARCH_USER and S_FORM_NAME --><th width="2%" nowrap="nowrap">{L_MARK}</th><!-- ENDIF --> +</tr> +<!-- BEGIN memberrow --> + + <!-- IF S_SHOW_GROUP --> + <!-- IF memberrow.S_FIRST_ROW and memberrow.S_GROUP_LEADER --> <tr class="row3"> <td colspan="8"><b class="gensmall">{L_GROUP_LEADER}</b></td> </tr> - <!-- ELSEIF not memberrow.S_GROUP_LEADER and not $S_MEMBER_HEADER --> + <!-- ELSEIF not memberrow.S_GROUP_LEADER and not $S_MEMBER_HEADER --> <tr class="row3"> <td colspan="8"><b class="gensmall">{L_GROUP_MEMBERS}</b></td> </tr> <!-- DEFINE $S_MEMBER_HEADER = 1 --> - <!-- ENDIF --> <!-- ENDIF --> - <!-- IF memberrow.S_ROW_COUNT is even --><tr class="row2"><!-- ELSE --> <tr class="row1"><!-- ENDIF --> + <!-- ENDIF --> + + <!-- IF memberrow.S_ROW_COUNT is even --><tr class="row2"><!-- ELSE --> <tr class="row1"><!-- ENDIF --> <td class="gen" align="center"> {memberrow.ROW_NUMBER} </td> <td class="genmed" align="left"><strong><a<!-- IF memberrow.USER_COLOR --> style="color:#{memberrow.USER_COLOR}"<!-- ENDIF --> href="{memberrow.U_VIEWPROFILE}">{memberrow.USERNAME}</a></strong></td> @@ -67,41 +69,41 @@ <!-- IF S_SEARCH_USER and S_FORM_NAME --><td align="center"><input type="checkbox" class="radio" name="user" value="{memberrow.USERNAME}" /></td><!-- ENDIF --> </tr> - <!-- BEGINELSE --> +<!-- BEGINELSE --> <tr> <td class="row1" colspan="<!-- IF S_SEARCH_USER and S_FORM_NAME -->9<!-- ELSE -->8<!-- ENDIF -->" height="28" align="center"><span class="gen">{L_NO_MEMBERS}</span></td> </tr> - <!-- END memberrow --> +<!-- END memberrow --> - <tr> - <td class="cat" colspan="<!-- IF S_SEARCH_USER and S_FORM_NAME -->9<!-- ELSE -->8<!-- ENDIF -->" align="center"><!-- IF S_SEARCH_USER and S_FORM_NAME --><input class="btnlite" type="submit" value="{L_SELECT_MARKED}" /><!-- ELSE --><span class="gensmall">{L_SELECT_SORT_METHOD}:</span> <select name="sk">{S_MODE_SELECT}</select> <span class="gensmall">{L_ORDER}</span> <select name="sd">{S_ORDER_SELECT}</select> <input type="submit" name="submit" value="{L_SUBMIT}" class="btnlite" /><!-- ENDIF --></td> - </tr> - </table> +<tr> + <td class="cat" colspan="<!-- IF S_SEARCH_USER and S_FORM_NAME -->9<!-- ELSE -->8<!-- ENDIF -->" align="center"><!-- IF S_SEARCH_USER and S_FORM_NAME --><input class="btnlite" type="submit" value="{L_SELECT_MARKED}" /><!-- ELSE --><span class="gensmall">{L_SELECT_SORT_METHOD}:</span> <select name="sk">{S_MODE_SELECT}</select> <span class="gensmall">{L_ORDER}</span> <select name="sd">{S_ORDER_SELECT}</select> <input type="submit" name="submit" value="{L_SUBMIT}" class="btnlite" /><!-- ENDIF --></td> +</tr> +</table> - </form> +</form> - <table width="100%" cellspacing="0" cellpadding="0"> - <tr> - <td class="pagination">{PAGE_NUMBER} [ {TOTAL_USERS} ]</td> - <td align="right"><!-- IF S_SEARCH_USER and S_FORM_NAME --><b class="nav"><a href="javascript:marklist('results', 'user', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('results', 'user', false);">{L_UNMARK_ALL}</a></b><br /><!-- ENDIF --><span class="pagination"><!-- IF PAGINATION --><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --><!-- ENDIF --></span></td> - </tr> - </table> +<table width="100%" cellspacing="0" cellpadding="0"> +<tr> + <td class="pagination">{PAGE_NUMBER} [ {TOTAL_USERS} ]</td> + <td align="right"><!-- IF S_SEARCH_USER and S_FORM_NAME --><b class="nav"><a href="javascript:marklist('results', 'user', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('results', 'user', false);">{L_UNMARK_ALL}</a></b><br /><!-- ENDIF --><span class="pagination"><!-- IF PAGINATION --><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --><!-- ENDIF --></span></td> +</tr> +</table> - <br clear="all" /> +<br clear="all" /> - <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> - <tr> - <td class="row1"> - <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> - </tr> - </table> +<table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> +<tr> + <td class="row1"> + <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> + <p class="datetime">{S_TIMEZONE}</p> + </td> +</tr> +</table> - <br clear="all" /> +<br clear="all" /> - <div align="right"><!-- INCLUDE jumpbox.html --></div> +<div align="right"><!-- INCLUDE jumpbox.html --></div> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/memberlist_email.html b/phpBB/styles/subSilver/template/memberlist_email.html index c7fd0716c4..2ecbf7f3f3 100644 --- a/phpBB/styles/subSilver/template/memberlist_email.html +++ b/phpBB/styles/subSilver/template/memberlist_email.html @@ -3,12 +3,14 @@ <script language="JavaScript" type="text/javascript"> <!-- -function checkForm(formObj) { +function checkForm(formObj) +{ return; - formErrors = false; + formErrors = false; - if (formObj.message.value.length < 2) { + if (formObj.message.value.length < 2) + { formErrors = "{LA_EMPTY_MESSAGE_EMAIL}"; } else if ( formObj.subject.value.length < 2) @@ -16,7 +18,8 @@ function checkForm(formObj) { formErrors = "{LA_EMPTY_SUBJECT_EMAIL}"; } - if (formErrors) { + if (formErrors) + { alert(formErrors); return false; } @@ -24,73 +27,79 @@ function checkForm(formObj) { //--> </script> - <div id="pagecontent"> +<div id="pagecontent"> - <form action="{S_POST_ACTION}" method="post" name="post" onsubmit="return checkForm(this)"><table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2">{L_SEND_EMAIL}</th> - </tr> - <!-- IF ERROR_MESSAGE --> - <tr> - <td class="row3" colspan="2" align="center"><span class="error">{ERROR_MESSAGE}</span></td> - </tr> - <!-- ENDIF --> - <!-- IF S_SEND_USER --> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_RECIPIENT}</b></td> - <td class="row2" width="65%"><b class="genmed">{USERNAME}</b></td> - </tr> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_SUBJECT}</b></td> - <td class="row2"><input class="post" type="text" name="subject" size="50" maxlength="100" tabindex="2" value="{SUBJECT}" /></td> - </tr> - <!-- ELSE ---> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_EMAIL_ADDRESS}</b></td> - <td class="row2"><input class="post" type="text" name="email" size="50" maxlength="100" value="{EMAIL}" /></td> - </tr> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_REAL_NAME}</b></td> - <td class="row2"><input class="post" type="text" name="name" size="50" maxlength="100" value="{NAME}" /></td> - </tr> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_DEST_LANG}</b><br /><span class="gensmall">{L_DEST_LANG_EXPLAIN}</span></td> - <td class="row2"><select name="lang">{S_LANG_OPTIONS}</select></td> - </tr> - <!-- ENDIF --> - <tr> - <td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}</b><br /><span class="gensmall">{L_EMAIL_BODY_EXPLAIN}</span></td> - <td class="row2"><textarea class="post" name="message" rows="15" cols="76" tabindex="3">{MESSAGE}</textarea></td> - </tr> + <form action="{S_POST_ACTION}" method="post" name="post" onsubmit="return checkForm(this)"> + + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <th colspan="2">{L_SEND_EMAIL}</th> + </tr> + <!-- IF ERROR_MESSAGE --> + <tr> + <td class="row3" colspan="2" align="center"><span class="error">{ERROR_MESSAGE}</span></td> + </tr> + <!-- ENDIF --> + <!-- IF S_SEND_USER --> + <tr> + <td class="row1" width="35%"><b class="genmed">{L_RECIPIENT}</b></td> + <td class="row2" width="65%"><b class="genmed">{USERNAME}</b></td> + </tr> + <tr> + <td class="row1" width="35%"><b class="genmed">{L_SUBJECT}</b></td> + <td class="row2"><input class="post" type="text" name="subject" size="50" maxlength="100" tabindex="2" value="{SUBJECT}" /></td> + </tr> + <!-- ELSE ---> + <tr> + <td class="row1" width="35%"><b class="genmed">{L_EMAIL_ADDRESS}</b></td> + <td class="row2"><input class="post" type="text" name="email" size="50" maxlength="100" value="{EMAIL}" /></td> + </tr> + <tr> + <td class="row1" width="35%"><b class="genmed">{L_REAL_NAME}</b></td> + <td class="row2"><input class="post" type="text" name="name" size="50" maxlength="100" value="{NAME}" /></td> + </tr> + <tr> + <td class="row1" width="35%"><b class="genmed">{L_DEST_LANG}</b><br /><span class="gensmall">{L_DEST_LANG_EXPLAIN}</span></td> + <td class="row2"><select name="lang">{S_LANG_OPTIONS}</select></td> + </tr> + <!-- ENDIF --> + <tr> + <td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}</b><br /><span class="gensmall">{L_EMAIL_BODY_EXPLAIN}</span></td> + <td class="row2"><textarea class="post" name="message" rows="15" cols="76" tabindex="3">{MESSAGE}</textarea></td> + </tr> + <tr> + <td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span></td> + <td class="row2"> + <table cellspacing="0" cellpadding="1" border="0"> <tr> - <td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span></td> - <td class="row2"><table cellspacing="0" cellpadding="1" border="0"> - <tr> - <td><input type="checkbox" class="radio" name="cc_email" value="1" checked="checked" /></td> - <td class="gen">{L_CC_EMAIL}</td> - </tr> - </table></td> + <td><input type="checkbox" class="radio" name="cc_email" value="1" checked="checked" /></td> + <td class="gen">{L_CC_EMAIL}</td> </tr> - <tr> - <td class="cat" colspan="2" height="28" align="center"><input type="submit" tabindex="6" name="submit" class="btnmain" value="{L_SEND_EMAIL}" /></td> - </tr> - </table></form> + </table> + </td> + </tr> + <tr> + <td class="cat" colspan="2" height="28" align="center"><input type="submit" tabindex="6" name="submit" class="btnmain" value="{L_SEND_EMAIL}" /></td> + </tr> + </table> + + </form> - </div> +</div> - <br clear="all" /> +<br clear="all" /> - <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> - <tr> - <td class="row1"> - <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> - </tr> - </table> +<table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> +<tr> + <td class="row1"> + <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> + <p class="datetime">{S_TIMEZONE}</p> + </td> +</tr> +</table> - <br clear="all" /> +<br clear="all" /> - <div style="float: right;"><!-- INCLUDE jumpbox.html --></div> +<div style="float: right;"><!-- INCLUDE jumpbox.html --></div> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/memberlist_group.html b/phpBB/styles/subSilver/template/memberlist_group.html index 3a9740aaa3..e873d3eb52 100644 --- a/phpBB/styles/subSilver/template/memberlist_group.html +++ b/phpBB/styles/subSilver/template/memberlist_group.html @@ -1,15 +1,15 @@ <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="7">{L_GROUP_INFORMATION}</th> - </tr> - <tr> - <td class="row1" width="20%"><b class="genmed">{L_GROUP_NAME}:</b></td> - <td class="row2"><b class="gen"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR}"<!-- ENDIF -->>{GROUP_NAME}</b></td> - <td class="row1" width="33%" rowspan="2" align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<br /><!-- ENDIF --><!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF --><!-- IF GROUP_RANK --><span class="gensmall">{GROUP_RANK}</span><br /><br /><!-- ENDIF --><!-- IF U_PM --><a href="{U_PM}">{PM_IMG}</a><!-- ENDIF --></td> - </tr> - <tr> - <td class="row1" width="20%"><b class="genmed">{L_GROUP_DESC}:</b></td> - <td class="row2"><span class="gen">{GROUP_DESC}</span><p class="forumdesc">{GROUP_TYPE}</p></td> - </tr> +<tr> + <th colspan="7">{L_GROUP_INFORMATION}</th> +</tr> +<tr> + <td class="row1" width="20%"><b class="genmed">{L_GROUP_NAME}:</b></td> + <td class="row2"><b class="gen"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR}"<!-- ENDIF -->>{GROUP_NAME}</b></td> + <td class="row1" width="33%" rowspan="2" align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<br /><!-- ENDIF --><!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF --><!-- IF GROUP_RANK --><span class="gensmall">{GROUP_RANK}</span><br /><br /><!-- ENDIF --><!-- IF U_PM --><a href="{U_PM}">{PM_IMG}</a><!-- ENDIF --></td> +</tr> +<tr> + <td class="row1" width="20%"><b class="genmed">{L_GROUP_DESC}:</b></td> + <td class="row2"><span class="gen">{GROUP_DESC}</span><p class="forumdesc">{GROUP_TYPE}</p></td> +</tr> </table> diff --git a/phpBB/styles/subSilver/template/memberlist_im.html b/phpBB/styles/subSilver/template/memberlist_im.html index 67311eb8a4..1010f144f3 100644 --- a/phpBB/styles/subSilver/template/memberlist_im.html +++ b/phpBB/styles/subSilver/template/memberlist_im.html @@ -4,7 +4,8 @@ <!-- MSNM info from http://www.cdolive.net/ - doesn't seem to work with MSN Messenger --> -<form method="post" action="{S_IM_ACTION}"><table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center"> +<form method="post" action="{S_IM_ACTION}"> + <table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center"> <tr> <th colspan="2">{L_SEND_IM}</th> </tr> @@ -17,65 +18,66 @@ </tr> <!-- IF S_SEND_ICQ --> - <tr> - <td class="row1"><b class="genmed">{L_IM_NAME}: </b></td> - <td class="row2"><input class="post" type="text" name="from" size="20" maxlength="40" /></td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_IM_MESSAGE}: </b></td> - <td class="row2"><textarea class="post" name="body" rows="5" cols="45"></textarea></td> - </tr> - <tr> - <td class="cat" colspan="2" align="center"><input type="hidden" name="fromemail" value="{EMAIL}" /><input type="hidden" name="subject" value="{SITENAME}" /><input type="hidden" name="to" value="{IM_CONTACT}" /><input class="btnmain" name="submit" type="submit" value="{L_IM_SEND}" /></td> - </tr> + <tr> + <td class="row1"><b class="genmed">{L_IM_NAME}: </b></td> + <td class="row2"><input class="post" type="text" name="from" size="20" maxlength="40" /></td> + </tr> + <tr> + <td class="row1"><b class="genmed">{L_IM_MESSAGE}: </b></td> + <td class="row2"><textarea class="post" name="body" rows="5" cols="45"></textarea></td> + </tr> + <tr> + <td class="cat" colspan="2" align="center"><input type="hidden" name="fromemail" value="{EMAIL}" /><input type="hidden" name="subject" value="{SITENAME}" /><input type="hidden" name="to" value="{IM_CONTACT}" /><input class="btnmain" name="submit" type="submit" value="{L_IM_SEND}" /></td> + </tr> <!-- ENDIF --> <!-- IF S_SEND_AIM --> - <tr> - <td class="row1" colspan="2" align="center"><br /><a class="gen" href="aim:addbuddy?screenname={IM_CONTACT}">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="aim:goim?screenname={IM_CONTACT}&message={SITENAME}">{L_IM_SEND_MESSAGE}</a><br /><br /><a class="gensmall" href="http://www.aol.co.uk/aim/index.html" target="_blank">{L_IM_DOWNLOAD_APP}</a> | <a class="gensmall" href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM" target="_blank">{L_IM_AIM_EXPRESS}</a> </td> - </tr> - <tr> - <td class="cat" colspan="2" align="center"> </td> - </tr> + <tr> + <td class="row1" colspan="2" align="center"><br /><a class="gen" href="aim:addbuddy?screenname={IM_CONTACT}">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="aim:goim?screenname={IM_CONTACT}&message={SITENAME}">{L_IM_SEND_MESSAGE}</a><br /><br /><a class="gensmall" href="http://www.aol.co.uk/aim/index.html" target="_blank">{L_IM_DOWNLOAD_APP}</a> | <a class="gensmall" href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM" target="_blank">{L_IM_AIM_EXPRESS}</a> </td> + </tr> + <tr> + <td class="cat" colspan="2" align="center"> </td> + </tr> <!-- ENDIF --> <!-- IF S_SEND_MSNM --> - <tr> - <td class="row1" colspan="2" align="center"><object classid="clsid:FB7199AB-79BF-11d2-8D94-0000F875C541" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object><br /><a class="gen" href="javascript:objMessengerApp.LaunchAddContactUI('{IM_CONTACT}')">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="javascript:objMessengerApp.LaunchIMUI('{IM_CONTACT}')">{L_IM_SEND_MESSAGE}</a></td> - </tr> - <tr> - <td class="cat" colspan="2" align="center"> </td> - </tr> + <tr> + <td class="row1" colspan="2" align="center"><object classid="clsid:FB7199AB-79BF-11d2-8D94-0000F875C541" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object><br /><a class="gen" href="javascript:objMessengerApp.LaunchAddContactUI('{IM_CONTACT}')">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="javascript:objMessengerApp.LaunchIMUI('{IM_CONTACT}')">{L_IM_SEND_MESSAGE}</a></td> + </tr> + <tr> + <td class="cat" colspan="2" align="center"> </td> + </tr> <!-- ENDIF --> <!-- IF S_SEND_JABBER --> - <tr> - <td class="row1"><b class="genmed">{L_IM_MESSAGE}: </b></td> - <td class="row2"><textarea class="post" name="message" rows="5" cols="45"></textarea></td> - </tr> - <tr> - <td class="cat" colspan="2" align="center"><input class="btnmain" name="submit" type="submit" value="{L_IM_SEND}" /></td> - </tr> + <tr> + <td class="row1"><b class="genmed">{L_IM_MESSAGE}: </b></td> + <td class="row2"><textarea class="post" name="message" rows="5" cols="45"></textarea></td> + </tr> + <tr> + <td class="cat" colspan="2" align="center"><input class="btnmain" name="submit" type="submit" value="{L_IM_SEND}" /></td> + </tr> <!-- ENDIF --> <!-- IF S_NO_SEND_JABBER --> - <tr> - <td class="row1" colspan="2"><span class="genmed">{L_IM_NO_JABBER}</span></td> - </tr> - <tr> - <td class="cat" colspan="2" align="center"><input class="btnmain" name="submit" type="submit" value="{L_IM_SEND}" /></td> - </tr> + <tr> + <td class="row1" colspan="2"><span class="genmed">{L_IM_NO_JABBER}</span></td> + </tr> + <tr> + <td class="cat" colspan="2" align="center"><input class="btnmain" name="submit" type="submit" value="{L_IM_SEND}" /></td> + </tr> <!-- ENDIF --> <!-- IF S_SENT_JABBER --> - <tr> - <td class="row1" colspan="2" align="center"><span class="gen">{L_IM_SENT_JABBER}</span></td> - </tr> - <tr> - <td class="cat" colspan="2" align="center"></td> - </tr> + <tr> + <td class="row1" colspan="2" align="center"><span class="gen">{L_IM_SENT_JABBER}</span></td> + </tr> + <tr> + <td class="cat" colspan="2" align="center"></td> + </tr> <!-- ENDIF --> -</table></form> + </table> +</form> <!-- INCLUDE simple_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/memberlist_leaders.html b/phpBB/styles/subSilver/template/memberlist_leaders.html index 7e53ad0d70..70c88c04eb 100644 --- a/phpBB/styles/subSilver/template/memberlist_leaders.html +++ b/phpBB/styles/subSilver/template/memberlist_leaders.html @@ -29,9 +29,9 @@ <td class="gen" align="center"> <!-- IF admin.U_PM --><a href="{admin.U_PM}">{PM_IMG}</a><!-- ENDIF --> </td> </tr> <!-- BEGINELSE --> -<tr> - <td class="row1" colspan="9" height="28" align="center"><span class="gen">{L_NO_MEMBERS}</span></td> -</tr> + <tr> + <td class="row1" colspan="9" height="28" align="center"><span class="gen">{L_NO_MEMBERS}</span></td> + </tr> <!-- END admin --> <tr class="row3"> <td colspan="9"><b class="gensmall">{L_MODERATORS}</b></td> @@ -52,9 +52,9 @@ <td class="gen" align="center"> <!-- IF mod.U_PM --><a href="{mod.U_PM}">{PM_IMG}</a><!-- ENDIF --> </td> </tr> <!-- BEGINELSE --> -<tr> - <td class="row1" colspan="9" height="28" align="center"><span class="gen">{L_NO_MEMBERS}</span></td> -</tr> + <tr> + <td class="row1" colspan="9" height="28" align="center"><span class="gen">{L_NO_MEMBERS}</span></td> + </tr> <!-- END mod --> </table> diff --git a/phpBB/styles/subSilver/template/memberlist_view.html b/phpBB/styles/subSilver/template/memberlist_view.html index a4bde60552..818be5f7ce 100644 --- a/phpBB/styles/subSilver/template/memberlist_view.html +++ b/phpBB/styles/subSilver/template/memberlist_view.html @@ -1,174 +1,187 @@ <!-- INCLUDE overall_header.html --> - <div id="pagecontent"> +<div id="pagecontent"> - <form method="post" action="{S_PROFILE_ACTION}"><table class="tablebg" width="100%" cellspacing="1"> + <form method="post" action="{S_PROFILE_ACTION}"> + + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <th colspan="2" nowrap="nowrap">{L_VIEWING_PROFILE}</th> + </tr> + <tr> + <td class="cat" width="40%" align="center"><h4>{L_USER_PRESENCE}</h4></td> + <td class="cat" width="60%" align="center"><h4>{L_USER_FORUM}</h4></td> + </tr> + <tr> + <td class="row1" align="center"> + + <table cellspacing="1" cellpadding="2" border="0"> + <tr> + <td align="center"><!-- IF USER_COLOR --><b class="gen" style="color: #{USER_COLOR}"><!-- ELSE --><b class="gen"><!-- ENDIF -->{USERNAME}</b><!-- IF U_USER_ADMIN --><span class="genmed"> [ <a href="{U_USER_ADMIN}">{L_USER_ADMIN}</a> ]</span><!-- ENDIF --></td> + </tr> + <!-- IF RANK --> + <tr> + <td class="postdetails" align="center">{RANK}</td> + </tr> + <!-- ENDIF --> + <!-- IF RANK_IMG --> + <tr> + <td align="center">{RANK_IMG}</td> + </tr> + <!-- ENDIF --> + <!-- IF AVATAR_IMG --> + <tr> + <td align="center">{AVATAR_IMG}</td> + </tr> + <!-- ENDIF --> + <tr> + <td align="center">{ONLINE_IMG}</td> + </tr> + <!-- IF U_SWITCH_PERMISSIONS --> + <tr> + <td class="genmed" align="center">[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</td> + </tr> + <!-- ENDIF --> + <!-- IF S_USER_LOGGED_IN and S_ZEBRA --> + <tr> + <td class="genmed" align="center">[ <a href="{U_ADD_FRIEND}">{L_ADD_FRIEND}</a> | <a href="{U_ADD_FOE}">{L_ADD_FOE}</a> ]</td> + </tr> + <!-- ENDIF --> + </table> + </td> + <td class="row1"> + <table width="100%" cellspacing="1" cellpadding="2" border="0"> <tr> - <th colspan="2" nowrap="nowrap">{L_VIEWING_PROFILE}</th> + <td class="gen" align="right" nowrap="nowrap">{L_JOINED}: </td> + <td width="100%"><b class="gen">{JOINED}</b></td> </tr> <tr> - <td class="cat" width="40%" align="center"><h4>{L_USER_PRESENCE}</h4></td> - <td class="cat" width="60%" align="center"><h4>{L_USER_FORUM}</h4></td> + <td class="gen" align="right" nowrap="nowrap">{L_VISITED}: </td> + <td width="100%"><b class="gen">{VISITED}</b></td> </tr> + <!-- IF U_NOTES or U_WARN --> + <tr> + <td class="gen" align="right" valign="top" nowrap="nowrap">{L_WARNINGS}: </td> + <td width="100%"><b class="gen">{WARNINGS}</b><br /><span class="genmed">[ <a href="{U_NOTES}">{L_VIEW_NOTES}</a> <!-- IF U_WARN --> | <a href="{U_WARN}">{L_WARN_USER}</a> <!-- ENDIF -->]</td> + </tr> + <!-- ENDIF --> <tr> - <td class="row1" align="center"><table cellspacing="1" cellpadding="2" border="0"> - <tr> - <td align="center"><!-- IF USER_COLOR --><b class="gen" style="color: #{USER_COLOR}"><!-- ELSE --><b class="gen"><!-- ENDIF -->{USERNAME}</b><!-- IF U_USER_ADMIN --><span class="genmed"> [ <a href="{U_USER_ADMIN}">{L_USER_ADMIN}</a> ]</span><!-- ENDIF --></td> - </tr> - <!-- IF RANK --> - <tr> - <td class="postdetails" align="center">{RANK}</td> - </tr> - <!-- ENDIF --> - <!-- IF RANK_IMG --> - <tr> - <td align="center">{RANK_IMG}</td> - </tr> - <!-- ENDIF --> - <!-- IF AVATAR_IMG --> - <tr> - <td align="center">{AVATAR_IMG}</td> - </tr> - <!-- ENDIF --> - <tr> - <td align="center">{ONLINE_IMG}</td> - </tr> - <!-- IF U_SWITCH_PERMISSIONS --> - <tr> - <td class="genmed" align="center">[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</td> - </tr> - <!-- ENDIF --> - <!-- IF S_USER_LOGGED_IN and S_ZEBRA --> - <tr> - <td class="genmed" align="center">[ <a href="{U_ADD_FRIEND}">{L_ADD_FRIEND}</a> | <a href="{U_ADD_FOE}">{L_ADD_FOE}</a> ]</td> - </tr> - <!-- ENDIF --> - </table></td> - <td class="row1"><table width="100%" cellspacing="1" cellpadding="2" border="0"> - <tr> - <td class="gen" align="right" nowrap="nowrap">{L_JOINED}: </td> - <td width="100%"><b class="gen">{JOINED}</b></td> - </tr> - <tr> - <td class="gen" align="right" nowrap="nowrap">{L_VISITED}: </td> - <td width="100%"><b class="gen">{VISITED}</b></td> - </tr> - <!-- IF U_NOTES or U_WARN --> - <tr> - <td class="gen" align="right" valign="top" nowrap="nowrap">{L_WARNINGS}: </td> - <td width="100%"><b class="gen">{WARNINGS}</b><br /><span class="genmed">[ <a href="{U_NOTES}">{L_VIEW_NOTES}</a> <!-- IF U_WARN --> | <a href="{U_WARN}">{L_WARN_USER}</a> <!-- ENDIF -->]</td> - </tr> - <!-- ENDIF --> - <tr> - <td class="gen" align="right" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}: </td> - <td><!-- IF POSTS_PCT neq 0 --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<br /><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></span><!-- ELSE --><b class="gen">{POSTS}</b><!-- ENDIF --></td> - </tr> - <!-- IF S_SHOW_ACTIVITY --> - <tr> - <td class="gen" align="right" valign="top" nowrap="nowrap">{L_ACTIVE_IN_FORUM}: </td> - <td><!-- IF ACTIVE_FORUM_PCT neq 0 --><b><a class="gen" href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></b><br /><span class="genmed">[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td> - </tr> - <tr> - <td class="gen" align="right" valign="top" nowrap="nowrap">{L_ACTIVE_IN_TOPIC}: </td> - <td><!-- IF ACTIVE_TOPIC_PCT neq 0 --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="gensmall">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td> - </tr> - <!-- ENDIF --> - </table></td> + <td class="gen" align="right" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}: </td> + <td><!-- IF POSTS_PCT neq 0 --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<br /><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></span><!-- ELSE --><b class="gen">{POSTS}</b><!-- ENDIF --></td> </tr> + <!-- IF S_SHOW_ACTIVITY --> + <tr> + <td class="gen" align="right" valign="top" nowrap="nowrap">{L_ACTIVE_IN_FORUM}: </td> + <td><!-- IF ACTIVE_FORUM_PCT neq 0 --><b><a class="gen" href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></b><br /><span class="genmed">[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td> + </tr> + <tr> + <td class="gen" align="right" valign="top" nowrap="nowrap">{L_ACTIVE_IN_TOPIC}: </td> + <td><!-- IF ACTIVE_TOPIC_PCT neq 0 --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="gensmall">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td> + </tr> + <!-- ENDIF --> + </table> + </td> + </tr> + <tr> + <td class="cat" align="center"><h4>{L_CONTACT_USER}</h4></td> + <td class="cat" align="center"><h4>{L_ABOUT_USER}</h4></td> + </tr> + <tr> + <td class="row1"> + <table width="100%" cellspacing="1" cellpadding="2" border="0"> <tr> - <td class="cat" align="center"><h4>{L_CONTACT_USER}</h4></td> - <td class="cat" align="center"><h4>{L_ABOUT_USER}</h4></td> + <td class="gen" align="right" nowrap="nowrap">{L_EMAIL_ADDRESS}: </td> + <td class="row1" width="100%"><!-- IF U_EMAIL --><a href="{U_EMAIL}">{EMAIL_IMG}</a><!-- ENDIF --></td> </tr> <tr> - <td class="row1"><table width="100%" cellspacing="1" cellpadding="2" border="0"> - <tr> - <td class="gen" align="right" nowrap="nowrap">{L_EMAIL_ADDRESS}: </td> - <td class="row1" width="100%"><!-- IF U_EMAIL --><a href="{U_EMAIL}">{EMAIL_IMG}</a><!-- ENDIF --></td> - </tr> - <tr> - <td class="gen" nowrap="nowrap" align="right">{L_PM}: </td> - <td><!-- IF U_PM --><a href="{U_PM}">{PM_IMG}</a><!-- ENDIF --></td> - </tr> - <tr> - <td class="gen" nowrap="nowrap" align="right">{L_MSNM}: </td> - <td><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup('{U_MSN}', 550, 320); return false">{MSN_IMG}</a><!-- ENDIF --></td> - </tr> - <tr> - <td class="gen" nowrap="nowrap" align="right">{L_YIM}: </td> - <td><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup('{U_YIM}', 780, 550); return false">{YIM_IMG}</a><!-- ENDIF --></td> - </tr> - <tr> - <td class="gen" nowrap="nowrap" align="right">{L_AIM}: </td> - <td><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup('{U_AIM}', 550, 320); return false">{AIM_IMG}</a><!-- ENDIF --></td> - </tr> - <tr> - <td class="gen" nowrap="nowrap" align="right">{L_ICQ}: </td> - <td><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup('{U_ICQ}', 550, 320); return false">{ICQ_IMG}</a><!-- ENDIF --></td> - </tr> - <tr> - <td class="gen" nowrap="nowrap" align="right">{L_JABBER}: </td> - <td><!-- IF U_JABBER and S_JABBER_ENABLED --><a href="{U_JABBER}" onclick="popup('{U_JABBER}', 550, 320); return false">{JABBER_IMG}</a><!-- ELSEIF U_JABBER -->{JABBER_IMG}<!-- ENDIF --></td> - </tr> - </table></td> - <td class="row1"><table cellspacing="1" cellpadding="2" border="0"> - <tr> - <td class="gen" align="right" nowrap="nowrap">{L_USERGROUPS}: </td> - <td><select name="g">{S_GROUP_OPTIONS}</select> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /></td> - </tr> - <tr> - <td class="gen" align="right" nowrap="nowrap">{L_LOCATION}: </td> - <td><b class="genmed">{LOCATION}</b></td> - </tr> - <tr> - <td class="gen" align="right" nowrap="nowrap">{L_OCCUPATION}: </td> - <td><b class="genmed">{OCCUPATION}</b></td> - </tr> - <tr> - <td class="gen" align="right" nowrap="nowrap">{L_INTERESTS}: </td> - <td><b class="genmed">{INTERESTS}</b></td> - </tr> - <tr> - <td class="gen" align="right" nowrap="nowrap">{L_WEBSITE}: </td> - <td><b><!-- IF U_WWW --><a class="genmed" href="{U_WWW}" target="_userwww">{U_WWW}</a><!-- ENDIF --></b></td> - </tr> - <!-- IF S_PROFILE_FIELD1 --> - <!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. --> - <tr> - <td class="gen" align="right" nowrap="nowrap">{PROFILE_FIELD1_NAME}: </td> - <td><b class="genmed">{PROFILE_FIELD1_VALUE}</b></td> - </tr> - <!-- ENDIF --> - <!-- BEGIN custom_fields --> - <tr> - <td class="gen" align="right" nowrap="nowrap">{custom_fields.PROFILE_FIELD_NAME}: </td> - <td><b class="genmed">{custom_fields.PROFILE_FIELD_VALUE}</b></td> - </tr> - <!-- END custom_fields --> - </table></td> + <td class="gen" nowrap="nowrap" align="right">{L_PM}: </td> + <td><!-- IF U_PM --><a href="{U_PM}">{PM_IMG}</a><!-- ENDIF --></td> </tr> - <tr> - <td class="cat" colspan="2" align="center"><h4>{L_SIGNATURE}</h4></td> + <tr> + <td class="gen" nowrap="nowrap" align="right">{L_MSNM}: </td> + <td><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup('{U_MSN}', 550, 320); return false">{MSN_IMG}</a><!-- ENDIF --></td> + </tr> + <tr> + <td class="gen" nowrap="nowrap" align="right">{L_YIM}: </td> + <td><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup('{U_YIM}', 780, 550); return false">{YIM_IMG}</a><!-- ENDIF --></td> + </tr> + <tr> + <td class="gen" nowrap="nowrap" align="right">{L_AIM}: </td> + <td><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup('{U_AIM}', 550, 320); return false">{AIM_IMG}</a><!-- ENDIF --></td> + </tr> + <tr> + <td class="gen" nowrap="nowrap" align="right">{L_ICQ}: </td> + <td><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup('{U_ICQ}', 550, 320); return false">{ICQ_IMG}</a><!-- ENDIF --></td> </tr> + <tr> + <td class="gen" nowrap="nowrap" align="right">{L_JABBER}: </td> + <td><!-- IF U_JABBER and S_JABBER_ENABLED --><a href="{U_JABBER}" onclick="popup('{U_JABBER}', 550, 320); return false">{JABBER_IMG}</a><!-- ELSEIF U_JABBER -->{JABBER_IMG}<!-- ENDIF --></td> + </tr> + </table> + </td> + <td class="row1"> + <table cellspacing="1" cellpadding="2" border="0"> <tr> - <td class="row1" colspan="2"><div class="postbody" style="padding: 10px;">{SIGNATURE}</div></td> + <td class="gen" align="right" nowrap="nowrap">{L_USERGROUPS}: </td> + <td><select name="g">{S_GROUP_OPTIONS}</select> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /></td> + </tr> + <tr> + <td class="gen" align="right" nowrap="nowrap">{L_LOCATION}: </td> + <td><b class="genmed">{LOCATION}</b></td> + </tr> + <tr> + <td class="gen" align="right" nowrap="nowrap">{L_OCCUPATION}: </td> + <td><b class="genmed">{OCCUPATION}</b></td> </tr> - </table></form> + <tr> + <td class="gen" align="right" nowrap="nowrap">{L_INTERESTS}: </td> + <td><b class="genmed">{INTERESTS}</b></td> + </tr> + <tr> + <td class="gen" align="right" nowrap="nowrap">{L_WEBSITE}: </td> + <td><b><!-- IF U_WWW --><a class="genmed" href="{U_WWW}" target="_userwww">{U_WWW}</a><!-- ENDIF --></b></td> + </tr> + <!-- IF S_PROFILE_FIELD1 --> + <!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. --> + <tr> + <td class="gen" align="right" nowrap="nowrap">{PROFILE_FIELD1_NAME}: </td> + <td><b class="genmed">{PROFILE_FIELD1_VALUE}</b></td> + </tr> + <!-- ENDIF --> + <!-- BEGIN custom_fields --> + <tr> + <td class="gen" align="right" nowrap="nowrap">{custom_fields.PROFILE_FIELD_NAME}: </td> + <td><b class="genmed">{custom_fields.PROFILE_FIELD_VALUE}</b></td> + </tr> + <!-- END custom_fields --> + </table> + </td> + </tr> + <tr> + <td class="cat" colspan="2" align="center"><h4>{L_SIGNATURE}</h4></td> + </tr> + <tr> + <td class="row1" colspan="2"><div class="postbody" style="padding: 10px;">{SIGNATURE}</div></td> + </tr> + </table> + + </form> - </div> +</div> - <br clear="all" /> +<br clear="all" /> - <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> - <tr> - <td class="row1"> - <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> - </tr> - </table> +<table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> +<tr> + <td class="row1"> + <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> + <p class="datetime">{S_TIMEZONE}</p> + </td> +</tr> +</table> - <br clear="all" /> +<br clear="all" /> - <div style="float: right;"><!-- INCLUDE jumpbox.html --></div> +<div style="float: right;"><!-- INCLUDE jumpbox.html --></div> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/message_body.html b/phpBB/styles/subSilver/template/message_body.html index 9bd7dc74ff..03c34041bf 100644 --- a/phpBB/styles/subSilver/template/message_body.html +++ b/phpBB/styles/subSilver/template/message_body.html @@ -1,23 +1,23 @@ <!-- INCLUDE overall_header.html --> - <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th>{MESSAGE_TITLE}</th> - </tr> - <tr> - <td class="row1" align="center"><br /><p class="gen">{MESSAGE_TEXT}</p><br /></td> - </tr> - </table> +<table class="tablebg" width="100%" cellspacing="1"> +<tr> + <th>{MESSAGE_TITLE}</th> +</tr> +<tr> + <td class="row1" align="center"><br /><p class="gen">{MESSAGE_TEXT}</p><br /></td> +</tr> +</table> - <br clear="all" /> +<br clear="all" /> - <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> - <tr> - <td class="row1"> - <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> - </tr> - </table> +<table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> +<tr> + <td class="row1"> + <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a></p> + <p class="datetime">{S_TIMEZONE}</p> + </td> +</tr> +</table> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/overall_header.html b/phpBB/styles/subSilver/template/overall_header.html index a05f7d42c8..491e51f96e 100644 --- a/phpBB/styles/subSilver/template/overall_header.html +++ b/phpBB/styles/subSilver/template/overall_header.html @@ -84,14 +84,17 @@ function marklist(id, name, state) <div id="wrapheader"> - <div id="logodesc"><table width="100%" cellspacing="0"> + <div id="logodesc"> + <table width="100%" cellspacing="0"> <tr> <td><a href="{U_INDEX}">{SITE_LOGO_IMG}</a></td> <td width="100%" align="center"><h1>{SITENAME}</h1><span class="gen">{SITE_DESCRIPTION}</span></td> </tr> - </table></div> + </table> + </div> - <div id="menubar"><table width="100%" cellspacing="0"> + <div id="menubar"> + <table width="100%" cellspacing="0"> <tr> <td class="genmed"> <a href="{U_LOGIN_LOGOUT}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" border="0" alt="{L_LOGIN_LOGOUT}" /> {L_LOGIN_LOGOUT}</a> @@ -103,14 +106,17 @@ function marklist(id, name, state) </td> <td class="genmed" align="right"><a href="{U_FAQ}"><img src="{T_THEME_PATH}/images/icon_mini_faq.gif" width="12" height="13" border="0" alt="{L_FAQ}" /> {L_FAQ}</a><!-- IF S_DISPLAY_SEARCH --> <a href="{U_SEARCH}"><img src="{T_THEME_PATH}/images/icon_mini_search.gif" width="12" height="13" border="0" alt="{L_SEARCH}" /> {L_SEARCH}</a><!-- ENDIF --><!-- IF S_DISPLAY_MEMBERLIST --> <a href="{U_MEMBERLIST}"><img src="{T_THEME_PATH}/images/icon_mini_members.gif" width="12" height="13" border="0" alt="{L_MEMBERLIST}" /> {L_MEMBERLIST}</a><!-- ENDIF --><!-- IF S_USER_LOGGED_IN --> <a href="{U_PROFILE}"><img src="{T_THEME_PATH}/images/icon_mini_profile.gif" width="12" height="13" border="0" alt="{L_PROFILE}" /> {L_PROFILE}</a><!-- ENDIF --></td> </tr> - </table></div> + </table> + </div> - <div id="datebar"><table width="100%" cellspacing="0"> + <div id="datebar"> + <table width="100%" cellspacing="0"> <tr> <td class="gensmall"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ENDIF --></td> <td class="gensmall" align="right">{CURRENT_TIME}<br /></td> </tr> - </table></div> + </table> + </div> </div> @@ -128,12 +134,12 @@ function marklist(id, name, state) <br style="clear: both;" /> <table class="tablebg" width="100%" cellspacing="1" cellpadding="0" style="margin-top: 5px;"> - <tr> - <td class="row1"> - <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> - </tr> + <tr> + <td class="row1"> + <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> + <p class="datetime">{S_TIMEZONE}</p> + </td> + </tr> </table> <br /> diff --git a/phpBB/styles/subSilver/template/posting_attach_body.html b/phpBB/styles/subSilver/template/posting_attach_body.html index 6fc214c976..41f4daa6d2 100644 --- a/phpBB/styles/subSilver/template/posting_attach_body.html +++ b/phpBB/styles/subSilver/template/posting_attach_body.html @@ -1,5 +1,8 @@ -<script language="javascript" type="text/javascript"> +<script type="text/javascript"> <!-- + /** + * Show upload progress bar + */ function popup_progress_bar() { close_waitscreen = 0; @@ -9,65 +12,73 @@ </script> <!-- IF S_CLOSE_PROGRESS_WINDOW --> -<script language="javascript" type="text/javascript"> -<!-- - close_waitscreen = 1; -//--> -</script> + <script language="javascript" type="text/javascript"> + <!-- + close_waitscreen = 1; + //--> + </script> <!-- ENDIF --> - <tr> - <th colspan="2" height="28">{L_ADD_ATTACHMENT}</th> - </tr> - <tr> - <td class="row3" colspan="2"><span class="gensmall">{L_ADD_ATTACHMENT_EXPLAIN}</span></td> - </tr> +<tr> + <th colspan="2" height="28">{L_ADD_ATTACHMENT}</th> +</tr> +<tr> + <td class="row3" colspan="2"><span class="gensmall">{L_ADD_ATTACHMENT_EXPLAIN}</span></td> +</tr> - <tr> - <td class="row1"><b class="genmed">{L_FILENAME}</b></td> - <td class="row2"><input type="file" name="fileupload" size="40" maxlength="{FILESIZE}" value="" class="btnlite" /></td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_FILE_COMMENT}</b></td> - <td class="row2"><table border="0" cellspacing="0" cellpadding="2"> - <tr> - <td><textarea class="post" name="filecomment" rows="3" cols="35" size="40">{FILE_COMMENT}</textarea> </td> - <td valign="top"><table border="0" cellspacing="4" cellpadding="0"> - <tr> - <td><input class="btnlite" type="submit" style="width:150px" name="add_file" value="{L_ADD_FILE}" onclick="javascript:popup_progress_bar();" /></td> - </tr></table> - </td> - </tr></table> - </td> - </tr> +<tr> + <td class="row1"><b class="genmed">{L_FILENAME}</b></td> + <td class="row2"><input type="file" name="fileupload" size="40" maxlength="{FILESIZE}" value="" class="btnlite" /></td> +</tr> +<tr> + <td class="row1"><b class="genmed">{L_FILE_COMMENT}</b></td> + <td class="row2"> + <table border="0" cellspacing="0" cellpadding="2"> + <tr> + <td><textarea class="post" name="filecomment" rows="3" cols="35" size="40">{FILE_COMMENT}</textarea> </td> + <td valign="top"> + <table border="0" cellspacing="4" cellpadding="0"> + <tr> + <td><input class="btnlite" type="submit" style="width:150px" name="add_file" value="{L_ADD_FILE}" onclick="javascript:popup_progress_bar();" /></td> + </tr> + </table> + </td> + </tr> + </table> + </td> +</tr> - <!-- IF S_HAS_ATTACHMENTS --> +<!-- IF S_HAS_ATTACHMENTS --> <tr> <th colspan="2" height="28">{L_POSTED_ATTACHMENTS}</th> </tr> - <!-- BEGIN attach_row --> + <!-- BEGIN attach_row --> <tr> <td class="row1"><b class="genmed">{L_FILENAME}</b></td> <td class="row2"><a class="genmed" href="{attach_row.U_VIEW_ATTACHMENT}" target="_blank">{attach_row.FILENAME}</a></td> </tr> <tr> <td class="row1"><b class="genmed">{L_FILE_COMMENT}</b></td> - <td class="row2"><table border="0" cellspacing="0" cellpadding="2"> + <td class="row2"> + <table border="0" cellspacing="0" cellpadding="2"> <tr> <td><textarea class="post" name="comment_list[{attach_row.ASSOC_INDEX}]" rows="3" cols="35" wrap="virtual" size=40>{attach_row.FILE_COMMENT}</textarea> </td> - <td valign="top"><table border="0" cellspacing="4" cellpadding="0"> + <td valign="top"> + <table border="0" cellspacing="4" cellpadding="0"> <tr> <td><input class="btnlite" type="submit" style="width:150px" name="edit_comment[{attach_row.ASSOC_INDEX}]" value="{L_UPDATE_COMMENT}" /></td> </tr> <tr> <td><input class="btnlite" type="submit" style="width:150px" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" /></td> - </tr></table> + </tr> + </table> </td> - </tr></table> + </tr> + </table> </td> </tr> {attach_row.S_HIDDEN} - <!-- END attach_row --> + <!-- END attach_row --> - <!-- ENDIF --> +<!-- ENDIF --> diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html index e7fecbbce9..4e42ca0bf5 100644 --- a/phpBB/styles/subSilver/template/posting_body.html +++ b/phpBB/styles/subSilver/template/posting_body.html @@ -32,10 +32,13 @@ e_help = "{LA_BBCODE_E_HELP}"; function checkForm() { - if (document.post.message.value.length < 2) { + if (document.post.message.value.length < 2) + { alert('{LA_EMPTY_MESSAGE}'); return false; - } else { + } + else + { // document.post.post.disabled = true; return true; } @@ -46,17 +49,17 @@ function checkForm() <script language="javascript" type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script> <!-- IF S_FORUM_RULES --> -<div class="forumrules"> - <!-- IF U_FORUM_RULES --> - <h3 style="color:red">{L_FORUM_RULES}</h3><br /> - <a href="{U_FORUM_RULES}"><b>{L_FORUM_RULES_LINK}</b></a> - <!-- ELSE --> - <h3 style="color:red">{L_FORUM_RULES}</h3><br /> - {FORUM_RULES} - <!-- ENDIF --> -</div> + <div class="forumrules"> + <!-- IF U_FORUM_RULES --> + <h3 style="color:red">{L_FORUM_RULES}</h3><br /> + <a href="{U_FORUM_RULES}"><b>{L_FORUM_RULES_LINK}</b></a> + <!-- ELSE --> + <h3 style="color:red">{L_FORUM_RULES}</h3><br /> + {FORUM_RULES} + <!-- ENDIF --> + </div> -<br clear="all" /> + <br clear="all" /> <!-- ENDIF --> <!-- IF not S_PRIVMSGS --> @@ -80,12 +83,12 @@ function checkForm() <!-- IF S_DRAFT_LOADED --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th align="center">{L_INFORMATION}</th> - </tr> - <tr> - <td class="row1" align="center"><span class="gen">{L_DRAFT_LOADED}</span></td> - </tr> + <tr> + <th align="center">{L_INFORMATION}</th> + </tr> + <tr> + <td class="row1" align="center"><span class="gen">{L_DRAFT_LOADED}</span></td> + </tr> </table> <br clear="all" /> @@ -93,31 +96,31 @@ function checkForm() <!-- IF S_SHOW_DRAFTS --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="3" align="center">{L_LOAD_DRAFT}</th> - </tr> - <tr> - <td class="row1" colspan="3" align="center"><span class="gen">{L_LOAD_DRAFT_EXPLAIN}</span></td> - </tr> - <tr> - <th>{L_SAVE_DATE}</th> - <th>{L_DRAFT_TITLE}</th> - <th>{L_OPTIONS}</th> - </tr> - <!-- BEGIN draftrow --> + <tr> + <th colspan="3" align="center">{L_LOAD_DRAFT}</th> + </tr> + <tr> + <td class="row1" colspan="3" align="center"><span class="gen">{L_LOAD_DRAFT_EXPLAIN}</span></td> + </tr> + <tr> + <th>{L_SAVE_DATE}</th> + <th>{L_DRAFT_TITLE}</th> + <th>{L_OPTIONS}</th> + </tr> + <!-- BEGIN draftrow --> - <!-- IF draftrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + <!-- IF draftrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td class="postdetails" style="padding: 4px;">{draftrow.DATE}</td> - <td style="padding: 4px;"><b class="gen">{draftrow.DRAFT_SUBJECT}</b> - <!-- IF draftrow.S_LINK_TOPIC --><br /><span class="gensmall">{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span> - <!-- ELSEIF draftrow.S_LINK_FORUM --><br /><span class="gensmall">{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span> - <!-- ELSEIF draftrow.S_LINK_PM --><br /><span class="gensmall">{L_PRIVATE_MESSAGE}</span> - <!-- ELSE --><br /><span class="gensmall">{L_NO_TOPIC_FORUM}</span><!-- ENDIF --> - </td> - <td style="padding: 4px;" align="center"><span class="gen"><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a></td> - </tr> - <!-- END draftrow --> + <td class="postdetails" style="padding: 4px;">{draftrow.DATE}</td> + <td style="padding: 4px;"><b class="gen">{draftrow.DRAFT_SUBJECT}</b> + <!-- IF draftrow.S_LINK_TOPIC --><br /><span class="gensmall">{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span> + <!-- ELSEIF draftrow.S_LINK_FORUM --><br /><span class="gensmall">{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span> + <!-- ELSEIF draftrow.S_LINK_PM --><br /><span class="gensmall">{L_PRIVATE_MESSAGE}</span> + <!-- ELSE --><br /><span class="gensmall">{L_NO_TOPIC_FORUM}</span><!-- ENDIF --> + </td> + <td style="padding: 4px;" align="center"><span class="gen"><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a></td> + </tr> + <!-- END draftrow --> </table> <br clear="all" /> @@ -130,106 +133,112 @@ function checkForm() <!-- IF not S_PRIVMSGS and S_UNGLOBALISE --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th>{L_MOVE}</th> - </tr> - <tr> - <td class="spacer" colspan="2"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> - </tr> - <tr> - <td class="row2" align="center"><span class="gen">{L_UNGLOBALISE_EXPLAIN}<br /><br />{L_SELECT_DESTINATION_FORUM} </span><select name="to_forum_id">{S_FORUM_SELECT}</select><br /><br /><input class="btnmain" type="submit" name="post" value="{L_CONFIRM}" /> <input class="btnlite" type="submit" name="cancel_unglobalise" value="{L_CANCEL}" /></td> - </tr> + <tr> + <th>{L_MOVE}</th> + </tr> + <tr> + <td class="spacer" colspan="2"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> + </tr> + <tr> + <td class="row2" align="center"><span class="gen">{L_UNGLOBALISE_EXPLAIN}<br /><br />{L_SELECT_DESTINATION_FORUM} </span><select name="to_forum_id">{S_FORUM_SELECT}</select><br /><br /><input class="btnmain" type="submit" name="post" value="{L_CONFIRM}" /> <input class="btnlite" type="submit" name="cancel_unglobalise" value="{L_CANCEL}" /></td> + </tr> </table> <br clear="all" /> <!-- ENDIF --> <table class="tablebg" width="100%" cellspacing="1"> +<tr> + <th colspan="2"><b>{L_POST_A}</b></th> +</tr> + +<!-- IF ERROR --> <tr> - <th colspan="2"><b>{L_POST_A}</b></th> + <td class="row2" colspan="2" align="center"><span class="genmed" style="color:red">{ERROR}</span></td> </tr> +<!-- ENDIF --> - <!-- IF ERROR --> - <tr> - <td class="row2" colspan="2" align="center"><span class="genmed" style="color:red">{ERROR}</span></td> - </tr> - <!-- ENDIF --> +<!-- IF S_DELETE_ALLOWED --> + <tr> + <td class="row1"><b class="genmed">{L_DELETE_POST}:</b></td> + <td class="row2"><input type="checkbox" class="radio" name="delete" /> <span class="gensmall">[ {L_DELETE_POST_WARN} ]</span></td> + </tr> +<!-- ENDIF --> - <!-- IF S_DELETE_ALLOWED --> - <tr> - <td class="row1"><b class="genmed">{L_DELETE_POST}:</b></td> - <td class="row2"><input type="checkbox" class="radio" name="delete" /> <span class="gensmall">[ {L_DELETE_POST_WARN} ]</span></td> - </tr> - <!-- ENDIF --> +<!-- IF S_SHOW_TOPIC_ICONS --> + <tr> + <td class="row1"><b class="genmed">{L_ICON}:</b></td> + <td class="row2"> + <table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr> + <td><input type="radio" class="radio" name="icon" value="0"{S_NO_ICON_CHECKED} /><span class="genmed">{L_NONE}</span> <!-- BEGIN topic_icon --><input type="radio" class="radio" name="icon" value="{topic_icon.ICON_ID}"{topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /> <!-- END topic_icon --></td> + </tr> + </table> + </td> + </tr> +<!-- ENDIF --> - <!-- IF S_SHOW_TOPIC_ICONS --> - <tr> - <td class="row1"><b class="genmed">{L_ICON}:</b></td> - <td class="row2"><table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td><input type="radio" class="radio" name="icon" value="0"{S_NO_ICON_CHECKED} /><span class="genmed">{L_NONE}</span> <!-- BEGIN topic_icon --><input type="radio" class="radio" name="icon" value="{topic_icon.ICON_ID}"{topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /> <!-- END topic_icon --></td> - </tr> - </table></td> - </tr> - <!-- ENDIF --> +<!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME --> + <tr> + <td class="row1"><b class="genmed">{L_USERNAME}:</b></td> + <td class="row2"><input class="post" type="text" tabindex="1" name="username" size="25" maxlength="25" value="{USERNAME}" /></td> + </tr> +<!-- ENDIF --> - <!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME --> - <tr> - <td class="row1"><b class="genmed">{L_USERNAME}:</b></td> - <td class="row2"><input class="post" type="text" tabindex="1" name="username" size="25" maxlength="25" value="{USERNAME}" /></td> - </tr> - <!-- ENDIF --> +<!-- IF S_PRIVMSGS --> + <tr> + <td class="row1"><b class="genmed">{L_TO}:</b></td> + <td class="row2"> + <!-- BEGIN to_recipient --> + <span class="genmed"> + <a href="{to_recipient.U_VIEW}"><!-- IF to_recipient.COLOUR --><b style="color:#{to_recipient.COLOUR}"><!-- ELSE --><b<!-- IF to_recipient.IS_GROUP --> class="blue"<!-- ENDIF -->><!-- ENDIF -->{to_recipient.NAME}</b></a> </span><!-- IF not S_EDIT_POST --><input class="post" type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="Remove" /> <!-- ENDIF --> + <!-- BEGINELSE --> + <span class="genmed">{L_NONE}</span> + <!-- END to_recipient --> + </td> + </tr> + <tr> + <td class="row1"><b class="genmed">{L_BCC}:</b></td> + <td class="row2"> + <!-- BEGIN bcc_recipient --> + <span class="genmed"> + <a href="{bcc_recipient.U_VIEW}"><!-- IF bcc_recipient.COLOUR --><b style="color:#{bcc_recipient.COLOUR}"><!-- ELSE --><b<!-- IF bcc_recipient.IS_GROUP --> class="blue"<!-- ENDIF -->><!-- ENDIF -->{bcc_recipient.NAME}</b></a> </span><!-- IF not S_EDIT_POST --><input class="post" type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="Remove" /> <!-- ENDIF --> + <!-- BEGINELSE --> + <span class="genmed">{L_NONE}</span> + <!-- END bcc_recipient --> + </td> + </tr> + {S_HIDDEN_ADDRESS_FIELD} +<!-- ENDIF --> - <!-- IF S_PRIVMSGS --> +<tr> + <td class="row1" width="22%"><b class="genmed">{L_SUBJECT}:</b></td> + <td class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="60" tabindex="2" value="{SUBJECT}" /></td> +</tr> +<tr> + <td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}:</b><br /><span class="gensmall">{L_MESSAGE_BODY_EXPLAIN}</span><br /><br /> + <table width="100%" cellspacing="5" cellpadding="0" border="0" align="center"> <tr> - <td class="row1"><b class="genmed">{L_TO}:</b></td> - <td class="row2"> - <!-- BEGIN to_recipient --> - <span class="genmed"> - <a href="{to_recipient.U_VIEW}"><!-- IF to_recipient.COLOUR --><b style="color:#{to_recipient.COLOUR}"><!-- ELSE --><b<!-- IF to_recipient.IS_GROUP --> class="blue"<!-- ENDIF -->><!-- ENDIF -->{to_recipient.NAME}</b></a> </span><!-- IF not S_EDIT_POST --><input class="post" type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="Remove" /> <!-- ENDIF --> - <!-- BEGINELSE --> - <span class="genmed">{L_NONE}</span> - <!-- END to_recipient --> - </td> + <td class="gensmall" align="center"><b>{L_SMILIES}</b></td> </tr> <tr> - <td class="row1"><b class="genmed">{L_BCC}:</b></td> - <td class="row2"> - <!-- BEGIN bcc_recipient --> - <span class="genmed"> - <a href="{bcc_recipient.U_VIEW}"><!-- IF bcc_recipient.COLOUR --><b style="color:#{bcc_recipient.COLOUR}"><!-- ELSE --><b<!-- IF bcc_recipient.IS_GROUP --> class="blue"<!-- ENDIF -->><!-- ENDIF -->{bcc_recipient.NAME}</b></a> </span><!-- IF not S_EDIT_POST --><input class="post" type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="Remove" /> <!-- ENDIF --> - <!-- BEGINELSE --> - <span class="genmed">{L_NONE}</span> - <!-- END bcc_recipient --> - </td> + <td align="center"><!-- BEGIN smiley --><a href="javascript:smiley('{smiley.A_SMILEY_CODE}')" style="line-height: 20px;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" border="0" alt="{smiley.SMILEY_DESC}" title="{smiley.SMILEY_DESC}" onclick="smiley('{smiley.A_SMILEY_CODE}');return false" hspace="2" vspace="2" /></a> <!-- END smiley --></td> </tr> - {S_HIDDEN_ADDRESS_FIELD} - <!-- ENDIF --> - <tr> - <td class="row1" width="22%"><b class="genmed">{L_SUBJECT}:</b></td> - <td class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="60" tabindex="2" value="{SUBJECT}" /></td> - </tr> - <tr> - <td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}:</b><br /><span class="gensmall">{L_MESSAGE_BODY_EXPLAIN}</span><br /><br /> - <table width="100%" cellspacing="5" cellpadding="0" border="0" align="center"> - <tr> - <td class="gensmall" align="center"><b>{L_SMILIES}</b></td> - </tr> + <!-- IF S_SHOW_SMILEY_LINK --> <tr> - <td align="center"><!-- BEGIN smiley --><a href="javascript:smiley('{smiley.A_SMILEY_CODE}')" style="line-height: 20px;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" border="0" alt="{smiley.SMILEY_DESC}" title="{smiley.SMILEY_DESC}" onclick="smiley('{smiley.A_SMILEY_CODE}');return false" hspace="2" vspace="2" /></a> <!-- END smiley --></td> + <td align="center"><a class="nav" href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=350,resizable=yes,scrollbars=yes,WIDTH=300');return false;" target="_phpbbsmilies">{L_MORE_SMILIES}</a></td> </tr> + <!-- ENDIF --> - <!-- IF S_SHOW_SMILEY_LINK --> - <tr> - <td align="center"><a class="nav" href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=350,resizable=yes,scrollbars=yes,WIDTH=300');return false;" target="_phpbbsmilies">{L_MORE_SMILIES}</a></td> - </tr> - <!-- ENDIF --> - - </table></td> - <td class="row2" valign="top"><table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr valign="middle" align="left"> - <td colspan="2"><input type="button" class="btnbbcode" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" /> + </table> + </td> + <td class="row2" valign="top"> + + <table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr valign="middle" align="left"> + <td colspan="2"> + <input type="button" class="btnbbcode" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" /> <input type="button" class="btnbbcode" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" /> <input type="button" class="btnbbcode" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" /> <!-- IF S_BBCODE_QUOTE --><input type="button" class="btnbbcode" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" /><!-- ENDIF --> @@ -240,134 +249,142 @@ function checkForm() <input type="button" class="btnbbcode" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" /> <!-- IF S_BBCODE_FLASH --><input type="button" class="btnbbcode" accesskey="f" name="addbbcode18" value="Flash" onclick="bbstyle(18)" /><!-- ENDIF --> <span class="genmed" style="white-space: nowrap;">{L_FONT_SIZE}: <select class="gensmall" name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" onmouseover="helpline('f')"> - <option value="7">{L_FONT_TINY}</option> - <option value="9">{L_FONT_SMALL}</option> - <option value="12" selected="selected">{L_FONT_NORMAL}</option> - <option value="18">{L_FONT_LARGE}</option> - <option value="24">{L_FONT_HUGE}</option> - </select> | <a href="javascript:bbstyle(-1)" onmouseover="helpline('a')">{L_CLOSE_TAGS}</a></span> - </td> - </tr> - <!-- IF .custom_tags --> + <option value="7">{L_FONT_TINY}</option> + <option value="9">{L_FONT_SMALL}</option> + <option value="12" selected="selected">{L_FONT_NORMAL}</option> + <option value="18">{L_FONT_LARGE}</option> + <option value="24">{L_FONT_HUGE}</option> + </select> | <a href="javascript:bbstyle(-1)" onmouseover="helpline('a')">{L_CLOSE_TAGS}</a></span> + </td> + </tr> + <!-- IF .custom_tags --> <tr valign="middle" align="left"> <td colspan="2"> <!-- BEGIN custom_tags --> <input type="button" class="btnbbcode" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" /> <!-- END custom_tags --> </td> - <!-- ENDIF --> - <tr> - <td><input type="text" name="helpbox" style="width:100%" maxlength="100" class="helpline" value="{L_STYLES_TIP}" /></td> - <td class="genmed" align="center">{L_FONT_COLOR}</td> </tr> - <tr> - <td valign="top" style="width: 100%;"><textarea name="message" rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" style="width: 98%;">{MESSAGE}</textarea></td> - <td width="80" align="center" valign="top"><script language="javascript" type="text/javascript"><!-- - - colorPalette('v', 7, 6) + <!-- ENDIF --> + <tr> + <td><input type="text" name="helpbox" style="width:100%" maxlength="100" class="helpline" value="{L_STYLES_TIP}" /></td> + <td class="genmed" align="center">{L_FONT_COLOR}</td> + </tr> + <tr> + <td valign="top" style="width: 100%;"><textarea name="message" rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" style="width: 98%;">{MESSAGE}</textarea></td> + <td width="80" align="center" valign="top"> + <script type="text/javascript"> + <!-- + colorPalette('v', 7, 6) + //--> + </script> + </td> + </tr> + </table> + </td> +</tr> - //--></script></td> - </tr> - </table></td> +<!-- IF S_INLINE_ATTACHMENT_OPTIONS --> + <tr> + <td class="row1"><b class="genmed">{L_ATTACHMENTS}:</b></td> + <td class="row2"><select name="attachments">{S_INLINE_ATTACHMENT_OPTIONS}</select> <input type="button" class="btnbbcode" accesskey="a" value="{L_PLACE_INLINE}" name="attachinline" onclick="attach_inline();" /> + </td> </tr> +<!-- ENDIF --> - <!-- IF S_INLINE_ATTACHMENT_OPTIONS --> +<tr> + <td class="row1" valign="top"><b class="genmed">{L_OPTIONS}:</b><br /> + <table cellspacing="2" cellpadding="0" border="0"> <tr> - <td class="row1"><b class="genmed">{L_ATTACHMENTS}:</b></td> - <td class="row2"><select name="attachments">{S_INLINE_ATTACHMENT_OPTIONS}</select> <input type="button" class="btnbbcode" accesskey="a" value="{L_PLACE_INLINE}" name="attachinline" onclick="attach_inline();" /> - </td> + <td class="gensmall">{BBCODE_STATUS}</td> </tr> - <!-- ENDIF --> - - <tr> - <td class="row1" valign="top"><b class="genmed">{L_OPTIONS}:</b><br /><table cellspacing="2" cellpadding="0" border="0"> + <tr> + <td class="gensmall">{IMG_STATUS}</td> + </tr> + <tr> + <td class="gensmall">{FLASH_STATUS}</td> + </tr> + <tr> + <td class="gensmall">{SMILIES_STATUS}</td> + </tr> + </table> + </td> + <td class="row2"> + <table cellpadding="1"> + <!-- IF S_BBCODE_ALLOWED --> <tr> - <td class="gensmall">{BBCODE_STATUS}</td> + <td><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /></td> + <td class="gen">{L_DISABLE_BBCODE}</td> </tr> + <!-- ENDIF --> + + <!-- IF S_SMILIES_ALLOWED --> <tr> - <td class="gensmall">{IMG_STATUS}</td> + <td><input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} /></td> + <td class="gen">{L_DISABLE_SMILIES}</td> </tr> + <!-- ENDIF --> + + <tr> + <td><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /></td> + <td class="gen">{L_DISABLE_MAGIC_URL}</td> + </tr> + + <!-- IF S_SIG_ALLOWED --> <tr> - <td class="gensmall">{FLASH_STATUS}</td> + <td><input type="checkbox" class="radio" name="attach_sig"{S_SIGNATURE_CHECKED} /></td> + <td class="gen">{L_ATTACH_SIG}</td> </tr> + <!-- ENDIF --> + + <!-- IF S_NOTIFY_ALLOWED --> <tr> - <td class="gensmall">{SMILIES_STATUS}</td> + <td><input type="checkbox" class="radio" name="notify"{S_NOTIFY_CHECKED} /></td> + <td class="gen">{L_NOTIFY_REPLY}</td> </tr> - </table></td> - <td class="row2"><table cellpadding="1"> - <!-- IF S_BBCODE_ALLOWED --> - <tr> - <td><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /></td> - <td class="gen">{L_DISABLE_BBCODE}</td> - </tr> - <!-- ENDIF --> + <!-- ENDIF --> - <!-- IF S_SMILIES_ALLOWED --> + <!-- IF not S_PRIVMSGS --> + <!-- IF S_LOCK_TOPIC_ALLOWED --> <tr> - <td><input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} /></td> - <td class="gen">{L_DISABLE_SMILIES}</td> + <td><input type="checkbox" class="radio" name="lock_topic"{S_LOCK_TOPIC_CHECKED} /></td> + <td class="gen">{L_LOCK_TOPIC}</td> </tr> <!-- ENDIF --> - - <tr> - <td><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /></td> - <td class="gen">{L_DISABLE_MAGIC_URL}</td> - </tr> - - <!-- IF S_SIG_ALLOWED --> + + <!-- IF S_LOCK_POST_ALLOWED --> <tr> - <td><input type="checkbox" class="radio" name="attach_sig"{S_SIGNATURE_CHECKED} /></td> - <td class="gen">{L_ATTACH_SIG}</td> + <td><input type="checkbox" class="radio" name="lock_post"{S_LOCK_POST_CHECKED} /></td> + <td class="gen">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</td> </tr> <!-- ENDIF --> - <!-- IF S_NOTIFY_ALLOWED --> + <!-- IF S_TYPE_TOGGLE --> <tr> - <td><input type="checkbox" class="radio" name="notify"{S_NOTIFY_CHECKED} /></td> - <td class="gen">{L_NOTIFY_REPLY}</td> + <td> </td> + <td class="gen"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->: <!-- BEGIN topic_type --><input type="radio" class="radio" name="topic_type" value="{topic_type.VALUE}"{topic_type.S_CHECKED} />{topic_type.L_TOPIC_TYPE} <!-- END topic_type --></td> </tr> <!-- ENDIF --> + <!-- ENDIF --> + </table> + </td> +</tr> - <!-- IF not S_PRIVMSGS --> - <!-- IF S_LOCK_TOPIC_ALLOWED --> - <tr> - <td><input type="checkbox" class="radio" name="lock_topic"{S_LOCK_TOPIC_CHECKED} /></td> - <td class="gen">{L_LOCK_TOPIC}</td> - </tr> - <!-- ENDIF --> - - <!-- IF S_LOCK_POST_ALLOWED --> - <tr> - <td><input type="checkbox" class="radio" name="lock_post"{S_LOCK_POST_CHECKED} /></td> - <td class="gen">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</td> - </tr> - <!-- ENDIF --> - - <!-- IF S_TYPE_TOGGLE --> - <tr> - <td> </td> - <td class="gen"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->: <!-- BEGIN topic_type --><input type="radio" class="radio" name="topic_type" value="{topic_type.VALUE}"{topic_type.S_CHECKED} />{topic_type.L_TOPIC_TYPE} <!-- END topic_type --></td> - </tr> - <!-- ENDIF --> - <!-- ENDIF --> - </table></td> - </tr> - - <!-- IF S_TOPIC_TYPE_ANNOUNCE or S_TOPIC_TYPE_STICKY --> +<!-- IF S_TOPIC_TYPE_ANNOUNCE or S_TOPIC_TYPE_STICKY --> <tr> <td class="row1"><b class="genmed">{L_STICK_TOPIC_FOR}:</b><br /><span class="gensmall">{L_STICKY_ANNOUNCE_TIME_LIMIT}</span></td> <td class="row2"><input class="post" type="text" name="topic_time_limit" size="3" maxlength="3" value="{TOPIC_TIME_LIMIT}" /> <b class="gen">{L_DAYS}</b> <span class="gensmall">{L_STICK_TOPIC_FOR_EXPLAIN}</span></td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> - <!-- IF S_EDIT_REASON --> - <tr> - <td class="row1" valign="top"><b class="genmed">{L_EDIT_REASON}:</b></td> - <td class="row2"><input class="post" type="text" name="edit_reason" size="50" maxlength="100" value="{EDIT_REASON}" /></td> - </tr> - <!-- ENDIF --> +<!-- IF S_EDIT_REASON --> + <tr> + <td class="row1" valign="top"><b class="genmed">{L_EDIT_REASON}:</b></td> + <td class="row2"><input class="post" type="text" name="edit_reason" size="50" maxlength="100" value="{EDIT_REASON}" /></td> + </tr> +<!-- ENDIF --> - <!-- IF S_CONFIRM_CODE --> +<!-- IF S_CONFIRM_CODE --> <tr> <th colspan="2" height="28" valign="middle">{L_POST_CONFIRMATION}</th> </tr> @@ -384,42 +401,42 @@ function checkForm() <td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td> <td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8" /></td> </tr> - <!-- ENDIF --> - - <!-- IF S_SHOW_ATTACH_BOX or S_SHOW_POLL_BOX --> - <tr> - <td class="cat" colspan="2" align="center"> - <input class="btnlite" type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" /> - <input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" /> - <!-- IF S_SAVE_ALLOWED --> <input class="btnlite" type="submit" accesskey="k" tabindex="8" name="save" value="{L_SAVE}" /><!-- ENDIF --> - <!-- IF S_HAS_DRAFTS --> <input class="btnlite" type="submit" accesskey="d" tabindex="9" name="load" value="{L_LOAD}" /><!-- ENDIF --> - <input class="btnlite" type="submit" accesskey="c" tabindex="7" name="cancel" value="{L_CANCEL}" /> - </td> - </tr> - - <!-- IF S_SHOW_ATTACH_BOX --><!-- INCLUDE posting_attach_body.html --><!-- ENDIF --> - - <!-- IF S_SHOW_POLL_BOX --> - <!-- INCLUDE posting_poll_body.html --> - <!-- ELSEIF S_POLL_DELETE --> - <tr> - <td class="row1"><span class="genmed"><b>{L_POLL_DELETE}:</b></span></td> - <td class="row2"><input type="checkbox" class="radio" name="poll_delete" /></td> - </tr> - <!-- ENDIF --> - <!-- ENDIF --> +<!-- ENDIF --> +<!-- IF S_SHOW_ATTACH_BOX or S_SHOW_POLL_BOX --> <tr> - <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS} + <td class="cat" colspan="2" align="center"> <input class="btnlite" type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" /> <input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" /> - <!-- IF not S_SHOW_ATTACH_BOX and not S_SHOW_POLL_BOX --> - <!-- IF S_SAVE_ALLOWED --> <input class="btnlite" type="submit" accesskey="k" tabindex="8" name="save" value="{L_SAVE}" /><!-- ENDIF --> - <!-- IF S_HAS_DRAFTS --> <input class="btnlite" type="submit" accesskey="d" tabindex="9" name="load" value="{L_LOAD}" /><!-- ENDIF --> - <!-- ENDIF --> + <!-- IF S_SAVE_ALLOWED --> <input class="btnlite" type="submit" accesskey="k" tabindex="8" name="save" value="{L_SAVE}" /><!-- ENDIF --> + <!-- IF S_HAS_DRAFTS --> <input class="btnlite" type="submit" accesskey="d" tabindex="9" name="load" value="{L_LOAD}" /><!-- ENDIF --> <input class="btnlite" type="submit" accesskey="c" tabindex="7" name="cancel" value="{L_CANCEL}" /> </td> </tr> + + <!-- IF S_SHOW_ATTACH_BOX --><!-- INCLUDE posting_attach_body.html --><!-- ENDIF --> + + <!-- IF S_SHOW_POLL_BOX --> + <!-- INCLUDE posting_poll_body.html --> + <!-- ELSEIF S_POLL_DELETE --> + <tr> + <td class="row1"><span class="genmed"><b>{L_POLL_DELETE}:</b></span></td> + <td class="row2"><input type="checkbox" class="radio" name="poll_delete" /></td> + </tr> + <!-- ENDIF --> +<!-- ENDIF --> + +<tr> + <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS} + <input class="btnlite" type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" /> + <input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" /> + <!-- IF not S_SHOW_ATTACH_BOX and not S_SHOW_POLL_BOX --> + <!-- IF S_SAVE_ALLOWED --> <input class="btnlite" type="submit" accesskey="k" tabindex="8" name="save" value="{L_SAVE}" /><!-- ENDIF --> + <!-- IF S_HAS_DRAFTS --> <input class="btnlite" type="submit" accesskey="d" tabindex="9" name="load" value="{L_LOAD}" /><!-- ENDIF --> + <!-- ENDIF --> + <input class="btnlite" type="submit" accesskey="c" tabindex="7" name="cancel" value="{L_CANCEL}" /> + </td> +</tr> </table> <br clear="all" /> @@ -434,9 +451,9 @@ function checkForm() <!-- INCLUDE ucp_footer.html --> <!-- ELSE --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td> - </tr> + <tr> + <td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td> + </tr> </table> </form> @@ -445,21 +462,21 @@ function checkForm() <br clear="all" /> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <td class="cat"><h4>{L_WHO_IS_ONLINE}</h4></td> - </tr> - <tr> - <td class="row1"><span class="gensmall">{LOGGED_IN_USER_LIST}</span></td> - </tr> + <tr> + <td class="cat"><h4>{L_WHO_IS_ONLINE}</h4></td> + </tr> + <tr> + <td class="row1"><span class="gensmall">{LOGGED_IN_USER_LIST}</span></td> + </tr> </table> <!-- ENDIF --> <br clear="all" /> <table width="100%" cellspacing="1"> - <tr> - <td align="right"><!-- INCLUDE jumpbox.html --></td> - </tr> + <tr> + <td align="right"><!-- INCLUDE jumpbox.html --></td> + </tr> </table> <!-- INCLUDE overall_footer.html --> diff --git a/phpBB/styles/subSilver/template/posting_poll_body.html b/phpBB/styles/subSilver/template/posting_poll_body.html index 8b1402acec..1f858e8ef9 100644 --- a/phpBB/styles/subSilver/template/posting_poll_body.html +++ b/phpBB/styles/subSilver/template/posting_poll_body.html @@ -1,34 +1,36 @@ - <tr> - <th colspan="2" height="28">{L_ADD_POLL}</th> - </tr> - <tr> - <td class="row3" colspan="2"><span class="gensmall">{L_ADD_POLL_EXPLAIN}</span></td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_POLL_QUESTION}:</b></td> - <td class="row2"><input class="post" type="text" name="poll_title" size="50" maxlength="255" value="{POLL_TITLE}" /></td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_POLL_OPTIONS}:</b><br /><span class="gensmall">{L_POLL_OPTIONS_EXPLAIN}</span></td> - <td class="row2"><textarea style="width:450px" name="poll_option_text" rows="5" cols="35">{POLL_OPTIONS}</textarea></td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_POLL_MAX_OPTIONS}:</b><br /><span class="gensmall">{L_POLL_MAX_OPTIONS_EXPLAIN}</span></td> - <td class="row2"><input class="post" type="text" name="poll_max_options" size="3" maxlength="3" value="{POLL_MAX_OPTIONS}" /></td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_POLL_FOR}</b></td> - <td class="row2"><input class="post" type="text" name="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" /> <b class="gen">{L_DAYS}</b> <span class="gensmall">{L_POLL_FOR_EXPLAIN}</span></td> - </tr> - <!-- IF S_POLL_VOTE_CHANGE --> +<tr> + <th colspan="2" height="28">{L_ADD_POLL}</th> +</tr> +<tr> + <td class="row3" colspan="2"><span class="gensmall">{L_ADD_POLL_EXPLAIN}</span></td> +</tr> +<tr> + <td class="row1"><b class="genmed">{L_POLL_QUESTION}:</b></td> + <td class="row2"><input class="post" type="text" name="poll_title" size="50" maxlength="255" value="{POLL_TITLE}" /></td> +</tr> +<tr> + <td class="row1"><b class="genmed">{L_POLL_OPTIONS}:</b><br /><span class="gensmall">{L_POLL_OPTIONS_EXPLAIN}</span></td> + <td class="row2"><textarea style="width:450px" name="poll_option_text" rows="5" cols="35">{POLL_OPTIONS}</textarea></td> +</tr> +<tr> + <td class="row1"><b class="genmed">{L_POLL_MAX_OPTIONS}:</b><br /><span class="gensmall">{L_POLL_MAX_OPTIONS_EXPLAIN}</span></td> + <td class="row2"><input class="post" type="text" name="poll_max_options" size="3" maxlength="3" value="{POLL_MAX_OPTIONS}" /></td> +</tr> +<tr> + <td class="row1"><b class="genmed">{L_POLL_FOR}</b></td> + <td class="row2"><input class="post" type="text" name="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" /> <b class="gen">{L_DAYS}</b> <span class="gensmall">{L_POLL_FOR_EXPLAIN}</span></td> +</tr> +<!-- IF S_POLL_VOTE_CHANGE --> <tr> <td class="row1"><b class="genmed">{L_POLL_VOTE_CHANGE}:</b><br /><span class="gensmall">{L_POLL_VOTE_CHANGE_EXPLAIN}</span></td> <td class="row2"><input type="checkbox" class="radio" name="poll_vote_change"{VOTE_CHANGE_CHECKED} /></td> - <!-- ENDIF --> - <!-- IF S_POLL_DELETE --> - <tr> + </tr> +<!-- ENDIF --> + +<!-- IF S_POLL_DELETE --> + <tr> <td class="row1"><b class="genmed">{L_POLL_DELETE}</b></td> <td class="row2"><input type="checkbox" class="radio" name="poll_delete" /></td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> diff --git a/phpBB/styles/subSilver/template/posting_preview.html b/phpBB/styles/subSilver/template/posting_preview.html index 862d85bf0e..4bb98fbd7d 100644 --- a/phpBB/styles/subSilver/template/posting_preview.html +++ b/phpBB/styles/subSilver/template/posting_preview.html @@ -1,12 +1,12 @@ <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th>{L_PREVIEW}</th> - </tr> - <tr> - <td class="row1">{MINI_POST_IMG}<span class="postdetails">{L_POSTED}: {POST_DATE} {L_POST_SUBJECT}: {PREVIEW_SUBJECT}</span></td> - </tr> - <!-- IF S_HAS_POLL_OPTIONS --> +<tr> + <th>{L_PREVIEW}</th> +</tr> +<tr> + <td class="row1">{MINI_POST_IMG}<span class="postdetails">{L_POSTED}: {POST_DATE} {L_POST_SUBJECT}: {PREVIEW_SUBJECT}</span></td> +</tr> +<!-- IF S_HAS_POLL_OPTIONS --> <tr> <td class="row2" colspan="2" align="center"><br clear="all" /> <table cellspacing="0" cellpadding="4" border="0" align="center"> @@ -17,16 +17,16 @@ <td align="center"> <table cellspacing="0" cellpadding="2" border="0"> <!-- BEGIN poll_option --> - <tr> - <td> + <tr> + <td> <!-- IF S_IS_MULTI_CHOICE --> <input type="checkbox" class="radio" name="vote_id" value="" /> <!-- ELSE --> <input type="radio" class="radio" name="vote_id" value="" /> <!-- ENDIF --> - </td> - <td><span class="gen">{poll_option.POLL_OPTION_CAPTION}</span></td> - </tr> + </td> + <td><span class="gen">{poll_option.POLL_OPTION_CAPTION}</span></td> + </tr> <!-- END poll_option --> </table> </td> @@ -37,32 +37,34 @@ </table> </td> </tr> - <!-- ENDIF --> - <tr> - <td class="row1"><table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td><div class="postbody">{PREVIEW_MESSAGE}</div> - <!-- IF S_HAS_ATTACHMENTS --> +<!-- ENDIF --> +<tr> + <td class="row1"> + <table width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td><div class="postbody">{PREVIEW_MESSAGE}</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> + <td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td> + </tr> + <!-- BEGIN attachment --> <tr> <td class="row2">{attachment.DISPLAY_ATTACHMENT}</td> </tr> - <!-- END attachment --> + <!-- END attachment --> </table> - <!-- ENDIF --> - <!-- IF PREVIEW_SIGNATURE --><span class="postbody"><br />_________________<br />{PREVIEW_SIGNATURE}</span><!-- ENDIF --></td> - </tr> - </table></td> - </tr> - <tr> - <td class="spacer"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> - </tr> + <!-- ENDIF --> + <!-- IF PREVIEW_SIGNATURE --><span class="postbody"><br />_________________<br />{PREVIEW_SIGNATURE}</span><!-- ENDIF --></td> + </tr> + </table> + </td> +</tr> +<tr> + <td class="spacer"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> +</tr> </table> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/posting_progress_bar.html b/phpBB/styles/subSilver/template/posting_progress_bar.html index 54e4322a09..e510659908 100644 --- a/phpBB/styles/subSilver/template/posting_progress_bar.html +++ b/phpBB/styles/subSilver/template/posting_progress_bar.html @@ -1,5 +1,8 @@ <script language="javascript" type="text/javascript"> <!-- + /** + * Close upload popup + */ function close_popup() { if (opener != null) diff --git a/phpBB/styles/subSilver/template/posting_review.html b/phpBB/styles/subSilver/template/posting_review.html index 005c5a5c91..4964cacd05 100644 --- a/phpBB/styles/subSilver/template/posting_review.html +++ b/phpBB/styles/subSilver/template/posting_review.html @@ -1,26 +1,24 @@ + <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th align="center">{L_POST_REVIEW}</th> - </tr> - <tr> - <td class="row1" align="center"><span class="gen">{L_POST_REVIEW_EXPLAIN}</span></td> - </tr> - <tr> - <td class="spacer"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> - </tr> - <tr> - <td class="row1"><table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th width="22%">{L_AUTHOR}</th> - <th>{L_MESSAGE}</th> - </tr> - <!-- BEGIN post_review_row --> +<tr> + <th align="center">{L_POST_REVIEW}</th> +</tr> +<tr> + <td class="row1" align="center"><span class="gen">{L_POST_REVIEW_EXPLAIN}</span></td> +</tr> +<tr> + <td class="spacer"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> +</tr> +<tr> + <td class="row1"> + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <th width="22%">{L_AUTHOR}</th> + <th>{L_MESSAGE}</th> + </tr> + <!-- BEGIN post_review_row --> - <!-- IF post_review_row.S_ROW_COUNT is even --> - <tr class="row1"> - <!-- ELSE --> - <tr class="row2"> - <!-- ENDIF --> + <!-- IF post_review_row.S_ROW_COUNT is even --> <tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td rowspan="2" align="left" valign="top"><a name="{post_review_row.U_POST_ID}"></a> <table width="150" cellspacing="0" cellpadding="4" border="0"> @@ -41,13 +39,10 @@ </td> </tr> - <!-- IF post_review_row.S_ROW_COUNT is even --> - <tr class="row1"> - <!-- ELSE --> - <tr class="row2"> - <!-- ENDIF --> + <!-- IF post_review_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td valign="top"><table width="100%" cellspacing="0"> + <td valign="top"> + <table width="100%" cellspacing="0"> <tr> <td valign="top"> <table width="100%" cellspacing="0" cellpadding="2"> @@ -68,14 +63,16 @@ </table> </td> </tr> - </table></td> + </table> + </td> </tr> <tr> <td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> </tr> - <!-- END post_review_row --> - </table></td> - </tr> + <!-- END post_review_row --> + </table> + </td> +</tr> </table> <br clear="all" />
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/posting_smilies.html b/phpBB/styles/subSilver/template/posting_smilies.html index 81ff78e950..479b59dbda 100644 --- a/phpBB/styles/subSilver/template/posting_smilies.html +++ b/phpBB/styles/subSilver/template/posting_smilies.html @@ -2,32 +2,40 @@ <script language="javascript" type="text/javascript"> <!-- +/** +* Apply clicked smiley to message body +*/ function smiley(text) { text = ' ' + text + ' '; - if (opener.document.forms['post'].message.createTextRange && opener.document.forms['post'].message.caretPos) { + if (opener.document.forms['post'].message.createTextRange && opener.document.forms['post'].message.caretPos) + { var caretPos = opener.document.forms['post'].message.caretPos; caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? text + ' ' : text; opener.document.forms['post'].message.focus(); - } else { - opener.document.forms['post'].message.value += text; - opener.document.forms['post'].message.focus(); + } + else + { + opener.document.forms['post'].message.value += text; + opener.document.forms['post'].message.focus(); } } //--> </script> <table width="100%" cellspacing="1" cellpadding="4" border="0"> - <tr> - <td><table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0"> - <tr> - <th height="28">{L_SMILIES}</th> - </tr> - <tr> - <td class="row1" align="center" valign="middle"><!-- BEGIN smiley --> <a href="javascript:smiley('{smiley.A_SMILEY_CODE}')"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" border="0" alt="{smiley.SMILEY_DESC}" title="{smiley.SMILEY_DESC}" hspace="2" vspace="2" onclick="smiley('{smiley.A_SMILEY_CODE}');return false" /></a> <!-- END smiley --><br /><a class="nav" href="javascript:window.close();">{L_CLOSE_WINDOW}</a></td> - </tr> - </table></td> - </tr> +<tr> + <td> + <table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0"> + <tr> + <th height="28">{L_SMILIES}</th> + </tr> + <tr> + <td class="row1" align="center" valign="middle"><!-- BEGIN smiley --> <a href="javascript:smiley('{smiley.A_SMILEY_CODE}')"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" border="0" alt="{smiley.SMILEY_DESC}" title="{smiley.SMILEY_DESC}" hspace="2" vspace="2" onclick="smiley('{smiley.A_SMILEY_CODE}');return false" /></a> <!-- END smiley --><br /><a class="nav" href="javascript:window.close();">{L_CLOSE_WINDOW}</a></td> + </tr> + </table> + </td> +</tr> </table> <!-- INCLUDE simple_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/posting_topic_review.html b/phpBB/styles/subSilver/template/posting_topic_review.html index 23bc623153..021789776b 100644 --- a/phpBB/styles/subSilver/template/posting_topic_review.html +++ b/phpBB/styles/subSilver/template/posting_topic_review.html @@ -1,71 +1,73 @@ <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th align="center">{L_TOPIC_REVIEW} - {TOPIC_TITLE}</th> - </tr> - <tr> - <td class="row1"><div style="overflow: auto; width: 100%; height: 300px;"> +<tr> + <th align="center">{L_TOPIC_REVIEW} - {TOPIC_TITLE}</th> +</tr> +<tr> + <td class="row1"><div style="overflow: auto; width: 100%; height: 300px;"> - <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th width="22%">{L_AUTHOR}</th> - <th>{L_MESSAGE}</th> - </tr> - <!-- BEGIN topic_review_row --> + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <th width="22%">{L_AUTHOR}</th> + <th>{L_MESSAGE}</th> + </tr> + <!-- BEGIN topic_review_row --> - <!-- IF topic_review_row.S_ROW_COUNT is even --> - <tr class="row1"> - <!-- ELSE --> - <tr class="row2"> - <!-- ENDIF --> + <!-- IF topic_review_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td rowspan="2" align="left" valign="top"><a name="{topic_review_row.U_POST_ID}"></a><table width="150" cellspacing="0"> - <tr> - <td align="center"><b class="postauthor">{topic_review_row.POSTER_NAME}</b></td> - </tr> - </table></td> - <td width="100%"><table width="100%" cellspacing="0"> - <tr> - <td> </td> - <td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}:</b> </td> - <td class="gensmall" width="100%" valign="middle">{topic_review_row.POST_SUBJECT}</td> - <td valign="top" nowrap="nowrap"> <!-- IF topic_review_row.U_QUOTE --><a href="{topic_review_row.U_QUOTE}">{QUOTE_IMG}</a><!-- ENDIF --></td> - </tr> - </table></td> - </tr> + <td rowspan="2" align="left" valign="top"><a name="{topic_review_row.U_POST_ID}"></a> + <table width="150" cellspacing="0"> + <tr> + <td align="center"><b class="postauthor">{topic_review_row.POSTER_NAME}</b></td> + </tr> + </table> + </td> + <td width="100%"> + <table width="100%" cellspacing="0"> + <tr> + <td> </td> + <td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}:</b> </td> + <td class="gensmall" width="100%" valign="middle">{topic_review_row.POST_SUBJECT}</td> + <td valign="top" nowrap="nowrap"> <!-- IF topic_review_row.U_QUOTE --><a href="{topic_review_row.U_QUOTE}">{QUOTE_IMG}</a><!-- ENDIF --></td> + </tr> + </table> + </td> + </tr> - <!-- IF topic_review_row.S_ROW_COUNT is even --> - <tr class="row1"> - <!-- ELSE --> - <tr class="row2"> - <!-- ENDIF --> + <!-- IF topic_review_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td valign="top"><table width="100%" cellspacing="0"> - <tr> - <td valign="top"><table width="100%" cellspacing="0" cellpadding="2"> - <tr> - <td><div id="message_{topic_review_row.U_POST_ID}"><div class="postbody">{topic_review_row.MESSAGE}</div></div></td> - </tr> - </table></td> - </tr> - <tr> - <td><table width="100%" cellspacing="0"> - <tr valign="middle"> - <td width="100%" align="left"><span class="gensmall"><!-- IF topic_review_row.U_MCP_DETAILS -->[ <a href="{topic_review_row.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></span></td> - <td width="10" nowrap="nowrap"><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a></td> - <td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {topic_review_row.POST_DATE}</td> - </tr> - </table></td> - </tr> - </table></td> - </tr> - <tr> - <td class="spacer" colspan="2"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> - </tr> - <!-- END topic_review_row --> - </table> - </div></td> - </tr> + <td valign="top"> + <table width="100%" cellspacing="0"> + <tr> + <td valign="top"> + <table width="100%" cellspacing="0" cellpadding="2"> + <tr> + <td><div id="message_{topic_review_row.U_POST_ID}"><div class="postbody">{topic_review_row.MESSAGE}</div></div></td> + </tr> + </table> + </td> + </tr> + <tr> + <td> + <table width="100%" cellspacing="0"> + <tr valign="middle"> + <td width="100%" align="left"><span class="gensmall"><!-- IF topic_review_row.U_MCP_DETAILS -->[ <a href="{topic_review_row.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></span></td> + <td width="10" nowrap="nowrap"><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a></td> + <td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {topic_review_row.POST_DATE}</td> + </tr> + </table> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td class="spacer" colspan="2"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> + </tr> + <!-- END topic_review_row --> + </table> + </div></td> +</tr> </table> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/report_body.html b/phpBB/styles/subSilver/template/report_body.html index f586389be0..ca66a9d5f2 100644 --- a/phpBB/styles/subSilver/template/report_body.html +++ b/phpBB/styles/subSilver/template/report_body.html @@ -16,10 +16,10 @@ </select></td> </tr> <!-- IF S_CAN_NOTIFY --> -<tr> - <td class="row1"><span class="gen"><b>{L_REPORT_NOTIFY}:</b></span><br /><span class="gensmall">{L_REPORT_NOTIFY_EXPLAIN}</span></td> - <td class="row2"><span class="gen"><input type="radio" class="radio" name="notify" value="1"<!-- IF S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" class="radio" name="notify" value="0"<!-- IF not S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_NO}</span></td> -</tr> + <tr> + <td class="row1"><span class="gen"><b>{L_REPORT_NOTIFY}:</b></span><br /><span class="gensmall">{L_REPORT_NOTIFY_EXPLAIN}</span></td> + <td class="row2"><span class="gen"><input type="radio" class="radio" name="notify" value="1"<!-- IF S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" class="radio" name="notify" value="0"<!-- IF not S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_NO}</span></td> + </tr> <!-- ENDIF --> <tr> <td class="row1" valign="top"><span class="gen"><b>{L_MORE_INFO}:</b></span><br /><span class="gensmall">{L_CAN_LEAVE_BLANK}</span></td> diff --git a/phpBB/styles/subSilver/template/search_body.html b/phpBB/styles/subSilver/template/search_body.html index 2074cefb50..ea8198565b 100644 --- a/phpBB/styles/subSilver/template/search_body.html +++ b/phpBB/styles/subSilver/template/search_body.html @@ -1,82 +1,83 @@ <!-- INCLUDE overall_header.html --> - <div id="pagecontent"> +<div id="pagecontent"> - <form method="get" action="{S_SEARCH_ACTION}"><table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="4">{L_SEARCH_QUERY}</th> - </tr> - <tr> - <td class="row1" colspan="2" width="50%"><b class="genmed">{L_SEARCH_KEYWORDS}: </b><br /><span class="gensmall">{L_SEARCH_KEYWORDS_EXPLAIN}</span></td> - <td class="row2" colspan="2" valign="top"><input type="text" style="width: 300px" class="post" name="keywords" size="30" /><br /><input type="radio" class="radio" name="terms" value="all" checked="checked" /> <span class="genmed">{L_SEARCH_ALL_TERMS}</span><br /><input type="radio" class="radio" name="terms" value="any" /> <span class="genmed">{L_SEARCH_ANY_TERMS}</span></td> - </tr> - <tr> - <td class="row1" colspan="2"><b class="genmed">{L_SEARCH_AUTHOR}:</b><br /><span class="gensmall">{L_SEARCH_AUTHOR_EXPLAIN}</span></td> - <td class="row2" colspan="2" valign="middle"><input type="text" style="width: 300px" class="post" name="author" size="30" /></td> - </tr> - <tr> - <td class="row1" colspan="2"><b class="genmed">{L_SEARCH_FORUMS}: </b><br /><span class="gensmall">{L_SEARCH_FORUMS_EXPLAIN}</span></td> - <td class="row2" colspan="2"><select name="fid[]" multiple="multiple" size="5">{S_FORUM_OPTIONS}</select></td> - </tr> - <tr> - <th colspan="4">{L_SEARCH_OPTIONS}</th> - </tr> - <tr> - <td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_SUBFORUMS}: </b></td> - <td class="row2" width="25%" nowrap="nowrap"><input type="radio" class="radio" name="sc" value="1" checked="checked" /> <span class="genmed">{L_YES}</span> <input type="radio" class="radio" name="sc" value="0" /> <span class="genmed">{L_NO}</span></td> - <td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_WITHIN}: </b></td> - <td class="row2" width="25%" nowrap="nowrap"><input type="radio" class="radio" name="sf" value="all" checked="checked" /> <span class="genmed">{L_SEARCH_TITLE_MSG}</span><br /><input type="radio" class="radio" name="sf" value="msgonly" /> <span class="genmed">{L_SEARCH_MSG_ONLY}</span> <br /><input type="radio" class="radio" name="sf" value="titleonly" /> <span class="genmed">{L_SEARCH_TITLE_ONLY}</span> <br /><input type="radio" class="radio" name="sf" value="firstpost" /> <span class="genmed">{L_SEARCH_FIRST_POST}</span></td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_RESULT_SORT}: </b></td> - <td class="row2" nowrap="nowrap">{S_SELECT_SORT_KEY}<br /><input type="radio" class="radio" name="sd" value="a" /> <span class="genmed">{L_SORT_ASCENDING}</span><br /><input type="radio" class="radio" name="sd" value="d" checked="checked" /> <span class="genmed">{L_SORT_DESCENDING}</span></td> - <td class="row1" nowrap="nowrap"><b class="genmed">{L_DISPLAY_RESULTS}: </b></td> - <td class="row2" nowrap="nowrap"><input type="radio" class="radio" name="sr" value="posts" checked="checked" /> <span class="genmed">{L_POSTS}</span> <input type="radio" class="radio" name="sr" value="topics" /> <span class="genmed">{L_TOPICS}</td> - </tr> - <tr> - <td class="row1" width="25%"><b class="genmed">{L_RESULT_DAYS}: </b></td> - <td class="row2" width="25%" nowrap="nowrap">{S_SELECT_SORT_DAYS}</td> - <td class="row1" nowrap="nowrap"><b class="genmed">{L_RETURN_FIRST}: </b></td> - <td class="row2" nowrap="nowrap"><select name="ch">{S_CHARACTER_OPTIONS}</select> <span class="genmed">{L_POST_CHARACTERS}</span></td> - </tr> - <tr> - <td class="cat" colspan="4" align="center">{S_HIDDEN_FIELDS}<input class="btnlite" name="submit" type="submit" value="{L_SEARCH}" /> <input class="btnlite" type="reset" value="{L_RESET}" /></td> - </tr> - </table></form> + <form method="get" action="{S_SEARCH_ACTION}"> + + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <th colspan="4">{L_SEARCH_QUERY}</th> + </tr> + <tr> + <td class="row1" colspan="2" width="50%"><b class="genmed">{L_SEARCH_KEYWORDS}: </b><br /><span class="gensmall">{L_SEARCH_KEYWORDS_EXPLAIN}</span></td> + <td class="row2" colspan="2" valign="top"><input type="text" style="width: 300px" class="post" name="keywords" size="30" /><br /><input type="radio" class="radio" name="terms" value="all" checked="checked" /> <span class="genmed">{L_SEARCH_ALL_TERMS}</span><br /><input type="radio" class="radio" name="terms" value="any" /> <span class="genmed">{L_SEARCH_ANY_TERMS}</span></td> + </tr> + <tr> + <td class="row1" colspan="2"><b class="genmed">{L_SEARCH_AUTHOR}:</b><br /><span class="gensmall">{L_SEARCH_AUTHOR_EXPLAIN}</span></td> + <td class="row2" colspan="2" valign="middle"><input type="text" style="width: 300px" class="post" name="author" size="30" /></td> + </tr> + <tr> + <td class="row1" colspan="2"><b class="genmed">{L_SEARCH_FORUMS}: </b><br /><span class="gensmall">{L_SEARCH_FORUMS_EXPLAIN}</span></td> + <td class="row2" colspan="2"><select name="fid[]" multiple="multiple" size="5">{S_FORUM_OPTIONS}</select></td> + </tr> + <tr> + <th colspan="4">{L_SEARCH_OPTIONS}</th> + </tr> + <tr> + <td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_SUBFORUMS}: </b></td> + <td class="row2" width="25%" nowrap="nowrap"><input type="radio" class="radio" name="sc" value="1" checked="checked" /> <span class="genmed">{L_YES}</span> <input type="radio" class="radio" name="sc" value="0" /> <span class="genmed">{L_NO}</span></td> + <td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_WITHIN}: </b></td> + <td class="row2" width="25%" nowrap="nowrap"><input type="radio" class="radio" name="sf" value="all" checked="checked" /> <span class="genmed">{L_SEARCH_TITLE_MSG}</span><br /><input type="radio" class="radio" name="sf" value="msgonly" /> <span class="genmed">{L_SEARCH_MSG_ONLY}</span> <br /><input type="radio" class="radio" name="sf" value="titleonly" /> <span class="genmed">{L_SEARCH_TITLE_ONLY}</span> <br /><input type="radio" class="radio" name="sf" value="firstpost" /> <span class="genmed">{L_SEARCH_FIRST_POST}</span></td> + </tr> + <tr> + <td class="row1"><b class="genmed">{L_RESULT_SORT}: </b></td> + <td class="row2" nowrap="nowrap">{S_SELECT_SORT_KEY}<br /><input type="radio" class="radio" name="sd" value="a" /> <span class="genmed">{L_SORT_ASCENDING}</span><br /><input type="radio" class="radio" name="sd" value="d" checked="checked" /> <span class="genmed">{L_SORT_DESCENDING}</span></td> + <td class="row1" nowrap="nowrap"><b class="genmed">{L_DISPLAY_RESULTS}: </b></td> + <td class="row2" nowrap="nowrap"><input type="radio" class="radio" name="sr" value="posts" checked="checked" /> <span class="genmed">{L_POSTS}</span> <input type="radio" class="radio" name="sr" value="topics" /> <span class="genmed">{L_TOPICS}</td> + </tr> + <tr> + <td class="row1" width="25%"><b class="genmed">{L_RESULT_DAYS}: </b></td> + <td class="row2" width="25%" nowrap="nowrap">{S_SELECT_SORT_DAYS}</td> + <td class="row1" nowrap="nowrap"><b class="genmed">{L_RETURN_FIRST}: </b></td> + <td class="row2" nowrap="nowrap"><select name="ch">{S_CHARACTER_OPTIONS}</select> <span class="genmed">{L_POST_CHARACTERS}</span></td> + </tr> + <tr> + <td class="cat" colspan="4" align="center">{S_HIDDEN_FIELDS}<input class="btnlite" name="submit" type="submit" value="{L_SEARCH}" /> <input class="btnlite" type="reset" value="{L_RESET}" /></td> + </tr> + </table> + + </form> + + <br clear="all" /> - <br clear="all" /> + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <th colspan="2">{L_RECENT_SEARCHES}</th> + </tr> + <!-- BEGIN recentsearch --> + <!-- IF recentsearch.S_ROW_COUNT is even --><tr class="row2"><!-- ELSE --><tr class="row1"><!-- ENDIF --> - <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2">{L_RECENT_SEARCHES}</th> - </tr> - <!-- BEGIN recentsearch --> - <!-- IF recentsearch.S_ROW_COUNT is even --> - <tr class="row2"> - <!-- ELSE --> - <tr class="row1"> - <!-- ENDIF --> - <td class="genmed" style="padding: 4px;" width="70%"><a href="{recentsearch.U_KEYWORDS}">{recentsearch.KEYWORDS}</a></td> - <td class="genmed" style="padding: 4px;" width="30%" align="center">{recentsearch.TIME}</td> - </tr> - <!-- BEGINELSE --> - <tr> - <td class="row1" colspan="2" align="center"><span class="genmed">{L_NO_RECENT_SEARCHES}</span></td> - </tr> - <!-- END recentsearch --> - </table> + <td class="genmed" style="padding: 4px;" width="70%"><a href="{recentsearch.U_KEYWORDS}">{recentsearch.KEYWORDS}</a></td> + <td class="genmed" style="padding: 4px;" width="30%" align="center">{recentsearch.TIME}</td> + </tr> + <!-- BEGINELSE --> + <tr> + <td class="row1" colspan="2" align="center"><span class="genmed">{L_NO_RECENT_SEARCHES}</span></td> + </tr> + <!-- END recentsearch --> + </table> - <br clear="all" /> + <br clear="all" /> </div> <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> - <tr> - <td class="row1"> - <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> - </tr> + <tr> + <td class="row1"> + <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a></p> + <p class="datetime">{S_TIMEZONE}</p> + </td> + </tr> </table> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/search_results.html b/phpBB/styles/subSilver/template/search_results.html index 48215b6325..e7a5098e65 100644 --- a/phpBB/styles/subSilver/template/search_results.html +++ b/phpBB/styles/subSilver/template/search_results.html @@ -3,13 +3,13 @@ <form method="post" action="{S_SEARCH_ACTION}"> <table width="100%" cellspacing="1"> - <tr> - <td colspan="2"><span class="titles">{SEARCH_MATCHES}</span><br /></td> - </tr> - <tr> - <td class="genmed"><!-- IF SEARCH_TOPIC -->{L_SEARCHED_TOPIC}: <a href="{U_SEARCH_TOPIC}"><b>{SEARCH_TOPIC}</b></a><br /><!-- ENDIF --><!-- IF SEARCH_WORDS -->{L_SEARCHED_FOR}: <a href="{U_SEARCH_WORDS}"><b>{SEARCH_WORDS}</b></a><!-- ENDIF --><!-- IF IGNORED_WORDS --> {L_IGNORED_TERMS}: <b>{IGNORED_WORDS}</b><!-- ENDIF --></td> - <td align="right"><!-- IF SEARCH_IN_RESULTS --><span class="genmed">{L_SEARCH_IN_RESULTS}: </span><input type="text" name="add_keywords" value="" /> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /><!-- ENDIF --></td> - </tr> +<tr> + <td colspan="2"><span class="titles">{SEARCH_MATCHES}</span><br /></td> +</tr> +<tr> + <td class="genmed"><!-- IF SEARCH_TOPIC -->{L_SEARCHED_TOPIC}: <a href="{U_SEARCH_TOPIC}"><b>{SEARCH_TOPIC}</b></a><br /><!-- ENDIF --><!-- IF SEARCH_WORDS -->{L_SEARCHED_FOR}: <a href="{U_SEARCH_WORDS}"><b>{SEARCH_WORDS}</b></a><!-- ENDIF --><!-- IF IGNORED_WORDS --> {L_IGNORED_TERMS}: <b>{IGNORED_WORDS}</b><!-- ENDIF --></td> + <td align="right"><!-- IF SEARCH_IN_RESULTS --><span class="genmed">{L_SEARCH_IN_RESULTS}: </span><input type="text" name="add_keywords" value="" /> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /><!-- ENDIF --></td> +</tr> </table> <br clear="all" /> @@ -26,45 +26,45 @@ <th nowrap="nowrap"> {L_LAST_POST} </th> </tr> <!-- BEGIN searchresults --> - <tr valign="middle"> - <td class="row1" width="25" align="center">{searchresults.TOPIC_FOLDER_IMG}</td> - <td class="row1" width="25" align="center"> + <tr valign="middle"> + <td class="row1" width="25" align="center">{searchresults.TOPIC_FOLDER_IMG}</td> + <td class="row1" width="25" align="center"> <!-- IF searchresults.TOPIC_ICON_IMG --> <img src="{T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}" width="{searchresults.TOPIC_ICON_IMG_WIDTH}" height="{searchresults.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /> <!-- ENDIF --> - </td> - <td class="row1"> - <!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a><!-- ENDIF --> - {topicrow.ATTACH_ICON_IMG} <a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> - <!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --> - <a href="{searchresults.U_MCP_QUEUE}">{searchresults.UNAPPROVED_IMG}</a> - <!-- ENDIF --> - <!-- IF searchresults.S_TOPIC_REPORTED --> - <a href="{searchresults.U_MCP_REPORT}">{REPORTED_IMG}</a> - <!-- ENDIF --> - <!-- IF searchresults.PAGINATION --> - <p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {searchresults.PAGINATION} ] </p> - <!-- ENDIF --> - <!-- IF searchresults.S_TOPIC_GLOBAL --> - <p class="gensmall">{L_GLOBAL}</p> - <!-- ELSE --> - <p class="gensmall">{L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></p> - <!-- ENDIF --> - </td> - <td class="row2" width="100" align="center"><p class="topicauthor">{searchresults.TOPIC_AUTHOR}</p></td> - <td class="row1" width="50" align="center"><p class="topicdetails">{searchresults.TOPIC_REPLIES}</p></td> - <td class="row2" width="50" align="center"><p class="topicdetails">{searchresults.TOPIC_VIEWS}</p></td> - <td class="row1" width="120" align="center"> - <p class="topicdetails">{searchresults.LAST_POST_TIME}</p> - <p class="topicdetails"><!-- IF searchresults.U_LAST_POST_AUTHOR --><a href="{searchresults.U_LAST_POST_AUTHOR}">{searchresults.LAST_POST_AUTHOR}</a><!-- ELSE -->{searchresults.LAST_POST_AUTHOR}<!-- ENDIF --> - <a href="{searchresults.U_LAST_POST}">{searchresults.LAST_POST_IMG}</a> - </p> - </td> - </tr> + </td> + <td class="row1"> + <!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a><!-- ENDIF --> + {topicrow.ATTACH_ICON_IMG} <a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> + <!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --> + <a href="{searchresults.U_MCP_QUEUE}">{searchresults.UNAPPROVED_IMG}</a> + <!-- ENDIF --> + <!-- IF searchresults.S_TOPIC_REPORTED --> + <a href="{searchresults.U_MCP_REPORT}">{REPORTED_IMG}</a> + <!-- ENDIF --> + <!-- IF searchresults.PAGINATION --> + <p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {searchresults.PAGINATION} ] </p> + <!-- ENDIF --> + <!-- IF searchresults.S_TOPIC_GLOBAL --> + <p class="gensmall">{L_GLOBAL}</p> + <!-- ELSE --> + <p class="gensmall">{L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></p> + <!-- ENDIF --> + </td> + <td class="row2" width="100" align="center"><p class="topicauthor">{searchresults.TOPIC_AUTHOR}</p></td> + <td class="row1" width="50" align="center"><p class="topicdetails">{searchresults.TOPIC_REPLIES}</p></td> + <td class="row2" width="50" align="center"><p class="topicdetails">{searchresults.TOPIC_VIEWS}</p></td> + <td class="row1" width="120" align="center"> + <p class="topicdetails">{searchresults.LAST_POST_TIME}</p> + <p class="topicdetails"><!-- IF searchresults.U_LAST_POST_AUTHOR --><a href="{searchresults.U_LAST_POST_AUTHOR}">{searchresults.LAST_POST_AUTHOR}</a><!-- ELSE -->{searchresults.LAST_POST_AUTHOR}<!-- ENDIF --> + <a href="{searchresults.U_LAST_POST}">{searchresults.LAST_POST_IMG}</a> + </p> + </td> + </tr> <!-- BEGINELSE --> - <tr valign="middle"> - <td colspan="7" class="row3" align="center">{L_NO_SEARCH_RESULTS}</td> - </tr> + <tr valign="middle"> + <td colspan="7" class="row3" align="center">{L_NO_SEARCH_RESULTS}</td> + </tr> <!-- END searchresults --> <tr> <td class="cat" colspan="7" valign="middle" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY --> <span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}<!-- ENDIF --> <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td> @@ -78,37 +78,42 @@ <th width="150" nowrap="nowrap">{L_AUTHOR}</th> <th width="100%" nowrap="nowrap">{L_MESSAGE}</th> </tr> + <!-- BEGIN searchresults --> - <tr class="row2"> - <!-- IF searchresults.S_IGNORE_POST --> - <td class="gensmall" colspan="2" height="25" align="center">{searchresults.L_IGNORE_POST}</td> - <!-- ELSE --> - <td colspan="2" height="25"><p class="topictitle"><a name="{searchresults.POST_ID}"></a> <!-- IF searchresults.FORUM_TITLE -->{L_FORUM}: <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a><!-- ELSE -->{L_GLOBAL}<!-- ENDIF --> {L_TOPIC}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></p></td> - </tr> - <tr class="row1"> - <td width="150" align="center" valign="middle"><b class="postauthor">{searchresults.POSTER_NAME}</b></td> - <td height="25"><table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td class="gensmall"><div style="float:left"> <b>{L_POST_SUBJECT}:</b> <a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a></div><div style="float:right"><a href="{searchresults.U_VIEW_POST}">{searchresults.MINI_POST_IMG}</a><b>{L_POSTED}:</b> {searchresults.POST_DATE} </div></td> + <tr class="row2"> + <!-- IF searchresults.S_IGNORE_POST --> + <td class="gensmall" colspan="2" height="25" align="center">{searchresults.L_IGNORE_POST}</td> + <!-- ELSE --> + <td colspan="2" height="25"><p class="topictitle"><a name="{searchresults.POST_ID}"></a> <!-- IF searchresults.FORUM_TITLE -->{L_FORUM}: <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a><!-- ELSE -->{L_GLOBAL}<!-- ENDIF --> {L_TOPIC}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></p></td> </tr> - </table></td> - </tr> - <tr class="row1"> - <td width="150" align="center" valign="top"><br /><span class="postdetails">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br />{L_VIEWS}: <b>{searchresults.TOPIC_VIEWS}</b></span><br /><br /></td> - <td valign="top"><table width="100%" cellspacing="5"> - <tr> - <td class="postbody">{searchresults.MESSAGE}</td> + <tr class="row1"> + <td width="150" align="center" valign="middle"><b class="postauthor">{searchresults.POSTER_NAME}</b></td> + <td height="25"> + <table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr> + <td class="gensmall"><div style="float:left"> <b>{L_POST_SUBJECT}:</b> <a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a></div><div style="float:right"><a href="{searchresults.U_VIEW_POST}">{searchresults.MINI_POST_IMG}</a><b>{L_POSTED}:</b> {searchresults.POST_DATE} </div></td> + </tr> + </table> + </td> </tr> - </table></td> - </tr> - <!-- ENDIF --> - <tr> - <td class="spacer" colspan="2"><img src="images/spacer.gif" height="1" alt="" /></td> - </tr> + <tr class="row1"> + <td width="150" align="center" valign="top"><br /><span class="postdetails">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br />{L_VIEWS}: <b>{searchresults.TOPIC_VIEWS}</b></span><br /><br /></td> + <td valign="top"> + <table width="100%" cellspacing="5"> + <tr> + <td class="postbody">{searchresults.MESSAGE}</td> + </tr> + </table> + </td> + </tr> + <!-- ENDIF --> + <tr> + <td class="spacer" colspan="2"><img src="images/spacer.gif" height="1" alt="" /></td> + </tr> <!-- BEGINELSE --> - <tr valign="middle"> - <td colspan="2" class="row3" align="center">{L_NO_SEARCH_RESULTS}</td> - </tr> + <tr valign="middle"> + <td colspan="2" class="row3" align="center">{L_NO_SEARCH_RESULTS}</td> + </tr> <!-- END searchresults --> <tr> <td class="cat" colspan="2" align="center"><span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td> @@ -123,9 +128,9 @@ <br clear="all" /><br /> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td> - </tr> +<tr> + <td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td> +</tr> </table> <br clear="all" /> diff --git a/phpBB/styles/subSilver/template/ucp_footer.html b/phpBB/styles/subSilver/template/ucp_footer.html index 15f9dbcdb3..a9dc458a72 100644 --- a/phpBB/styles/subSilver/template/ucp_footer.html +++ b/phpBB/styles/subSilver/template/ucp_footer.html @@ -1,14 +1,14 @@ - <!-- IF not S_PRIVMSGS or S_SHOW_DRAFTS --></form><!-- ENDIF --></td> - </tr> + <!-- IF not S_PRIVMSGS or S_SHOW_DRAFTS --></form><!-- ENDIF --></td> +</tr> </table> <br clear="all" /> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td> - </tr> +<tr> + <td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td> +</tr> </table> <div align="right"><!-- INCLUDE jumpbox.html --></div> diff --git a/phpBB/styles/subSilver/template/ucp_groups_manage.html b/phpBB/styles/subSilver/template/ucp_groups_manage.html index 8b7fd7987e..f33e86ba04 100644 --- a/phpBB/styles/subSilver/template/ucp_groups_manage.html +++ b/phpBB/styles/subSilver/template/ucp_groups_manage.html @@ -3,11 +3,16 @@ <!-- IF S_EDIT --> <script type="text/javascript"> + <!-- + /** + * Colour swatch + */ function swatch() { window.open('{UA_SWATCH}', '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636'); return false; } + //--> </script> <!-- IF S_ERROR --> @@ -18,119 +23,118 @@ <!-- ENDIF --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2">{L_USERGROUPS}</th> - </tr> - <tr> - <td class="row3" colspan="2"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td> - </tr> + <tr> + <th colspan="2">{L_USERGROUPS}</th> + </tr> + <tr> + <td class="row3" colspan="2"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td> + </tr> + <tr> + <th colspan="2">{L_GROUP_DETAILS}</th> + </tr> + <tr> + <td class="row1" width="35%"><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></td> + <td class="row2"><!-- IF S_SPECIAL_GROUP --><b>{GROUP_NAME}</b><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></td> + </tr> + <tr> + <td class="row1" width="35%"><label for="group_desc">{L_GROUP_DESC}:</label></td> + <td class="row2"><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd> + <br /><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE} <input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES} <input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</dd> + </td> + </tr> + <!-- IF not S_SPECIAL_GROUP --> <tr> - <th colspan="2">{L_GROUP_DETAILS}</th> - </tr> - <tr> - <td class="row1" width="35%"><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></td> - <td class="row2"><!-- IF S_SPECIAL_GROUP --><b>{GROUP_NAME}</b><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></td> - </tr> - <tr> - <td class="row1" width="35%"><label for="group_desc">{L_GROUP_DESC}:</label></td> - <td class="row2"><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd> - <br /><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE} <input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES} <input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</dd> + <td class="row1" width="35%"><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt> + <td class="row2"> + <input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN} + <input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST} + <input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSE}"{GROUP_CLOSED} /> {L_GROUP_CLOSED} + <input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN} </td> </tr> - <!-- IF not S_SPECIAL_GROUP --> + <!-- ELSE --> + <input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" /> + <!-- ENDIF --> + + <tr> + <th colspan="2">{L_GROUP_SETTINGS_SAVE}</th> + </tr> + <tr> + <td class="row1" width="35%"><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></td> + <td class="row2"><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" /> <span>[ <a href="#" onclick="swatch(); return false">{L_COLOUR_SWATCH}</a> ]</span></td> + </tr> + <tr> + <td class="row1" width="35%"><label for="group_rank">{L_GROUP_RANK}:</label></td> + <td class="row2"><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></td> + </tr> + <tr> + <th colspan="2">{L_GROUP_AVATAR}</th> + <tr> + <tr> + <td class="row1" width="35%"><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></td> + <td class="row2">{AVATAR_IMAGE}<br /><br /><input type="checkbox" class="radio" name="delete" /> <span>{L_DELETE_AVATAR}</span></td> + </tr> + <!-- IF not S_IN_AVATAR_GALLERY --> + <!-- IF S_CAN_UPLOAD --> <tr> - <td class="row1" width="35%"><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt> - <td class="row2"> - <input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN} - <input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST} - <input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSE}"{GROUP_CLOSED} /> {L_GROUP_CLOSED} - <input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN} - </td> + <td class="row1" width="35%"><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></td> + <td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></td> + </tr> + <tr> + <td class="row1" width="35%"><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td> + <td class="row2"><input name="uploadurl" type="text" id="uploadurl" value="" /></td> </tr> - <!-- ELSE --> - <input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" /> <!-- ENDIF --> - <tr> - <th colspan="2">{L_GROUP_SETTINGS_SAVE}</th> + <td class="row1" width="35%"><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td> + <td class="row2"><input name="remotelink" type="text" id="remotelink" value="" /></td> </tr> <tr> - <td class="row1" width="35%"><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></td> - <td class="row2"><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" /> <span>[ <a href="#" onclick="swatch(); return false">{L_COLOUR_SWATCH}</a> ]</span></td> - </tr> - <tr> - <td class="row1" width="35%"><label for="group_rank">{L_GROUP_RANK}:</label></td> - <td class="row2"><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></td> + <td class="row1" width="35%"><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td> + <td class="row2"><input name="width" type="text" id="width" size="3" value="{GROUP_AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{GROUP_AVATAR_HEIGHT}" /> <span>px</span></td> </tr> + <!-- IF S_DISPLAY_GALLERY --> + <tr> + <td class="row1" width="35%"><label>{L_AVATAR_GALLERY}:</label></td> + <td class="row2"><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></td> + </tr> + <!-- ENDIF --> + <!-- ELSE --> <tr> - <th colspan="2">{L_GROUP_AVATAR}</th> - <tr> + <th colspan="2">{L_AVATAR_GALLERY}</th> + </tr> <tr> - <td class="row1" width="35%"><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></td> - <td class="row2">{AVATAR_IMAGE}<br /><br /><input type="checkbox" class="radio" name="delete" /> <span>{L_DELETE_AVATAR}</span></td> + <td class="row1" width="35%"><label for="category">{L_AVATAR_CATEGORY}:</label></td> + <td class="row2"><select name="category" id="category">{S_CAT_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></td> </tr> - <!-- IF not S_IN_AVATAR_GALLERY --> - <!-- IF S_CAN_UPLOAD --> - <tr> - <td class="row1" width="35%"><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></td> - <td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></td> - </tr> - <tr> - <td class="row1" width="35%"><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td> - <td class="row2"><input name="uploadurl" type="text" id="uploadurl" value="" /></td> - </tr> - <!-- ENDIF --> - <tr> - <td class="row1" width="35%"><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td> - <td class="row2"><input name="remotelink" type="text" id="remotelink" value="" /></td> + <tr> + <td class="row1" width="35%"> + <table cellspacing="1"> + <!-- BEGIN avatar_row --> + <tr> + <!-- BEGIN avatar_column --> + <td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td> + <!-- END avatar_column --> </tr> <tr> - <td class="row1" width="35%"><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td> - <td class="row2"><input name="width" type="text" id="width" size="3" value="{GROUP_AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{GROUP_AVATAR_HEIGHT}" /> <span>px</span></td> - </dl> - <!-- IF S_DISPLAY_GALLERY --> - <tr> - <td class="row1" width="35%"><label>{L_AVATAR_GALLERY}:</label></td> - <td class="row2"><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></td> + <!-- BEGIN avatar_option_column --> + <td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td> + <!-- END avatar_option_column --> </tr> - <!-- ENDIF --> - <!-- ELSE --> - - <tr> - <th colspan="2">{L_AVATAR_GALLERY}</th> - </tr> - <tr> - <td class="row1" width="35%"><label for="category">{L_AVATAR_CATEGORY}:</label></td> - <td class="row2"><select name="category" id="category">{S_CAT_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></td> - </tr> - <tr> - <td class="row1" width="35%"> - <table cellspacing="1"> - <!-- BEGIN avatar_row --> - <tr> - <!-- BEGIN avatar_column --> - <td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td> - <!-- END avatar_column --> - </tr> - <tr> - <!-- BEGIN avatar_option_column --> - <td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td> - <!-- END avatar_option_column --> - </tr> - <!-- END avatar_row --> - </table> - </td> - <td class="row2"><input class="button2" type="submit" name="cancel" value="{L_CANCEL}" /></td> - </tr> + <!-- END avatar_row --> + </table> + </td> + <td class="row2"><input class="button2" type="submit" name="cancel" value="{L_CANCEL}" /></td> + </tr> - <!-- ENDIF --> + <!-- ENDIF --> - <tr> - <td class="cat" colspan="2" align="center"><input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" /> - <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /></td> - </tr> + <tr> + <td class="cat" colspan="2" align="center"><input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" /> + <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /></td> + </tr> </table> <!-- ELSEIF S_LIST --> @@ -140,51 +144,51 @@ <p>{L_GROUP_MEMBERS_EXPLAIN}</p> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th>{L_USERNAME}</th> - <th>{L_GROUP_DEFAULT}</th> - <th>{L_JOINED}</th> - <th>{L_POSTS}</th> - <th>{L_MARK}</th> - </tr> + <tr> + <th>{L_USERNAME}</th> + <th>{L_GROUP_DEFAULT}</th> + <th>{L_JOINED}</th> + <th>{L_POSTS}</th> + <th>{L_MARK}</th> + </tr> - <tr> - <td class="row3" colspan="5"><b>{L_GROUP_LEAD}</b></td> + <tr> + <td class="row3" colspan="5"><b>{L_GROUP_LEAD}</b></td> + </tr> + <!-- BEGIN leader --> + <!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + <td><a href="{leader.U_USER_VIEW}">{leader.USERNAME}</a></td> + <td style="text-align: center;"><!-- IF leader.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td> + <td style="text-align: center;">{leader.JOINED}</td> + <td style="text-align: center;">{leader.USER_POSTS}</td> + <td style="text-align: center;"></td> </tr> - <!-- BEGIN leader --> - <!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td><a href="{leader.U_USER_VIEW}">{leader.USERNAME}</a></td> - <td style="text-align: center;"><!-- IF leader.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td> - <td style="text-align: center;">{leader.JOINED}</td> - <td style="text-align: center;">{leader.USER_POSTS}</td> - <td style="text-align: center;"></td> - </tr> - <!-- END leader --> - <tr> - <td class="row3" colspan="5"><b>{L_GROUP_APPROVED}</b></td> - </tr> - <!-- BEGIN member --> - <!-- IF member.S_PENDING --> - <tr> - <td class="row3" colspan="5"><b>{L_GROUP_PENDING}</b></td> - </tr> - <!-- ELSE --> - <!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td><a href="{member.U_USER_VIEW}">{member.USERNAME}</a></td> - <td style="text-align: center;"><!-- IF member.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td> - <td style="text-align: center;">{member.JOINED}</td> - <td style="text-align: center;">{member.USER_POSTS}</td> - <td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{member.USER_ID}" /></td> - </tr> - <!-- ENDIF --> - <!-- BEGINELSE --> + <!-- END leader --> + <tr> + <td class="row3" colspan="5"><b>{L_GROUP_APPROVED}</b></td> + </tr> + <!-- BEGIN member --> + <!-- IF member.S_PENDING --> <tr> - <td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MEMBERS}</td> + <td class="row3" colspan="5"><b>{L_GROUP_PENDING}</b></td> </tr> - <!-- END member --> + <!-- ELSE --> + <!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + <td><a href="{member.U_USER_VIEW}">{member.USERNAME}</a></td> + <td style="text-align: center;"><!-- IF member.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td> + <td style="text-align: center;">{member.JOINED}</td> + <td style="text-align: center;">{member.USER_POSTS}</td> + <td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{member.USER_ID}" /></td> + </tr> + <!-- ENDIF --> + <!-- BEGINELSE --> <tr> - <td class="cat" colspan="5" align="center"><div style="float: right;"><span class="small"><a href="javascript:marklist('ucp', 'mark', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('ucp', 'mark', false);">{L_UNMARK_ALL}</a></span></div><div style="float: left"><select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select> <input class="button2" type="submit" name="update" value="{L_SUBMIT}" /></div></td> + <td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MEMBERS}</td> </tr> + <!-- END member --> + <tr> + <td class="cat" colspan="5" align="center"><div style="float: right;"><span class="small"><a href="javascript:marklist('ucp', 'mark', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('ucp', 'mark', false);">{L_UNMARK_ALL}</a></span></div><div style="float: left"><select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select> <input class="button2" type="submit" name="update" value="{L_SUBMIT}" /></div></td> + </tr> </table> <div class="pagination" style="float: left;"> @@ -203,56 +207,56 @@ <p>{L_ADD_USERS_EXPLAIN}</p> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2">{L_ADD_USERS}</th> - </tr> - <tr> - <td class="row1"><label for="default">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></td> - <td class="row2"><input name="default" type="radio" class="radio" value="1" /> {L_YES} <input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</td> - </tr> - <tr> - <td class="row1"><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></td> - <td class="row2"><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea><br />[ <a href="{U_FIND_USERNAME}" target="usersearch">{L_FIND_USERNAME}</a> ]</td> - </tr> - <tr> - <td class="cat" colspan="2" align="center"><input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" /></td> - </tr> + <tr> + <th colspan="2">{L_ADD_USERS}</th> + </tr> + <tr> + <td class="row1"><label for="default">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></td> + <td class="row2"><input name="default" type="radio" class="radio" value="1" /> {L_YES} <input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</td> + </tr> + <tr> + <td class="row1"><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></td> + <td class="row2"><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea><br />[ <a href="{U_FIND_USERNAME}" target="usersearch">{L_FIND_USERNAME}</a> ]</td> + </tr> + <tr> + <td class="cat" colspan="2" align="center"><input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" /></td> + </tr> </table> <!-- ELSE --> - <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="4">{L_USERGROUPS}</th> - </tr> - <tr> - <td class="row3" colspan="4"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td> - </tr> + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <th colspan="4">{L_USERGROUPS}</th> + </tr> + <tr> + <td class="row3" colspan="4"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td> + </tr> - <tr> - <th>{L_GROUP_DETAILS}</th> - <th colspan="3">{L_OPTIONS}</th> - </tr> - <tr> - <td class="row3" colspan="4"><b class="gensmall">{L_GROUP_LEADER}</b></td> - </tr> - <!-- BEGIN leader --> - <!-- IF leader.S_ROW_COUNT is odd --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + <tr> + <th>{L_GROUP_DETAILS}</th> + <th colspan="3">{L_OPTIONS}</th> + </tr> + <tr> + <td class="row3" colspan="4"><b class="gensmall">{L_GROUP_LEADER}</b></td> + </tr> + <!-- BEGIN leader --> + <!-- IF leader.S_ROW_COUNT is odd --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td><b class="genmed">{leader.GROUP_NAME}</b><!-- IF leader.GROUP_DESC --><p class="forumdesc">{leader.GROUP_DESC}</p><!-- ENDIF --></td> - <td style="text-align: center;"><a href="{leader.U_EDIT}">{L_EDIT}</a></td> - <td style="text-align: center;"><a href="{leader.U_LIST}">{L_GROUP_LIST}</a></td> + <td><b class="genmed">{leader.GROUP_NAME}</b><!-- IF leader.GROUP_DESC --><p class="forumdesc">{leader.GROUP_DESC}</p><!-- ENDIF --></td> + <td style="text-align: center;"><a href="{leader.U_EDIT}">{L_EDIT}</a></td> + <td style="text-align: center;"><a href="{leader.U_LIST}">{L_GROUP_LIST}</a></td> - </tr> - <!-- BEGINELSE --> + </tr> + <!-- BEGINELSE --> <tr> <td class="row2" align="center" colspan="4"><b class="genmed">{L_NO_LEADERS}</b></td> </tr> - <!-- END leader --> + <!-- END leader --> - <tr> - <td class="cat" align="right" colspan="4"> </td> - </tr> + <tr> + <td class="cat" align="right" colspan="4"> </td> + </tr> </table> <!-- ENDIF --> diff --git a/phpBB/styles/subSilver/template/ucp_groups_membership.html b/phpBB/styles/subSilver/template/ucp_groups_membership.html index f73a887d41..1cfd744750 100644 --- a/phpBB/styles/subSilver/template/ucp_groups_membership.html +++ b/phpBB/styles/subSilver/template/ucp_groups_membership.html @@ -1,24 +1,25 @@ <!-- INCLUDE ucp_header.html --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="3">{L_USERGROUPS}</th> - </tr> - <tr> - <td class="row3" colspan="3"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td> - </tr> +<tr> + <th colspan="3">{L_USERGROUPS}</th> +</tr> +<tr> + <td class="row3" colspan="3"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td> +</tr> - <tr> - <th colspan="2">{L_GROUP_DETAILS}</td> - <th>{L_SELECT}</td> - </tr> +<tr> + <th colspan="2">{L_GROUP_DETAILS}</td> + <th>{L_SELECT}</td> +</tr> - <!-- BEGIN leader --> +<!-- BEGIN leader --> <!-- IF leader.S_FIRST_ROW --> - <tr> - <td class="row3" colspan="3"><b class="gensmall">{L_GROUP_LEADER}</b></td> - </tr> + <tr> + <td class="row3" colspan="3"><b class="gensmall">{L_GROUP_LEADER}</b></td> + </tr> <!-- ENDIF --> + <!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td width="6%" align="center" nowrap="nowrap"><!-- IF S_CHANGE_DEFAULT --><input type="radio" class="radio" name="default"<!-- IF leader.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{leader.GROUP_ID}" /><!-- ENDIF --></td> <td> @@ -28,14 +29,15 @@ </td> <td width="6%" align="center" nowrap="nowrap"><!-- IF not leader.GROUP_SPECIAL --><input type="radio" class="radio" name="selected" value="{leader.GROUP_ID}" /><!-- ENDIF --></td> </tr> - <!-- END leader --> +<!-- END leader --> - <!-- BEGIN member --> +<!-- BEGIN member --> <!-- IF member.S_FIRST_ROW --> - <tr> - <td class="row3" colspan="3"><b class="gensmall">{L_GROUP_MEMBER}</b></td> - </tr> + <tr> + <td class="row3" colspan="3"><b class="gensmall">{L_GROUP_MEMBER}</b></td> + </tr> <!-- ENDIF --> + <!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td width="6%" align="center" nowrap="nowrap"><!-- IF S_CHANGE_DEFAULT --><input type="radio" class="radio" name="default"<!-- IF member.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{member.GROUP_ID}" /><!-- ENDIF --></td> <td> @@ -45,14 +47,15 @@ </td> <td width="6%" align="center" nowrap="nowrap"><!-- IF not member.GROUP_SPECIAL --><input type="radio" class="radio" name="selected" value="{member.GROUP_ID}" /><!-- ENDIF --></td> </tr> - <!-- END member --> +<!-- END member --> - <!-- BEGIN pending --> +<!-- BEGIN pending --> <!-- IF pending.S_FIRST_ROW --> - <tr> - <td class="row3" colspan="3"><b class="gensmall">{L_GROUP_PENDING}</b></td> - </tr> + <tr> + <td class="row3" colspan="3"><b class="gensmall">{L_GROUP_PENDING}</b></td> + </tr> <!-- ENDIF --> + <!-- IF pending.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td width="6%" align="center" nowrap="nowrap"> </td> <td> @@ -62,14 +65,15 @@ </td> <td width="6%" align="center" nowrap="nowrap"><!-- IF not pending.GROUP_SPECIAL --><input type="radio" class="radio" name="selected" value="{pending.GROUP_ID}" /><!-- ENDIF --></td> </tr> - <!-- END pending --> +<!-- END pending --> - <!-- BEGIN nonmember --> +<!-- BEGIN nonmember --> <!-- IF nonmember.S_FIRST_ROW --> - <tr> - <td class="row3" colspan="3"><b class="gensmall">{L_GROUP_NONMEMBER}</b></td> - </tr> + <tr> + <td class="row3" colspan="3"><b class="gensmall">{L_GROUP_NONMEMBER}</b></td> + </tr> <!-- ENDIF --> + <!-- IF nonmember.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td width="6%" align="center" nowrap="nowrap"> </td> <td> @@ -79,11 +83,11 @@ </td> <td width="6%" align="center" nowrap="nowrap"><!-- IF nonmember.S_CAN_JOIN --><input type="radio" class="radio" name="selected" value="{nonmember.GROUP_ID}" /><!-- ENDIF --></td> </tr> - <!-- END nonmember --> +<!-- END nonmember --> - <tr> - <td class="cat" colspan="3"><!-- IF S_CHANGE_DEFAULT --><div style="float: left;"><input class="btnlite" type="submit" name="change_default" value="Change default group" /></div><!-- ENDIF --><div style="float:right"><span class="genmed">Select: </span><select name="action"><option value="join">Join selected</option><option value="resign">Resign selected</option><option value="demote">Demote selected</option></select> <input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> </div></td> - </tr> +<tr> + <td class="cat" colspan="3"><!-- IF S_CHANGE_DEFAULT --><div style="float: left;"><input class="btnlite" type="submit" name="change_default" value="Change default group" /></div><!-- ENDIF --><div style="float:right"><span class="genmed">Select: </span><select name="action"><option value="join">Join selected</option><option value="resign">Resign selected</option><option value="demote">Demote selected</option></select> <input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> </div></td> +</tr> </table> <!-- INCLUDE ucp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/ucp_header.html b/phpBB/styles/subSilver/template/ucp_header.html index 924943d4cb..3b73856650 100644 --- a/phpBB/styles/subSilver/template/ucp_header.html +++ b/phpBB/styles/subSilver/template/ucp_header.html @@ -1,21 +1,22 @@ <!-- INCLUDE overall_header.html --> <table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td width="20%" valign="top"> +<tr> + <td width="20%" valign="top"> <!-- IF S_SHOW_PM_BOX and S_POST_ACTION --> <form action="{S_POST_ACTION}" method="post" name="post"{S_FORM_ENCTYPE}> + <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th>{L_PM_TO}</th> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_USERNAME}:</b></td> - </tr> - <tr> - <td class="row2"><input class="post" type="text" name="username" size="20" maxlength="40" value="" /> <input class="post" type="submit" name="add_to" value="{L_ADD}" /></td> - </tr> + <tr> + <th>{L_PM_TO}</th> + </tr> + <tr> + <td class="row1"><b class="genmed">{L_USERNAME}:</b></td> + </tr> + <tr> + <td class="row2"><input class="post" type="text" name="username" size="20" maxlength="40" value="" /> <input class="post" type="submit" name="add_to" value="{L_ADD}" /></td> + </tr> <!-- IF S_ALLOW_MASS_PM --> <tr> <td class="row1"><b class="genmed">{L_USERNAMES}:</b></td> @@ -46,70 +47,70 @@ <!-- ENDIF --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th>{L_OPTIONS}</th> - </tr> +<tr> + <th>{L_OPTIONS}</th> +</tr> - <!-- BEGIN l_block1 --> +<!-- BEGIN l_block1 --> <tr> <!-- IF l_block1.S_SELECTED --> - <td class="row1"><b class="nav">{l_block1.L_TITLE}</b> + <td class="row1"><b class="nav">{l_block1.L_TITLE}</b> - <!-- IF S_PRIVMSGS --> + <!-- IF S_PRIVMSGS --> - <!-- the ! at the beginning of the loop name forces the loop to be not a nested one of l_block1 (it gets parsed seperatly) --> - <!-- BEGIN !folder --> - <!-- IF folder.S_FIRST_ROW --> - <ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;"> - <!-- ENDIF --> + <!-- the ! at the beginning of the loop name forces the loop to be not a nested one of l_block1 (it gets parsed seperatly) --> + <!-- BEGIN !folder --> + <!-- IF folder.S_FIRST_ROW --> + <ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;"> + <!-- ENDIF --> - <!-- IF folder.S_CUR_FOLDER --> - <li class="row2" style="padding: 1px 0;">» <a href="{folder.U_FOLDER}">{folder.FOLDER_NAME}<!-- IF folder.S_UNREAD_MESSAGES --> ({folder.UNREAD_MESSAGES})<!-- ENDIF --></a></li> - <!-- ELSE --> - <li>» <a href="{folder.U_FOLDER}">{folder.FOLDER_NAME}<!-- IF folder.S_UNREAD_MESSAGES --> ({folder.UNREAD_MESSAGES})<!-- ENDIF --></a></li> - <!-- ENDIF --> + <!-- IF folder.S_CUR_FOLDER --> + <li class="row2" style="padding: 1px 0;">» <a href="{folder.U_FOLDER}">{folder.FOLDER_NAME}<!-- IF folder.S_UNREAD_MESSAGES --> ({folder.UNREAD_MESSAGES})<!-- ENDIF --></a></li> + <!-- ELSE --> + <li>» <a href="{folder.U_FOLDER}">{folder.FOLDER_NAME}<!-- IF folder.S_UNREAD_MESSAGES --> ({folder.UNREAD_MESSAGES})<!-- ENDIF --></a></li> + <!-- ENDIF --> - <!-- IF folder.S_LAST_ROW --> - </ul> - <hr /> - <!-- ENDIF --> - <!-- END !folder --> + <!-- IF folder.S_LAST_ROW --> + </ul> + <hr /> + <!-- ENDIF --> + <!-- END !folder --> - <!-- ENDIF --> + <!-- ENDIF --> <ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;"> <!-- BEGIN l_block2 --> - <li>» <!-- 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> + <li>» <!-- 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 --> </ul> <!-- ELSE --> - <td class="row2" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'" onclick="location.href='{l_block1.U_TITLE}'"><a class="nav" href="{l_block1.U_TITLE}">{l_block1.L_TITLE}</a> + <td class="row2" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'" onclick="location.href='{l_block1.U_TITLE}'"><a class="nav" href="{l_block1.U_TITLE}">{l_block1.L_TITLE}</a> <!-- ENDIF --> </td> </tr> - <!-- END l_block1 --> +<!-- END l_block1 --> </table> <div style="padding: 2px;"></div> <!-- IF S_SHOW_COLOUR_LEGEND --> -<table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> + <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> <tr> <th colspan="2">{L_MESSAGE_COLOURS}</th> </tr> <!-- BEGIN pm_colour_info --> - <tr> - <!-- IF not pm_colour_info.IMG --> - <td class="row1 {pm_colour_info.CLASS}" width="5"><img src="images/spacer.gif" width="5" alt="{pm_colour_info.LANG}" border="0" /></td> - <!-- ELSE --> - <td class="row1" width="25" align="center">{pm_colour_info.IMG}</td> - <!-- ENDIF --> - <td class="row1"><span class="genmed">{pm_colour_info.LANG}</span></td> - </tr> + <tr> + <!-- IF not pm_colour_info.IMG --> + <td class="row1 {pm_colour_info.CLASS}" width="5"><img src="images/spacer.gif" width="5" alt="{pm_colour_info.LANG}" border="0" /></td> + <!-- ELSE --> + <td class="row1" width="25" align="center">{pm_colour_info.IMG}</td> + <!-- ENDIF --> + <td class="row1"><span class="genmed">{pm_colour_info.LANG}</span></td> + </tr> <!-- END pm_colour_info --> -</table> + </table> -<div style="padding: 2px;"></div> + <div style="padding: 2px;"></div> <!-- ENDIF --> <!-- IF S_ZEBRA_ENABLED --> @@ -130,7 +131,7 @@ <!-- ENDIF --> </li> <!-- BEGINELSE --> - <li>{L_NO_FRIENDS_ONLINE}</li> + <li>{L_NO_FRIENDS_ONLINE}</li> <!-- END friends_online --> </ul> @@ -140,12 +141,12 @@ <ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;"> <!-- BEGIN friends_offline --> - <li><a href="{friends_offline.U_PROFILE}">{friends_offline.USERNAME}</a> + <li><a href="{friends_offline.U_PROFILE}">{friends_offline.USERNAME}</a> <!-- IF S_SHOW_PM_BOX --> [ <input class="post" style="font-size: 90%;" type="submit" name="add_to[{friends_offline.USER_ID}]" value="{L_ADD}" /> ] <!-- ENDIF --> <!-- BEGINELSE --> - <li>{L_NO_FRIENDS_OFFLINE}</li> + <li>{L_NO_FRIENDS_OFFLINE}</li> <!-- END friends_offline --> </ul> @@ -154,6 +155,6 @@ </table> <!-- ENDIF --> - </td> - <td><img src="images/spacer.gif" width="4" alt="" /></td> - <td width="80%" valign="top"><!-- IF not S_PRIVMSGS or S_SHOW_DRAFTS --><form name="ucp" id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}><!-- ENDIF --> +</td> +<td><img src="images/spacer.gif" width="4" alt="" /></td> +<td width="80%" valign="top"><!-- IF not S_PRIVMSGS or S_SHOW_DRAFTS --><form name="ucp" id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}><!-- ENDIF --> diff --git a/phpBB/styles/subSilver/template/ucp_main_bookmarks.html b/phpBB/styles/subSilver/template/ucp_main_bookmarks.html index 808a742c7b..b13a2a3eeb 100644 --- a/phpBB/styles/subSilver/template/ucp_main_bookmarks.html +++ b/phpBB/styles/subSilver/template/ucp_main_bookmarks.html @@ -20,6 +20,7 @@ <!-- BEGIN topicrow --> <!-- IF topicrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + <td style="padding: 4px;" width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td> <!-- IF topicrow.S_DELETED_TOPIC --> <td class="postdetails" style="padding: 4px" width="100%" colspan="2">{L_DELETED_TOPIC}</td> diff --git a/phpBB/styles/subSilver/template/ucp_main_drafts.html b/phpBB/styles/subSilver/template/ucp_main_drafts.html index 401533785b..50d56613a3 100644 --- a/phpBB/styles/subSilver/template/ucp_main_drafts.html +++ b/phpBB/styles/subSilver/template/ucp_main_drafts.html @@ -1,20 +1,20 @@ <!-- INCLUDE ucp_header.html --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="4">{L_UCP}</th> - </tr> - <tr> - <td class="row3" colspan="4" align="center"><span class="genmed">{L_DRAFTS_EXPLAIN}</span></td> - </tr> +<tr> + <th colspan="4">{L_UCP}</th> +</tr> +<tr> + <td class="row3" colspan="4" align="center"><span class="genmed">{L_DRAFTS_EXPLAIN}</span></td> +</tr> - <!-- IF ERROR --> +<!-- IF ERROR --> <tr> <td class="row1" colspan="2" align="center"><span class="genmed" style="color:red">{ERROR}</span></td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> - <!-- IF not S_EDIT_DRAFT --> +<!-- IF not S_EDIT_DRAFT --> <!-- IF S_DRAFT_ROWS --> <tr> @@ -41,25 +41,26 @@ <td style="padding: 4px;" align="center"><input type="checkbox" class="radio" name="d[{draftrow.DRAFT_ID}]" /></td> </tr> <!-- BEGINELSE --> - <tr> - <td class="row1" colspan="4" height="25" align="center"><b class="genmed">{L_NO_SAVED_DRAFTS}</b></td> - </tr> + <tr> + <td class="row1" colspan="4" height="25" align="center"><b class="genmed">{L_NO_SAVED_DRAFTS}</b></td> + </tr> <!-- END draftrow --> <!-- IF S_DRAFT_ROWS --> - <tr> - <td class="cat" colspan="4" align="right"><input class="btnlite" type="submit" name="delete" value="{L_DELETE_MARKED}" /> </td> - </tr> + <tr> + <td class="cat" colspan="4" align="right"><input class="btnlite" type="submit" name="delete" value="{L_DELETE_MARKED}" /> </td> + </tr> <!-- ENDIF --> - <!-- ELSEIF S_EDIT_DRAFT --> +<!-- ELSEIF S_EDIT_DRAFT --> <tr> <td class="row1" width="22%"><b class="genmed">{L_SUBJECT}:</b></td> <td class="row2"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="60" tabindex="2" value="{DRAFT_SUBJECT}" /></td> </tr> <tr> <td class="row1" width="22%"><b class="genmed">{L_MESSAGE}: </b><br /><span class="gensmall">{L_EDIT_DRAFT_EXPLAIN}</span></td> - <td class="row2"><table cellspacing="0" cellpadding="2" border="0"> + <td class="row2"> + <table cellspacing="0" cellpadding="2" border="0"> <tr align="center" valign="middle"> <td><input class="btnbbcode" type="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" onmouseover="helpline('b')" /></td> <td><input class="btnbbcode" type="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" onmouseover="helpline('i')" /></td> @@ -72,7 +73,8 @@ <td><input class="btnbbcode" type="button" accesskey="w" name="addbbcode18" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(18)" onmouseover="helpline('w')" /></td> </tr> <tr> - <td colspan="9"><table width="100%" cellspacing="0" cellpadding="0" border="0"> + <td colspan="9"> + <table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> <td><span class="genmed"> {L_FONT_SIZE}:</span> <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" onmouseover="helpline('f')"> <option value="7">{L_FONT_TINY}</option> @@ -83,7 +85,8 @@ </select></td> <td class="gensmall" nowrap="nowrap" align="right"><a href="javascript:bbstyle(-1)" onmouseover="helpline('a')">{L_CLOSE_TAGS}</a></td> </tr> - </table></td> + </table> + </td> </tr> <tr> <td colspan="9"><input class="helpline" type="text" name="helpbox" size="45" maxlength="100" value="{L_STYLES_TIP}" /></td> @@ -91,7 +94,8 @@ <tr> <td colspan="9"><textarea class="post" name="message" rows="10" cols="76" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{DRAFT_MESSAGE}</textarea></td> </tr> - </table></td> + </table> + </td> </tr> <tr class="row1"> <td colspan="9" align="left"><p class="topictitle"><a href="{S_UCP_ACTION}">{L_BACK_TO_DRAFTS}</a></p></td> @@ -99,7 +103,7 @@ <tr> <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> </table> <!-- INCLUDE ucp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/ucp_main_front.html b/phpBB/styles/subSilver/template/ucp_main_front.html index b6a459adec..a89616e643 100644 --- a/phpBB/styles/subSilver/template/ucp_main_front.html +++ b/phpBB/styles/subSilver/template/ucp_main_front.html @@ -1,24 +1,19 @@ <!-- INCLUDE ucp_header.html --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="3">{L_UCP}</th> - </tr> - <tr> - <td class="row1" colspan="3" align="center"><p class="genmed">{L_UCP_WELCOME}</p></td> - </tr> - <tr> - <th colspan="3">{L_IMPORTANT_NEWS}</th> - </tr> +<tr> + <th colspan="3">{L_UCP}</th> +</tr> +<tr> + <td class="row1" colspan="3" align="center"><p class="genmed">{L_UCP_WELCOME}</p></td> +</tr> +<tr> + <th colspan="3">{L_IMPORTANT_NEWS}</th> +</tr> - <!-- BEGIN topicrow --> - - <!-- IF topicrow.S_ROW_COUNT is even --> - <tr class="row1"> - <!-- ELSE --> - <tr class="row2"> - <!-- ENDIF --> +<!-- BEGIN topicrow --> + <!-- IF topicrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td> <td class="row1" width="100%"> <p class="topictitle"><!-- IF topicrow.S_UNREAD --><a href="{topicrow.U_NEWEST_POST}">{topicrow.NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p><p class="gensmall">{topicrow.GOTO_PAGE}</p> @@ -35,26 +30,27 @@ </p> </td> </tr> - <!-- BEGINELSE --> +<!-- BEGINELSE --> <tr class="row1"> <td align="center" colspan="3"><b class="gen">{L_NO_IMPORTANT_NEWS}</b></td> </tr> - <!-- END topicrow --> +<!-- END topicrow --> - <tr> - <th colspan="3">{L_YOUR_DETAILS}</th> - </tr> - <tr> - <td class="row1" colspan="3"><table width="100%" cellspacing="1" cellpadding="4"> - <tr> - <td align="right" valign="top" nowrap="nowrap"><b class="genmed">{L_JOINED}: </b></td> - <td width="100%"><b class="gen">{JOINED}</b></td> - </tr> - <tr> - <td align="right" valign="top" nowrap="nowrap"><b class="genmed">{L_TOTAL_POSTS}: </b></td> - <td><!-- IF POSTS_PCT neq 0 --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<br /><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></span><!-- ELSE --><b class="gen">{POSTS}<b><!-- ENDIF --></td> - </tr> - <!-- IF S_SHOW_ACTIVITY --> +<tr> + <th colspan="3">{L_YOUR_DETAILS}</th> +</tr> +<tr> + <td class="row1" colspan="3"> + <table width="100%" cellspacing="1" cellpadding="4"> + <tr> + <td align="right" valign="top" nowrap="nowrap"><b class="genmed">{L_JOINED}: </b></td> + <td width="100%"><b class="gen">{JOINED}</b></td> + </tr> + <tr> + <td align="right" valign="top" nowrap="nowrap"><b class="genmed">{L_TOTAL_POSTS}: </b></td> + <td><!-- IF POSTS_PCT neq 0 --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<br /><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></span><!-- ELSE --><b class="gen">{POSTS}<b><!-- ENDIF --></td> + </tr> + <!-- IF S_SHOW_ACTIVITY --> <tr> <td align="right" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_FORUM}: </b></td> <td><!-- IF ACTIVE_FORUM_PCT neq 0 --><b><a class="gen" href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></b><br /><span class="genmed">[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td> @@ -63,18 +59,19 @@ <td align="right" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_TOPIC}: </b></td> <td><!-- IF ACTIVE_TOPIC_PCT neq 0 --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="gensmall">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td> </tr> - <!-- ENDIF --> - <!-- IF WARNINGS --> + <!-- ENDIF --> + <!-- IF WARNINGS --> <tr> <td align="right" valign="middle" nowrap="nowrap"><b class="genmed">{L_YOUR_WARNINGS}: </b></td> <td class="genmed">{WARNING_IMG} [ <b>{WARNINGS}</b> ]</td> </tr> - <!-- ENDIF --> - </table></td> - </tr> - <tr> - <td class="cat" colspan="3"> </td> - </tr> + <!-- ENDIF --> + </table> + </td> +</tr> +<tr> + <td class="cat" colspan="3"> </td> +</tr> </table> <!-- INCLUDE ucp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/ucp_main_subscribed.html b/phpBB/styles/subSilver/template/ucp_main_subscribed.html index c88e473bd1..8153ac8eda 100644 --- a/phpBB/styles/subSilver/template/ucp_main_subscribed.html +++ b/phpBB/styles/subSilver/template/ucp_main_subscribed.html @@ -1,40 +1,35 @@ <!-- INCLUDE ucp_header.html --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="4">{L_UCP}</th> - </tr> - <tr> - <td class="row1" colspan="4" align="center"><span class="genmed">{L_UCP_WELCOME}</span></td> - </tr> - <tr> - <th colspan="4">{L_WATCHED_FORUMS}</th> - </tr> +<tr> + <th colspan="4">{L_UCP}</th> +</tr> +<tr> + <td class="row1" colspan="4" align="center"><span class="genmed">{L_UCP_WELCOME}</span></td> +</tr> +<tr> + <th colspan="4">{L_WATCHED_FORUMS}</th> +</tr> - <!-- BEGIN forumrow --> - - <!-- IF forumrow.S_ROW_COUNT is even --> - <tr class="row1"> - <!-- ELSE --> - <tr class="row2"> - <!-- ENDIF --> +<!-- BEGIN forumrow --> + <!-- IF forumrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td style="padding: 4px;" width="20" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td> <td style="padding: 4px;" width="100%"><p class="topictitle"><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></p></td> <td class="gensmall" style="padding: 4px;" align="center" valign="middle" nowrap="nowrap"><!-- IF forumrow.LAST_POST_TIME -->{forumrow.LAST_POST_TIME}<br /><!-- IF forumrow.U_LAST_POST_AUTHOR --><a href="{forumrow.U_LAST_POST_AUTHOR}">{forumrow.LAST_POST_AUTHOR}</a><!-- ELSE -->{forumrow.LAST_POST_AUTHOR}<!-- ENDIF --> <a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_IMG}</a><!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></td> <td style="padding: 4px;"> <input type="checkbox" class="radio" name="f[{forumrow.FORUM_ID}]" /> </td> </tr> - <!-- BEGINELSE --> +<!-- BEGINELSE --> <tr class="row1"> <td colspan="4" align="center"><b class="genmed">{L_NO_WATCHED_FORUMS}</b></td> </tr> - <!-- END forumrow --> +<!-- END forumrow --> - <tr> - <th colspan="4">{L_WATCHED_TOPICS}</th> - </tr> +<tr> + <th colspan="4">{L_WATCHED_TOPICS}</th> +</tr> - <!-- IF TOTAL_TOPICS --> +<!-- IF TOTAL_TOPICS --> <tr> <td class="row3" colspan="4"> <table width="100%" cellspacing="1"> @@ -46,22 +41,18 @@ </table> </td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> - <!-- BEGIN topicrow --> - - <!-- IF topicrow.S_ROW_COUNT is even --> - <tr class="row1"> - <!-- ELSE --> - <tr class="row2"> - <!-- ENDIF --> +<!-- BEGIN topicrow --> + <!-- IF topicrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td style="padding: 4px;" width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td> <td style="padding: 4px;" width="100%" valign="top"> <p class="topictitle"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{topicrow.NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p><br /> <!-- IF topicrow.PAGINATION --> <p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ] </p> <!-- ENDIF --> + </td> <td style="padding: 4px;" align="left" valign="top" nowrap="nowrap"> <p class="topicdetails">{topicrow.LAST_POST_TIME}</p> <p class="topicdetails"><!-- IF topicrow.U_LAST_POST_AUTHOR --><a href="{topicrow.U_LAST_POST_AUTHOR}">{topicrow.LAST_POST_AUTHOR}</a><!-- ELSE -->{topicrow.LAST_POST_AUTHOR}<!-- ENDIF --> @@ -70,15 +61,15 @@ </td> <td style="padding: 4px;"> <input type="checkbox" class="radio" name="t[{topicrow.TOPIC_ID}]" /> </td> </tr> - <!-- BEGINELSE --> +<!-- BEGINELSE --> <tr class="row1"> <td colspan="4" align="center"><b class="genmed">{L_NO_WATCHED_TOPICS}</b></td> </tr> - <!-- END topicrow --> +<!-- END topicrow --> - <tr> - <td class="cat" colspan="4" align="right"><input class="btnlite" type="submit" name="unwatch" value="{L_UNWATCH_MARKED}" /> </td> - </tr> +<tr> + <td class="cat" colspan="4" align="right"><input class="btnlite" type="submit" name="unwatch" value="{L_UNWATCH_MARKED}" /> </td> +</tr> </table> <div class="gensmall" style="float: right; padding-top: 2px;"><b><a href="javascript:marklist('ucp', 't', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('ucp', 't', false);">{L_UNMARK_ALL}</a></b></div> diff --git a/phpBB/styles/subSilver/template/ucp_pm_history.html b/phpBB/styles/subSilver/template/ucp_pm_history.html index 8caae7fcd1..cbfc951f4a 100644 --- a/phpBB/styles/subSilver/template/ucp_pm_history.html +++ b/phpBB/styles/subSilver/template/ucp_pm_history.html @@ -11,7 +11,7 @@ <th width="22%">{L_AUTHOR}</th> <th>{L_MESSAGE}</th> </tr> - <!-- BEGIN history_row --> + <!-- BEGIN history_row --> <!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td rowspan="2" align="left" valign="top"><a name="{history_row.U_POST_ID}"></a> <table width="150" cellspacing="0"> @@ -25,7 +25,7 @@ </td> </tr> - <!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + <!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td valign="top"> <table width="100%" cellspacing="0"> <tr> @@ -52,14 +52,14 @@ </td> </tr> - <!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + <!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td class="gensmall"><a href="{history_row.U_VIEW_MESSAGE}">{L_VIEW_PM}</a></td> <td><div class="gensmall" style="float:left"> <!-- IF history_row.U_PROFILE --><a href="{history_row.U_PROFILE}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF history_row.U_EMAIL --><a href="{history_row.U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF --> </div> <div class="gensmall" style="float:right"><!-- IF history_row.U_QUOTE --><a href="{history_row.U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF history_row.U_POST_REPLY_PM --><a href="{history_row.U_POST_REPLY_PM}">{REPLY_IMG}</a><!-- ENDIF --> </div></td> </tr> <tr> <td class="spacer" colspan="2"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> </tr> - <!-- END history_row --> + <!-- END history_row --> </table> </div></td> </tr> diff --git a/phpBB/styles/subSilver/template/ucp_pm_options.html b/phpBB/styles/subSilver/template/ucp_pm_options.html index 9e774126f9..321c98be2a 100644 --- a/phpBB/styles/subSilver/template/ucp_pm_options.html +++ b/phpBB/styles/subSilver/template/ucp_pm_options.html @@ -2,12 +2,12 @@ <!-- IF ERROR_MESSAGE or NOTIFICATION_MESSAGE --> <table border="0" cellspacing="0" cellpadding="0" width="100%"> - <tr> - <td class="row3" align="center"> - <!-- IF ERROR_MESSAGE --><span class="genmed" style="color:red">{ERROR_MESSAGE}</span><!-- ENDIF --> - <!-- IF NOTIFICATION_MESSAGE --><span class="genmed" style="color:red">{NOTIFICATION_MESSAGE}</span><!-- ENDIF --> - </td> - </tr> + <tr> + <td class="row3" align="center"> + <!-- IF ERROR_MESSAGE --><span class="genmed" style="color:red">{ERROR_MESSAGE}</span><!-- ENDIF --> + <!-- IF NOTIFICATION_MESSAGE --><span class="genmed" style="color:red">{NOTIFICATION_MESSAGE}</span><!-- ENDIF --> + </td> + </tr> </table> <div style="padding: 2px;"></div> <!-- ENDIF --> @@ -15,65 +15,66 @@ <form name="ucp" method="post" action="{S_UCP_ACTION}"> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="3">{L_ADD_NEW_RULE}</th> - </tr> - <!-- IF S_CHECK_DEFINED --> +<tr> + <th colspan="3">{L_ADD_NEW_RULE}</th> +</tr> +<!-- IF S_CHECK_DEFINED --> <tr> <td class="row1" width="50" align="left" valign="top"><b class="gen">{L_IF}:</b></td> <td class="row2" align="center" valign="top"><!-- IF S_CHECK_SELECT --><select name="check_option">{S_CHECK_OPTIONS}</select><!-- ELSE --><b class="gen">{CHECK_CURRENT}</b><input type="hidden" name="check_option" value="{CHECK_OPTION}" /><!-- ENDIF --></td> <td class="row1" width="50" align="right" valign="top"><!-- IF S_CHECK_SELECT --><input type="submit" name="next" value="{L_NEXT}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> </tr> - <!-- ENDIF --> - <!-- IF S_RULE_DEFINED --> +<!-- ENDIF --> +<!-- IF S_RULE_DEFINED --> <tr> <td class="row1" width="50" align="left" valign="top"><!-- IF S_RULE_SELECT --><input type="submit" name="back[rule]" value="{L_PREVIOUS}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> <td class="row2" align="center" valign="top"><!-- IF S_RULE_SELECT --><select name="rule_option">{S_RULE_OPTIONS}</select><!-- ELSE --><b class="gen">{RULE_CURRENT}</b><input type="hidden" name="rule_option" value="{RULE_OPTION}" /><!-- ENDIF --></td> <td class="row1" width="50" align="right" valign="top"><!-- IF S_RULE_SELECT --><input type="submit" name="next" value="{L_NEXT}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> - <!-- IF S_COND_DEFINED --> +<!-- IF S_COND_DEFINED --> <!-- IF S_COND_SELECT or COND_CURRENT --> - <tr> - <td class="row1" width="50" align="left" valign="top"><!-- IF S_COND_SELECT --><input type="submit" name="back[cond]" value="{L_PREVIOUS}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> - <td class="row2" align="center" valign="top"> - <!-- IF S_COND_SELECT --> - <!-- IF S_TEXT_CONDITION --> - <input type="text" name="rule_string" value="{CURRENT_STRING}" size="30" maxlength="250" class="post" /> - <!-- ELSEIF S_USER_CONDITION --> - <input type="text" class="post" name="rule_string" value="{CURRENT_STRING}" maxlength="50" size="20" /> <span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="window.open('{U_FIND_USERNAME}', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;">{L_FIND_USERNAME}</a> ]</span> - <!-- ELSEIF S_GROUP_CONDITION --> - <input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><!-- IF S_GROUP_OPTIONS --><select name="rule_group_id">{S_GROUP_OPTIONS}</select><!-- ELSE -->{L_NO_GROUPS}<!-- ENDIF --> - <!-- ENDIF --> - <!-- ELSE --> - <b class="gen">{COND_CURRENT}</b> - <input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><input type="hidden" name="rule_user_id" value="{CURRENT_USER_ID}" /><input type="hidden" name="rule_group_id" value="{CURRENT_GROUP_ID}" /> - <!-- ENDIF --> - </td> - <td class="row1" width="50" align="right" valign="top"><!-- IF S_COND_SELECT --><input type="submit" name="next" value="{L_NEXT}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> - </tr> + <tr> + <td class="row1" width="50" align="left" valign="top"><!-- IF S_COND_SELECT --><input type="submit" name="back[cond]" value="{L_PREVIOUS}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> + <td class="row2" align="center" valign="top"> + <!-- IF S_COND_SELECT --> + <!-- IF S_TEXT_CONDITION --> + <input type="text" name="rule_string" value="{CURRENT_STRING}" size="30" maxlength="250" class="post" /> + <!-- ELSEIF S_USER_CONDITION --> + <input type="text" class="post" name="rule_string" value="{CURRENT_STRING}" maxlength="50" size="20" /> <span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="window.open('{U_FIND_USERNAME}', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;">{L_FIND_USERNAME}</a> ]</span> + <!-- ELSEIF S_GROUP_CONDITION --> + <input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><!-- IF S_GROUP_OPTIONS --><select name="rule_group_id">{S_GROUP_OPTIONS}</select><!-- ELSE -->{L_NO_GROUPS}<!-- ENDIF --> + <!-- ENDIF --> + <!-- ELSE --> + <b class="gen">{COND_CURRENT}</b> + <input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><input type="hidden" name="rule_user_id" value="{CURRENT_USER_ID}" /><input type="hidden" name="rule_group_id" value="{CURRENT_GROUP_ID}" /> + <!-- ENDIF --> + </td> + <td class="row1" width="50" align="right" valign="top"><!-- IF S_COND_SELECT --><input type="submit" name="next" value="{L_NEXT}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> + </tr> <!-- ENDIF --> <input type="hidden" name="cond_option" value="{COND_OPTION}" /> - <!-- ENDIF --> - <!-- IF NONE_CONDITION --><input type="hidden" name="cond_option" value="none" /><!-- ENDIF --> +<!-- ENDIF --> - <!-- IF S_ACTION_DEFINED --> +<!-- IF NONE_CONDITION --><input type="hidden" name="cond_option" value="none" /><!-- ENDIF --> + +<!-- IF S_ACTION_DEFINED --> <tr> <td class="row1" width="50" align="left" valign="top"><!-- IF S_ACTION_SELECT --><input type="submit" name="back[action]" value="{L_PREVIOUS}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> <td class="row2" align="center" valign="top"><!-- IF S_ACTION_SELECT --><select name="action_option">{S_ACTION_OPTIONS}</select><!-- ELSE --><b class="gen">{ACTION_CURRENT}</b><input type="hidden" name="action_option" value="{ACTION_OPTION}" /><!-- ENDIF --></td> <td class="row1" width="50" align="right" valign="top"><!-- IF S_ACTION_SELECT --><input type="submit" name="add_rule" value="{L_ADD_RULE}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> </table> <div style="padding: 2px;"></div> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="6">{L_DEFINED_RULES}</th> - </tr> - <!-- BEGIN rule --> +<tr> + <th colspan="6">{L_DEFINED_RULES}</th> +</tr> +<!-- BEGIN rule --> <tr> <td class="row1" width="25" align="center"><span class="gen">{rule.COUNT}</span></td> <td class="row2" width="120"><span class="gen">{rule.CHECK}</span></td> @@ -82,17 +83,17 @@ <td class="row1"><span class="gen">{rule.ACTION}<!-- IF rule.FOLDER --> -> {rule.FOLDER}<!-- ENDIF --></span></td> <td class="row2" width="25"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="btnlite" /></td> </tr> - <!-- BEGINELSE --> +<!-- BEGINELSE --> <tr> <td colspan="6" class="row3" align="center"><span class="gen">{L_NO_RULES_DEFINED}</span></td> </tr> - <!-- END rule --> +<!-- END rule --> </table> <div style="padding: 2px;"></div> <!-- IF S_FOLDER_OPTIONS --> -<table class="tablebg" width="100%" cellspacing="1"> + <table class="tablebg" width="100%" cellspacing="1"> <tr> <th colspan="2">{L_RENAME_FOLDER}</th> </tr> @@ -107,20 +108,20 @@ <tr> <td class="row1" align="right" colspan="2"><input class="btnlite" style="width:150px" type="submit" name="rename_folder" value="{L_RENAME}" /></td> </tr> -</table> + </table> -<div style="padding: 2px;"></div> + <div style="padding: 2px;"></div> <!-- ENDIF --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2">{L_ADD_FOLDER}</th> - </tr> - <!-- IF S_MAX_FOLDER_REACHED --> +<tr> + <th colspan="2">{L_ADD_FOLDER}</th> +</tr> +<!-- IF S_MAX_FOLDER_REACHED --> <tr> <td colspan="2">{L_MAX_FOLDER_REACHED}</td> </tr> - <!-- ELSE --> +<!-- ELSE --> <tr> <td class="row1" width="200"><b class="gen">{L_ADD_FOLDER}: </b></td> <td class="row1"><input type="text" class="post" name="foldername" size="30" maxlength="30" /></td> @@ -128,13 +129,13 @@ <tr> <td class="row1" align="right" colspan="2"><input class="btnlite" style="width:150px" type="submit" name="addfolder" value="{L_ADD}" /></td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> </table> <div style="padding: 2px;"></div> <!-- IF S_FOLDER_OPTIONS --> -<table class="tablebg" width="100%" cellspacing="1"> + <table class="tablebg" width="100%" cellspacing="1"> <tr> <th colspan="3">{L_REMOVE_FOLDER}</th> </tr> @@ -155,35 +156,34 @@ <td class="row2" width="200"> </td> <td class="row2" colspan="2" align="right"><input class="btnlite" style="width:150px" type="submit" name="remove_folder" value="{L_REMOVE}" /></td> </tr> + </table> -</table> - -<div style="padding: 2px;"></div> + <div style="padding: 2px;"></div> <!-- ENDIF --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2">{L_FOLDER_OPTIONS}</th> - </tr> - <tr> - <td class="row1" width="200"><b class="genmed">{L_IF_FOLDER_FULL}: </b></span></td> - <td class="row1"><input type="radio" class="radio" name="full_action" value="1"{S_DELETE_CHECKED} /> <span class="genmed">{L_DELETE_OLDEST_MESSAGES}</span></td> - </tr> - <tr> - <td class="row1" width="200"> </td> - <td class="row1"><input type="radio" class="radio" name="full_action" value="2"{S_MOVE_CHECKED} /> <span class="genmed">{L_MOVE_TO_FOLDER}: </span><select name="full_move_to">{S_FULL_FOLDER_OPTIONS}</select></td> - </tr> - <tr> - <td class="row1" width="200"> </td> - <td class="row1"><input type="radio" class="radio" name="full_action" value="3"{S_HOLD_CHECKED} /> <span class="genmed">{L_HOLD_NEW_MESSAGES}</span></td> - </tr> - <tr> - <td class="row2" width="200"><b class="genmed">{L_DEFAULT_ACTION}: </b><br /><span class="gensmall">{L_DEFAULT_ACTION_EXPLAIN}</span></td> - <td class="row2"><span class="genmed">{DEFAULT_ACTION}</span></td> - </tr> - <tr> - <td class="row1" colspan="2" align="right"><input class="btnlite" style="width:150px" type="submit" name="fullfolder" value="{L_CHANGE}" /></td> - </tr> +<tr> + <th colspan="2">{L_FOLDER_OPTIONS}</th> +</tr> +<tr> + <td class="row1" width="200"><b class="genmed">{L_IF_FOLDER_FULL}: </b></span></td> + <td class="row1"><input type="radio" class="radio" name="full_action" value="1"{S_DELETE_CHECKED} /> <span class="genmed">{L_DELETE_OLDEST_MESSAGES}</span></td> +</tr> +<tr> + <td class="row1" width="200"> </td> + <td class="row1"><input type="radio" class="radio" name="full_action" value="2"{S_MOVE_CHECKED} /> <span class="genmed">{L_MOVE_TO_FOLDER}: </span><select name="full_move_to">{S_FULL_FOLDER_OPTIONS}</select></td> +</tr> +<tr> + <td class="row1" width="200"> </td> + <td class="row1"><input type="radio" class="radio" name="full_action" value="3"{S_HOLD_CHECKED} /> <span class="genmed">{L_HOLD_NEW_MESSAGES}</span></td> +</tr> +<tr> + <td class="row2" width="200"><b class="genmed">{L_DEFAULT_ACTION}: </b><br /><span class="gensmall">{L_DEFAULT_ACTION_EXPLAIN}</span></td> + <td class="row2"><span class="genmed">{DEFAULT_ACTION}</span></td> +</tr> +<tr> + <td class="row1" colspan="2" align="right"><input class="btnlite" style="width:150px" type="submit" name="fullfolder" value="{L_CHANGE}" /></td> +</tr> </table> <!-- INCLUDE ucp_footer.html --> diff --git a/phpBB/styles/subSilver/template/ucp_pm_popup.html b/phpBB/styles/subSilver/template/ucp_pm_popup.html index 60f9ca7643..f3d02b5ed9 100644 --- a/phpBB/styles/subSilver/template/ucp_pm_popup.html +++ b/phpBB/styles/subSilver/template/ucp_pm_popup.html @@ -2,6 +2,9 @@ <script language="javascript" type="text/javascript"> <!-- +/** +* Jump to inbox +*/ function jump_to_inbox() { opener.document.location.href = "{UA_RETURN_INBOX}"; @@ -23,7 +26,8 @@ function jump_to_inbox() {MESSAGE}<br /><br />{CLICK_TO_VIEW} <!-- ENDIF --> </span> - <br /><br /><span class="genmed"><a href="javascript:window.close();">{L_CLOSE_WINDOW}</a></span><br /><br /></td> + <br /><br /><span class="genmed"><a href="javascript:window.close();">{L_CLOSE_WINDOW}</a></span><br /><br /> + </td> </tr> </table> </td> diff --git a/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html b/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html index 08e0325cc9..5173341047 100644 --- a/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html +++ b/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html @@ -1,10 +1,12 @@ <!-- INCLUDE ucp_header.html --> <div id="pagecontent"> + <!-- IF not PROMPT --> <!-- INCLUDE ucp_pm_message_header.html --> <!-- ENDIF --> - <div style="padding: 2px;"></div> + +<div style="padding: 2px;"></div> <!-- IF S_PM_ICONS --> <!-- DEFINE $COLSPAN = 6 --> @@ -49,17 +51,19 @@ </tr> <!-- BEGIN messagerow --> - <tr> - <td class="row1" width="25" align="center" nowrap="nowrap">{messagerow.FOLDER_IMG}</td> + <tr> + <td class="row1" width="25" align="center" nowrap="nowrap">{messagerow.FOLDER_IMG}</td> <!-- IF S_PM_ICONS --> <td class="row1" width="25" align="center">{messagerow.PM_ICON_IMG}</td> <!-- ENDIF --> + <!-- IF messagerow.S_PM_DELETED --><td class="row3"><!-- ELSE --><td class="row1"><!-- ENDIF --> <!-- IF not messagerow.PM_IMG and messagerow.PM_CLASS --> <span class="{messagerow.PM_CLASS}" style="float: left;"><img src="images/spacer.gif" width="10" height="10" alt="" /></span> <!-- ELSEIF messagerow.PM_IMG --> {messagerow.PM_IMG} <!-- ENDIF --> + <span class="topictitle"> {messagerow.ATTACH_ICON_IMG} <!-- IF messagerow.S_PM_DELETED --> @@ -69,14 +73,15 @@ <a href="{messagerow.U_VIEW_PM}">{messagerow.SUBJECT}</a> <!-- ENDIF --> </span></td> - <td class="row1" width="100" align="center"><p class="topicauthor"><!-- IF S_SHOW_RECIPIENTS -->{messagerow.RECIPIENTS}<!-- ELSE -->{messagerow.MESSAGE_AUTHOR}<!-- ENDIF --></p></td> - <td class="row1" width="120" align="center"><p class="topicdetails">{messagerow.SENT_TIME}</p></td> - <td class="row1" width="20" align="center"><p class="topicdetails"><input type="checkbox" class="radio" name="marked_msg_id[]" value="{messagerow.MESSAGE_ID}" /></p></td> - </tr> + + <td class="row1" width="100" align="center"><p class="topicauthor"><!-- IF S_SHOW_RECIPIENTS -->{messagerow.RECIPIENTS}<!-- ELSE -->{messagerow.MESSAGE_AUTHOR}<!-- ENDIF --></p></td> + <td class="row1" width="120" align="center"><p class="topicdetails">{messagerow.SENT_TIME}</p></td> + <td class="row1" width="20" align="center"><p class="topicdetails"><input type="checkbox" class="radio" name="marked_msg_id[]" value="{messagerow.MESSAGE_ID}" /></p></td> + </tr> <!-- BEGINELSE --> - <tr> - <td class="row1" colspan="{$COLSPAN}" height="30" align="center" valign="middle"><span class="gen">{L_NO_MESSAGES}</span></td> - </tr> + <tr> + <td class="row1" colspan="{$COLSPAN}" height="30" align="center" valign="middle"><span class="gen">{L_NO_MESSAGES}</span></td> + </tr> <!-- END messagerow --> </table> diff --git a/phpBB/styles/subSilver/template/ucp_pm_viewmessage.html b/phpBB/styles/subSilver/template/ucp_pm_viewmessage.html index ec6c453459..8fcc265860 100644 --- a/phpBB/styles/subSilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/subSilver/template/ucp_pm_viewmessage.html @@ -7,22 +7,22 @@ <table class="tablebg" width="100%" cellspacing="1" cellpadding="4"> - <tr class="row1"> - <td class="genmed" nowrap="nowrap" width="150"><b>{L_PM_SUBJECT}:</b></td> - <td class="gen">{SUBJECT}</td> - </tr> - - <tr class="row1"> - <td class="genmed" nowrap="nowrap" width="150"><b>{L_PM_FROM}:</b></td> - <td class="gen"><a href="{U_AUTHOR_PROFILE}">{AUTHOR_NAME}</a></td> - </tr> - - <tr class="row1"> - <td class="genmed" nowrap="nowrap" width="150"><b>{L_SENT_AT}:</b></td> - <td class="gen">{SENT_DATE}</td> - </tr> - - <!-- IF S_TO_RECIPIENT --> +<tr class="row1"> + <td class="genmed" nowrap="nowrap" width="150"><b>{L_PM_SUBJECT}:</b></td> + <td class="gen">{SUBJECT}</td> +</tr> + +<tr class="row1"> + <td class="genmed" nowrap="nowrap" width="150"><b>{L_PM_FROM}:</b></td> + <td class="gen"><a href="{U_AUTHOR_PROFILE}">{AUTHOR_NAME}</a></td> +</tr> + +<tr class="row1"> + <td class="genmed" nowrap="nowrap" width="150"><b>{L_SENT_AT}:</b></td> + <td class="gen">{SENT_DATE}</td> +</tr> + +<!-- IF S_TO_RECIPIENT --> <tr class="row1"> <td class="genmed" nowrap="nowrap" width="150"><b>{L_TO}:</b></td> <td class="gen"> @@ -31,9 +31,9 @@ <!-- END to_recipient --> </td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> - <!-- IF S_BCC_RECIPIENT --> +<!-- IF S_BCC_RECIPIENT --> <tr class="row1"> <td class="genmed" nowrap="nowrap" width="150"><b>{L_BCC}:</b></td> <td class="gen"> @@ -42,82 +42,75 @@ <!-- END bcc_recipient --> </td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> </table> <div style="padding: 2px;"></div> <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> - <tr> - <th nowrap="nowrap">{L_MESSAGE}</th> - </tr> +<tr> + <th nowrap="nowrap">{L_MESSAGE}</th> +</tr> - <tr> - <td class="spacer" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> - </tr> +<tr> + <td class="spacer" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> +</tr> - <tr class="row1"> - <td valign="top"><table width="100%" cellspacing="5"> - <tr> - <td> - - <div class="postbody">{MESSAGE}</div> +<tr class="row1"> + <td valign="top"> + <table width="100%" cellspacing="5"> + <tr> + <td> + <div class="postbody">{MESSAGE}</div> - <!-- IF S_HAS_ATTACHMENTS --> + <!-- 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> + <td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td> + </tr> + <!-- BEGIN attachment --> <tr> <td class="row2">{attachment.DISPLAY_ATTACHMENT}</td> </tr> - <!-- END attachment --> - </table> - <!-- ENDIF --> - - <!-- IF S_DISPLAY_NOTICE --> - <span class="gensmall" style="color:red;"><br /><br />{L_DOWNLOAD_NOTICE}</span> - <!-- ENDIF --> - <!-- IF SIGNATURE --> - <span class="postbody"><br />_________________<br />{SIGNATURE}</span> - <!-- ENDIF --> - <!-- IF EDITED_MESSAGE --> - <span class="gensmall">{EDITED_MESSAGE}</span> - <!-- ENDIF --> - - <!-- IF not S_HAS_ATTACHMENTS --><br clear="all" /><br /><!-- ENDIF --> - - <table width="100%" cellspacing="0"> - <tr valign="middle"> - <td class="gensmall" align="right"> <!-- IF U_INFO --><a href="{U_INFO}">{INFO_IMG}</a> <!-- ENDIF --> <!-- IF U_DELETE --><a href="{U_DELETE}">{DELETE_IMG}</a> <!-- ENDIF --></td> - </tr> + <!-- END attachment --> </table> - - </td> - </tr> - </table></td> - </tr> - - <tr class="row1"> - <td><div class="gensmall" style="float:left"> <!-- IF U_AUTHOR_PROFILE --><a href="{U_AUTHOR_PROFILE}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF U_EMAIL --><a href="{U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF --> </div> <div class="gensmall" style="float:right"><!-- IF U_QUOTE --><a href="{U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF U_POST_REPLY_PM --><a href="{U_POST_REPLY_PM}">{REPLY_IMG}</a><!-- ENDIF --> <!-- IF U_EDIT --><a href="{U_EDIT}">{EDIT_IMG}</a> <!-- ENDIF --> </div></td> - </tr> - - <tr> - <td class="spacer" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> - </tr> -</table> - -<!-- -<table width="100%" cellspacing="1"> - <tr> - <td align="left" valign="middle" nowrap="nowrap"><a href="{U_POST_REPLY_PM}">{REPLY_IMG}</a></td> - </tr> + <!-- ENDIF --> + + <!-- IF S_DISPLAY_NOTICE --> + <span class="gensmall" style="color:red;"><br /><br />{L_DOWNLOAD_NOTICE}</span> + <!-- ENDIF --> + <!-- IF SIGNATURE --> + <span class="postbody"><br />_________________<br />{SIGNATURE}</span> + <!-- ENDIF --> + <!-- IF EDITED_MESSAGE --> + <span class="gensmall">{EDITED_MESSAGE}</span> + <!-- ENDIF --> + + <!-- IF not S_HAS_ATTACHMENTS --><br clear="all" /><br /><!-- ENDIF --> + + <table width="100%" cellspacing="0"> + <tr valign="middle"> + <td class="gensmall" align="right"> <!-- IF U_INFO --><a href="{U_INFO}">{INFO_IMG}</a> <!-- ENDIF --> <!-- IF U_DELETE --><a href="{U_DELETE}">{DELETE_IMG}</a> <!-- ENDIF --></td> + </tr> + </table> + + </td> + </tr> + </table> + </td> +</tr> + +<tr class="row1"> + <td><div class="gensmall" style="float:left"> <!-- IF U_AUTHOR_PROFILE --><a href="{U_AUTHOR_PROFILE}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF U_EMAIL --><a href="{U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF --> </div> <div class="gensmall" style="float:right"><!-- IF U_QUOTE --><a href="{U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF U_POST_REPLY_PM --><a href="{U_POST_REPLY_PM}">{REPLY_IMG}</a><!-- ENDIF --> <!-- IF U_EDIT --><a href="{U_EDIT}">{EDIT_IMG}</a> <!-- ENDIF --> </div></td> +</tr> + +<tr> + <td class="spacer" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> +</tr> </table> -//--> <div style="padding: 2px;"></div> <!-- INCLUDE ucp_pm_message_footer.html --> diff --git a/phpBB/styles/subSilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subSilver/template/ucp_pm_viewmessage_print.html index ceb23ccd28..da7f7a03f9 100644 --- a/phpBB/styles/subSilver/template/ucp_pm_viewmessage_print.html +++ b/phpBB/styles/subSilver/template/ucp_pm_viewmessage_print.html @@ -4,34 +4,37 @@ <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}"> <meta http-equiv="Content-Style-Type" content="text/css"> <title>{SITENAME} :: {PAGE_TITLE}</title> + <style type="text/css"> <!-- + body { - font-family: Verdana,serif; - font-size: 10pt; + font-family: Verdana,serif; + font-size: 10pt; } td { - font-family: Verdana,serif; - font-size: 10pt; - line-height: 150%; + font-family: Verdana,serif; + font-size: 10pt; + line-height: 150%; } -.code, .quote { - font-size: smaller; - border: black solid 1px; +.code, +.quote { + font-size: smaller; + border: black solid 1px; } .forum { - font-family: Arial,Helvetica,sans-serif; - font-weight: bold; - font-size: 18pt; + font-family: Arial,Helvetica,sans-serif; + font-weight: bold; + font-size: 18pt; } .topic { - font-family: Arial,Helvetica,sans-serif; - font-size: 14pt; - font-weight: bold; + font-family: Arial,Helvetica,sans-serif; + font-size: 14pt; + font-weight: bold; } .gensmall { @@ -39,44 +42,44 @@ td { } hr { - color: #888888; - height: 3px; - border-style: solid; + color: #888; + height: 3px; + border-style: solid; } -hr.sep { - color: #AAAAAA; - height: 1px; - border-style: dashed; +hr.sep { + color: #aaa; + height: 1px; + border-style: dashed; } ---> +//--> </style> + </head> <body> <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center"> - <tr> - <td colspan="2" align="center"><span class="Forum">{SITENAME}</span><br /><span class="gensmall">{L_PRIVATE_MESSAGING}</a></span></td> - </tr> - <tr> - <td colspan="2"><br /></td> - </tr> - <tr> - <td><span class="Topic">{SUBJECT}</span><br /></td> - <td align="right" valign="bottom"><span class="gensmall">{PAGE_NUMBER}</span></td> - </tr> +<tr> + <td colspan="2" align="center"><span class="Forum">{SITENAME}</span><br /><span class="gensmall">{L_PRIVATE_MESSAGING}</a></span></td> +</tr> +<tr> + <td colspan="2"><br /></td> +</tr> +<tr> + <td><span class="topic">{SUBJECT}</span><br /></td> + <td align="right" valign="bottom"><span class="gensmall">{PAGE_NUMBER}</span></td> +</tr> </table> - <hr width="85%" /> <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center"> - <tr> - <td width="10%" nowrap="nowrap">{L_PM_FROM}: </td> - <td><b>{AUTHOR_NAME}</b> [ {SENT_DATE} ]</td> - </tr> +<tr> + <td width="10%" nowrap="nowrap">{L_PM_FROM}: </td> + <td><b>{AUTHOR_NAME}</b> [ {SENT_DATE} ]</td> +</tr> - <!-- IF S_TO_RECIPIENT --> +<!-- IF S_TO_RECIPIENT --> <tr> <td width="10%" nowrap="nowrap">{L_TO}:</td> <td> @@ -85,9 +88,9 @@ hr.sep { <!-- END to_recipient --> </td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> - <!-- IF S_BCC_RECIPIENT --> +<!-- IF S_BCC_RECIPIENT --> <tr> <td width="10%" nowrap="nowrap">{L_BCC}:</td> <td> @@ -96,32 +99,32 @@ hr.sep { <!-- END bcc_recipient --> </td> </tr> - <!-- ENDIF --> - <tr> - <td colspan="2"><hr class="sep" />{MESSAGE}</td> - </tr> +<!-- ENDIF --> +<tr> + <td colspan="2"><hr class="sep" />{MESSAGE}</td> +</tr> </table> <hr width="85%" /> <!-- We request you retain the full copyright notice below including the link to www.phpbb.com. This not only gives respect to the large amount of time given freely by the developers - but also helps build interest, traffic and use of phpBB2. If you (honestly) cannot retain - the full copyright we ask you at least leave in place the "Powered by phpBB {PHPBB_VERSION}" - line, with phpBB linked to www.phpbb.com. If you refuse to include even this then support on - our forums may be affected. + but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain + the full copyright we ask you at least leave in place the "Powered by phpBB" line. If you + refuse to include even this then support on our forums may be affected. - The phpBB Group : 2002 + The phpBB Group : 2006 // --> + <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center"> - <tr> - <td><span class="gensmall">{PAGE_NUMBER}</span></td> - <td align="right"><span class="gensmall">{S_TIMEZONE}</span></td> - </tr> - <tr> - <td colspan="2" align="center"><span class="gensmall">Powered by phpBB {PHPBB_VERSION} © 2002 phpBB Group<br />http://www.phpbb.com/</span></td> - </tr> +<tr> + <td><span class="gensmall">{PAGE_NUMBER}</span></td> + <td align="right"><span class="gensmall">{S_TIMEZONE}</span></td> +</tr> +<tr> + <td colspan="2" align="center"><span class="gensmall">Powered by phpBB © 2002, 2006 phpBB Group<br />http://www.phpbb.com/</span></td> +</tr> </table> </body> -</html>
\ No newline at end of file +</html> diff --git a/phpBB/styles/subSilver/template/ucp_profile_avatar.html b/phpBB/styles/subSilver/template/ucp_profile_avatar.html index 1cd5b76064..d33c2a07f0 100644 --- a/phpBB/styles/subSilver/template/ucp_profile_avatar.html +++ b/phpBB/styles/subSilver/template/ucp_profile_avatar.html @@ -1,31 +1,31 @@ <!-- INCLUDE ucp_header.html --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2" valign="middle">{L_TITLE}</th> - </tr> - <!-- IF ERROR --> +<tr> + <th colspan="2" valign="middle">{L_TITLE}</th> +</tr> +<!-- IF ERROR --> <tr> <td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</span></td> </tr> - <!-- ENDIF --> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_CURRENT_IMAGE}: </b><br /><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td> - <td class="row2" align="center"><br /><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --><br /><br /><input type="checkbox" class="radio" name="delete" /> <span class="gensmall">{L_DELETE_AVATAR}</span></td> - </tr> - <!-- IF S_UPLOAD_AVATAR_FILE --> +<!-- ENDIF --> +<tr> + <td class="row1" width="35%"><b class="genmed">{L_CURRENT_IMAGE}: </b><br /><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td> + <td class="row2" align="center"><br /><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --><br /><br /><input type="checkbox" class="radio" name="delete" /> <span class="gensmall">{L_DELETE_AVATAR}</span></td> +</tr> +<!-- IF S_UPLOAD_AVATAR_FILE --> <tr> <td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_FILE}: </b></td> <td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input class="post" type="file" name="uploadfile" /></td> </tr> - <!-- ENDIF --> - <!-- IF S_UPLOAD_AVATAR_URL --> +<!-- ENDIF --> +<!-- IF S_UPLOAD_AVATAR_URL --> <tr> <td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_URL}: </b><br /><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td> <td class="row2"><input class="post" type="text" name="uploadurl" size="40" value="{AVATAR_URL}" /></td> </tr> - <!-- ENDIF --> - <!-- IF S_LINK_AVATAR --> +<!-- ENDIF --> +<!-- IF S_LINK_AVATAR --> <tr> <td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_AVATAR}: </b><br /><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td> <td class="row2"><input class="post" type="text" name="remotelink" size="40" value="{AVATAR_REMOTE}" /></td> @@ -34,14 +34,15 @@ <td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_SIZE}: </b><br /><span class="gensmall">{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td> <td class="row2"><input class="post" type="text" name="width" size="3" value="{WIDTH}" /> <span class="gen">px X </span> <input class="post" type="text" name="height" size="3" value="{HEIGHT}" /> <span class="gen">px</span></td> </tr> - <!-- ENDIF --> - <!-- IF S_GALLERY_AVATAR --> +<!-- ENDIF --> +<!-- IF S_GALLERY_AVATAR --> <tr> <td class="row1" width="35%"><b class="genmed">{L_AVATAR_GALLERY}: </b></td> <td class="row2"><input class="btnlite" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></td> </tr> - <!-- ENDIF --> - <!-- IF S_IN_AVATAR_GALLERY --> +<!-- ENDIF --> + +<!-- IF S_IN_AVATAR_GALLERY --> <tr> <th colspan="2">{L_AVATAR_GALLERY}</th> </tr> @@ -49,30 +50,30 @@ <td class="cat" colspan="2" align="center" valign="middle"><span class="genmed">{L_AVATAR_CATEGORY}: </span><select name="category">{S_CAT_OPTIONS}</select> <input class="btnlite" type="submit" value="{L_GO}" name="display_gallery" /></td> </tr> <tr> - <td class="row1" colspan="2" align="center"><table cellspacing="1" cellpadding="4" border="0"> - + <td class="row1" colspan="2" align="center"> + <table cellspacing="1" cellpadding="4" border="0"> <!-- BEGIN avatar_row --> <tr> <!-- BEGIN avatar_column --> - <td class="row1" align="center"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td> + <td class="row1" align="center"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td> <!-- END avatar_column --> </tr> <tr> <!-- BEGIN avatar_option_column --> - <td class="row2" align="center"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td> + <td class="row2" align="center"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td> <!-- END avatar_option_column --> </tr> <!-- END avatar_row --> - - </table></td> + </table> + </td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> - <!-- IF S_GALLERY_AVATAR or S_IN_AVATAR_GALLERY or S_LINK_AVATAR or S_UPLOAD_AVATAR_URL or S_UPLOAD_AVATAR_FILE --> +<!-- IF S_GALLERY_AVATAR or S_IN_AVATAR_GALLERY or S_LINK_AVATAR or S_UPLOAD_AVATAR_URL or S_UPLOAD_AVATAR_FILE --> <tr> <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> <!-- IF S_IN_AVATAR_GALLERY --><input class="btnlite" type="submit" name="cancel" value="{L_CANCEL}" /><!-- ELSE --><input class="btnlite" type="reset" value="{L_RESET}" name="reset" /><!-- ENDIF --></td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> </table> <!-- INCLUDE ucp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/ucp_profile_profile_info.html b/phpBB/styles/subSilver/template/ucp_profile_profile_info.html index 92d036b7cc..1d7e11c06e 100644 --- a/phpBB/styles/subSilver/template/ucp_profile_profile_info.html +++ b/phpBB/styles/subSilver/template/ucp_profile_profile_info.html @@ -1,57 +1,57 @@ <!-- INCLUDE ucp_header.html --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2" valign="middle">{L_TITLE}</th> - </tr> - <!-- IF ERROR --> +<tr> + <th colspan="2" valign="middle">{L_TITLE}</th> +</tr> +<!-- IF ERROR --> <tr> <td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</span></td> </tr> - <!-- ENDIF --> - <tr> - <td class="row3" colspan="2"><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td> - </tr> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_UCP_ICQ}: </b></td> - <td class="row2"><input class="post" type="text" name="icq" size="30" maxlength="15" value="{ICQ}" /></td> - </tr> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_UCP_AIM}: </b></td> - <td class="row2"><input class="post" type="text" name="aim" size="30" maxlength="255" value="{AIM}" /></td> - </tr> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_UCP_MSNM}: </b></td> - <td class="row2"><input class="post" type="text" name="msn" size="30" maxlength="255" value="{MSN}" /></td> - </tr> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_UCP_YIM}: </b></td> - <td class="row2"><input class="post" type="text" name="yim" size="30" maxlength="255" value="{YIM}" /></td> - </tr> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_UCP_JABBER}: </b></td> - <td class="row2"><input class="post" type="text" name="jabber" size="30" maxlength="255" value="{JABBER}" /></td> - </tr> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_WEBSITE}: </b></td> - <td class="row2"><input class="post" type="text" name="website" size="30" maxlength="255" value="{WEBSITE}" /></td> - </tr> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_LOCATION}: </b></td> - <td class="row2"><input class="post" type="text" name="location" size="30" maxlength="100" value="{LOCATION}" /></td> - </tr> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_OCCUPATION}: </b></td> - <td class="row2"><textarea class="post" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></td> - </tr> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_INTERESTS}: </b></td> - <td class="row2"><textarea class="post" name="interests" rows="3" cols="30">{INTERESTS}</textarea></td> - </tr> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_BIRTHDAY}: </b><br /><span class="gensmall">{L_BIRTHDAY_EXPLAIN}</span></td> - <td class="row2"><span class="genmed">{L_DAY}:</span> <select name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> <span class="genmed">{L_MONTH}:</span> <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> <span class="genmed">{L_YEAR}:</span> <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></td> - </tr> +<!-- ENDIF --> +<tr> + <td class="row3" colspan="2"><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td> +</tr> +<tr> + <td class="row1" width="35%"><b class="genmed">{L_UCP_ICQ}: </b></td> + <td class="row2"><input class="post" type="text" name="icq" size="30" maxlength="15" value="{ICQ}" /></td> +</tr> +<tr> + <td class="row1" width="35%"><b class="genmed">{L_UCP_AIM}: </b></td> + <td class="row2"><input class="post" type="text" name="aim" size="30" maxlength="255" value="{AIM}" /></td> +</tr> +<tr> + <td class="row1" width="35%"><b class="genmed">{L_UCP_MSNM}: </b></td> + <td class="row2"><input class="post" type="text" name="msn" size="30" maxlength="255" value="{MSN}" /></td> +</tr> +<tr> + <td class="row1" width="35%"><b class="genmed">{L_UCP_YIM}: </b></td> + <td class="row2"><input class="post" type="text" name="yim" size="30" maxlength="255" value="{YIM}" /></td> +</tr> +<tr> + <td class="row1" width="35%"><b class="genmed">{L_UCP_JABBER}: </b></td> + <td class="row2"><input class="post" type="text" name="jabber" size="30" maxlength="255" value="{JABBER}" /></td> +</tr> +<tr> + <td class="row1" width="35%"><b class="genmed">{L_WEBSITE}: </b></td> + <td class="row2"><input class="post" type="text" name="website" size="30" maxlength="255" value="{WEBSITE}" /></td> +</tr> +<tr> + <td class="row1" width="35%"><b class="genmed">{L_LOCATION}: </b></td> + <td class="row2"><input class="post" type="text" name="location" size="30" maxlength="100" value="{LOCATION}" /></td> +</tr> +<tr> + <td class="row1" width="35%"><b class="genmed">{L_OCCUPATION}: </b></td> + <td class="row2"><textarea class="post" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></td> +</tr> +<tr> + <td class="row1" width="35%"><b class="genmed">{L_INTERESTS}: </b></td> + <td class="row2"><textarea class="post" name="interests" rows="3" cols="30">{INTERESTS}</textarea></td> +</tr> +<tr> + <td class="row1" width="35%"><b class="genmed">{L_BIRTHDAY}: </b><br /><span class="gensmall">{L_BIRTHDAY_EXPLAIN}</span></td> + <td class="row2"><span class="genmed">{L_DAY}:</span> <select name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> <span class="genmed">{L_MONTH}:</span> <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> <span class="genmed">{L_YEAR}:</span> <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></td> +</tr> <!-- BEGIN profile_fields --> <tr> <td class="row1" width="35%"> @@ -62,9 +62,9 @@ <td class="row2">{profile_fields.FIELD}<!-- IF profile_fields.ERROR --><br /><span class="gensmall" style="color:red">{profile_fields.ERROR}</span><!-- ENDIF --></td> </tr> <!-- END profile_fields --> - <tr> - <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td> - </tr> +<tr> + <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td> +</tr> </table> <!-- INCLUDE ucp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/ucp_profile_reg_details.html b/phpBB/styles/subSilver/template/ucp_profile_reg_details.html index da51dd8732..ba70350308 100644 --- a/phpBB/styles/subSilver/template/ucp_profile_reg_details.html +++ b/phpBB/styles/subSilver/template/ucp_profile_reg_details.html @@ -1,34 +1,34 @@ <!-- INCLUDE ucp_header.html --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2" valign="middle">{L_TITLE}</th> - </tr> - <!-- IF S_FORCE_PASSWORD --> +<tr> + <th colspan="2" valign="middle">{L_TITLE}</th> +</tr> +<!-- IF S_FORCE_PASSWORD --> <tr> <td class="row3" colspan="2" align="center"><span class="gensmall">{L_FORCE_PASSWORD_EXPLAIN}</span></td> </tr> - <!-- ENDIF --> - <!-- IF ERROR --> +<!-- ENDIF --> +<!-- IF ERROR --> <tr> <td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</span></td> </tr> - <!-- ENDIF --> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_USERNAME}: </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td> - <td class="row2"><!-- IF S_CHANGE_USERNAME --><input type="text" class="post" name="username" size="30" maxlength="30" value="{USERNAME}" /><!-- ELSE --><b class="gen">{USERNAME}</b><!-- ENDIF --></td> - </tr> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td> - <td class="row2"><!-- IF S_CHANGE_EMAIL --><input type="text" class="post" name="email" size="30" maxlength="60" value="{EMAIL}" /><!-- ELSE --><b class="gen">{EMAIL}</b><!-- ENDIF --></td> - </tr> - <!-- IF S_CHANGE_EMAIL --> +<!-- ENDIF --> +<tr> + <td class="row1" width="35%"><b class="genmed">{L_USERNAME}: </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td> + <td class="row2"><!-- IF S_CHANGE_USERNAME --><input type="text" class="post" name="username" size="30" maxlength="30" value="{USERNAME}" /><!-- ELSE --><b class="gen">{USERNAME}</b><!-- ENDIF --></td> +</tr> +<tr> + <td class="row1" width="35%"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td> + <td class="row2"><!-- IF S_CHANGE_EMAIL --><input type="text" class="post" name="email" size="30" maxlength="60" value="{EMAIL}" /><!-- ELSE --><b class="gen">{EMAIL}</b><!-- ENDIF --></td> +</tr> +<!-- IF S_CHANGE_EMAIL --> <tr> <td class="row1" width="35%"><b class="genmed">{L_CONFIRM_EMAIL}: </b><br /><span class="gensmall">{L_CONFIRM_EMAIL_EXPLAIN}</span></td> <td class="row2"><input type="text" class="post" name="email_confirm" size="30" maxlength="60" value="{CONFIRM_EMAIL}" /></td> </tr> - <!-- ENDIF --> - <!-- IF S_CHANGE_PASSWORD --> +<!-- ENDIF --> +<!-- IF S_CHANGE_PASSWORD --> <tr> <td class="row1" width="35%"><b class="genmed">{L_CHANGE_PASSWORD}: </b><br /><span class="gensmall">{L_CHANGE_PASSWORD_EXPLAIN}</span></td> <td class="row2"><input type="password" class="post" name="new_password" size="30" maxlength="255" value="{NEW_PASSWORD}" /></td> @@ -37,14 +37,14 @@ <td class="row1" width="35%"><b class="genmed">{L_CONFIRM_PASSWORD}: </b><br /><span class="gensmall">{L_CONFIRM_PASSWORD_EXPLAIN}</span></td> <td class="row2"><input type="password" class="post" name="password_confirm" size="30" maxlength="255" value="{PASSWORD_CONFIRM}" /></td> </tr> - <!-- ENDIF --> - <tr> - <td class="row1" width="35%"><b class="genmed">{L_CURRENT_PASSWORD}: </b><br /><span class="gensmall">{L_CURRENT_PASSWORD_EXPLAIN}</span></td> - <td class="row2"><input type="password" class="post" name="cur_password" size="30" maxlength="255" value="{CUR_PASSWORD}" /></td> - </tr> - <tr> - <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td> - </tr> +<!-- ENDIF --> +<tr> + <td class="row1" width="35%"><b class="genmed">{L_CURRENT_PASSWORD}: </b><br /><span class="gensmall">{L_CURRENT_PASSWORD_EXPLAIN}</span></td> + <td class="row2"><input type="password" class="post" name="cur_password" size="30" maxlength="255" value="{CUR_PASSWORD}" /></td> +</tr> +<tr> + <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td> +</tr> </table> <!-- INCLUDE ucp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/ucp_profile_signature.html b/phpBB/styles/subSilver/template/ucp_profile_signature.html index 01b0b58a10..3e837acc49 100644 --- a/phpBB/styles/subSilver/template/ucp_profile_signature.html +++ b/phpBB/styles/subSilver/template/ucp_profile_signature.html @@ -31,21 +31,23 @@ e_help = "{LA_BBCODE_E_HELP}"; <script language="javascript" type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2">{L_TITLE}</th> - </tr> +<tr> + <th colspan="2">{L_TITLE}</th> +</tr> - <!-- IF ERROR --> +<!-- IF ERROR --> <tr> <td class="row3" colspan="2" align="center"><span class="genmed error">{ERROR}</span></td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> - <tr> - <td class="row1" width="20%"><b class="genmed">{L_SIGNATURE}: </b><br /><span class="gensmall">{L_SIGNATURE_EXPLAIN}</span></td> - <td class="row2"><table cellspacing="0" cellpadding="2" border="0"> - <tr valign="middle" align="left"> - <td colspan="2"><input type="button" class="btnbbcode" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" /> +<tr> + <td class="row1" width="20%"><b class="genmed">{L_SIGNATURE}: </b><br /><span class="gensmall">{L_SIGNATURE_EXPLAIN}</span></td> + <td class="row2"> + <table cellspacing="0" cellpadding="2" border="0"> + <tr valign="middle" align="left"> + <td colspan="2"> + <input type="button" class="btnbbcode" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" /> <input type="button" class="btnbbcode" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" /> <input type="button" class="btnbbcode" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" /> <input type="button" class="btnbbcode" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" /> @@ -55,91 +57,102 @@ e_help = "{LA_BBCODE_E_HELP}"; <!-- IF S_BBCODE_IMG --><input type="button" class="btnbbcode" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" /><!-- ENDIF --> <input type="button" class="btnbbcode" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" /> <!-- IF S_BBCODE_FLASH --><input type="button" class="btnbbcode" accesskey="f" name="addbbcode18" value="Flash" onclick="bbstyle(18)" /><!-- ENDIF --> - </td> - </tr> - <tr> - <td valign="middle" align="left"> + </td> + </tr> + <tr> + <td valign="middle" align="left"> <span class="genmed" style="white-space: nowrap;">{L_FONT_SIZE}: <select class="gensmall" name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" onmouseover="helpline('f')"> - <option value="7">{L_FONT_TINY}</option> - <option value="9">{L_FONT_SMALL}</option> - <option value="12" selected="selected">{L_FONT_NORMAL}</option> - <option value="18">{L_FONT_LARGE}</option> - <option value="24">{L_FONT_HUGE}</option> - </select> | <a href="javascript:bbstyle(-1)" onmouseover="helpline('a')">{L_CLOSE_TAGS}</a></span> - </td> - </tr> - <!-- IF .custom_tags --> + <option value="7">{L_FONT_TINY}</option> + <option value="9">{L_FONT_SMALL}</option> + <option value="12" selected="selected">{L_FONT_NORMAL}</option> + <option value="18">{L_FONT_LARGE}</option> + <option value="24">{L_FONT_HUGE}</option> + </select> | <a href="javascript:bbstyle(-1)" onmouseover="helpline('a')">{L_CLOSE_TAGS}</a></span> + </td> + </tr> + <!-- IF .custom_tags --> <tr valign="middle" align="left"> <td colspan="2"> <!-- BEGIN custom_tags --> <input type="button" class="btnbbcode" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" /> <!-- END custom_tags --> </td> - <!-- ENDIF --> - <tr> - <td colspan="9"><input type="text" name="helpbox" style="width:100%" maxlength="100" class="helpline" value="{L_STYLES_TIP}" /></td> - </tr> - <tr> - <td colspan="9"><textarea class="post" name="signature" rows="10" cols="80" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></td> - </tr> - <tr> - <td colspan="9"><table cellspacing="0" cellpadding="0" border="0" width="100%"> - <tr> - <td bgcolor="black" align="center"><script language="javascript" type="text/javascript"><!-- - - colorPalette('h', 18, 5) - - //--></script></td> - </tr> - </table></td> - </tr> - </table></td> - </tr> - <tr> - <td class="row1" valign="top"><b class="genmed">{L_OPTIONS}</b><br /><table cellspacing="2" cellpadding="0" border="0"> - <tr> - <td class="gensmall">{BBCODE_STATUS}</td> - </tr> - <tr> - <td class="gensmall">{IMG_STATUS}</td> - </tr> - <tr> - <td class="gensmall">{FLASH_STATUS}</td> - </tr> - <tr> - <td class="gensmall">{SMILIES_STATUS}</td> - </tr> - </table></td> - <td class="row2" valign="top"><table cellspacing="0" cellpadding="1" border="0"> - <!-- IF S_BBCODE_ALLOWED --> + <!-- ENDIF --> + <tr> + <td colspan="9"><input type="text" name="helpbox" style="width:100%" maxlength="100" class="helpline" value="{L_STYLES_TIP}" /></td> + </tr> + <tr> + <td colspan="9"><textarea class="post" name="signature" rows="10" cols="80" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></td> + </tr> + <tr> + <td colspan="9"> + <table cellspacing="0" cellpadding="0" border="0" width="100%"> + <tr> + <td bgcolor="black" align="center"> + <script type="text/javascript"> + <!-- + colorPalette('h', 18, 5) + //--> + </script> + </td> + </tr> + </table> + </td> + </tr> + </table> + </td> +</tr> +<tr> + <td class="row1" valign="top"><b class="genmed">{L_OPTIONS}</b><br /> + <table cellspacing="2" cellpadding="0" border="0"> + <tr> + <td class="gensmall">{BBCODE_STATUS}</td> + </tr> + <tr> + <td class="gensmall">{IMG_STATUS}</td> + </tr> + <tr> + <td class="gensmall">{FLASH_STATUS}</td> + </tr> + <tr> + <td class="gensmall">{SMILIES_STATUS}</td> + </tr> + </table> + </td> + <td class="row2" valign="top"> + <table cellspacing="0" cellpadding="1" border="0"> + <!-- IF S_BBCODE_ALLOWED --> <tr> <td><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /></td> <td class="gen">{L_DISABLE_BBCODE}</td> </tr> - <!-- ENDIF --> - <!-- IF S_SMILIES_ALLOWED --> + <!-- ENDIF --> + <!-- IF S_SMILIES_ALLOWED --> <tr> <td><input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} /></td> <td class="gen">{L_DISABLE_SMILIES}</td> </tr> - <!-- ENDIF --> - <tr> - <td><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /></td> - <td class="gen">{L_DISABLE_MAGIC_URL}</td> - </tr> - </table></td> - </tr> - <!-- IF SIGNATURE_PREVIEW --> + <!-- ENDIF --> + <tr> + <td><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /></td> + <td class="gen">{L_DISABLE_MAGIC_URL}</td> + </tr> + </table> + </td> +</tr> + +<!-- IF SIGNATURE_PREVIEW --> <tr> <th colspan="2" valign="middle">{L_SIGNATURE_PREVIEW}</th> </tr> <tr> <td class="row1" colspan="2"><div class="postbody" style="padding: 6px;">{SIGNATURE_PREVIEW}</div></td> </tr> - <!-- ENDIF --> - <tr> - <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnlite" type="submit" name="preview" value="{L_PREVIEW}" /> <input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td> - </tr> +<!-- ENDIF --> + +<tr> + <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnlite" type="submit" name="preview" value="{L_PREVIEW}" /> <input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td> +</tr> </table> <!-- INCLUDE ucp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/ucp_register.html b/phpBB/styles/subSilver/template/ucp_register.html index 94a1e35cbe..70a3572ba8 100644 --- a/phpBB/styles/subSilver/template/ucp_register.html +++ b/phpBB/styles/subSilver/template/ucp_register.html @@ -1,7 +1,10 @@ <!-- INCLUDE overall_header.html --> -<script language="Javascript" type="text/javascript"> +<script type="text/javascript"> <!-- + /** + * Change language + */ function change_language(lang_iso) { document.forms['register'].change_lang.value = lang_iso; @@ -10,93 +13,100 @@ //--> </script> -<form name="register" method="post" action="{S_UCP_ACTION}"><table width="80%" cellspacing="2" cellpadding="2" border="0" align="center"> - <tr> - <td class="nav"><a href="{U_INDEX}">{L_INDEX}</a></td> - </tr> +<form name="register" method="post" action="{S_UCP_ACTION}"> + +<table width="80%" cellspacing="2" cellpadding="2" border="0" align="center"> +<tr> + <td class="nav"><a href="{U_INDEX}">{L_INDEX}</a></td> +</tr> </table> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2" height="28" valign="middle">{L_REGISTRATION}</th> - </tr> +<tr> + <th colspan="2" height="28" valign="middle">{L_REGISTRATION}</th> +</tr> - <!-- IF ERROR --> +<!-- IF ERROR --> <tr> <td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> - <!-- IF L_ITEMS_REQUIRED --> +<!-- IF L_ITEMS_REQUIRED --> <tr> <td class="row2" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td> </tr> - <!-- ENDIF --> - - <tr> - <td class="row1" width="38%"><b class="genmed">{L_USERNAME}: </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td> - <td class="row2"><input class="post" type="text" name="username" size="25" maxlength="40" value="{USERNAME}" /></td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td> - <td class="row2"><input class="post" type="text" name="email" size="25" maxlength="255" value="{EMAIL}" /></td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_CONFIRM_EMAIL}: </b></td> - <td class="row2"><input class="post" type="text" name="email_confirm" size="25" maxlength="255" value="{EMAIL_CONFIRM}" /></td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_NEW_PASSWORD}: </b><br /><span class="gensmall">{L_NEW_PASSWORD_EXPLAIN}</span></td> - <td class="row2"><input class="post" type="password" name="new_password" size="25" maxlength="100" value="{PASSWORD}" /></td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_CONFIRM_PASSWORD}: </b></td> - <td class="row2"><input class="post" type="password" name="password_confirm" size="25" maxlength="100" value="{PASSWORD_CONFIRM}" /></td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_LANGUAGE}: </b></td> - <td class="row2"><select name="lang" onchange="javascript:change_language(this.value);">{S_LANG_OPTIONS}</select></td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_TIMEZONE}: </b></td> - <td class="row2"><select name="tz">{S_TZ_OPTIONS}</select></td> - </tr> +<!-- ENDIF --> - <!-- BEGIN profile_fields --> - <tr> - <td class="row1" width="35%"><b class="genmed">{profile_fields.LANG_NAME}: </b><!-- IF profile_fields.LANG_EXPLAIN --><br /><span class="gensmall">{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></td> +<tr> + <td class="row1" width="38%"><b class="genmed">{L_USERNAME}: </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td> + <td class="row2"><input class="post" type="text" name="username" size="25" maxlength="40" value="{USERNAME}" /></td> +</tr> +<tr> + <td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td> + <td class="row2"><input class="post" type="text" name="email" size="25" maxlength="255" value="{EMAIL}" /></td> +</tr> +<tr> + <td class="row1"><b class="genmed">{L_CONFIRM_EMAIL}: </b></td> + <td class="row2"><input class="post" type="text" name="email_confirm" size="25" maxlength="255" value="{EMAIL_CONFIRM}" /></td> +</tr> +<tr> + <td class="row1"><b class="genmed">{L_NEW_PASSWORD}: </b><br /><span class="gensmall">{L_NEW_PASSWORD_EXPLAIN}</span></td> + <td class="row2"><input class="post" type="password" name="new_password" size="25" maxlength="100" value="{PASSWORD}" /></td> +</tr> +<tr> + <td class="row1"><b class="genmed">{L_CONFIRM_PASSWORD}: </b></td> + <td class="row2"><input class="post" type="password" name="password_confirm" size="25" maxlength="100" value="{PASSWORD_CONFIRM}" /></td> +</tr> +<tr> + <td class="row1"><b class="genmed">{L_LANGUAGE}: </b></td> + <td class="row2"><select name="lang" onchange="javascript:change_language(this.value);">{S_LANG_OPTIONS}</select></td> +</tr> +<tr> + <td class="row1"><b class="genmed">{L_TIMEZONE}: </b></td> + <td class="row2"><select name="tz">{S_TZ_OPTIONS}</select></td> +</tr> +<!-- BEGIN profile_fields --> + <tr> + <td class="row1" width="35%"> + <b class="genmed">{profile_fields.LANG_NAME}: </b> + <!-- IF profile_fields.S_REQUIRED --><b>*</b><!-- ENDIF --> + <!-- IF profile_fields.LANG_EXPLAIN --><br /><span class="gensmall">{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --> + </td> <td class="row2">{profile_fields.FIELD}<!-- IF profile_fields.ERROR --><br /><span class="gensmall" style="color:red">{profile_fields.ERROR}</span><!-- ENDIF --></td> </tr> - <!-- END profile_fields --> +<!-- END profile_fields --> - <!-- IF S_CONFIRM_CODE --> - <tr> +<!-- IF S_CONFIRM_CODE --> + <tr> <th colspan="2" height="28" valign="middle">{L_CONFIRMATION}</th> </tr> - <tr> + <tr> <td class="row3" colspan="2"><span class="gensmall">{L_CONFIRM_EXPLAIN}</span></td> </tr> <tr> <td class="row1" colspan="2" align="center">{CONFIRM_IMG}</td> </tr> - <tr> + <tr> <td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td> <td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8" /></td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> - <!-- IF S_COPPA --> - <tr> +<!-- IF S_COPPA --> + <tr> <th colspan="2" height="28" valign="middle">{L_COPPA_COMPLIANCE}</th> </tr> - <tr> + <tr> <td class="row3" colspan="2"><span class="gensmall">{L_COPPA_EXPLAIN}</span></td> </tr> - <!-- ENDIF --> +<!-- ENDIF --> - <tr> - <td class="cat" colspan="2" align="center" height="28">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td> - </tr> -</table></form> +<tr> + <td class="cat" colspan="2" align="center" height="28">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td> +</tr> +</table> + +</form> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/ucp_zebra_foes.html b/phpBB/styles/subSilver/template/ucp_zebra_foes.html index b8c1e2cc1c..7ff375ce79 100644 --- a/phpBB/styles/subSilver/template/ucp_zebra_foes.html +++ b/phpBB/styles/subSilver/template/ucp_zebra_foes.html @@ -1,28 +1,28 @@ <!-- INCLUDE ucp_header.html --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2" valign="middle">{L_TITLE}</th> - </tr> - <tr> - <td class="row3" colspan="2"><span class="gensmall">{L_FOES_EXPLAIN}</span></td> - </tr> - <!-- IF ERROR --> +<tr> + <th colspan="2" valign="middle">{L_TITLE}</th> +</tr> +<tr> + <td class="row3" colspan="2"><span class="gensmall">{L_FOES_EXPLAIN}</span></td> +</tr> +<!-- IF ERROR --> <tr> <td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</span></td> </tr> - <!-- ENDIF --> - <tr> - <td class="row1" width="40%"><b class="genmed">{L_YOUR_FOES}:</b><br /><span class="gensmall">{L_YOUR_FOES_EXPLAIN}</span></td> - <td class="row2" align="center"><!-- IF S_USERNAME_OPTIONS --><select name="usernames[]" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select><!-- ELSE --><b class="genmed">{L_NO_FOES}</b><!-- ENDIF --></td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_ADD_FOES}:</b><br /><span class="gensmall">{L_ADD_FOES_EXPLAIN} [ <a href="{U_SEARCH_USER}" onclick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false">{L_FIND_USERNAME}</a> ]</span></td> - <td class="row2" align="center"><textarea name="add" rows="5" cols="30">{USERNAMES}</textarea><br /></td> - </tr> - <tr> - <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td> - </tr> +<!-- ENDIF --> +<tr> + <td class="row1" width="40%"><b class="genmed">{L_YOUR_FOES}:</b><br /><span class="gensmall">{L_YOUR_FOES_EXPLAIN}</span></td> + <td class="row2" align="center"><!-- IF S_USERNAME_OPTIONS --><select name="usernames[]" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select><!-- ELSE --><b class="genmed">{L_NO_FOES}</b><!-- ENDIF --></td> +</tr> +<tr> + <td class="row1"><b class="genmed">{L_ADD_FOES}:</b><br /><span class="gensmall">{L_ADD_FOES_EXPLAIN} [ <a href="{U_SEARCH_USER}" onclick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false">{L_FIND_USERNAME}</a> ]</span></td> + <td class="row2" align="center"><textarea name="add" rows="5" cols="30">{USERNAMES}</textarea><br /></td> +</tr> +<tr> + <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td> +</tr> </table> <!-- INCLUDE ucp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/ucp_zebra_friends.html b/phpBB/styles/subSilver/template/ucp_zebra_friends.html index 2c52a22e62..fa0403002f 100644 --- a/phpBB/styles/subSilver/template/ucp_zebra_friends.html +++ b/phpBB/styles/subSilver/template/ucp_zebra_friends.html @@ -1,28 +1,28 @@ <!-- INCLUDE ucp_header.html --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2" valign="middle">{L_TITLE}</th> - </tr> - <tr> - <td class="row3" colspan="2"><span class="gensmall">{L_FRIENDS_EXPLAIN}</span></td> - </tr> - <!-- IF ERROR --> +<tr> + <th colspan="2" valign="middle">{L_TITLE}</th> +</tr> +<tr> + <td class="row3" colspan="2"><span class="gensmall">{L_FRIENDS_EXPLAIN}</span></td> +</tr> +<!-- IF ERROR --> <tr> <td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</span></td> </tr> - <!-- ENDIF --> - <tr> - <td class="row1" width="40%"><b class="genmed">{L_YOUR_FRIENDS}:</b><br /><span class="gensmall">{L_YOUR_FRIENDS_EXPLAIN}</span></td> - <td class="row2" align="center"><!-- IF S_USERNAME_OPTIONS --><select name="usernames[]" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select><!-- ELSE --><b class="genmed">{L_NO_FRIENDS}</b><!-- ENDIF --></td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_ADD_FRIENDS}:</b><br /><span class="gensmall">{L_ADD_FRIENDS_EXPLAIN} [ <a href="{U_SEARCH_USER}" onclick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false">{L_FIND_USERNAME}</a> ]</span></td> - <td class="row2" align="center"><textarea name="add" rows="5" cols="30">{USERNAMES}</textarea><br /></td> - </tr> - <tr> - <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td> - </tr> +<!-- ENDIF --> +<tr> + <td class="row1" width="40%"><b class="genmed">{L_YOUR_FRIENDS}:</b><br /><span class="gensmall">{L_YOUR_FRIENDS_EXPLAIN}</span></td> + <td class="row2" align="center"><!-- IF S_USERNAME_OPTIONS --><select name="usernames[]" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select><!-- ELSE --><b class="genmed">{L_NO_FRIENDS}</b><!-- ENDIF --></td> +</tr> +<tr> + <td class="row1"><b class="genmed">{L_ADD_FRIENDS}:</b><br /><span class="gensmall">{L_ADD_FRIENDS_EXPLAIN} [ <a href="{U_SEARCH_USER}" onclick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false">{L_FIND_USERNAME}</a> ]</span></td> + <td class="row2" align="center"><textarea name="add" rows="5" cols="30">{USERNAMES}</textarea><br /></td> +</tr> +<tr> + <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> <input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td> +</tr> </table> <!-- INCLUDE ucp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/viewforum_body.html b/phpBB/styles/subSilver/template/viewforum_body.html index 71b6194620..d0f939e57e 100644 --- a/phpBB/styles/subSilver/template/viewforum_body.html +++ b/phpBB/styles/subSilver/template/viewforum_body.html @@ -1,6 +1,6 @@ <!-- INCLUDE overall_header.html --> - <!-- IF S_FORUM_RULES --> +<!-- IF S_FORUM_RULES --> <div class="forumrules"> <!-- IF U_FORUM_RULES --> <h3 style="color:red">{L_FORUM_RULES}</h3><br /> @@ -12,32 +12,32 @@ </div> <br clear="all" /> - <!-- ENDIF --> +<!-- ENDIF --> - <!-- IF S_DISPLAY_ACTIVE --> +<!-- IF S_DISPLAY_ACTIVE --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><span class="nav">{L_ACTIVE_TOPICS}</span></td> - </tr> + <tr> + <td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><span class="nav">{L_ACTIVE_TOPICS}</span></td> + </tr> - <tr> - <!-- IF S_TOPIC_ICONS --> + <tr> + <!-- IF S_TOPIC_ICONS --> <th colspan="3"> {L_TOPICS} </th> - <!-- ELSE --> + <!-- ELSE --> <th colspan="2"> {L_TOPICS} </th> - <!-- ENDIF --> - <th> {L_AUTHOR} </th> - <th> {L_REPLIES} </th> - <th> {L_VIEWS} </th> - <th> {L_LAST_POST} </th> - </tr> + <!-- ENDIF --> + <th> {L_AUTHOR} </th> + <th> {L_REPLIES} </th> + <th> {L_VIEWS} </th> + <th> {L_LAST_POST} </th> + </tr> - <!-- BEGIN topicrow --> + <!-- BEGIN topicrow --> <tr> <td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td> <!-- IF S_TOPIC_ICONS --> - <td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td> + <td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td> <!-- ENDIF --> <td class="row1"> <!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a><!-- ENDIF --> @@ -63,31 +63,30 @@ </td> </tr> - <!-- BEGINELSE --> + <!-- BEGINELSE --> <tr> <!-- IF S_TOPIC_ICONS --> - <td class="row1" colspan="7" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td> + <td class="row1" colspan="7" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td> <!-- ELSE --> - <td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td> + <td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td> <!-- ENDIF --> </tr> - <!-- END topicrow --> + <!-- END topicrow --> - <tr align="center"> - <td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->8<!-- ELSE -->7<!-- ENDIF -->"> </td> - </tr> + <tr align="center"> + <td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->8<!-- ELSE -->7<!-- ENDIF -->"> </td> + </tr> </table> <br clear="all" /> - <!-- ENDIF --> - +<!-- ENDIF --> - <!-- IF S_HAS_SUBFORUM --> +<!-- IF S_HAS_SUBFORUM --> <!-- INCLUDE viewforum_subforum.html --> - <!-- ENDIF --> +<!-- ENDIF --> - <!-- IF S_IS_POSTABLE --> +<!-- IF S_IS_POSTABLE --> <div id="pageheader"> <h2><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2> @@ -100,64 +99,66 @@ </div> <br clear="all" /><br /> - <!-- ENDIF --> +<!-- ENDIF --> - <div id="pagecontent"> +<div id="pagecontent"> - <!-- IF S_IS_POSTABLE or TOTAL_TOPICS --> + <!-- IF S_IS_POSTABLE or TOTAL_TOPICS --> <table width="100%" cellspacing="1"> - <tr> - <!-- IF S_IS_POSTABLE --> + <tr> + <!-- IF S_IS_POSTABLE --> <td align="left" valign="middle"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a></td> - <!-- ENDIF --> - <!-- IF TOTAL_TOPICS --> + <!-- ENDIF --> + <!-- IF TOTAL_TOPICS --> <td class="nav" valign="middle" nowrap="nowrap"> {PAGE_NUMBER}<br /></td> <td class="gensmall" nowrap="nowrap"> [ {TOTAL_TOPICS} ] </td> <td class="gensmall" width="100%" align="right" nowrap="nowrap"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></td> - <!-- ENDIF --> - </tr> + <!-- ENDIF --> + </tr> </table> - <!-- ENDIF --> + <!-- ENDIF --> - <!-- IF S_IS_POSTABLE --> + <!-- IF S_IS_POSTABLE --> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><table width="100%" cellspacing="0"> - <tr class="nav"> - <td valign="middle"> <!-- IF S_WATCH_FORUM_LINK --><a href="{S_WATCH_FORUM_LINK}">{S_WATCH_FORUM_TITLE}</a><!-- ENDIF --></td> - <td align="right" valign="middle"><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a> </td> - </tr> - </table></td> - </tr> + <tr> + <td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"> + <table width="100%" cellspacing="0"> + <tr class="nav"> + <td valign="middle"> <!-- IF S_WATCH_FORUM_LINK --><a href="{S_WATCH_FORUM_LINK}">{S_WATCH_FORUM_TITLE}</a><!-- ENDIF --></td> + <td align="right" valign="middle"><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a> </td> + </tr> + </table> + </td> + </tr> - <tr> - <!-- IF S_TOPIC_ICONS --> + <tr> + <!-- IF S_TOPIC_ICONS --> <th colspan="3"> {L_TOPICS} </th> - <!-- ELSE --> + <!-- ELSE --> <th colspan="2"> {L_TOPICS} </th> - <!-- ENDIF --> - <th> {L_AUTHOR} </th> - <th> {L_REPLIES} </th> - <th> {L_VIEWS} </th> - <th> {L_LAST_POST} </th> - </tr> + <!-- ENDIF --> + <th> {L_AUTHOR} </th> + <th> {L_REPLIES} </th> + <th> {L_VIEWS} </th> + <th> {L_LAST_POST} </th> + </tr> - <!-- BEGIN topicrow --> + <!-- BEGIN topicrow --> <!-- IF topicrow.S_TOPIC_TYPE_SWITCH eq 1 --> - <tr> - <td class="row3" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><b class="gensmall">{L_ANNOUNCEMENTS}</b></td> - </tr> + <tr> + <td class="row3" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><b class="gensmall">{L_ANNOUNCEMENTS}</b></td> + </tr> <!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH eq 0 --> - <tr> - <td class="row3" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><b class="gensmall">{L_TOPICS}</b></td> - </tr> + <tr> + <td class="row3" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><b class="gensmall">{L_TOPICS}</b></td> + </tr> <!-- ENDIF --> <tr> <td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td> <!-- IF S_TOPIC_ICONS --> - <td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td> + <td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td> <!-- ENDIF --> <td class="row1"> <!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a><!-- ENDIF --> @@ -171,7 +172,7 @@ <!-- IF topicrow.PAGINATION --> <p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ] </p> <!-- ENDIF --> - </td> + </td> <td class="row2" width="100" align="center"><p class="topicauthor">{topicrow.TOPIC_AUTHOR}</p></td> <td class="row1" width="50" align="center"><p class="topicdetails">{topicrow.REPLIES}</p></td> <td class="row2" width="50" align="center"><p class="topicdetails">{topicrow.VIEWS}</p></td> @@ -183,112 +184,115 @@ </td> </tr> - <!-- BEGINELSE --> + <!-- BEGINELSE --> <tr> <!-- IF S_TOPIC_ICONS --> - <td class="row1" colspan="7" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td> + <td class="row1" colspan="7" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td> <!-- ELSE --> - <td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td> + <td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td> <!-- ENDIF --> </tr> - <!-- END topicrow --> + <!-- END topicrow --> - <tr align="center"> - <!-- IF S_TOPIC_ICONS --> - <td class="cat" colspan="8"> - <!-- ELSE --> - <td class="cat" colspan="7" > - <!-- ENDIF --> - <form method="post" action="{S_TOPIC_ACTION}"><span class="gensmall">{L_DISPLAY_TOPICS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></form></td> - </tr> + <tr align="center"> + <!-- IF S_TOPIC_ICONS --> + <td class="cat" colspan="8"> + <!-- ELSE --> + <td class="cat" colspan="7"> + <!-- ENDIF --> + <form method="post" action="{S_TOPIC_ACTION}"><span class="gensmall">{L_DISPLAY_TOPICS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></form> + </td> + </tr> </table> <table width="100%" cellspacing="1"> - <tr> - <td align="left" valign="middle"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a></td> - <td class="nav" nowrap="nowrap"> {PAGE_NUMBER}</td> - <td class="gensmall" nowrap="nowrap"> [ {TOTAL_TOPICS} ]</td> - <td class="nav" width="100%" align="right" nowrap="nowrap"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></td> - </tr> + <tr> + <td align="left" valign="middle"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a></td> + <td class="nav" nowrap="nowrap"> {PAGE_NUMBER}</td> + <td class="gensmall" nowrap="nowrap"> [ {TOTAL_TOPICS} ]</td> + <td class="nav" width="100%" align="right" nowrap="nowrap"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></td> + </tr> </table> <br clear="all" /> - <!-- ENDIF --> + <!-- ENDIF --> - </div> +</div> - <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> - <tr> - <td class="row1"> - <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> - </tr> - </table> +<table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> +<tr> + <td class="row1"> + <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> + <p class="datetime">{S_TIMEZONE}</p> + </td> +</tr> +</table> - <!-- IF S_DISPLAY_ONLINE_LIST --> +<!-- IF S_DISPLAY_ONLINE_LIST --> <br clear="all" /> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <td class="cat"><h4>{L_WHO_IS_ONLINE}</h4></td> - </tr> - <tr> - <td class="row1"><p class="gensmall">{LOGGED_IN_USER_LIST}</p></td> - </tr> + <tr> + <td class="cat"><h4>{L_WHO_IS_ONLINE}</h4></td> + </tr> + <tr> + <td class="row1"><p class="gensmall">{LOGGED_IN_USER_LIST}</p></td> + </tr> </table> - <!-- ENDIF --> +<!-- ENDIF --> - <!-- IF S_IS_POSTABLE --> +<!-- IF S_IS_POSTABLE --> <br clear="all" /> <table width="100%" cellspacing="0"> - <tr> - <td align="left" valign="top"><table cellspacing="3" cellpadding="0" border="0"> - <tr> - <td width="20" align="left">{FOLDER_NEW_IMG}</td> - <td class="gensmall">{L_NEW_POSTS}</td> - <td> </td> - <td width="20" align="center">{FOLDER_IMG}</td> - <td class="gensmall">{L_NO_NEW_POSTS}</td> - <td> </td> - <td width="20" align="center">{FOLDER_ANNOUNCE_IMG}</td> - <td class="gensmall">{L_ICON_ANNOUNCEMENT}</td> - </tr> - <tr> - <td width="20" align="center">{FOLDER_HOT_NEW_IMG}</td> - <td class="gensmall">{L_NEW_POSTS_HOT}</td> - <td> </td> - <td width="20" align="center">{FOLDER_HOT_IMG}</td> - <td class="gensmall">{L_NO_NEW_POSTS_HOT}</td> - <td> </td> - <td width="20" align="center">{FOLDER_STICKY_IMG}</td> - <td class="gensmall">{L_ICON_STICKY}</td> - </tr> - <tr> - <td class="gensmall">{FOLDER_LOCKED_NEW_IMG}</td> - <td class="gensmall">{L_NEW_POSTS_LOCKED}</td> - <td> </td> - <td class="gensmall">{FOLDER_LOCKED_IMG}</td> - <td class="gensmall">{L_NO_NEW_POSTS_LOCKED}</td> - <td> </td> - <td width="20" align="center">{FOLDER_MOVED_IMG}</td> - <td class="gensmall">{L_MOVED_TOPIC}</td> - </tr> - </table></td> - <td align="right"><span class="gensmall"><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></span></td> - </tr> + <tr> + <td align="left" valign="top"> + <table cellspacing="3" cellpadding="0" border="0"> + <tr> + <td width="20" align="left">{FOLDER_NEW_IMG}</td> + <td class="gensmall">{L_NEW_POSTS}</td> + <td> </td> + <td width="20" align="center">{FOLDER_IMG}</td> + <td class="gensmall">{L_NO_NEW_POSTS}</td> + <td> </td> + <td width="20" align="center">{FOLDER_ANNOUNCE_IMG}</td> + <td class="gensmall">{L_ICON_ANNOUNCEMENT}</td> + </tr> + <tr> + <td width="20" align="center">{FOLDER_HOT_NEW_IMG}</td> + <td class="gensmall">{L_NEW_POSTS_HOT}</td> + <td> </td> + <td width="20" align="center">{FOLDER_HOT_IMG}</td> + <td class="gensmall">{L_NO_NEW_POSTS_HOT}</td> + <td> </td> + <td width="20" align="center">{FOLDER_STICKY_IMG}</td> + <td class="gensmall">{L_ICON_STICKY}</td> + </tr> + <tr> + <td class="gensmall">{FOLDER_LOCKED_NEW_IMG}</td> + <td class="gensmall">{L_NEW_POSTS_LOCKED}</td> + <td> </td> + <td class="gensmall">{FOLDER_LOCKED_IMG}</td> + <td class="gensmall">{L_NO_NEW_POSTS_LOCKED}</td> + <td> </td> + <td width="20" align="center">{FOLDER_MOVED_IMG}</td> + <td class="gensmall">{L_MOVED_TOPIC}</td> + </tr> + </table> + </td> + <td align="right"><span class="gensmall"><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></span></td> + </tr> </table> - <!-- ENDIF --> +<!-- ENDIF --> - <br clear="all" /> +<br clear="all" /> - <table width="100%" cellspacing="0"> - <tr> - <td><!-- IF S_DISPLAY_SEARCHBOX --><!-- INCLUDE searchbox.html --><!-- ENDIF --></td> - <td align="right"><!-- INCLUDE jumpbox.html --></td> - </tr> - </table> +<table width="100%" cellspacing="0"> +<tr> + <td><!-- IF S_DISPLAY_SEARCHBOX --><!-- INCLUDE searchbox.html --><!-- ENDIF --></td> + <td align="right"><!-- INCLUDE jumpbox.html --></td> +</tr> +</table> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/viewforum_subforum.html b/phpBB/styles/subSilver/template/viewforum_subforum.html index ff1e41a2fb..cb152010c5 100644 --- a/phpBB/styles/subSilver/template/viewforum_subforum.html +++ b/phpBB/styles/subSilver/template/viewforum_subforum.html @@ -1,32 +1,33 @@ - <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <td class="cat" colspan="5" align="right"><a class="nav" href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a> </td> - </tr> - <tr> - <th colspan="2" nowrap="nowrap"> {L_FORUM} </th> - <th width="50" nowrap="nowrap"> {L_TOPICS} </th> - <th width="50" nowrap="nowrap"> {L_POSTS} </th> - <th nowrap="nowrap"> {L_LAST_POST} </th> - </tr> - <!-- BEGIN forumrow --> - <!-- IF forumrow.S_IS_CAT --> +<table class="tablebg" width="100%" cellspacing="1"> +<tr> + <td class="cat" colspan="5" align="right"><a class="nav" href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a> </td> +</tr> +<tr> + <th colspan="2" nowrap="nowrap"> {L_FORUM} </th> + <th width="50" nowrap="nowrap"> {L_TOPICS} </th> + <th width="50" nowrap="nowrap"> {L_POSTS} </th> + <th nowrap="nowrap"> {L_LAST_POST} </th> +</tr> +<!-- BEGIN forumrow --> + <!-- IF forumrow.S_IS_CAT --> <tr> <td class="cat" colspan="2"><a class="cattitle" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></td> <td class="catdiv" colspan="3" align="right"> </td> </tr> - <!-- ELSEIF forumrow.S_IS_LINK --> + <!-- ELSEIF forumrow.S_IS_LINK --> <tr> <td class="row1" width="50" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td> <td class="row1"><a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><br /> <table cellspacing="5" cellpadding="0" border="0"> - <tr> - <td><span class="gensmall">{forumrow.FORUM_DESC}</span></td> - </tr> - </table></td> + <tr> + <td><span class="gensmall">{forumrow.FORUM_DESC}</span></td> + </tr> + </table> + </td> <td class="row2" colspan="3" align="center" valign="middle"><!-- IF forumrow.CLICKS --><span class="genmed">{L_REDIRECTS}: {forumrow.CLICKS}</span><!-- ENDIF --></td> </tr> - <!-- ELSE --> + <!-- ELSE --> <tr> <td class="row1" width="50" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td> <td class="row1" width="100%"> @@ -57,8 +58,8 @@ <!-- ENDIF --> </td> </tr> - <!-- ENDIF --> - <!-- END forumrow --> - </table> + <!-- ENDIF --> +<!-- END forumrow --> +</table> - <br clear="all" /> +<br clear="all" /> diff --git a/phpBB/styles/subSilver/template/viewonline_body.html b/phpBB/styles/subSilver/template/viewonline_body.html index 34a3edf5e3..510f12f57c 100644 --- a/phpBB/styles/subSilver/template/viewonline_body.html +++ b/phpBB/styles/subSilver/template/viewonline_body.html @@ -1,62 +1,63 @@ <!-- INCLUDE overall_header.html --> - <h4>{TOTAL_REGISTERED_USERS_ONLINE}</h4> - <h4>{TOTAL_GUEST_USERS_ONLINE}<!-- IF S_SWITCH_GUEST_DISPLAY --> [ <a href="{U_SWITCH_GUEST_DISPLAY}">{L_SWITCH_GUEST_DISPLAY}</a> ]<!-- ENDIF --></h4> - <br /> +<h4>{TOTAL_REGISTERED_USERS_ONLINE}</h4> +<h4>{TOTAL_GUEST_USERS_ONLINE}<!-- IF S_SWITCH_GUEST_DISPLAY --> [ <a href="{U_SWITCH_GUEST_DISPLAY}">{L_SWITCH_GUEST_DISPLAY}</a> ]<!-- ENDIF --></h4> +<br /> - <!-- IF PAGINATION --> +<!-- IF PAGINATION --> <table width="100%" cellspacing="1"> <tr> <td class="nav" valign="middle" nowrap="nowrap"> {PAGE_NUMBER}<br /></td> <td class="gensmall" width="100%" align="right" nowrap="nowrap"><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b></td> </tr> </table> - <!-- ENDIF --> - - <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th width="40%"><a href="{U_SORT_USERNAME}">{L_USERNAME}</a></th> - <th width="20%"><a href="{U_SORT_UPDATED}">{L_LAST_UPDATED}</a></th> - <th width="40%"><a href="{U_SORT_LOCATION}">{L_FORUM_LOCATION}</a></th> - </tr> - <!-- BEGIN user_row --> - <tr> - <td class="row1"><p class="gen"><!-- IF user_row.U_USER_PROFILE --><a href="{user_row.U_USER_PROFILE}"><!-- ENDIF -->{user_row.USERNAME}<!-- IF user_row.U_USER_PROFILE --></a><!-- ENDIF --></p><!-- IF user_row.USER_IP --><p class="gensmall">{L_IP}: <a href="{user_row.U_USER_IP}">{user_row.USER_IP}</a> » <a href="{user_row.U_WHOIS}" onclick="popup('{user_row.U_WHOIS}', 750, 500);return false">{L_WHOIS}</a></p><!-- ENDIF --></td> - <td class="row2" align="center" nowrap="nowrap"><p class="genmed"> {user_row.LASTUPDATE}</p></td> - <td class="row1"><p class="genmed"><a href="{user_row.U_FORUM_LOCATION}">{user_row.FORUM_LOCATION}</a></p></td> - </tr> - <!-- END user_row --> - <!-- IF LEGEND --> - <tr> - <td class="row1" colspan="3"><b class="gensmall">{L_LEGEND} :: {LEGEND}</b></td> - </tr> - <!-- ENDIF --> - </table> +<!-- ENDIF --> + +<table class="tablebg" width="100%" cellspacing="1"> +<tr> + <th width="40%"><a href="{U_SORT_USERNAME}">{L_USERNAME}</a></th> + <th width="20%"><a href="{U_SORT_UPDATED}">{L_LAST_UPDATED}</a></th> + <th width="40%"><a href="{U_SORT_LOCATION}">{L_FORUM_LOCATION}</a></th> +</tr> +<!-- BEGIN user_row --> + <tr> + <td class="row1"><p class="gen"><!-- IF user_row.U_USER_PROFILE --><a href="{user_row.U_USER_PROFILE}"><!-- ENDIF -->{user_row.USERNAME}<!-- IF user_row.U_USER_PROFILE --></a><!-- ENDIF --></p><!-- IF user_row.USER_IP --><p class="gensmall">{L_IP}: <a href="{user_row.U_USER_IP}">{user_row.USER_IP}</a> » <a href="{user_row.U_WHOIS}" onclick="popup('{user_row.U_WHOIS}', 750, 500);return false">{L_WHOIS}</a></p><!-- ENDIF --></td> + <td class="row2" align="center" nowrap="nowrap"><p class="genmed"> {user_row.LASTUPDATE}</p></td> + <td class="row1"><p class="genmed"><a href="{user_row.U_FORUM_LOCATION}">{user_row.FORUM_LOCATION}</a></p></td> + </tr> +<!-- END user_row --> - <!-- IF PAGINATION --> +<!-- IF LEGEND --> + <tr> + <td class="row1" colspan="3"><b class="gensmall">{L_LEGEND} :: {LEGEND}</b></td> + </tr> +<!-- ENDIF --> +</table> + +<!-- IF PAGINATION --> <table width="100%" cellspacing="1"> <tr> <td class="nav" valign="middle" nowrap="nowrap"> {PAGE_NUMBER}<br /></td> <td class="gensmall" width="100%" align="right" nowrap="nowrap"><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b></td> </tr> </table> - <!-- ENDIF --> +<!-- ENDIF --> - <div class="gensmall" align="right">{L_ONLINE_EXPLAIN}</div> +<div class="gensmall" align="right">{L_ONLINE_EXPLAIN}</div> - <br clear="all" /> +<br clear="all" /> - <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> - <tr> - <td class="row1"> - <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> - </tr> - </table> +<table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> +<tr> + <td class="row1"> + <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> + <p class="datetime">{S_TIMEZONE}</p> + </td> +</tr> +</table> - <br clear="all" /> +<br clear="all" /> - <div align="right"><!-- INCLUDE jumpbox.html --></div> +<div align="right"><!-- INCLUDE jumpbox.html --></div> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/viewonline_whois.html b/phpBB/styles/subSilver/template/viewonline_whois.html index 2b98660943..d10fa2ac0f 100644 --- a/phpBB/styles/subSilver/template/viewonline_whois.html +++ b/phpBB/styles/subSilver/template/viewonline_whois.html @@ -1,13 +1,12 @@ <!-- INCLUDE simple_header.html --> - <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th>{L_WHOIS}</th> - </tr> - <tr> - <td class="row1"><pre>{WHOIS}</pre></td> - </tr> - </table> - +<table class="tablebg" width="100%" cellspacing="1"> +<tr> + <th>{L_WHOIS}</th> +</tr> +<tr> + <td class="row1"><pre>{WHOIS}</pre></td> +</tr> +</table> <!-- INCLUDE simple_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/viewtopic_body.html b/phpBB/styles/subSilver/template/viewtopic_body.html index 6362199c5e..325ebba88a 100644 --- a/phpBB/styles/subSilver/template/viewtopic_body.html +++ b/phpBB/styles/subSilver/template/viewtopic_body.html @@ -1,6 +1,6 @@ <!-- INCLUDE overall_header.html --> - <!-- IF S_FORUM_RULES --> +<!-- IF S_FORUM_RULES --> <div class="forumrules"> <!-- IF U_FORUM_RULES --> <h3 style="color:red">{L_FORUM_RULES}</h3><br /> @@ -12,325 +12,333 @@ </div> <br clear="all" /> - <!-- ENDIF --> +<!-- ENDIF --> - <div id="pageheader"> - <h2><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2> +<div id="pageheader"> + <h2><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2> - <!-- IF MODERATORS --> - <p class="moderators">{L_MODERATORS}: {MODERATORS}</p> - <!-- ENDIF --> - <!-- IF U_MCP --> - <p class="linkmcp">[ <a href="{U_MCP}">{L_MCP}</a> ]</p> - <!-- ENDIF --> - </div> +<!-- IF MODERATORS --> + <p class="moderators">{L_MODERATORS}: {MODERATORS}</p> +<!-- ENDIF --> +<!-- IF U_MCP --> + <p class="linkmcp">[ <a href="{U_MCP}">{L_MCP}</a> ]</p> +<!-- ENDIF --> +</div> + +<br clear="all" /><br /> - <br clear="all" /><br /> +<div id="pagecontent"> - <div id="pagecontent"> + <table width="100%" cellspacing="1"> + <tr> + <td align="left" valign="middle" nowrap="nowrap"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a> <a href="{U_POST_REPLY_TOPIC}">{REPLY_IMG}</a></td> + <!-- IF TOTAL_POSTS --> + <td class="nav" valign="middle" nowrap="nowrap"> {PAGE_NUMBER}<br /></td> + <td class="gensmall" nowrap="nowrap"> [ {TOTAL_POSTS} ] </td> + <td class="gensmall" width="100%" align="right" nowrap="nowrap"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></td> + <!-- ENDIF --> + </tr> + </table> - <table width="100%" cellspacing="1"> + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <td class="cat" colspan="2"> + <table width="100%" cellspacing="0"> <tr> - <td align="left" valign="middle" nowrap="nowrap"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a> <a href="{U_POST_REPLY_TOPIC}">{REPLY_IMG}</a></td> - <!-- IF TOTAL_POSTS --> - <td class="nav" valign="middle" nowrap="nowrap"> {PAGE_NUMBER}<br /></td> - <td class="gensmall" nowrap="nowrap"> [ {TOTAL_POSTS} ] </td> - <td class="gensmall" width="100%" align="right" nowrap="nowrap"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></td> - <!-- ENDIF --> + <td class="nav" nowrap="nowrap"> + <!-- IF U_WATCH_TOPIC --><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}">{L_WATCH_TOPIC}</a><!-- IF U_PRINT_TOPIC or U_EMAIL_TOPIC or U_BUMP_TOPIC or U_BOOKMARK_TOPIC --> | <!-- ENDIF --><!-- ENDIF --> + <!-- IF U_BOOKMARK_TOPIC --><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}">{L_BOOKMARK_TOPIC}</a><!-- IF U_PRINT_TOPIC or U_EMAIL_TOPIC or U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF --> + <!-- IF U_PRINT_TOPIC --><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}">{L_PRINT_TOPIC}</a><!-- IF U_EMAIL_TOPIC or U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF --> + <!-- IF U_EMAIL_TOPIC --><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}">{L_EMAIL_TOPIC}</a><!-- IF U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF --> + <!-- IF U_BUMP_TOPIC --><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}">{L_BUMP_TOPIC}</a><!-- ENDIF --> + </td> + <td class="nav" align="right" nowrap="nowrap"><a href="{U_VIEW_OLDER_TOPIC}">{L_VIEW_PREVIOUS_TOPIC}</a> | <a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> | <a href="{U_VIEW_NEWER_TOPIC}">{L_VIEW_NEXT_TOPIC}</a> </td> </tr> - </table> + </table> + </td> + </tr> +<!-- IF S_HAS_POLL --> + <tr> + <td class="row2" colspan="2" align="center"><br clear="all" /> + + <form method="post" action="{S_POLL_ACTION}"> - <table class="tablebg" width="100%" cellspacing="1"> + <table cellspacing="0" cellpadding="4" border="0" align="center"> <tr> - <td class="cat" colspan="2"><table width="100%" cellspacing="0"> - <tr> - <td class="nav" nowrap="nowrap"> - <!-- IF U_WATCH_TOPIC --><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}">{L_WATCH_TOPIC}</a><!-- IF U_PRINT_TOPIC or U_EMAIL_TOPIC or U_BUMP_TOPIC or U_BOOKMARK_TOPIC --> | <!-- ENDIF --><!-- ENDIF --> - <!-- IF U_BOOKMARK_TOPIC --><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}">{L_BOOKMARK_TOPIC}</a><!-- IF U_PRINT_TOPIC or U_EMAIL_TOPIC or U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF --> - <!-- IF U_PRINT_TOPIC --><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}">{L_PRINT_TOPIC}</a><!-- IF U_EMAIL_TOPIC or U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF --> - <!-- IF U_EMAIL_TOPIC --><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}">{L_EMAIL_TOPIC}</a><!-- IF U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF --> - <!-- IF U_BUMP_TOPIC --><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}">{L_BUMP_TOPIC}</a><!-- ENDIF --> - </td> - <td class="nav" align="right" nowrap="nowrap"><a href="{U_VIEW_OLDER_TOPIC}">{L_VIEW_PREVIOUS_TOPIC}</a> | <a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> | <a href="{U_VIEW_NEWER_TOPIC}">{L_VIEW_NEXT_TOPIC}</a> </td> - </tr> - </table></td> + <td align="center"><span class="gen"><b>{POLL_QUESTION}</b></span><br /><span class="gensmall">{L_POLL_LENGTH}</span></td> </tr> - <!-- IF S_HAS_POLL --> <tr> - <td class="row2" colspan="2" align="center"><br clear="all" /><form method="post" action="{S_POLL_ACTION}"> - - <table cellspacing="0" cellpadding="4" border="0" align="center"> - <tr> - <td align="center"><span class="gen"><b>{POLL_QUESTION}</b></span><br /><span class="gensmall">{L_POLL_LENGTH}</span></td> - </tr> - <tr> - <td align="left"><table cellspacing="0" cellpadding="2" border="0"> - <!-- BEGIN poll_option --> - <tr> - <!-- IF S_CAN_VOTE --> - <td> - <!-- IF S_IS_MULTI_CHOICE --> - <input type="checkbox" class="radio" name="vote_id[]" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /> - <!-- ELSE --> - <input type="radio" class="radio" name="vote_id[]" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /> - <!-- ENDIF --> - </td> - <!-- ENDIF --> - <td><span class="gen">{poll_option.POLL_OPTION_CAPTION}</span></td> - <!-- IF S_DISPLAY_RESULTS --> - <td>{POLL_LEFT_CAP_IMG}{poll_option.POLL_OPTION_IMG}{POLL_RIGHT_CAP_IMG}</td> - <td class="gen" align="right"><b> {poll_option.POLL_OPTION_PERCENT} </b></td> - <td class="gen" align="center">[ {poll_option.POLL_OPTION_RESULT} ]</td> - <!-- IF poll_option.POLL_OPTION_VOTED --> - <td class="gensmall" valign="top"><b title="{L_POLL_VOTED_OPTION}">x</b></td> - <!-- ENDIF --> - <!-- ENDIF --> - </tr> - <!-- END poll_option --> - </table></td> - </tr> - <!-- IF S_CAN_VOTE --> - <tr> - <td align="center"><span class="gensmall">{L_MAX_VOTES}</span><br /><br /><input type="submit" name="update" value="{L_SUBMIT_VOTE}" class="btnlite" /></td> - </tr> - <!-- ENDIF --> + <td align="left"> + <table cellspacing="0" cellpadding="2" border="0"> + <!-- BEGIN poll_option --> + <tr> + <!-- IF S_CAN_VOTE --> + <td> + <!-- IF S_IS_MULTI_CHOICE --> + <input type="checkbox" class="radio" name="vote_id[]" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /> + <!-- ELSE --> + <input type="radio" class="radio" name="vote_id[]" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /> + <!-- ENDIF --> + </td> + <!-- ENDIF --> + <td><span class="gen">{poll_option.POLL_OPTION_CAPTION}</span></td> <!-- IF S_DISPLAY_RESULTS --> - <tr> - <td class="gensmall" colspan="4" align="center"><b>{L_TOTAL_VOTES} : {TOTAL_VOTES}</b></td> - </tr> - <!-- ELSE --> - <tr> - <td align="center"><span class="gensmall"><b><a href="{U_VIEW_RESULTS}">{L_VIEW_RESULTS}</a></b></span></td> - </tr> + <td>{POLL_LEFT_CAP_IMG}{poll_option.POLL_OPTION_IMG}{POLL_RIGHT_CAP_IMG}</td> + <td class="gen" align="right"><b> {poll_option.POLL_OPTION_PERCENT} </b></td> + <td class="gen" align="center">[ {poll_option.POLL_OPTION_RESULT} ]</td> + <!-- IF poll_option.POLL_OPTION_VOTED --> + <td class="gensmall" valign="top"><b title="{L_POLL_VOTED_OPTION}">x</b></td> + <!-- ENDIF --> <!-- ENDIF --> + </tr> + <!-- END poll_option --> </table> - {S_HIDDEN_FIELDS}</form></td> + </td> </tr> - <!-- ENDIF --> - </table> - - <!-- BEGIN postrow --> - <table class="tablebg" width="100%" cellspacing="1"> - <!-- IF postrow.S_FIRST_ROW --> + <!-- IF S_CAN_VOTE --> <tr> - <th>{L_AUTHOR}</th> - <th>{L_MESSAGE}</th> + <td align="center"><span class="gensmall">{L_MAX_VOTES}</span><br /><br /><input type="submit" name="update" value="{L_SUBMIT_VOTE}" class="btnlite" /></td> </tr> - <!-- ENDIF --> - <!-- IF postrow.S_ROW_COUNT is even --> - <tr class="row1"> - <!-- ELSE --> - <tr class="row2"> - <!-- ENDIF --> - - <!-- IF postrow.S_IGNORE_POST --> - <td class="gensmall" colspan="2" height="25" align="center">{postrow.L_IGNORE_POST}</td> - <!-- ELSE --> - <td align="center" valign="middle"><!-- IF postrow.S_FIRST_UNREAD --><a name="unread"></a><!-- ENDIF --><a name="p{postrow.POST_ID}"></a><b class="postauthor">{postrow.POSTER_NAME}</b></td> - <td width="100%" height="25"><table width="100%" cellspacing="0"> - <tr> - <!-- IF postrow.POST_ICON_IMG --> - <td><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" title="" /></td> - <!-- ENDIF --> - <td class="gensmall" width="100%"><div style="float:left"> <b>{L_POST_SUBJECT}:</b> {postrow.POST_SUBJECT}</div><div style="float:right"><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><b>{L_POSTED}:</b> {postrow.POST_DATE} </div></td> - </tr> - </table></td> + <!-- ENDIF --> + <!-- IF S_DISPLAY_RESULTS --> + <tr> + <td class="gensmall" colspan="4" align="center"><b>{L_TOTAL_VOTES} : {TOTAL_VOTES}</b></td> </tr> + <!-- ELSE --> + <tr> + <td align="center"><span class="gensmall"><b><a href="{U_VIEW_RESULTS}">{L_VIEW_RESULTS}</a></b></span></td> + </tr> + <!-- ENDIF --> + </table> + {S_HIDDEN_FIELDS} + + </form> + + </td> + </tr> +<!-- ENDIF --> + </table> - <!-- IF postrow.S_ROW_COUNT is even --> - <tr class="row1"> - <!-- ELSE --> - <tr class="row2"> - <!-- ENDIF --> - <td valign="top"> +<!-- BEGIN postrow --> + <table class="tablebg" width="100%" cellspacing="1"> + <!-- IF postrow.S_FIRST_ROW --> + <tr> + <th>{L_AUTHOR}</th> + <th>{L_MESSAGE}</th> + </tr> + <!-- ENDIF --> + <!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + + <!-- IF postrow.S_IGNORE_POST --> + <td class="gensmall" colspan="2" height="25" align="center">{postrow.L_IGNORE_POST}</td> + <!-- ELSE --> + <td align="center" valign="middle"><!-- IF postrow.S_FIRST_UNREAD --><a name="unread"></a><!-- ENDIF --><a name="p{postrow.POST_ID}"></a><b class="postauthor">{postrow.POSTER_NAME}</b></td> + <td width="100%" height="25"> + <table width="100%" cellspacing="0"> + <tr> + <!-- IF postrow.POST_ICON_IMG --> + <td><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" title="" /></td> + <!-- ENDIF --> + <td class="gensmall" width="100%"><div style="float:left"> <b>{L_POST_SUBJECT}:</b> {postrow.POST_SUBJECT}</div><div style="float:right"><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><b>{L_POSTED}:</b> {postrow.POST_DATE} </div></td> + </tr> + </table> + </td> + </tr> - <table cellspacing="4" align="center" width="150"> - <!-- IF postrow.ONLINE_IMG --> - <tr> - <td>{postrow.ONLINE_IMG}</td> - </tr> - <!-- ENDIF --> - <!-- IF postrow.POSTER_RANK --> - <tr> - <td class="postdetails">{postrow.POSTER_RANK}</td> - </tr> - <!-- ENDIF --> - <!-- IF postrow.RANK_IMAGE --> - <tr> - <td>{postrow.RANK_IMAGE}</td> - </tr> - <!-- ENDIF --> - <!-- IF postrow.POSTER_AVATAR --> - <tr> - <td>{postrow.POSTER_AVATAR}</td> - </tr> - <!-- ENDIF --> - </table> + <!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + + <td valign="top"> + <table cellspacing="4" align="center" width="150"> + <!-- IF postrow.ONLINE_IMG --> + <tr> + <td>{postrow.ONLINE_IMG}</td> + </tr> + <!-- ENDIF --> + <!-- IF postrow.POSTER_RANK --> + <tr> + <td class="postdetails">{postrow.POSTER_RANK}</td> + </tr> + <!-- ENDIF --> + <!-- IF postrow.RANK_IMAGE --> + <tr> + <td>{postrow.RANK_IMAGE}</td> + </tr> + <!-- ENDIF --> + <!-- IF postrow.POSTER_AVATAR --> + <tr> + <td>{postrow.POSTER_AVATAR}</td> + </tr> + <!-- ENDIF --> + </table> - <span class="postdetails"> + <span class="postdetails"> <!-- IF postrow.POSTER_JOINED --><br /><b>{L_JOINED}:</b> {postrow.POSTER_JOINED}<!-- ENDIF --> <!-- IF postrow.POSTER_POSTS != '' --><br /><b>{L_POSTS}:</b> {postrow.POSTER_POSTS}<!-- ENDIF --> <!-- IF postrow.POSTER_FROM --><br /><b>{L_LOCATION}:</b> {postrow.POSTER_FROM}<!-- ENDIF --> + <!-- IF postrow.S_PROFILE_FIELD1 --> - <!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. --> + <!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. --> <br /><b>{postrow.PROFILE_FIELD1_NAME}:</b> {postrow.PROFILE_FIELD1_VALUE} <!-- ENDIF --> + <!-- BEGIN custom_fields --> <br /><b>{postrow.custom_fields.PROFILE_FIELD_NAME}:</b> {postrow.custom_fields.PROFILE_FIELD_VALUE} <!-- END custom_fields --> - </span> + </span> - </td> - <td valign="top"><table width="100%" cellspacing="5"> - <tr> - <td> + </td> + <td valign="top"> + <table width="100%" cellspacing="5"> + <tr> + <td> + <!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_REPORTED --> + <table width="100%" cellspacing="0"> + <tr> + <td class="gensmall"><!-- IF postrow.S_POST_UNAPPROVED --><span class="postapprove">{UNAPPROVED_IMG} <a href="{postrow.U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></span> <!-- ENDIF --> <!-- IF postrow.S_POST_REPORTED --><span class="postreported">{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}">{L_POST_REPORTED}</a></span><!-- ENDIF --></td> + </tr> + </table> - <!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_REPORTED --> - <table width="100%" cellspacing="0"> - <tr> - <td class="gensmall"><!-- IF postrow.S_POST_UNAPPROVED --><span class="postapprove">{UNAPPROVED_IMG} <a href="{postrow.U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></span> <!-- ENDIF --> <!-- IF postrow.S_POST_REPORTED --><span class="postreported">{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}">{L_POST_REPORTED}</a></span><!-- ENDIF --></td> - </tr> - </table> + <br clear="all" /> + <!-- ENDIF --> - <br clear="all" /> - <!-- ENDIF --> + <div class="postbody">{postrow.MESSAGE}</div> - <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 --> - <!-- IF postrow.S_HAS_ATTACHMENTS --> - <br clear="all" /><br /> + <!-- IF postrow.S_DISPLAY_NOTICE --> + <span class="gensmall" style="color:red;"><br /><br />{L_DOWNLOAD_NOTICE}</span> + <!-- ENDIF --> + <!-- IF postrow.SIGNATURE --> + <span class="postbody"><br />_________________<br />{postrow.SIGNATURE}</span> + <!-- ENDIF --> + <!-- IF postrow.EDITED_MESSAGE or postrow.EDIT_REASON --> + <!-- IF postrow.EDIT_REASON --> + <br /><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 --> + <tr> + <td class="row3"><span class="gensmall">{postrow.EDITED_MESSAGE}</span></td> + </tr> + <tr> + <td class="row2"><span class="genmed">{postrow.EDIT_REASON}</span></td> + </tr> </table> - <!-- ENDIF --> + <!-- ELSE --> + <br /><br /> + <span class="gensmall">{postrow.EDITED_MESSAGE}</span> + <!-- ENDIF --> + <!-- ENDIF --> - <!-- IF postrow.S_DISPLAY_NOTICE --> - <span class="gensmall" style="color:red;"><br /><br />{L_DOWNLOAD_NOTICE}</span> - <!-- ENDIF --> - <!-- IF postrow.SIGNATURE --> - <span class="postbody"><br />_________________<br />{postrow.SIGNATURE}</span> - <!-- ENDIF --> - <!-- IF postrow.EDITED_MESSAGE or postrow.EDIT_REASON --> - <!-- IF postrow.EDIT_REASON --> - <br /><br /> - <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <td class="row3"><span class="gensmall">{postrow.EDITED_MESSAGE}</span></td> - </tr> - <tr> - <td class="row2"><span class="genmed">{postrow.EDIT_REASON}</span></td> - </tr> - </table> - <!-- ELSE --> - <br /><br /> - <span class="gensmall">{postrow.EDITED_MESSAGE}</span> - <!-- ENDIF --> - <!-- ENDIF --> - <!-- IF postrow.BUMPED_MESSAGE --> - <span class="gensmall">{postrow.BUMPED_MESSAGE}</span> - <!-- ENDIF --> + <!-- IF postrow.BUMPED_MESSAGE --> + <span class="gensmall">{postrow.BUMPED_MESSAGE}</span> + <!-- ENDIF --> - <!-- IF not postrow.S_HAS_ATTACHMENTS --><br clear="all" /><br /><!-- ENDIF --> + <!-- IF not postrow.S_HAS_ATTACHMENTS --><br clear="all" /><br /><!-- ENDIF --> - <table width="100%" cellspacing="0"> - <tr valign="middle"> - <!-- IF postrow.S_CAN_RATE --> - <td class="gensmall"><b>{L_RATE}:</b> <a style="color:green" href="{postrow.U_RATE_GOOD}">{L_RATE_GOOD}</a> / <a style="color:red" href="{postrow.U_RATE_BAD}">{L_RATE_BAD}</a></td> - <!-- ENDIF --> - <td class="gensmall" align="right"><!-- IF postrow.U_REPORT --><a href="{postrow.U_REPORT}">{REPORT_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_INFO --><a href="{postrow.U_INFO}">{INFO_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_WARN --><a href="{postrow.U_WARN}">{WARN_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_DELETE --><a href="{postrow.U_DELETE}">{DELETE_IMG}</a> <!-- ENDIF --></td> - </tr> - </table> + <table width="100%" cellspacing="0"> + <tr valign="middle"> + <td class="gensmall" align="right"> + <!-- IF postrow.U_REPORT --><a href="{postrow.U_REPORT}">{REPORT_IMG}</a> <!-- ENDIF --> + <!-- IF postrow.U_INFO --><a href="{postrow.U_INFO}">{INFO_IMG}</a> <!-- ENDIF --> + <!-- IF postrow.U_WARN --><a href="{postrow.U_WARN}">{WARN_IMG}</a> <!-- ENDIF --> + <!-- IF postrow.U_DELETE --><a href="{postrow.U_DELETE}">{DELETE_IMG}</a> <!-- ENDIF --> + </td> + </tr> + </table> + </td> + </tr> + </table> + </td> + </tr> - </td> - </tr> - </table></td> - </tr> + <!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <!-- IF postrow.S_ROW_COUNT is even --> - <tr class="row1"> - <!-- ELSE --> - <tr class="row2"> - <!-- ENDIF --> - <td nowrap="nowrap"> </td> - <td><div class="gensmall" style="float:left"> <!-- IF postrow.U_PROFILE --><a href="{postrow.U_PROFILE}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_PM --><a href="{postrow.U_PM}">{PM_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_EMAIL --><a href="{postrow.U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF --> </div> <div class="gensmall" style="float:right"><!-- IF postrow.U_QUOTE --><a href="{postrow.U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_EDIT --><a href="{postrow.U_EDIT}">{EDIT_IMG}</a> <!-- ENDIF --> </div></td> - </tr> + <td nowrap="nowrap"> </td> + <td><div class="gensmall" style="float: left;"> <!-- IF postrow.U_PROFILE --><a href="{postrow.U_PROFILE}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_PM --><a href="{postrow.U_PM}">{PM_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_EMAIL --><a href="{postrow.U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF --> </div> <div class="gensmall" style="float:right"><!-- IF postrow.U_QUOTE --><a href="{postrow.U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_EDIT --><a href="{postrow.U_EDIT}">{EDIT_IMG}</a> <!-- ENDIF --> </div></td> + </tr> - <!-- ENDIF --> - <tr> - <td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> - </tr> - </table> - <!-- END postrow --> - - <table width="100%" cellspacing="1" class="tablebg"> - <tr align="center"> - <td class="cat" colspan="2"><form name="viewtopic" method="post" action="{S_TOPIC_ACTION}"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></form></td> - </tr> - </table> + <!-- ENDIF --> + + <tr> + <td class="spacer" colspan="2" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td> + </tr> + </table> +<!-- END postrow --> - <table width="100%" cellspacing="1"> - <tr> - <td align="left" valign="middle" nowrap="nowrap"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a> <a href="{U_POST_REPLY_TOPIC}">{REPLY_IMG}</a></td> - <!-- IF TOTAL_POSTS --> - <td class="nav" valign="middle" nowrap="nowrap"> {PAGE_NUMBER}<br /></td> - <td class="gensmall" nowrap="nowrap"> [ {TOTAL_POSTS} ] </td> - <td class="gensmall" width="100%" align="right" nowrap="nowrap"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></td> - <!-- ENDIF --> - </tr> - </table> + <table width="100%" cellspacing="1" class="tablebg"> + <tr align="center"> + <td class="cat" colspan="2"><form name="viewtopic" method="post" action="{S_TOPIC_ACTION}"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></form></td> + </tr> + </table> - </div> + <table width="100%" cellspacing="1"> + <tr> + <td align="left" valign="middle" nowrap="nowrap"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a> <a href="{U_POST_REPLY_TOPIC}">{REPLY_IMG}</a></td> + <!-- IF TOTAL_POSTS --> + <td class="nav" valign="middle" nowrap="nowrap"> {PAGE_NUMBER}<br /></td> + <td class="gensmall" nowrap="nowrap"> [ {TOTAL_POSTS} ] </td> + <td class="gensmall" width="100%" align="right" nowrap="nowrap"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a> <!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> <a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></td> + <!-- ENDIF --> + </tr> + </table> - <div id="pagefooter"></div> +</div> - <br clear="all" /> +<div id="pagefooter"></div> - <table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> - <tr> - <td class="row1"> - <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> - <p class="datetime">{S_TIMEZONE}</p> - </td> - </tr> - </table> +<br clear="all" /> + +<table class="tablebg" width="100%" cellspacing="1" cellpadding="0"> +<tr> + <td class="row1"> + <p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p> + <p class="datetime">{S_TIMEZONE}</p> + </td> +</tr> +</table> - <!-- IF S_DISPLAY_ONLINE_LIST --> +<!-- IF S_DISPLAY_ONLINE_LIST --> <br clear="all" /> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <td class="cat"><h4>{L_WHO_IS_ONLINE}</h4></td> - </tr> - <tr> - <td class="row1"><p class="gensmall">{LOGGED_IN_USER_LIST}</p></td> - </tr> + <tr> + <td class="cat"><h4>{L_WHO_IS_ONLINE}</h4></td> + </tr> + <tr> + <td class="row1"><p class="gensmall">{LOGGED_IN_USER_LIST}</p></td> + </tr> </table> - <!-- ENDIF --> +<!-- ENDIF --> - <br clear="all" /> +<br clear="all" /> - <table width="100%" cellspacing="1"> - <tr> - <td width="40%" valign="top" nowrap="nowrap" align="left"><!-- IF S_TOPIC_MOD --><form method="post" action="{S_MOD_ACTION}"><span class="gensmall">{L_QUICK_MOD}:</span> {S_TOPIC_MOD} <input class="btnlite" type="submit" value="{L_GO}" /></form><!-- ENDIF --></td> - <td align="right" valign="top" nowrap="nowrap"><span class="gensmall"><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></span></td> - </tr> - </table> +<table width="100%" cellspacing="1"> +<tr> + <td width="40%" valign="top" nowrap="nowrap" align="left"><!-- IF S_TOPIC_MOD --><form method="post" action="{S_MOD_ACTION}"><span class="gensmall">{L_QUICK_MOD}:</span> {S_TOPIC_MOD} <input class="btnlite" type="submit" value="{L_GO}" /></form><!-- ENDIF --></td> + <td align="right" valign="top" nowrap="nowrap"><span class="gensmall"><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></span></td> +</tr> +</table> - <br clear="all" /> +<br clear="all" /> - <table width="100%" cellspacing="0"> - <tr> - <td><!-- IF S_DISPLAY_SEARCHBOX --><!-- INCLUDE searchbox.html --><!-- ENDIF --></td> - <td align="right"><!-- INCLUDE jumpbox.html --></td> - </tr> - </table> +<table width="100%" cellspacing="0"> +<tr> + <td><!-- IF S_DISPLAY_SEARCHBOX --><!-- INCLUDE searchbox.html --><!-- ENDIF --></td> + <td align="right"><!-- INCLUDE jumpbox.html --></td> +</tr> +</table> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/viewtopic_print.html b/phpBB/styles/subSilver/template/viewtopic_print.html index 57c789aab4..c286fcf660 100644 --- a/phpBB/styles/subSilver/template/viewtopic_print.html +++ b/phpBB/styles/subSilver/template/viewtopic_print.html @@ -4,34 +4,37 @@ <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}"> <meta http-equiv="Content-Style-Type" content="text/css"> <title>{SITENAME} :: {PAGE_TITLE}</title> + <style type="text/css"> <!-- + body { - font-family: Verdana,serif; - font-size: 10pt; + font-family: Verdana,serif; + font-size: 10pt; } td { - font-family: Verdana,serif; - font-size: 10pt; - line-height: 150%; + font-family: Verdana,serif; + font-size: 10pt; + line-height: 150%; } -.code, .quote { - font-size: smaller; - border: black solid 1px; +.code, +.quote { + font-size: smaller; + border: black solid 1px; } .forum { - font-family: Arial,Helvetica,sans-serif; - font-weight: bold; - font-size: 18pt; + font-family: Arial,Helvetica,sans-serif; + font-weight: bold; + font-size: 18pt; } .topic { - font-family: Arial,Helvetica,sans-serif; - font-size: 14pt; - font-weight: bold; + font-family: Arial,Helvetica,sans-serif; + font-size: 14pt; + font-weight: bold; } .gensmall { @@ -39,39 +42,40 @@ td { } hr { - color: #888888; - height: 3px; - border-style: solid; + color: #888; + height: 3px; + border-style: solid; } -hr.sep { - color: #AAAAAA; - height: 1px; - border-style: dashed; +hr.sep { + color: #aaa; + height: 1px; + border-style: dashed; } ---> +//--> </style> + </head> <body> <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center"> - <tr> - <td colspan="2" align="center"><span class="Forum">{SITENAME}</span><br /><span class="gensmall">{U_FORUM}</a></span></td> - </tr> - <tr> - <td colspan="2"><br /></td> - </tr> - <tr> - <td><span class="Topic">{TOPIC_TITLE}</span><br /><span class="gensmall">{U_TOPIC}</a></span></td> - <td align="right" valign="bottom"><span class="gensmall">{PAGE_NUMBER}</span></td> - </tr> +<tr> + <td colspan="2" align="center"><span class="Forum">{SITENAME}</span><br /><span class="gensmall">{U_FORUM}</a></span></td> +</tr> +<tr> + <td colspan="2"><br /></td> +</tr> +<tr> + <td><span class="topic">{TOPIC_TITLE}</span><br /><span class="gensmall">{U_TOPIC}</a></span></td> + <td align="right" valign="bottom"><span class="gensmall">{PAGE_NUMBER}</span></td> +</tr> </table> <!-- BEGIN postrow --> -<hr width="85%" /> + <hr width="85%" /> -<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center"> + <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center"> <tr> <td width="10%" nowrap="nowrap">{L_AUTHOR}: </td> <td><b>{postrow.POSTER_NAME}</b> [ {postrow.POST_DATE} ]</td> @@ -83,7 +87,7 @@ hr.sep { <tr> <td colspan="2"><hr class="sep" />{postrow.MESSAGE}</td> </tr> -</table> + </table> <!-- END postrow --> <hr width="85%" /> @@ -96,14 +100,15 @@ hr.sep { The phpBB Group : 2006 // --> + <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center"> - <tr> - <td><span class="gensmall">{PAGE_NUMBER}</span></td> - <td align="right"><span class="gensmall">{S_TIMEZONE}</span></td> - </tr> - <tr> - <td colspan="2" align="center"><span class="gensmall">Powered by phpBB © 2002, 2006 phpBB Group<br />http://www.phpbb.com/</span></td> - </tr> +<tr> + <td><span class="gensmall">{PAGE_NUMBER}</span></td> + <td align="right"><span class="gensmall">{S_TIMEZONE}</span></td> +</tr> +<tr> + <td colspan="2" align="center"><span class="gensmall">Powered by phpBB © 2002, 2006 phpBB Group<br />http://www.phpbb.com/</span></td> +</tr> </table> </body> diff --git a/phpBB/styles/subSilver/theme/stylesheet.css b/phpBB/styles/subSilver/theme/stylesheet.css index 2dcc6687f6..14daf52432 100644 --- a/phpBB/styles/subSilver/theme/stylesheet.css +++ b/phpBB/styles/subSilver/theme/stylesheet.css @@ -107,39 +107,46 @@ h1 { font-weight: bold; font-size: 1.8em; text-decoration: none; - } +} + h2 { font-family: Arial, Helvetica, sans-serif; font-weight: bold; font-size: 1.5em; text-decoration: none; line-height: 120%; - } +} + h3 { font-size: 1.3em; font-weight: bold; font-family: Arial, Helvetica, sans-serif; line-height: 120%; - } +} + h4 { margin: 0px; font-size: 1.1em; font-weight: bold; - } +} + p { font-size: 1.1em; - } +} + p.moderators { margin: 0px; float: left; color: black; font-weight: bold; - } +} + p.linkmcp { margin: 0px; float: right; white-space: nowrap; - } +} + p.breadcrumbs { margin: 0px; float: left; @@ -147,50 +154,60 @@ p.breadcrumbs { font-weight: bold; white-space: normal; font-size: 1em; - } +} + p.datetime { margin: 0px; float: right; white-space: nowrap; font-size: 1em; - } +} + p.searchbar { padding: 2px 0; white-space: nowrap; - } +} + p.searchbarreg { margin: 0px; float: right; white-space: nowrap; - } +} + p.forumdesc { padding-bottom: 4px; - } +} + p.topicauthor { margin: 1px 0px; - } +} + p.topicdetails { margin: 1px 0px; - } +} + .postreported, .postreported a:visited, .postreported a:hover, .postreported a:link, .postreported a:active { margin: 1px 0px; color: red; font-weight:bold; - } +} + .postapprove, .postapprove a:visited, .postapprove a:hover, .postapprove a:link, .postapprove a:active { color: green; font-weight:bold; - } +} + .postapprove img, .postreported img { vertical-align: bottom; - } +} .postauthor { color: #000000; - } +} + .postdetails { color: #000000; - } +} .postbody { font-size: 1.3em; @@ -204,47 +221,56 @@ p.topicdetails { .posthilit { background-color: yellow; - } +} + .nav { margin: 0px; color: black; font-weight: bold; - } +} + .pagination { padding: 4px; color: black; font-size: 1em; font-weight: bold; - } +} + .cattitle { - } + +} .gen { margin: 1px 1px; font-size: 1.2em; - } +} + .genmed { margin: 1px 1px; font-size: 1.1em; - } +} + .gensmall { margin: 1px 1px; font-size: 1em; - } +} + .copyright { color: #444; font-weight: normal; font-family: Verdana, Arial, Helvetica, sans-serif; - } +} + .titles { font-family: "Lucida Grande", Helvetica, Arial, sans-serif; font-weight: bold; font-size: 1.3em; text-decoration: none; - } +} + .error { color: red; - } +} /* Tables @@ -257,13 +283,16 @@ th { background-image: url('./images/cellpic3.gif'); white-space: nowrap; padding: 7px 5px; - } +} + td { padding: 2px; - } +} + .tablebg { background-color: #A9B8C2; - } +} + .catdiv { height: 28px; margin: 0px; @@ -272,7 +301,8 @@ td { background-color: white; background-image: url('./images/cellpic2.jpg'); background-repeat: repeat-y; - } +} + .cat { height: 28px; margin: 0px; @@ -281,86 +311,100 @@ td { background-color: #C7D0D7; background-image: url('./images/cellpic1.gif'); text-indent: 4px; - } +} + .row1 { background-color: #ECECEC; padding: 4px; - } +} + .row2 { background-color: #DCE1E5; padding: 4px; - } +} + .row3 { background-color: #C0C8D0; padding: 4px; - } +} + .rowgood { background-color: #C2D6CD; padding: 4px; - } +} + .rowneutral { background-color: #CAC1D7; padding: 4px; - } +} + .rowbad { background-color: #D7C1C3; padding: 4px; - } +} + .spacer { background-color: #D1D7DC; - } +} + hr { height: 1px; border-width: 0px; background-color: #D1D7DC; color: #D1D7DC; - } +} + .legend { text-align:center; margin: 0 auto; - } +} /* Links ------------ */ a:link { color: #006597; text-decoration: none; - } -a:active { - color: #005784; - text-decoration: none; - } +} + +a:active, a:visited { color: #005784; text-decoration: none; - } +} + a:hover { color: #D46400; text-decoration: underline; - } +} + a.forumlink { color: #069; font-weight: bold; font-family: "Lucida Grande", Helvetica, Arial, sans-serif; font-size: 1.2em; - } +} + a.topictitle { margin: 1px 0px; font-family: "Lucida Grande", Helvetica, Arial, sans-serif; font-weight: bold; font-size: 1.2em; - } +} + a.topictitle:visited { color: #5493B4; text-decoration: none; - } -th a, th a:visited { +} + +th a, +th a:visited { color: #FFA34F !important; text-decoration: none; - } +} + th a:hover { text-decoration: underline; - } +} /* Form Elements @@ -369,7 +413,8 @@ form { margin: 0px; padding: 0px; border: 0px; - } +} + input { color: #333333; font-family: Verdana, Helvetica, sans-serif; @@ -378,7 +423,8 @@ input { padding: 1px; border: 1px solid #A9B8C2; background-color: #FAFAFA; - } +} + textarea { background-color: #FAFAFA; color: #333333; @@ -388,7 +434,8 @@ textarea { font-weight: normal; border: 1px solid #A9B8C2; padding: 2px; - } +} + select { color: #333333; background-color: #FAFAFA; @@ -397,19 +444,23 @@ select { font-weight: normal; border: 1px solid #A9B8C2; padding: 1px; - } +} + option { padding-right: 1em; - } +} + input.radio { border: none; background-color: transparent; - } +} + .post { background-color: white; border-style: solid; border-width: 1px; - } +} + .btnbbcode { color: #000000; font-weight: normal; @@ -417,7 +468,8 @@ input.radio { font-family: Verdana, Helvetica, sans-serif; background-color: #EFEFEF; border: 1px solid #666666; - } +} + .btnmain { font-weight: bold; background-color: #ECECEC; @@ -425,7 +477,8 @@ input.radio { cursor: pointer; padding: 1px 5px; font-size: 1.1em; - } +} + .btnlite { font-weight: normal; background-color: #ECECEC; @@ -433,11 +486,12 @@ input.radio { cursor: pointer; padding: 1px 5px; font-size: 1.1em; - } +} + .helpline { background-color: #DEE3E7; border-style: none; - } +} /* BBCode @@ -452,10 +506,12 @@ input.radio { background-color: #A9B8C2; font-size: 0.85em; font-weight: bold; - } +} + .quotetitle .quotetitle { font-size: 1em; - } +} + .quotecontent, .attachcontent { margin: 0px 5px 10px 5px; padding: 5px; @@ -468,10 +524,12 @@ input.radio { font-family: "Lucida Grande", "Trebuchet MS", Helvetica, Arial, sans-serif; background-color: #FAFAFA; color: #4B5C77; - } +} + .attachcontent { font-size: 0.85em; - } +} + .codetitle { margin: 10px 5px 0px 5px; padding: 2px 4px; @@ -482,7 +540,8 @@ input.radio { background-color: #A9B8C2; font-family: Verdana, Helvetica, Arial, sans-serif; font-size: 0.8em; - } +} + .codecontent { margin: 0px 5px 10px 5px; padding: 5px; @@ -494,55 +553,67 @@ input.radio { font-size: 0.85em; font-family: Monaco, 'Courier New', monospace; background-color: #FAFAFA; - } +} + .syntaxbg { color: #FFFFFF; - } +} + .syntaxcomment { color: #FF8000; - } +} + .syntaxdefault { color: #0000BB; - } +} + .syntaxhtml { color: #000000; - } +} + .syntaxkeyword { color: #007700; - } +} + .syntaxstring { color: #DD0000; - } +} /* Private messages ------------------ */ .pm_marked_colour { background-color: #000000; - } +} + .pm_replied_colour { background-color: #A9B8C2; - } +} + .pm_friend_colour { background-color: #007700; - } +} + .pm_foe_colour { background-color: #DD0000; - } +} /* Misc ------------ */ img { border: none; - } +} + .blue { color: #006699; - } +} + table.colortable td { padding: 0; - } +} + pre { font-size: 1.1em; font-family: Monaco, 'Courier New', monospace; -}
\ No newline at end of file +} |