diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-06 20:53:46 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-06 20:53:46 +0000 |
| commit | dd9ad539fdab80badedf801a816b8a0beafbbf5c (patch) | |
| tree | db8ae8a184b060d5576604cc0dfa723773daedb8 /phpBB/adm | |
| parent | 2c8afb820e3842bed2ab6cec4053e71b5c566985 (diff) | |
| download | forums-dd9ad539fdab80badedf801a816b8a0beafbbf5c.tar forums-dd9ad539fdab80badedf801a816b8a0beafbbf5c.tar.gz forums-dd9ad539fdab80badedf801a816b8a0beafbbf5c.tar.bz2 forums-dd9ad539fdab80badedf801a816b8a0beafbbf5c.tar.xz forums-dd9ad539fdab80badedf801a816b8a0beafbbf5c.zip | |
ok, this one is rather large... the most important change:
re-introduce append_sid: old style continues to work, not a performance hog as it was in 2.0.x -> structure is different
apart from this, code cleanage, bug fixing, etc.
git-svn-id: file:///svn/phpbb/trunk@6015 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm')
40 files changed, 1795 insertions, 1363 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 29d6539f80..4c71fe0aa9 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -16,9 +16,9 @@ define('NEED_SID', true); // Include files $phpbb_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -require($phpbb_root_path . 'common.'.$phpEx); -require($phpbb_root_path . 'includes/functions_admin.'.$phpEx); -require($phpbb_root_path . 'includes/functions_module.'.$phpEx); +require($phpbb_root_path . 'common.' . $phpEx); +require($phpbb_root_path . 'includes/functions_admin.' . $phpEx); +require($phpbb_root_path . 'includes/functions_module.' . $phpEx); // Start session management $user->session_begin(); @@ -58,6 +58,7 @@ $mode = request_var('mode', ''); // Set custom template for admin area $template->set_custom_template($phpbb_admin_path . 'style', 'admin'); $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style'); + // the acp template is never stored in the database $user->theme['template_storedb'] = false; @@ -75,7 +76,7 @@ $module->set_active($module_id, $mode); // Assign data to the template engine for the list of modules // We do this before loading the active module for correct menu display in trigger_error -$module->assign_tpl_vars("{$phpbb_admin_path}index.$phpEx$SID"); +$module->assign_tpl_vars(append_sid("{$phpbb_admin_path}index.$phpEx")); // Load and execute the relevant module $module->load_active(); @@ -89,19 +90,19 @@ $template->set_filenames(array( adm_page_footer(); -// --------- -// FUNCTIONS -// +/** +* Header for acp pages +*/ function adm_page_header($page_title) { global $config, $db, $user, $template; - global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID; + global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID, $_SID; if (defined('HEADER_INC')) { return; } - + define('HEADER_INC', true); // gzip_compression @@ -116,17 +117,20 @@ function adm_page_header($page_title) $template->assign_vars(array( 'PAGE_TITLE' => $page_title, 'USERNAME' => $user->data['username'], + + 'SID' => $SID, + '_SID' => $_SID, + 'SESSION_ID' => $user->session_id, 'ROOT_PATH' => $phpbb_admin_path, - 'U_LOGOUT' => "{$phpbb_root_path}ucp.$phpEx$SID&mode=logout", - 'U_ADM_INDEX' => "{$phpbb_admin_path}index.$phpEx$SID", - 'U_INDEX' => "{$phpbb_root_path}index.$phpEx$SID", + 'U_LOGOUT' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'), + 'U_ADM_INDEX' => append_sid("{$phpbb_admin_path}index.$phpEx"), + 'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"), - 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], - 'S_CONTENT_ENCODING' => $user->lang['ENCODING'], - 'S_CONTENT_DIR_LEFT' => $user->lang['LEFT'], - 'S_CONTENT_DIR_RIGHT' => $user->lang['RIGHT'], - ) + 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], + 'S_CONTENT_ENCODING' => $user->lang['ENCODING'], + 'S_CONTENT_DIR_LEFT' => $user->lang['LEFT'], + 'S_CONTENT_DIR_RIGHT' => $user->lang['RIGHT']) ); if (!empty($config['send_encoding'])) @@ -140,10 +144,13 @@ function adm_page_header($page_title) return; } +/** +* Page footer for acp pages +*/ function adm_page_footer($copyright_html = true) { global $db, $config, $template, $user, $auth, $cache; - global $SID, $starttime, $phpbb_root_path, $phpbb_admin_path, $phpEx; + global $starttime, $phpbb_root_path, $phpbb_admin_path, $phpEx; // Output page creation time if (defined('DEBUG')) @@ -179,8 +186,7 @@ function adm_page_footer($copyright_html = true) $template->assign_vars(array( 'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '', 'S_COPYRIGHT_HTML' => $copyright_html, - 'VERSION' => $config['version'] - ) + 'VERSION' => $config['version']) ); $template->display('body'); @@ -197,12 +203,18 @@ function adm_page_footer($copyright_html = true) exit; } +/** +* Generate back link for acp pages +*/ function adm_back_link($u_action) { global $user; return '<br /><br /><a href="' . $u_action . '">« ' . $user->lang['BACK_TO_PREV'] . '</a>'; } +/** +* Build select field options in acp pages +*/ function build_select($option_ary, $option_default = false) { global $user; @@ -217,6 +229,9 @@ function build_select($option_ary, $option_default = false) return $html; } +/** +* Build radio fields in acp pages +*/ function h_radio($name, &$input_ary, $input_default = false, $id = false, $key = false) { global $user; @@ -234,6 +249,9 @@ function h_radio($name, &$input_ary, $input_default = false, $id = false, $key = return $html; } +/** +* Build configuration template for acp configuration pages +*/ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) { global $user, $module; @@ -249,21 +267,21 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) $maxlength = (int) $tpl_type[2]; $tpl = '<input id="' . $key . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '" value="' . $new[$config_key] . '" />'; - break; + break; case 'dimension': $size = (int) $tpl_type[1]; $maxlength = (int) $tpl_type[2]; $tpl = '<input id="' . $key . '" type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" /> x <input type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" />'; - break; + break; case 'textarea': $rows = (int) $tpl_type[1]; $cols = (int) $tpl_type[2]; $tpl = '<textarea id="' . $key . '" name="' . $name . '" rows="' . $rows . '" cols="' . $cols . '">' . $new[$config_key] . '</textarea>'; - break; + break; case 'radio': $key_yes = ($new[$config_key]) ? ' checked="checked"' : ''; @@ -276,7 +294,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) $tpl_yes = '<input type="radio" id="' . $key . '" name="' . $name . '" value="1"' . $key_yes . ' class="radio" /> ' . (($type_no) ? $user->lang['YES'] : $user->lang['ENABLED']); $tpl = ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') ? $tpl_yes . ' ' . $tpl_no : $tpl_no . ' ' . $tpl_yes; - break; + break; case 'select': case 'custom': @@ -295,7 +313,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) { break; } - + if (isset($vars['params'])) { $args = array(); @@ -331,17 +349,17 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) $tpl = $return; } - break; + break; default: - break; + break; } if (isset($vars['append'])) { $tpl .= $vars['append']; } - + return $tpl; } diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index 31d773993c..70a2415b6c 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -64,22 +64,22 @@ </fieldset> <!-- IF not S_SECURE_DOWNLOADS --> - <div class="errorbox"> - <p>{L_SECURE_DOWNLOAD_NOTICE}</p> - </div> + <div class="errorbox"> + <p>{L_SECURE_DOWNLOAD_NOTICE}</p> + </div> <!-- ENDIF --> <fieldset> <legend>{L_SECURE_TITLE}</legend> <p>{L_DOWNLOAD_ADD_IPS_EXPLAIN}</p> - <dl> - <dt><label for="ip_hostname">{L_IP_HOSTNAME}:</label></dt> - <dd><textarea id="ip_hostname" cols="40" rows="3" name="ips"></textarea></dd> - </dl> - <dl> - <dt><label for="exclude">{L_IP_EXCLUDE}:</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt> - <dd><input type="radio" id="exclude" name="ipexclude" value="1" class="radio" /> {L_YES} <input type="radio" name="ipexclude" value="0" checked="checked" class="radio" /> {L_NO}</dd> - </dl> + <dl> + <dt><label for="ip_hostname">{L_IP_HOSTNAME}:</label></dt> + <dd><textarea id="ip_hostname" cols="40" rows="3" name="ips"></textarea></dd> + </dl> + <dl> + <dt><label for="exclude">{L_IP_EXCLUDE}:</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt> + <dd><input type="radio" id="exclude" name="ipexclude" value="1" class="radio" /> {L_YES} <input type="radio" name="ipexclude" value="0" checked="checked" class="radio" /> {L_NO}</dd> + </dl> </fieldset> <fieldset class="quick"> @@ -89,16 +89,16 @@ <fieldset> <legend>{L_REMOVE_IPS}</legend> <!-- IF S_DEFINED_IPS --> - <p>{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}</p> + <p>{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}</p> <dl> <dt><label for="remove_ip_hostname">{L_IP_HOSTNAME}:</label></dt> <dd><select name="unip[]" id="remove_ip_hostname" multiple="multiple" size="10">{DEFINED_IPS}</select></dd> </dl> - </fieldset> + </fieldset> - <fieldset class="quick"> - <input class="button1" type="submit" id="unsecuresubmit" name="unsecuresubmit" value="{L_SUBMIT}" /> - </fieldset> + <fieldset class="quick"> + <input class="button1" type="submit" id="unsecuresubmit" name="unsecuresubmit" value="{L_SUBMIT}" /> + </fieldset> <!-- ELSE --> <p>{L_NO_IPS_DEFINED}</p> @@ -166,47 +166,47 @@ <input type="hidden" name="g" value="{GROUP_ID}" /> <legend>{L_LEGEND}</legend> - <dl> - <dt><label for="group_name">{L_GROUP_NAME}:</label></dt> - <dd><input type="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}" /></dd> - </dl> - <dl> - <dt><label for="category">{L_SPECIAL_CATEGORY}:</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt> - <dd>{S_CATEGORY_SELECT}</dd> - </dl> - <dl> - <dt><label for="allowed">{L_ALLOWED}:</label></dt> - <dd><input type="checkbox" id="allowed" name="allow_group" value="1"<!-- IF ALLOW_GROUP --> checked="checked"<!-- ENDIF --> /></dd> - </dl> - <dl> - <dt><label for="allow_in_pm">{L_ALLOW_IN_PM}:</label></dt> - <dd><input type="checkbox" id="allow_in_pm" name="allow_in_pm" value="1"<!-- IF ALLOW_IN_PM --> checked="checked"<!-- ENDIF --> /></dd> - </dl> - <dl> - <dt><label for="download_mode">{L_DOWNLOAD_MODE}:</label><br /><span>{L_DOWNLOAD_MODE_EXPLAIN}</span></dt> - <dd>{S_DOWNLOAD_SELECT}</dd> - </dl> - <dl> - <dt><label for="upload_icon">{L_UPLOAD_ICON}:</label></dt> - <dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);"> - <option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST} - </select></dd> - <dd> <img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> name="image_upload_icon" alt="" title="" /> </dd> - </dl> - <dl> - <dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt> - <dd><input type="text" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd> - </dl> - <dl> - <dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}:</label></dt> - <dd><div id="ext">{ASSIGNED_EXTENSIONS}</div> <span>[<a href="{U_EXTENSIONS}">{L_GO_TO_EXTENSIONS}</a> ]</span></dd> - <dd><select name="extensions[]" id="assigned_extensions" class="narrow" onchange="show_extensions(this);" multiple="multiple" size="8">{S_EXTENSION_OPTIONS}</select></dd> - </dl> - <dl> - <dt><label for="allowed_forums">{L_ALLOWED_FORUMS}:</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt> - <dd><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS} <input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</dd> - <dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd> - </dl> + <dl> + <dt><label for="group_name">{L_GROUP_NAME}:</label></dt> + <dd><input type="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}" /></dd> + </dl> + <dl> + <dt><label for="category">{L_SPECIAL_CATEGORY}:</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt> + <dd>{S_CATEGORY_SELECT}</dd> + </dl> + <dl> + <dt><label for="allowed">{L_ALLOWED}:</label></dt> + <dd><input type="checkbox" id="allowed" name="allow_group" value="1"<!-- IF ALLOW_GROUP --> checked="checked"<!-- ENDIF --> /></dd> + </dl> + <dl> + <dt><label for="allow_in_pm">{L_ALLOW_IN_PM}:</label></dt> + <dd><input type="checkbox" id="allow_in_pm" name="allow_in_pm" value="1"<!-- IF ALLOW_IN_PM --> checked="checked"<!-- ENDIF --> /></dd> + </dl> + <dl> + <dt><label for="download_mode">{L_DOWNLOAD_MODE}:</label><br /><span>{L_DOWNLOAD_MODE_EXPLAIN}</span></dt> + <dd>{S_DOWNLOAD_SELECT}</dd> + </dl> + <dl> + <dt><label for="upload_icon">{L_UPLOAD_ICON}:</label></dt> + <dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);"> + <option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST} + </select></dd> + <dd> <img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> name="image_upload_icon" alt="" title="" /> </dd> + </dl> + <dl> + <dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt> + <dd><input type="text" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd> + </dl> + <dl> + <dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}:</label></dt> + <dd><div id="ext">{ASSIGNED_EXTENSIONS}</div> <span>[<a href="{U_EXTENSIONS}">{L_GO_TO_EXTENSIONS}</a> ]</span></dd> + <dd><select name="extensions[]" id="assigned_extensions" class="narrow" onchange="show_extensions(this);" multiple="multiple" size="8">{S_EXTENSION_OPTIONS}</select></dd> + </dl> + <dl> + <dt><label for="allowed_forums">{L_ALLOWED_FORUMS}:</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt> + <dd><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS} <input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</dd> + <dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd> + </dl> </fieldset> <fieldset class="submit-buttons"> @@ -258,14 +258,14 @@ <form id="add_ext" method="post" action="{U_ACTION}"> <fieldset> <legend>{L_ADD_EXTENSION}</legend> - <dl> - <dt><label for="add_extension">{L_EXTENSION}</label></dt> - <dd><input type="text" id="add_extension" size="20" maxlength="100" name="add_extension" value="{ADD_EXTENSION}" /></dd> - </dl> - <dl> - <dt><label for="extension_group">{L_EXTENSION_GROUP}</label></dt> - <dd>{GROUP_SELECT_OPTIONS}</dd> - </dl> + <dl> + <dt><label for="add_extension">{L_EXTENSION}</label></dt> + <dd><input type="text" id="add_extension" size="20" maxlength="100" name="add_extension" value="{ADD_EXTENSION}" /></dd> + </dl> + <dl> + <dt><label for="extension_group">{L_EXTENSION_GROUP}</label></dt> + <dd>{GROUP_SELECT_OPTIONS}</dd> + </dl> </fieldset> <fieldset class="quick"> diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index 4c645be178..8bfdf735a5 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -43,28 +43,28 @@ <fieldset> <legend>{L_TITLE}</legend> - <dl> - <dt><label for="ban">{L_BAN_CELL}:</label></dt> - <dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd> - <!-- IF S_USERNAME_BAN --><dd>[ <a href="#" onclick="window.open('{U_FIND_USER}', '_phpbbsearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF --> - </dl> - <dl> - <dt><label for="banlength">{L_BAN_LENGTH}:</label></dt> - <dd><select name="banlength" id="banlength">{S_BAN_END_OPTIONS}</select></dd> - <dd><input type="text" name="banlengthother" /> (YYYY-MM-DD)</dd> - </dl> - <dl> - <dt><label for="banexclude">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt> - <dd><input type="radio" name="banexclude" value="1" class="radio" /> {L_YES} <input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio" /> {L_NO}</dd> - </dl> - <dl> - <dt><label for="banreason">{L_BAN_REASON}:</label></dt> - <dd><input name="banreason" type="text" id="banreason" class="medium" /></dd> - </dl> - <dl> - <dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt> - <dd><input name="bangivereason" type="text" id="bangivereason" class="medium" /></dd> - </dl> +<dl> + <dt><label for="ban">{L_BAN_CELL}:</label></dt> + <dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd> + <!-- IF S_USERNAME_BAN --><dd>[ <a href="#" onclick="window.open('{U_FIND_USER}', '_phpbbsearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF --> +</dl> +<dl> + <dt><label for="banlength">{L_BAN_LENGTH}:</label></dt> + <dd><select name="banlength" id="banlength">{S_BAN_END_OPTIONS}</select></dd> + <dd><input type="text" name="banlengthother" /> (YYYY-MM-DD)</dd> +</dl> +<dl> + <dt><label for="banexclude">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt> + <dd><input type="radio" name="banexclude" value="1" class="radio" /> {L_YES} <input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio" /> {L_NO}</dd> +</dl> +<dl> + <dt><label for="banreason">{L_BAN_REASON}:</label></dt> + <dd><input name="banreason" type="text" id="banreason" class="medium" /></dd> +</dl> +<dl> + <dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt> + <dd><input name="bangivereason" type="text" id="bangivereason" class="medium" /></dd> +</dl> </fieldset> <fieldset class="submit-buttons"> @@ -98,17 +98,18 @@ <dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt> <dd><input style="border: 0px;" type="text" name="unbangivereason" id="unbangivereason" class="full" disabled="disabled" /></dd> </dl> -</fieldset> + </fieldset> -<fieldset class="submit-buttons"> - <input class="button1" type="submit" id="unbansubmit" name="unbansubmit" value="{L_SUBMIT}" /> - <input class="button2" type="reset" id="unbanreset" name="unbanreset" value="{L_RESET}" /> -</fieldset> + <fieldset class="submit-buttons"> + <input class="button1" type="submit" id="unbansubmit" name="unbansubmit" value="{L_SUBMIT}" /> + <input class="button2" type="reset" id="unbanreset" name="unbanreset" value="{L_RESET}" /> + </fieldset> <!-- ELSE --> <p>{L_NO_BAN_CELL}</p> </fieldset> + <!-- ENDIF --> </form> diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index 00af899397..116aba0aff 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -15,27 +15,27 @@ <fieldset> <legend>{L_BBCODE_USAGE}</legend> <p>{L_BBCODE_USAGE_EXPLAIN}</p> - <dl> - <dt><label for="bbcode_match">{L_EXAMPLES}</label><br /><br /><span>{L_BBCODE_USAGE_EXAMPLE}</span></dt> - <dd><textarea id="bbcode_match" name="bbcode_match" cols="60" rows="5">{BBCODE_MATCH}</textarea></dd> - </dl> + <dl> + <dt><label for="bbcode_match">{L_EXAMPLES}</label><br /><br /><span>{L_BBCODE_USAGE_EXAMPLE}</span></dt> + <dd><textarea id="bbcode_match" name="bbcode_match" cols="60" rows="5">{BBCODE_MATCH}</textarea></dd> + </dl> </fieldset> <fieldset> <legend>{L_HTML_REPLACEMENT}</legend> <p>{L_HTML_REPLACEMENT_EXPLAIN}</p> - <dl> - <dt><label for="bbcode_tpl">{L_EXAMPLES}</label><br /><br /><span>{L_HTML_REPLACEMENT_EXAMPLE}</span></dt> - <dd><textarea id="bbcode_tpl" name="bbcode_tpl" cols="60" rows="8">{BBCODE_TPL}</textarea></dd> - </dl> + <dl> + <dt><label for="bbcode_tpl">{L_EXAMPLES}</label><br /><br /><span>{L_HTML_REPLACEMENT_EXAMPLE}</span></dt> + <dd><textarea id="bbcode_tpl" name="bbcode_tpl" cols="60" rows="8">{BBCODE_TPL}</textarea></dd> + </dl> </fieldset> <fieldset> <legend>{L_SETTINGS}</legend> - <dl> - <dt><label for="display_on_posting">{L_DISPLAY_ON_POSTING}</label></dt> - <dd><input type="checkbox" name="display_on_posting" id="display_on_posting" value="1"<!-- IF DISPLAY_ON_POSTING --> checked="checked"<!-- ENDIF --> /></dd> - </dl> + <dl> + <dt><label for="display_on_posting">{L_DISPLAY_ON_POSTING}</label></dt> + <dd><input type="checkbox" name="display_on_posting" id="display_on_posting" value="1"<!-- IF DISPLAY_ON_POSTING --> checked="checked"<!-- ENDIF --> /></dd> + </dl> </fieldset> <fieldset class="submit-buttons"> @@ -44,6 +44,7 @@ </fieldset> <br /> + <table cellspacing="1"> <thead> <tr> @@ -77,10 +78,10 @@ <table cellspacing="1"> <thead> - <tr> - <th>{L_BBCODE_TAG}</th> - <th>{L_ACTION}</th> - </tr> + <tr> + <th>{L_BBCODE_TAG}</th> + <th>{L_ACTION}</th> + </tr> </thead> <tbody> <!-- BEGIN bbcodes --> diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html index a5cc3363df..02cb055a74 100644 --- a/phpBB/adm/style/acp_board.html +++ b/phpBB/adm/style/acp_board.html @@ -24,6 +24,7 @@ <!-- ENDIF --> <!-- END options --> + <!-- IF S_AUTH --> <!-- BEGIN auth_tpl --> {auth_tpl.TPL} diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index facf5bd127..5d2fd9f77e 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -21,30 +21,30 @@ <fieldset> <legend>{L_TITLE}</legend> - <dl> - <dt><label for="bot_name">{L_BOT_NAME}:</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt> - <dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" /></dd> - </dl> - <dl> - <dt><label for="bot_style">{L_BOT_STYLE}:</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt> - <dd><select id="bot_style" name="bot_style">{S_STYLE_OPTIONS}</select></dd> - </dl> - <dl> - <dt><label for="bot_lang">{L_BOT_LANG}:</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt> - <dd><select id="bot_lang" name="bot_lang">{S_LANG_OPTIONS}</select></dd> - </dl> - <dl> - <dt><label for="bot_active">{L_BOT_ACTIVE}:</label></dt> - <dd><select id="bot_active" name="bot_active">{S_ACTIVE_OPTIONS}</select></dd> - </dl> - <dl> - <dt><label for="bot_agent">{L_BOT_AGENT}:</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt> - <dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" /></dd> - </dl> - <dl> - <dt><label for="bot_ip">{L_BOT_IP}:</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt> - <dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" /></dd> - </dl> + <dl> + <dt><label for="bot_name">{L_BOT_NAME}:</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt> + <dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" /></dd> + </dl> + <dl> + <dt><label for="bot_style">{L_BOT_STYLE}:</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt> + <dd><select id="bot_style" name="bot_style">{S_STYLE_OPTIONS}</select></dd> + </dl> + <dl> + <dt><label for="bot_lang">{L_BOT_LANG}:</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt> + <dd><select id="bot_lang" name="bot_lang">{S_LANG_OPTIONS}</select></dd> + </dl> + <dl> + <dt><label for="bot_active">{L_BOT_ACTIVE}:</label></dt> + <dd><select id="bot_active" name="bot_active">{S_ACTIVE_OPTIONS}</select></dd> + </dl> + <dl> + <dt><label for="bot_agent">{L_BOT_AGENT}:</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt> + <dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" /></dd> + </dl> + <dl> + <dt><label for="bot_ip">{L_BOT_IP}:</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt> + <dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" /></dd> + </dl> </fieldset> <fieldset class="submit-buttons"> @@ -64,12 +64,12 @@ <table cellspacing="1"> <thead> - <tr> - <th>{L_BOT_NAME}</th> - <th>{L_BOT_LAST_VISIT}</th> - <th colspan="3">{L_OPTIONS}</th> - <th>{L_MARK}</th> - </tr> + <tr> + <th>{L_BOT_NAME}</th> + <th>{L_BOT_LAST_VISIT}</th> + <th colspan="3">{L_OPTIONS}</th> + <th>{L_MARK}</th> + </tr> </thead> <tbody> <!-- BEGIN bots --> diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index 980ed4d68e..37b9557d83 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -1,51 +1,57 @@ <!-- INCLUDE overall_header.html --> <a name="maincontent"></a> + <!-- IF MODE eq 'restore' --> -<h1>{L_ACP_RESTORE}</h1> + <h1>{L_ACP_RESTORE}</h1> -<p>{L_ACP_RESTORE_EXPLAIN}</p> + <p>{L_ACP_RESTORE_EXPLAIN}</p> -<form id="acp_backup" method="post" action="{U_ACTION}"> -<fieldset> - <legend>{L_RESTORE_OPTIONS}</legend> + <form id="acp_backup" method="post" action="{U_ACTION}"> + + <fieldset> + <legend>{L_RESTORE_OPTIONS}</legend> <dl> <dt><label for="user">{L_SELECT_FILE}:</label></dt> <dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd> </dl> -</fieldset> -<!-- IF EXISTS --> -<fieldset class="submit-buttons"> - <input class="button1" type="submit" id="submit" name="submit" value="{L_START_RESTORE}" /> - <input class="button2" type="submit" id="delete" name="delete" value="{L_DELETE_BACKUP}" /> - <input class="button2" type="submit" id="download" name="download" value="{L_DOWNLOAD_BACKUP}" /> -</fieldset> -<!-- ENDIF --> -</form> -<!-- ELSE --> -<h1>{L_ACP_BACKUP}</h1> + </fieldset> -<p>{L_ACP_BACKUP_EXPLAIN}</p> + <!-- IF EXISTS --> + <fieldset class="submit-buttons"> + <input class="button1" type="submit" id="submit" name="submit" value="{L_START_RESTORE}" /> + <input class="button2" type="submit" id="delete" name="delete" value="{L_DELETE_BACKUP}" /> + <input class="button2" type="submit" id="download" name="download" value="{L_DOWNLOAD_BACKUP}" /> + </fieldset> + <!-- ENDIF --> + + </form> + +<!-- ELSE --> + <h1>{L_ACP_BACKUP}</h1> -<script type="text/javascript"> -<!-- + <p>{L_ACP_BACKUP_EXPLAIN}</p> - function selector(bool) - { - var table = document.getElementById('table'); + <script type="text/javascript"> + <!-- - for (var i = 0; i < table.options.length; i++) + function selector(bool) { - table.options[i].selected = bool; + var table = document.getElementById('table'); + + for (var i = 0; i < table.options.length; i++) + { + table.options[i].selected = bool; + } } - } -//--> -</script> + //--> + </script> + + <form id="acp_backup" method="post" action="{U_ACTION}"> -<form id="acp_backup" method="post" action="{U_ACTION}"> -<fieldset> - <legend>{L_BACKUP_OPTIONS}</legend> + <fieldset> + <legend>{L_BACKUP_OPTIONS}</legend> <dl> <dt><label for="user">{L_BACKUP_TYPE}:</label></dt> <dd><input type="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP} <input type="radio" name="type" value="structure" id="type" /> {L_STRUCTURE_ONLY} <input type="radio" name="type" value="data" id="type" /> {L_DATA_ONLY}</dd> @@ -68,11 +74,15 @@ <!-- END tables --> </select><br /><br /><div align="right"><a href="#" onclick="selector(true)">{L_SELECT_ALL}</a><br /><a href="#" onclick="selector(false)">{L_DESELECT_ALL}</a></div></dd> </dl> -</fieldset> -<fieldset class="submit-buttons"> - <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> - <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> -</fieldset> -</form> + </fieldset> + + <fieldset class="submit-buttons"> + <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> + <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + </fieldset> + + </form> + <!-- ENDIF --> + <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html index e5e63c6aae..8bd0957786 100644 --- a/phpBB/adm/style/acp_disallow.html +++ b/phpBB/adm/style/acp_disallow.html @@ -10,10 +10,10 @@ <fieldset> <legend>{L_ADD_DISALLOW_TITLE}</legend> - <dl> - <dt><label for="user">{L_USERNAME}:</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt> - <dd><input id="user" type="text" name="disallowed_user" class="medium" /></dd> - </dl> +<dl> + <dt><label for="user">{L_USERNAME}:</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt> + <dd><input id="user" type="text" name="disallowed_user" class="medium" /></dd> +</dl> </fieldset> <fieldset class="quick"> @@ -31,16 +31,14 @@ <dt><label for="disallowed">{L_USERNAME}:</label></dt> <dd><select name="disallowed_id" id="disallowed">{S_DISALLOWED_NAMES}</select></dd> </dl> -</fieldset> - -<fieldset class="quick"> - <input class="button1" type="submit" name="allow" value="{L_SUBMIT}" /> -</fieldset> + </fieldset> + <fieldset class="quick"> + <input class="button1" type="submit" name="allow" value="{L_SUBMIT}" /> <!-- ELSE --> <p>{L_NO_DISALLOWED}</p> -</fieldset> <!-- ENDIF --> +</fieldset> </form> diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index f8eaabf2dc..c974f61eed 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -53,10 +53,10 @@ <p>{L_FORUM_EDIT_EXPLAIN}</p> <!-- IF S_ERROR --> - <div class="errorbox"> - <h3>{L_WARNING}</h3> - <p>{ERROR_MSG}</p> - </div> + <div class="errorbox"> + <h3>{L_WARNING}</h3> + <p>{ERROR_MSG}</p> + </div> <!-- ENDIF --> <form id="forumedit" method="post" action="{U_EDIT_ACTION}"> @@ -69,11 +69,11 @@ </dl> <!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST --> <div id="type_actions"<!-- IF S_FORUM_POST --> style="display: none;"<!-- ENDIF -->> - <dl> - <dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}:</label></dt> - <dd><input type="radio" class="radio" id="type_action" name="type_action" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</dd> - <!-- IF S_MOVE_FORUM_OPTIONS --><dd><input type="radio" class="radio" name="type_action" value="move" /> {L_MOVE_POSTS_TO} <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF --> - </dl> + <dl> + <dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}:</label></dt> + <dd><input type="radio" class="radio" id="type_action" name="type_action" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</dd> + <!-- IF S_MOVE_FORUM_OPTIONS --><dd><input type="radio" class="radio" name="type_action" value="move" /> {L_MOVE_POSTS_TO} <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF --> + </dl> </div> <!-- ENDIF --> <dl> @@ -101,10 +101,10 @@ <dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd> </dl> <!-- IF S_ADD_ACTION --> - <dl> - <dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> - <dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd> - </dl> + <dl> + <dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> + <dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd> + </dl> <!-- ENDIF --> </fieldset> @@ -241,10 +241,10 @@ <p>{L_FORUM_DELETE_EXPLAIN}</p> <!-- IF S_ERROR --> - <div class="errorbox"> - <h3>{L_WARNING}</h3> - <p>{ERROR_MSG}</p> - </div> + <div class="errorbox"> + <h3>{L_WARNING}</h3> + <p>{ERROR_MSG}</p> + </div> <!-- ENDIF --> <form id="acp_forum" method="post" action="{U_ACTION}"> @@ -288,10 +288,10 @@ <p>{L_FORUM_ADMIN_EXPLAIN}</p> <!-- IF ERROR_MSG --> - <div class="errorbox"> - <h3>{L_WARNING}</h3> - <p>{ERROR_MSG}</p> - </div> + <div class="errorbox"> + <h3>{L_WARNING}</h3> + <p>{ERROR_MSG}</p> + </div> <!-- ENDIF --> <!-- IF S_RESYNCED --> @@ -303,30 +303,30 @@ <p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF --->]<!-- ENDIF --></strong></p> -<!-- IF forums --> - <table cellspacing="1"> - <col class="row1" /><col class="row1" /><col class="row2" /> - <tbody> - <!-- BEGIN forums --> - <tr> - <td style="width: 5%;">{forums.FOLDER_IMAGE}</td> - <td> - <strong><!-- IF forums.S_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong> - <!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF --> - <!-- 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> - </td> - </tr> - <!-- END forums --> - </tbody> - </table> -<!-- ENDIF --> + <!-- IF .forums --> + <table cellspacing="1"> + <col class="row1" /><col class="row1" /><col class="row2" /> + <tbody> + <!-- BEGIN forums --> + <tr> + <td style="width: 5%;">{forums.FOLDER_IMAGE}</td> + <td> + <strong><!-- IF forums.S_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong> + <!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF --> + <!-- 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> + </td> + </tr> + <!-- END forums --> + </tbody> + </table> + <!-- ENDIF --> <form id="fselect" method="post" action="{U_SEL_ACTION}"> diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 17193dff2e..471a41cf4c 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -21,15 +21,15 @@ <fieldset> <legend>{L_GROUP_DETAILS}</legend> - <dl> - <dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></dt> - <dd><!-- 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}" /></dd> - </dl> - <dl> - <dt><label for="group_desc">{L_GROUP_DESC}:</label></dt> - <dd><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd> - <dd><input type="checkbox" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE} <input type="checkbox" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES} <input type="checkbox" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</dd> - </dl> + <dl> + <dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></dt> + <dd><!-- 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}" /></dd> + </dl> + <dl> + <dt><label for="group_desc">{L_GROUP_DESC}:</label></dt> + <dd><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd> + <dd><input type="checkbox" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE} <input type="checkbox" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES} <input type="checkbox" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</dd> + </dl> <!-- IF not S_SPECIAL_GROUP --> <dl> <dt><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt> @@ -45,44 +45,44 @@ <!-- ENDIF --> <!-- IF S_ADD_GROUP --> - <dl> - <dt><label for="group_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> - <dd><select id="group_perm_from" name="group_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_GROUP_OPTIONS}</select></dd> - </dl> + <dl> + <dt><label for="group_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> + <dd><select id="group_perm_from" name="group_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_GROUP_OPTIONS}</select></dd> + </dl> <!-- ENDIF --> </fieldset> <fieldset> <legend>{L_GROUP_SETTINGS_SAVE}</legend> - <dl> - <dt><label for="group_legend">{L_GROUP_LEGEND}:</label></dt> - <dd><input name="group_legend" type="checkbox" id="group_legend"{GROUP_LEGEND} /></dd> - </dl> - <dl> - <dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label></dt> - <dd><input name="group_receive_pm" type="checkbox" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd> - </dl> - <dl> - <dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}:</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt> - <dd><input name="group_message_limit" type="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd> - </dl> - <dl> - <dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt> - <dd><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></dd> - </dl> - <dl> - <dt><label for="group_rank">{L_GROUP_RANK}:</label></dt> - <dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd> - </dl> + <dl> + <dt><label for="group_legend">{L_GROUP_LEGEND}:</label></dt> + <dd><input name="group_legend" type="checkbox" id="group_legend"{GROUP_LEGEND} /></dd> + </dl> + <dl> + <dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label></dt> + <dd><input name="group_receive_pm" type="checkbox" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd> + </dl> + <dl> + <dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}:</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt> + <dd><input name="group_message_limit" type="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd> + </dl> + <dl> + <dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt> + <dd><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></dd> + </dl> + <dl> + <dt><label for="group_rank">{L_GROUP_RANK}:</label></dt> + <dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd> + </dl> </fieldset> <fieldset> <legend>{L_GROUP_AVATAR}</legend> - <dl> - <dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> - <dd>{AVATAR_IMAGE}</dd> - <dd><input type="checkbox" name="delete" /> <span>{L_DELETE_AVATAR}</span></dd> - </dl> + <dl> + <dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> + <dd>{AVATAR_IMAGE}</dd> + <dd><input type="checkbox" name="delete" /> <span>{L_DELETE_AVATAR}</span></dd> + </dl> <!-- IF not S_IN_AVATAR_GALLERY --> <!-- IF S_CAN_UPLOAD --> <dl> @@ -94,14 +94,14 @@ <dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd> </dl> <!-- ENDIF --> - <dl> - <dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt> - <dd><input name="remotelink" type="text" id="remotelink" value="" /></dd> - </dl> - <dl> - <dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt> - <dd><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></dd> - </dl> + <dl> + <dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt> + <dd><input name="remotelink" type="text" id="remotelink" value="" /></dd> + </dl> + <dl> + <dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt> + <dd><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></dd> + </dl> <!-- IF S_DISPLAY_GALLERY --> <dl> <dt><label>{L_AVATAR_GALLERY}:</label></dt> @@ -113,26 +113,26 @@ <fieldset> <legend>{L_AVATAR_GALLERY}</legend> - <dl> - <dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt> - <dd><select name="category" id="category">{S_CAT_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd> - </dl> - <dl> - <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> - </dl> + <dl> + <dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt> + <dd><select name="category" id="category">{S_CAT_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd> + </dl> + <dl> + <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> + </dl> </fieldset> <fieldset class="quick" style="margin-top: -15px;"> diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html index 1f4e305f95..82bc7fed2f 100644 --- a/phpBB/adm/style/acp_jabber.html +++ b/phpBB/adm/style/acp_jabber.html @@ -17,34 +17,34 @@ <fieldset> <legend>{L_ACP_JABBER_SETTINGS}</legend> - <dl> - <dt><label for="jab_enable">{L_JAB_ENABLE}:</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt> - <dd><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED} <input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</dd> - </dl> - <dl> - <dt><label for="jab_host">{L_JAB_SERVER}:</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt> - <dd><input type="text" id="jab_host" name="jab_host" value="{JAB_HOST}" /></dd> - </dl> - <dl> - <dt><label for="jab_port">{L_JAB_PORT}:</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt> - <dd><input type="text" id="jab_port" name="jab_port" value="{JAB_PORT}" /></dd> - </dl> - <dl> - <dt><label for="jab_username">{L_JAB_USERNAME}:</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt> - <dd><input type="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}" /></dd> - </dl> - <dl> - <dt><label for="jab_password">{L_JAB_PASSWORD}:</label></dt> - <dd><input type="text" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd> - </dl> - <dl> - <dt><label for="jab_resource">{L_JAB_RESOURCE}:</label><br /><span>{L_JAB_RESOURCE_EXPLAIN}</span></dt> - <dd><input type="text" id="jab_resource" name="jab_resource" value="{JAB_RESOURCE}" /></dd> - </dl> - <dl> - <dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}:</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt> - <dd><input type="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" /></dd> - </dl> +<dl> + <dt><label for="jab_enable">{L_JAB_ENABLE}:</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt> + <dd><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED} <input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</dd> +</dl> +<dl> + <dt><label for="jab_host">{L_JAB_SERVER}:</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt> + <dd><input type="text" id="jab_host" name="jab_host" value="{JAB_HOST}" /></dd> +</dl> +<dl> + <dt><label for="jab_port">{L_JAB_PORT}:</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt> + <dd><input type="text" id="jab_port" name="jab_port" value="{JAB_PORT}" /></dd> +</dl> +<dl> + <dt><label for="jab_username">{L_JAB_USERNAME}:</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt> + <dd><input type="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}" /></dd> +</dl> +<dl> + <dt><label for="jab_password">{L_JAB_PASSWORD}:</label></dt> + <dd><input type="text" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd> +</dl> +<dl> + <dt><label for="jab_resource">{L_JAB_RESOURCE}:</label><br /><span>{L_JAB_RESOURCE_EXPLAIN}</span></dt> + <dd><input type="text" id="jab_resource" name="jab_resource" value="{JAB_RESOURCE}" /></dd> +</dl> +<dl> + <dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}:</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt> + <dd><input type="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" /></dd> +</dl> </fieldset> <fieldset class="submit-buttons"> diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index c0a0e8e745..dce0c00de6 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -150,7 +150,9 @@ </table> </form> + <!-- ELSEIF S_UPLOAD --> + <a href="{U_BACK}" style="float: right">« {L_BACK}</a> <h1>{L_UPLOAD_SETTINGS}</h1> @@ -188,6 +190,7 @@ </fieldset> </form> + <!-- ELSE --> <h1>{L_ACP_LANGUAGE_PACKS}</h1> diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index 5aec4dba1b..8690103f1e 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -24,45 +24,48 @@ </div> <!-- IF .log --> -<table cellspacing="1"> -<thead> -<tr> - <th>{L_USERNAME}</th> - <th>{L_IP}</th> - <th>{L_TIME}</th> - <th>{L_ACTION}</th> - <th>{L_MARK}</th> -</tr> -</thead> -<tbody> -<!-- BEGIN log --> - <!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - - <td> - {log.USERNAME} - <!-- IF log.REPORTEE_USERNAME --> - <br />» {log.REPORTEE_USERNAME} - <!-- ENDIF --> - </td> - <td style="text-align: center;">{log.IP}</td> - <td style="text-align: center;">{log.DATE}</td> - <td>{log.ACTION}<!-- IF log.DATA --><br />{log.DATA}</span><!-- ENDIF --></td> - <td style="text-align: center;"><input type="checkbox" name="mark[]" value="{log.ID}" /></td> + <table cellspacing="1"> + <thead> + <tr> + <th>{L_USERNAME}</th> + <th>{L_IP}</th> + <th>{L_TIME}</th> + <th>{L_ACTION}</th> + <th>{L_MARK}</th> </tr> -<!-- END log --> -</tbody> -</table> + </thead> + <tbody> + <!-- BEGIN log --> + <!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + + <td> + {log.USERNAME} + <!-- IF log.REPORTEE_USERNAME --> + <br />» {log.REPORTEE_USERNAME} + <!-- ENDIF --> + </td> + <td style="text-align: center;">{log.IP}</td> + <td style="text-align: center;">{log.DATE}</td> + <td>{log.ACTION}<!-- IF log.DATA --><br />{log.DATA}</span><!-- ENDIF --></td> + <td style="text-align: center;"><input type="checkbox" name="mark[]" value="{log.ID}" /></td> + </tr> + <!-- END log --> + </tbody> + </table> + <!-- ELSE --> + <div class="errorbox"> <p>{L_NO_ENTRIES}</p> </div> + <!-- ENDIF --> <!-- IF S_SHOW_FORUMS --> -<fieldset class="quick" style="float: left;"> - {L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select> - <input class="button2" type="submit" value="{L_GO}" /> -</fieldset> + <fieldset class="quick" style="float: left;"> + {L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select> + <input class="button2" type="submit" value="{L_GO}" /> + </fieldset> <!-- ENDIF --> <!-- IF S_CLEARLOGS --> diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index e1c0fa9a05..5e2dfc7890 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -14,58 +14,58 @@ <table cellspacing="1"> <caption>{L_FORUM_STATS}</caption> <col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" /> - <thead> - <tr> - <th>{L_STATISTIC}</th> - <th>{L_VALUE}</th> - <th>{L_STATISTIC}</th> - <th>{L_VALUE}</th> - </tr> - </thead> - <tbody> - <tr> - <td>{L_NUMBER_POSTS}: </td> - <td><b>{TOTAL_POSTS}</b></td> - <td>{L_POSTS_PER_DAY}: </td> - <td><b>{POSTS_PER_DAY}</b></td> - </tr> - <tr> - <td>{L_NUMBER_TOPICS}: </td> - <td><b>{TOTAL_TOPICS}</b></td> - <td>{L_TOPICS_PER_DAY}: </td> - <td><b>{TOPICS_PER_DAY}</b></td> - </tr> - <tr> - <td>{L_NUMBER_USERS}: </td> - <td><b>{TOTAL_USERS}</b></td> - <td>{L_USERS_PER_DAY}: </td> - <td><b>{USERS_PER_DAY}</b></td> - </tr> - <tr> - <td>{L_NUMBER_FILES}: </td> - <td><b>{TOTAL_FILES}</b></td> - <td>{L_FILES_PER_DAY}: </td> - <td><b>{FILES_PER_DAY}</b></td> - </tr> - <tr> - <td>{L_BOARD_STARTED}: </td> - <td><b>{START_DATE}</b></td> - <td>{L_AVATAR_DIR_SIZE}: </td> - <td><b>{AVATAR_DIR_SIZE}</b></td> - </tr> - <tr> - <td>{L_DATABASE_SIZE}: </td> - <td><b>{DBSIZE}</b></td> - <td>{L_UPLOAD_DIR_SIZE}: </td> - <td><b>{UPLOAD_DIR_SIZE}</b></td> - </tr> - <tr> - <td>{L_GZIP_COMPRESSION}: </td> - <td><b>{GZIP_COMPRESSION}</b></td> - <td> </td> - <td> </td> - </tr> - </tbody> +<thead> +<tr> + <th>{L_STATISTIC}</th> + <th>{L_VALUE}</th> + <th>{L_STATISTIC}</th> + <th>{L_VALUE}</th> +</tr> +</thead> +<tbody> +<tr> + <td>{L_NUMBER_POSTS}: </td> + <td><b>{TOTAL_POSTS}</b></td> + <td>{L_POSTS_PER_DAY}: </td> + <td><b>{POSTS_PER_DAY}</b></td> +</tr> +<tr> + <td>{L_NUMBER_TOPICS}: </td> + <td><b>{TOTAL_TOPICS}</b></td> + <td>{L_TOPICS_PER_DAY}: </td> + <td><b>{TOPICS_PER_DAY}</b></td> +</tr> +<tr> + <td>{L_NUMBER_USERS}: </td> + <td><b>{TOTAL_USERS}</b></td> + <td>{L_USERS_PER_DAY}: </td> + <td><b>{USERS_PER_DAY}</b></td> +</tr> +<tr> + <td>{L_NUMBER_FILES}: </td> + <td><b>{TOTAL_FILES}</b></td> + <td>{L_FILES_PER_DAY}: </td> + <td><b>{FILES_PER_DAY}</b></td> +</tr> +<tr> + <td>{L_BOARD_STARTED}: </td> + <td><b>{START_DATE}</b></td> + <td>{L_AVATAR_DIR_SIZE}: </td> + <td><b>{AVATAR_DIR_SIZE}</b></td> +</tr> +<tr> + <td>{L_DATABASE_SIZE}: </td> + <td><b>{DBSIZE}</b></td> + <td>{L_UPLOAD_DIR_SIZE}: </td> + <td><b>{UPLOAD_DIR_SIZE}</b></td> +</tr> +<tr> + <td>{L_GZIP_COMPRESSION}: </td> + <td><b>{GZIP_COMPRESSION}</b></td> + <td> </td> + <td> </td> +</tr> +</tbody> </table> <!-- IF S_ACTION_OPTIONS --> @@ -115,11 +115,11 @@ <table cellspacing="1"> <thead> - <tr> - <th>{L_USERNAME}</th> - <th>{L_JOINED}</th> - <th>{L_MARK}</th> - </tr> + <tr> + <th>{L_USERNAME}</th> + <th>{L_JOINED}</th> + <th>{L_MARK}</th> + </tr> </thead> <tbody> <!-- BEGIN inactive --> diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 20b2fd4399..bec0e76def 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -57,36 +57,36 @@ <p>{L_EDIT_MODULE_EXPLAIN}</p> <!-- IF S_ERROR --> - <div class="errorbox"> - <h3>{L_WARNING}</h3> - <p>{ERROR_MSG}</p> - </div> + <div class="errorbox"> + <h3>{L_WARNING}</h3> + <p>{ERROR_MSG}</p> + </div> <!-- ENDIF --> <form id="moduleedit" method="post" action="{U_EDIT_ACTION}"> <fieldset> <legend>{L_GENERAL_OPTIONS}</legend> - <dl> - <dt><label for="module_langname">{L_MODULE_LANGNAME}:</label><br /> - <span>{L_MODULE_LANGNAME_EXPLAIN}</span></dt> - <dd><input name="module_langname" type="text" id="module_langname" value="{MODULE_LANGNAME}" class="medium" /></dd> - </dl> - <dl> - <dt><label for="module_type">{L_MODULE_TYPE}:</label></dt> - <dd><select name="module_type" id="module_type" onchange="display_options(this.value);"><option value="category"<!-- IF S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_CATEGORY}</option><option value="module"<!-- IF not S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_MODULE}</option></select></dd> - </dl> - <dl> - <dt><label for="parent_id">{L_PARENT}:</label></dt> - <dd><select name="module_parent_id" id="parent_id">{S_CAT_OPTIONS}</select></dd> - </dl> - <hr /> - <dl> - <dt><label for="module_enabled">{L_MODULE_ENABLED}:</label></dt> - <dd><label><input class="radio" type="radio" name="module_enabled" id="module_enabled" value="1"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> - <label><input class="radio" type="radio" name="module_enabled" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> - </dl> - <div id="modoptions"<!-- IF S_IS_CAT --> style="display: none;"<!-- ENDIF -->> + <dl> + <dt><label for="module_langname">{L_MODULE_LANGNAME}:</label><br /> + <span>{L_MODULE_LANGNAME_EXPLAIN}</span></dt> + <dd><input name="module_langname" type="text" id="module_langname" value="{MODULE_LANGNAME}" class="medium" /></dd> + </dl> + <dl> + <dt><label for="module_type">{L_MODULE_TYPE}:</label></dt> + <dd><select name="module_type" id="module_type" onchange="display_options(this.value);"><option value="category"<!-- IF S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_CATEGORY}</option><option value="module"<!-- IF not S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_MODULE}</option></select></dd> + </dl> + <dl> + <dt><label for="parent_id">{L_PARENT}:</label></dt> + <dd><select name="module_parent_id" id="parent_id">{S_CAT_OPTIONS}</select></dd> + </dl> + <hr /> + <dl> + <dt><label for="module_enabled">{L_MODULE_ENABLED}:</label></dt> + <dd><label><input class="radio" type="radio" name="module_enabled" id="module_enabled" value="1"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> + <label><input class="radio" type="radio" name="module_enabled" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> + </dl> + <div id="modoptions"<!-- IF S_IS_CAT --> style="display: none;"<!-- ENDIF -->> <dl> <dt><label for="module_display">{L_MODULE_DISPLAYED}:</label><br /><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt> <dd><label><input class="radio" type="radio" name="module_display" id="module_display" value="1"<!-- IF MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> @@ -102,7 +102,7 @@ <span>{L_CHOOSE_MODE_EXPLAIN}</span></dt> <dd><select name="module_mode" id="module_mode">{S_MODULE_MODES}</select></dd> </dl> - </div> + </div> </fieldset> <fieldset class="submit-buttons"> @@ -122,10 +122,10 @@ <p>{L_ACP_MODULE_MANAGEMENT_EXPLAIN}</p> <!-- IF S_ERROR --> - <div class="errorbox"> - <h3>{L_WARNING}</h3> - <p>{ERROR_MSG}</p> - </div> + <div class="errorbox"> + <h3>{L_WARNING}</h3> + <p>{ERROR_MSG}</p> + </div> <!-- ENDIF --> <table cellspacing="1"> @@ -136,24 +136,24 @@ </tbody> </table> -<!-- IF .modules --> - <table cellspacing="1"> - <col class="row1" /><col class="row1" /><col class="row2" /><col class="row2" /> - <tbody> - <!-- BEGIN modules --> - <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> - </tr> - <!-- END modules --> - </tbody> - </table> -<!-- ENDIF --> + <!-- IF .modules --> + <table cellspacing="1"> + <col class="row1" /><col class="row1" /><col class="row2" /><col class="row2" /> + <tbody> + <!-- BEGIN modules --> + <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> + </tr> + <!-- END modules --> + </tbody> + </table> + <!-- ENDIF --> <form id="module" method="post" action="{U_ACTION}"> diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 8e1076d701..9538af8451 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -8,8 +8,10 @@ <!-- var active_option = 'options0'; - // Show/hide option panels - // value = suffix for ID to show + /** + * Show/hide option panels + * value = suffix for ID to show + */ function swap_options(id) { if (id == active_option) @@ -24,8 +26,10 @@ active_option = id; } - // Mark all radio buttons in one panel - // id = table ID container, s = status ['y'/'u'/'n'] + /** + * Mark all radio buttons in one panel + * id = table ID container, s = status ['y'/'u'/'n'] + */ function mark_options(id, s) { var t = document.getElementById(id); @@ -62,14 +66,14 @@ <fieldset> <legend>{L_ROLE_DETAILS}</legend> - <dl> - <dt><label for="role_name">{L_ROLE_NAME}:</label></dt> - <dd><input name="role_name" type="text" id="role_name" value="{ROLE_NAME}" /></dd> - </dl> - <dl> - <dt><label for="role_description">{L_ROLE_DESCRIPTION}:</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt> - <dd><textarea id="role_description" name="role_description" rows="3" cols="45">{ROLE_DESCRIPTION}</textarea></dd> - </dl> + <dl> + <dt><label for="role_name">{L_ROLE_NAME}:</label></dt> + <dd><input name="role_name" type="text" id="role_name" value="{ROLE_NAME}" /></dd> + </dl> + <dl> + <dt><label for="role_description">{L_ROLE_DESCRIPTION}:</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt> + <dd><textarea id="role_description" name="role_description" rows="3" cols="45">{ROLE_DESCRIPTION}</textarea></dd> + </dl> </fieldset> <fieldset class="quick"> diff --git a/phpBB/adm/style/acp_php_info.html b/phpBB/adm/style/acp_php_info.html index d4ca8c7d4c..e1d4731c64 100644 --- a/phpBB/adm/style/acp_php_info.html +++ b/phpBB/adm/style/acp_php_info.html @@ -7,6 +7,7 @@ <p>{L_ACP_PHP_INFO_EXPLAIN}</p> <div style="overflow: auto; width: 99%;"> -{PHPINFO} + {PHPINFO} </div> + <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index ce260d1b98..55186376ef 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -11,10 +11,10 @@ <p>{L_EXPLAIN}</p> <!-- IF ERROR_MSG --> - <div class="errorbox"> - <h3>{L_WARNING}</h3> - <p>{ERROR_MSG}</p> - </div> + <div class="errorbox"> + <h3>{L_WARNING}</h3> + <p>{ERROR_MSG}</p> + </div> <!-- ENDIF --> <form id="add_profile_field" method="post" action="{U_ACTION}"> @@ -23,38 +23,38 @@ <fieldset> <legend>{L_TITLE}</legend> - <dl> - <dt><label>{L_FIELD_TYPE}:</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt> - <dd><b>{FIELD_TYPE}</b></dd> - </dl> - <dl> - <dt><label for="field_ident">{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt> - <dd><input class="medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}" /></dd> - </dl> - <dl> - <dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}:</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt> - <dd><input type="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd> - </dl> + <dl> + <dt><label>{L_FIELD_TYPE}:</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt> + <dd><b>{FIELD_TYPE}</b></dd> + </dl> + <dl> + <dt><label for="field_ident">{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt> + <dd><input class="medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}" /></dd> + </dl> + <dl> + <dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}:</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt> + <dd><input type="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd> + </dl> </fieldset> <fieldset> <legend>{L_VISIBILITY_OPTION}</legend> - <dl> - <dt><label for="field_option_none">{L_DISPLAY_AT_PROFILE}:</label></dt> - <dd><input type="radio" id="field_option_none" name="field_option" value="none"<!-- IF not S_SHOW_ON_REG and not S_FIELD_REQUIRED and not S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd> - </dl> - <dl> - <dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}:</label><br /><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt> - <dd><input type="radio" id="field_show_on_reg" name="field_option" value="field_show_on_reg"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd> - </dl> - <dl> - <dt><label for="field_required">{L_REQUIRED_FIELD}:</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt> - <dd><input type="radio" id="field_required" name="field_option" value="field_required"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd> - </dl> - <dl> - <dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}:</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt> - <dd><input type="radio" id="field_hide" name="field_option" value="field_hide"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd> - </dl> + <dl> + <dt><label for="field_option_none">{L_DISPLAY_AT_PROFILE}:</label></dt> + <dd><input type="radio" id="field_option_none" name="field_option" value="none"<!-- IF not S_SHOW_ON_REG and not S_FIELD_REQUIRED and not S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd> + </dl> + <dl> + <dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}:</label><br /><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt> + <dd><input type="radio" id="field_show_on_reg" name="field_option" value="field_show_on_reg"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd> + </dl> + <dl> + <dt><label for="field_required">{L_REQUIRED_FIELD}:</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt> + <dd><input type="radio" id="field_required" name="field_option" value="field_required"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd> + </dl> + <dl> + <dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}:</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt> + <dd><input type="radio" id="field_hide" name="field_option" value="field_hide"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd> + </dl> </fieldset> <!-- IF S_EDIT_MODE --> @@ -65,31 +65,31 @@ <fieldset> <legend>{L_LANG_SPECIFIC}</legend> + <dl> + <dt><label for="lang_name">{L_USER_FIELD_NAME}:</label></dt> + <dd><input class="medium" type="text" id="lang_name" name="lang_name" value="{LANG_NAME}" /></dd> + </dl> + <dl> + <dt><label for="lang_explain">{L_FIELD_DESCRIPTION}:</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt> + <dd><textarea id="lang_explain" name="lang_explain" rows="3" cols="80">{LANG_EXPLAIN}</textarea></dd> + </dl> + <!-- IF S_TEXT or S_STRING --> <dl> - <dt><label for="lang_name">{L_USER_FIELD_NAME}:</label></dt> - <dd><input class="medium" type="text" id="lang_name" name="lang_name" value="{LANG_NAME}" /></dd> + <dt><label for="lang_default_value">{L_DEFAULT_VALUE}:</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt> + <dd><!-- IF S_STRING --><input class="medium" type="text" id="lang_default_value" name="lang_default_value" value="{LANG_DEFAULT_VALUE}" /><!-- ELSE --><textarea id="lang_default_value" name="lang_default_value" rows="5" cols="80">{LANG_DEFAULT_VALUE}</textarea><!-- ENDIF --></dd> </dl> + <!-- ENDIF --> + <!-- IF S_BOOL or S_DROPDOWN --> <dl> - <dt><label for="lang_explain">{L_FIELD_DESCRIPTION}:</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt> - <dd><textarea id="lang_explain" name="lang_explain" rows="3" cols="80">{LANG_EXPLAIN}</textarea></dd> - </dl> - <!-- IF S_TEXT or S_STRING --> - <dl> - <dt><label for="lang_default_value">{L_DEFAULT_VALUE}:</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt> - <dd><!-- IF S_STRING --><input class="medium" type="text" id="lang_default_value" name="lang_default_value" value="{LANG_DEFAULT_VALUE}" /><!-- ELSE --><textarea id="lang_default_value" name="lang_default_value" rows="5" cols="80">{LANG_DEFAULT_VALUE}</textarea><!-- ENDIF --></dd> - </dl> - <!-- ENDIF --> - <!-- IF S_BOOL or S_DROPDOWN --> - <dl> - <dt><label for="lang_options">{L_ENTRIES}:</label><br /><span>{L_LANG_OPTIONS_EXPLAIN}</span></dt> - <!-- IF S_DROPDOWN --> - <dd><textarea id="lang_options" name="lang_options" rows="5" cols="80">{LANG_OPTIONS}</textarea></dd> - <!-- ELSE --> - <dd><input class="medium" id="lang_options" name="lang_options[0]" value="{FIRST_LANG_OPTION}" /> {L_FIRST_OPTION}</dd> - <dd><input class="medium" name="lang_options[1]" value="{SECOND_LANG_OPTION}" /> {L_SECOND_OPTION}</dd> - <!-- ENDIF --> - </dl> + <dt><label for="lang_options">{L_ENTRIES}:</label><br /><span>{L_LANG_OPTIONS_EXPLAIN}</span></dt> + <!-- IF S_DROPDOWN --> + <dd><textarea id="lang_options" name="lang_options" rows="5" cols="80">{LANG_OPTIONS}</textarea></dd> + <!-- ELSE --> + <dd><input class="medium" id="lang_options" name="lang_options[0]" value="{FIRST_LANG_OPTION}" /> {L_FIRST_OPTION}</dd> + <dd><input class="medium" name="lang_options[1]" value="{SECOND_LANG_OPTION}" /> {L_SECOND_OPTION}</dd> <!-- ENDIF --> + </dl> + <!-- ENDIF --> </fieldset> <fieldset class="quick"> diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index ee8c337725..924e2d4fb3 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -8,7 +8,6 @@ <script type="text/javascript"> <!-- - function update_image(newimage) { document.getElementById('image').src = (newimage) ? "{RANKS_PATH}/" + newimage : "./images/spacer.gif"; diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html index e1f8fb2c8f..8011542447 100644 --- a/phpBB/adm/style/acp_reasons.html +++ b/phpBB/adm/style/acp_reasons.html @@ -22,14 +22,14 @@ <fieldset> <legend>{L_TITLE}</legend> <p><!-- IF S_TRANSLATED -->{L_IS_TRANSLATED}<!-- ELSE -->{L_IS_NOT_TRANSLATED}<!-- ENDIF --></p> - <dl> - <dt><label for="reason_title">{L_REASON_TITLE}:</label></dt> - <dd><input name="reason_title" type="text" id="reason_title" value="{REASON_TITLE}" /></dd> - </dl> - <dl> - <dt><label for="reason_description">{L_REASON_DESCRIPTION}:</label></dt> - <dd><textarea name="reason_description" id="reason_description" rows="8">{REASON_DESCRIPTION}</textarea></dd> - </dl> + <dl> + <dt><label for="reason_title">{L_REASON_TITLE}:</label></dt> + <dd><input name="reason_title" type="text" id="reason_title" value="{REASON_TITLE}" /></dd> + </dl> + <dl> + <dt><label for="reason_description">{L_REASON_DESCRIPTION}:</label></dt> + <dd><textarea name="reason_description" id="reason_description" rows="8">{REASON_DESCRIPTION}</textarea></dd> + </dl> </fieldset> <fieldset class="submit-buttons"> @@ -45,36 +45,37 @@ <p>{L_ACP_REASONS_EXPLAIN}</p> -<!-- IF reasons --> - <table cellspacing="1"> - <col class="row1" /><col class="row1" /><col class="row2" /> - <thead> - <tr> - <th>{L_REASON}</th> - <th>{L_USED_IN_REPORTS}</th> - <th>{L_OPTIONS}</th> - </tr> - </thead> - <tbody> - <!-- BEGIN reasons --> + <!-- IF .reasons --> + <table cellspacing="1"> + <col class="row1" /><col class="row1" /><col class="row2" /> + <thead> <tr> - <td> - <i style="float: right; font-size: .9em;"><!-- IF reasons.S_TRANSLATED -->{L_IS_TRANSLATED}<!-- ELSE -->{L_IS_NOT_TRANSLATED}<!-- ENDIF --></i> - <strong>{reasons.REASON_TITLE}<!-- IF reasons.S_OTHER_REASON --> *<!-- ENDIF --></strong> - <br /><span>{reasons.REASON_DESCRIPTION}</span> - </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 --> - </td> + <th>{L_REASON}</th> + <th>{L_USED_IN_REPORTS}</th> + <th>{L_OPTIONS}</th> </tr> - <!-- END reasons --> - </tbody> - </table> -<!-- ENDIF --> + </thead> + <tbody> + <!-- BEGIN reasons --> + <tr> + <td> + <i style="float: right; font-size: .9em;"><!-- IF reasons.S_TRANSLATED -->{L_IS_TRANSLATED}<!-- ELSE -->{L_IS_NOT_TRANSLATED}<!-- ENDIF --></i> + <strong>{reasons.REASON_TITLE}<!-- IF reasons.S_OTHER_REASON --> *<!-- ENDIF --></strong> + <br /><span>{reasons.REASON_DESCRIPTION}</span> + </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 --> + </td> + </tr> + <!-- END reasons --> + </tbody> + </table> + + <!-- ENDIF --> <form id="reasons" method="post" action="{U_ACTION}"> diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index 281ede19a8..f27d9a43ea 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -3,14 +3,14 @@ <a name="maincontent"></a> <!-- IF S_SETTINGS --> -<h1>{L_ACP_SEARCH_SETTINGS}</h1> + <h1>{L_ACP_SEARCH_SETTINGS}</h1> -<p>{L_ACP_SEARCH_SETTINGS_EXPLAIN}</p> + <p>{L_ACP_SEARCH_SETTINGS_EXPLAIN}</p> -<form id="acp_search" method="post" action="{U_ACTION}"> -<fieldset> - <legend>{L_GENERAL_SEARCH_SETTINGS}</legend> + <form id="acp_search" method="post" action="{U_ACTION}"> + <fieldset> + <legend>{L_GENERAL_SEARCH_SETTINGS}</legend> <dl> <dt><label for="load_search">{L_YES_SEARCH}:</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt> <dd><input type="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> class="radio" /> {L_YES} <input type="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> class="radio" /> {L_NO}</dd> @@ -35,89 +35,103 @@ <dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}:</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt> <dd><input id="search_store_results" type="text" size="4" maxlength="6" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /></dd> </dl> -</fieldset> - -<fieldset> - <legend>{L_SEARCH_TYPE}</legend> + </fieldset> + <fieldset> + <legend>{L_SEARCH_TYPE}</legend> <dl> <dt><label for="search_type">{L_SEARCH_TYPE}:</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt> <dd><select id="search_type" name="config[search_type]">{S_SEARCH_TYPES}</select></dd> </dl> -</fieldset> + </fieldset> -<!-- BEGIN backend --> -<fieldset> - <legend>{backend.NAME}</legend> + <!-- BEGIN backend --> - {backend.SETTINGS} -</fieldset> -<!-- END backend --> + <fieldset> + <legend>{backend.NAME}</legend> + {backend.SETTINGS} + </fieldset> -<fieldset class="submit-buttons"> - <input class="button1" type="submit" id="submit" name="submit" value="Submit" /> - <input class="button2" type="reset" id="reset" name="reset" value="Reset" /> -</fieldset> + <!-- END backend --> + + <fieldset class="submit-buttons"> + <input class="button1" type="submit" id="submit" name="submit" value="Submit" /> + <input class="button2" type="reset" id="reset" name="reset" value="Reset" /> + </fieldset> -</form> + </form> <!-- ELSEIF S_INDEX --> -<script language="javascript" type="text/javascript"> -<!-- - function popup_progress_bar(progress_type) - { - close_waitscreen = 0; - window.open('{UA_PROGRESS_BAR}&type=' + progress_type, '_index', 'HEIGHT=240,resizable=yes,scrollbars=no,WIDTH=400'); - } -//--> -</script> - -<h1>{L_ACP_SEARCH_INDEX}</h1> - -<p>{L_ACP_SEARCH_INDEX_EXPLAIN}</p> - -<!-- IF S_CONTINUE_INDEXING --> - <a href="{U_CONTINUE_INDEXING}" onclick="javascript:popup_progress_bar('{S_CONTINUE_INDEXING}');">{L_CONTINUE}</a> - - <p>{L_CONTINUE_EXPLAIN}</p> -<!-- ELSE --> -<!-- BEGIN backend --> -<!-- IF backend.S_STATS --> -<table cellspacing="1"> - <caption>» {L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption> - <col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" /> - <thead> - <tr> - <th>{L_STATISTIC}</th> - <th>{L_VALUE}</th> - <th>{L_STATISTIC}</th> - <th>{L_VALUE}</th> - </tr> - </thead> - <tbody> - <!-- BEGIN data --> - <tr> - <td>{backend.data.STATISTIC_1}:</td> - <td>{backend.data.VALUE_1}</td> - <td>{backend.data.STATISTIC_2}<!-- IF backend.data.STATISTIC_2 -->:<!-- ENDIF --></td> - <td>{backend.data.VALUE_2}</td> - </tr> - <!-- END data --> - </tbody> -</table> -<!-- ENDIF --> -<form id="acp_search_index_{backend.NAME}" method="post" action="{U_ACTION}"> -{backend.S_HIDDEN_FIELDS} - <fieldset class="quick"> - <!-- IF backend.S_INDEXED --> - <input class="button2" type="submit" name="action[delete]" value="{L_DELETE_INDEX}" onclick="javascript:popup_progress_bar('delete')" /> - <!-- ELSE --> - <input class="button2" type="submit" name="action[create]" value="{L_CREATE_INDEX}" onclick="javascript:popup_progress_bar('create')" /> - <!-- ENDIF --> - </fieldset> -</form> -<!-- END backend --> -<!-- ENDIF --> + + <script type="text/javascript"> + <!-- + + /** + * Popup search progress bar + */ + function popup_progress_bar(progress_type) + { + close_waitscreen = 0; + window.open('{UA_PROGRESS_BAR}&type=' + progress_type, '_index', 'HEIGHT=240,resizable=yes,scrollbars=no,WIDTH=400'); + } + //--> + </script> + + <h1>{L_ACP_SEARCH_INDEX}</h1> + + <p>{L_ACP_SEARCH_INDEX_EXPLAIN}</p> + + <!-- IF S_CONTINUE_INDEXING --> + <a href="{U_CONTINUE_INDEXING}" onclick="javascript:popup_progress_bar('{S_CONTINUE_INDEXING}');">{L_CONTINUE}</a> + + <p>{L_CONTINUE_EXPLAIN}</p> + <!-- ELSE --> + + <!-- BEGIN backend --> + + <!-- IF backend.S_STATS --> + + <table cellspacing="1"> + <caption>» {L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption> + <col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" /> + <thead> + <tr> + <th>{L_STATISTIC}</th> + <th>{L_VALUE}</th> + <th>{L_STATISTIC}</th> + <th>{L_VALUE}</th> + </tr> + </thead> + <tbody> + <!-- BEGIN data --> + <tr> + <td>{backend.data.STATISTIC_1}:</td> + <td>{backend.data.VALUE_1}</td> + <td>{backend.data.STATISTIC_2}<!-- IF backend.data.STATISTIC_2 -->:<!-- ENDIF --></td> + <td>{backend.data.VALUE_2}</td> + </tr> + <!-- END data --> + </tbody> + </table> + + <!-- ENDIF --> + + <form id="acp_search_index_{backend.NAME}" method="post" action="{U_ACTION}"> + {backend.S_HIDDEN_FIELDS} + + <fieldset class="quick"> + <!-- IF backend.S_INDEXED --> + <input class="button2" type="submit" name="action[delete]" value="{L_DELETE_INDEX}" onclick="javascript:popup_progress_bar('delete')" /> + <!-- ELSE --> + <input class="button2" type="submit" name="action[create]" value="{L_CREATE_INDEX}" onclick="javascript:popup_progress_bar('create')" /> + <!-- ENDIF --> + </fieldset> + + </form> + <!-- END backend --> + + <!-- ENDIF --> + <!-- ENDIF --> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 3a5b6330db..83e5e6c639 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -39,352 +39,367 @@ <p>{L_EXPLAIN}</p> <script language="javascript" type="text/javascript" defer="defer"> <!-- - - function update_image(newimage) - { - document.newimg.src = (newimage) ? "../styles/{NAME}/imageset/" + newimage : "images/no_image.png"; - } + function update_image(newimage) + { + document.newimg.src = (newimage) ? "../styles/{NAME}/imageset/" + newimage : "images/no_image.png"; + } //--> </script> - <form method="post" action="{U_ACTION}"><table width="95%" cellspacing="1" cellpadding="1" border="0" align="center"> - <tr> - <td align="right">{L_SELECT_IMAGE}: <select name="imgname" onchange="this.form.submit(); "> - <!-- BEGIN category --> + <form method="post" action="{U_ACTION}"> + + <table width="95%" cellspacing="1" cellpadding="1" border="0" align="center"> + <tr> + <td align="right">{L_SELECT_IMAGE}: <select name="imgname" onchange="this.form.submit(); "> + <!-- BEGIN category --> <option class="sep" value="">{category.NAME}</option> <!-- BEGIN images --><option value="{category.images.VALUE}"<!-- IF category.images.SELECTED--> selected="selected"<!-- ENDIF -->>{category.images.TEXT}</option> <!-- END images --> <!-- END category --> - </select> <input class="btnlite" type="submit" value="{L_SELECT}" tabindex="100" /></td> - </tr> - <tr> - <td><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center"> - <tr> - <th colspan="2">{L_EDIT_IMAGESET}</th> - </tr> - <!-- IF SUCCESS --> - <tr> - <td class="row1" colspan="2" align="center"><span style="color: green">{L_IMAGESET_UPDATED}</span><br /></td> - </tr> - <!-- ENDIF --> - <!-- IF ERROR --> - <tr> - <td class="row1" colspan="2" align="center"><span style="color: red">{L_NO_IMAGE}</span><br /></td> - </tr> - <!-- ENDIF --> - <tr> - <td class="row1" colspan="2" align="center"><table width="100%" cellspacing="2" cellpadding="2" border="0"> - <tr> - <td width="50%" align="center"><img src="<!-- IF IMAGE_REQUEST neq '' -->{IMAGE_REQUEST}<!-- ELSE -->images/no_image.png<!-- ENDIF -->"/></td> - <td width="50%" align="center"><img src="images/no_image.png" name="newimg" /></td> - </tr> - <tr> - <td class="gensmall" align="center">{L_CURRENT_IMAGE}</td> - <td class="gensmall" align="center">{L_SELECTED_IMAGE}</td> - </tr> - </table></td> - </tr> - <tr> - <th width="40%">{L_IMAGE_PARAMETER}</th> - <th>{L_IMAGE_VALUE}</th> - </tr> - <tr> - <td class="row1" width="40%"><b>{L_IMAGE}: </b></td> - <td class="row2"><select name="imgpath" onchange="update_image(this.options[selectedIndex].value);"><option value=""<!-- IF not IMAGE_SELECT--> selected="selected"<!-- ENDIF -->>{L_NONE}</option> + </select> <input class="btnlite" type="submit" value="{L_SELECT}" tabindex="100" /> + </td> + </tr> + <tr> + <td> + <table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center"> + <tr> + <th colspan="2">{L_EDIT_IMAGESET}</th> + </tr> + <!-- IF SUCCESS --> + <tr> + <td class="row1" colspan="2" align="center"><span style="color: green">{L_IMAGESET_UPDATED}</span><br /></td> + </tr> + <!-- ENDIF --> + <!-- IF ERROR --> + <tr> + <td class="row1" colspan="2" align="center"><span style="color: red">{L_NO_IMAGE}</span><br /></td> + </tr> + <!-- ENDIF --> + <tr> + <td class="row1" colspan="2" align="center"> + <table width="100%" cellspacing="2" cellpadding="2" border="0"> + <tr> + <td width="50%" align="center"><img src="<!-- IF IMAGE_REQUEST neq '' -->{IMAGE_REQUEST}<!-- ELSE -->images/no_image.png<!-- ENDIF -->"/></td> + <td width="50%" align="center"><img src="images/no_image.png" name="newimg" /></td> + </tr> + <tr> + <td class="gensmall" align="center">{L_CURRENT_IMAGE}</td> + <td class="gensmall" align="center">{L_SELECTED_IMAGE}</td> + </tr> + </table> + </td> + </tr> + <tr> + <th width="40%">{L_IMAGE_PARAMETER}</th> + <th>{L_IMAGE_VALUE}</th> + </tr> + <tr> + <td class="row1" width="40%"><b>{L_IMAGE}: </b></td> + <td class="row2"><select name="imgpath" onchange="update_image(this.options[selectedIndex].value);"><option value=""<!-- IF not IMAGE_SELECT--> selected="selected"<!-- ENDIF -->>{L_NONE}</option> <!-- BEGIN imagesetlist --> <option class="sep" value=""><!-- IF imagesetlist.TYPE -->{L_LOCALISED_IMAGES}<!-- ELSE -->{L_GLOBAL_IMAGES}<!-- ENDIF --></option> <!-- BEGIN images --> <option value="{imagesetlist.images.VALUE}"<!-- IF imagesetlist.images.SELECTED--> selected="selected"<!-- ENDIF -->>{imagesetlist.images.TEXT}</option> <!-- END images --> <!-- END imagesetlist --> - </select></td> - </tr> - <tr> - <td class="row1" width="40%"><b>{L_INCLUDE_DIMENSIONS}: </b><br /><span class="gensmall">{L_DIMENSIONS_EXPLAIN}</span></td> - <td class="row2"><input type="radio" name="imgsize" value="1"<!-- IF IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" name="imgsize" value="0"<!-- IF not IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_NO}</td> - </tr> - <tr> - <td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="update" value="{L_SUBMIT}" /> <input class="btnmain" type="reset" value="{L_RESET}" /></td> - </tr> - </table></td> - </tr> - </table></form> + </select> + </td> + </tr> + <tr> + <td class="row1" width="40%"><b>{L_INCLUDE_DIMENSIONS}: </b><br /><span class="gensmall">{L_DIMENSIONS_EXPLAIN}</span></td> + <td class="row2"><input type="radio" name="imgsize" value="1"<!-- IF IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" name="imgsize" value="0"<!-- IF not IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_NO}</td> + </tr> + <tr> + <td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="update" value="{L_SUBMIT}" /> <input class="btnmain" type="reset" value="{L_RESET}" /></td> + </tr> + </table> + </td> + </tr> + </table> + + </form> + <!-- ELSEIF S_EDIT_TEMPLATE or S_EDIT_THEME --> + <script language="javascript" type="text/javascript" defer="defer"> <!-- - - function append_text_rows(form_name, value) - { - url = document.getElementById(form_name).action; - var_start = url.indexOf('&text_rows='); - if (var_start == -1) - { - document.getElementById(form_name).action = url + "&text_rows=" + value; - } - else + function append_text_rows(form_name, value) { - url_start = url.substring(0, var_start + 1); - var_end = url.substring(var_start + 1).indexOf('&'); - if (var_end == -1) + url = document.getElementById(form_name).action; + var_start = url.indexOf('&text_rows='); + if (var_start == -1) { - document.getElementById(form_name).action = url_start + "text_rows=" + value; + document.getElementById(form_name).action = url + "&text_rows=" + value; } else { - document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value; + url_start = url.substring(0, var_start + 1); + var_end = url.substring(var_start + 1).indexOf('&'); + if (var_end == -1) + { + document.getElementById(form_name).action = url_start + "text_rows=" + value; + } + else + { + document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value; + } } } - } //--> </script> -<!-- IF S_EDIT_TEMPLATE --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <!-- IF S_EDIT_TEMPLATE --> - <h1>{L_EDIT_TEMPLATE}</h1> + <a href="{U_BACK}" style="float: right">« {L_BACK}</a> - <p>{L_EDIT_TEMPLATE_EXPLAIN}</p> + <h1>{L_EDIT_TEMPLATE}</h1> - <p>{L_SELECTED_TEMPLATE}: <b>{SELECTED_TEMPLATE}</b></p> + <p>{L_EDIT_TEMPLATE_EXPLAIN}</p> - <form id="acp_styles" method="post" action="{U_ACTION}"> + <p>{L_SELECTED_TEMPLATE}: <b>{SELECTED_TEMPLATE}</b></p> - <fieldset> - <legend>{L_SELECT_TEMPLATE}</legend> + <form id="acp_styles" method="post" action="{U_ACTION}"> + + <fieldset> + <legend>{L_SELECT_TEMPLATE}</legend> <dl> <dt><label for="template_file">{L_TEMPLATE_FILE}:</label></dt> <dd><select id="template_file" name="template_file" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_TEMPLATES}</select> <input class="btnlite" type="submit" value="{L_SELECT}" /></dd> </dl> - </fieldset> + </fieldset> - </form> + </form> + + <!-- IF TEMPLATE_FILE --> + <script language="javascript" type="text/javascript" defer="defer"> + <!-- + + function change_editor_height(height) + { + editor = document.getElementById('template_data'); + editor.rows = Math.max(5, Math.min(height, 999)); + + append_text_rows('acp_styles', height); + append_text_rows('acp_template', height); + } + + function append_text_rows(form_name, value) + { + url = document.getElementById(form_name).action; + var_start = url.indexOf('&text_rows='); + if (var_start == -1) + { + document.getElementById(form_name).action = url + "&text_rows=" + value; + } + else + { + url_start = url.substring(0, var_start + 1); + var_end = url.substring(var_start + 1).indexOf('&'); + if (var_end == -1) + { + document.getElementById(form_name).action = url_start + "text_rows=" + value; + } + else + { + document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value; + } + } + } + //--> + </script> + + <form id="acp_template" method="post" action="{U_ACTION}"> + + <fieldset> + <legend>{L_TEMPLATE_EDITOR}</legend> + <dl> + <dt><label>{L_SELECTED_TEMPLATE_FILE}:</label></dt> + <dd>{TEMPLATE_FILE}</dd> + </dl> + <dl> + <dt><label for="text_rows">{L_TEMPLATE_EDITOR_HEIGHT}:</label></dt> + <dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="btnlite" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd> + </dl> + <textarea id="template_data" name="template_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{TEMPLATE_DATA}</textarea> + </fieldset> - <!-- IF TEMPLATE_FILE --> - <script language="javascript" type="text/javascript" defer="defer"> - <!-- + <fieldset class="submit-buttons"> + {S_HIDDEN_FIELDS} + <input class="button1" id="save" type="submit" name="save" value="{L_SUBMIT}" /> + </fieldset> - function change_editor_height(height) - { - editor = document.getElementById('template_data'); - editor.rows = Math.max(5, Math.min(height, 999)); + </form> + <!-- ENDIF --> - append_text_rows('acp_styles', height); - append_text_rows('acp_template', height); - } + <!-- ELSEIF S_EDIT_THEME --> - function append_text_rows(form_name, value) - { - url = document.getElementById(form_name).action; - var_start = url.indexOf('&text_rows='); - if (var_start == -1) - { - document.getElementById(form_name).action = url + "&text_rows=" + value; - } - else - { - url_start = url.substring(0, var_start + 1); - var_end = url.substring(var_start + 1).indexOf('&'); - if (var_end == -1) - { - document.getElementById(form_name).action = url_start + "text_rows=" + value; - } - else + <script language="javascript" type="text/javascript"> + <!-- + + function swatch(field) { - document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value; + window.open('{UA_SWATCH}' + field, '_swatch', 'HEIGHT=115,resizable=yes,scrollbars=no,WIDTH=636'); + return false; } - } - } - //--> - </script> - - <form id="acp_template" method="post" action="{U_ACTION}"> - - <fieldset> - <legend>{L_TEMPLATE_EDITOR}</legend> - <dl> - <dt><label>{L_SELECTED_TEMPLATE_FILE}:</label></dt> - <dd>{TEMPLATE_FILE}</dd> - </dl> - <dl> - <dt><label for="text_rows">{L_TEMPLATE_EDITOR_HEIGHT}:</label></dt> - <dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="btnlite" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd> - </dl> - <textarea id="template_data" name="template_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{TEMPLATE_DATA}</textarea> - </fieldset> - - <fieldset class="submit-buttons"> - {S_HIDDEN_FIELDS} - <input class="button1" id="save" type="submit" name="save" value="{L_SUBMIT}" /> - </fieldset> - - - </form> - <!-- ENDIF --> - -<!-- ELSEIF S_EDIT_THEME --> - <script language="javascript" type="text/javascript"> - <!-- + function change_editor_height(height) + { + editor = document.getElementById('css_data'); + editor.rows = Math.max(5, Math.min(height, 999)); - function swatch(field) - { - window.open('{UA_SWATCH}' + field, '_swatch', 'HEIGHT=115,resizable=yes,scrollbars=no,WIDTH=636'); - return false; - } + append_text_rows('acp_styles', height); + append_text_rows('acp_theme', height); + append_text_rows('acp_custom_class', height); + } - function change_editor_height(height) - { - editor = document.getElementById('css_data'); - editor.rows = Math.max(5, Math.min(height, 999)); + //--> + </script> - append_text_rows('acp_styles', height); - append_text_rows('acp_theme', height); - append_text_rows('acp_custom_class', height); - } + <a href="{U_BACK}" style="float: right">« {L_BACK}</a> - //--> - </script> + <h1>{L_EDIT_THEME}</h1> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <p>{L_EDIT_THEME_EXPLAIN}</p> - <h1>{L_EDIT_THEME}</h1> + <p>{L_SELECTED_THEME}: <b>{SELECTED_THEME}</b></p> - <p>{L_EDIT_THEME_EXPLAIN}</p> + <!-- IF S_SHOWCSS --> + <h3>{L_SHOW_CSS_NOTE}</h3> + <p>{L_SHOW_CSS_EXPLAIN}</p> + <!-- ENDIF --> - <p>{L_SELECTED_THEME}: <b>{SELECTED_THEME}</b></p> + <form id="acp_styles" method="post" action="{U_ACTION}"> - <!-- IF S_SHOWCSS --> - <h3>{L_SHOW_CSS_NOTE}</h3> - <p>{L_SHOW_CSS_EXPLAIN}</p> - <!-- ENDIF --> - - <form id="acp_styles" method="post" action="{U_ACTION}"> - <fieldset> - <legend>{L_SELECT_CLASS}</legend> + <fieldset> + <legend>{L_SELECT_CLASS}</legend> <dl> <dt><label for="css_class">{L_SELECT_CLASS}:</label></dt> <dd><select id="css_class" name="css_class" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_CLASSES}</select> <input class="btnlite" type="submit" id="select_class" name="select_class" value="{L_SELECT}" /></dd> </dl> <!-- IF S_CLASS --> - <dl> - <dt><label>{L_SELECTED_CLASS}:</label></dt> - <dd>{S_CLASS}</dd> - </dl> + <dl> + <dt><label>{L_SELECTED_CLASS}:</label></dt> + <dd>{S_CLASS}</dd> + </dl> <!-- ENDIF --> - </fieldset> - </form> - - <!-- IF S_CLASS --> - - <form id="acp_theme" method="post" action="{U_ACTION}"> - - <!-- IF S_SHOWCSS --> + </fieldset> + + </form> - <fieldset> - <legend>{L_THEME_EDITOR}</legend> - <dl> - <dt><label for="text_rows">{L_THEME_EDITOR_HEIGHT}:</label></dt> - <dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="btnlite" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd> - </dl> - <textarea id="css_data" name="css_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{CSS_DATA}</textarea> - </fieldset> + <!-- IF S_CLASS --> - <!-- ELSE --> + <form id="acp_theme" method="post" action="{U_ACTION}"> + + <!-- IF S_SHOWCSS --> + + <fieldset> + <legend>{L_THEME_EDITOR}</legend> + <dl> + <dt><label for="text_rows">{L_THEME_EDITOR_HEIGHT}:</label></dt> + <dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="btnlite" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd> + </dl> + <textarea id="css_data" name="css_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{CSS_DATA}</textarea> + </fieldset> + + <!-- ELSE --> + + <fieldset> + <legend>{L_BACKGROUND}</legend> + <dl> + <dt><label for="background_color">{L_BACKGROUND_COLOUR}:</label><br /><span>{L_CSS_COLOUR_EXPLAIN}</span></dt> + <dd><input id="background_color" name="background_color" type="text" value="{BACKGROUND_COLOR}" size="6" /> <span>[ <a href="#" onclick="swatch('background_color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> + </dl> + <dl> + <dt><label for="backround_image">{L_BACKGROUND_IMAGE}:</label></td> + <dd><select id="background_image" name="background_image">{S_BACKGROUND_IMAGE}</select></dd> + </dl> + <dl> + <dt><label for="background_repeat">{L_BACKGROUND_REPEAT}:</label></dt> + <dd><select id="background_repeat" name="background_repeat">{S_BACKGROUND_REPEAT}</select></dd> + </dl> + </fieldset> + + <fieldset> + <legend>{L_FOREGROUND}</legend> + <dl> + <dt><label for="color">{L_FONT_COLOUR}:</label><br /><span>{L_CSS_COLOUR_EXPLAIN}</span></dt> + <dd><input id="color" name="color" type="text" value="{COLOR}" size="6" /> <span>[ <a href="#" onclick="swatch('color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> + </dl> + <dl> + <dt><label for="font_family">{L_FONT_FACE}:</label><br /><span>{L_FONT_FACE_EXPLAIN}</span></dt> + <dd><input id="font_family" name="font_family" type="text" value="{FONT_FAMILY}" size="40" maxlength="255" /></dd> + </dl> + <dl> + <dt><label for="font_size">{L_FONT_SIZE}:</label></dt> + <dd><input id="font_size" name="font_size" type="text" value="{FONT_SIZE}" size="3" maxlength="3" /> <select id="font_size_unit" name="font_size_unit">{S_FONT_SIZE_UNITS}</select></dd> + </dl> + <dl> + <dt><label for="font_weight">{L_BOLD}:</label></dt> + <dd><input id="font_weight" type="radio" name="font_weight" value="bold"<!-- IF FONT_WEIGHT eq "bold" --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" name="font_weight" value="normal"<!-- IF FONT_WEIGHT eq "normal" --> checked="checked"<!-- ENDIF --> /> {L_NO} <input type="radio" name="font_weight" value=""<!-- IF not FONT_WEIGHT --> checked="checked"<!-- ENDIF --> /> {L_UNSET}</dd> + </dl> + <dl> + <dt><label for="font_style">{L_ITALIC}:</label></dt> + <dd><input id="font_style" type="radio" name="font_style" value="italic"<!-- IF FONT_STYLE eq "italic" --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" name="font_style" value="normal"<!-- IF FONT_STYLE eq "normal" --> checked="checked"<!-- ENDIF --> /> {L_NO} <input type="radio" name="font_style" value=""<!-- IF not FONT_STYLE --> checked="checked"<!-- ENDIF --> /> {L_UNSET}</dd> + </dl> + <dl> + <dt><label for="text_decoration">{L_UNDERLINE}:</label></dt> + <dd><input id="text_decoration" type="radio" name="text_decoration" value="underline"<!-- IF TEXT_DECORATION eq "underline" --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" name="text_decoration" value="normal"<!-- IF TEXT_DECORATION eq "normal" --> checked="checked"<!-- ENDIF --> /> {L_NO} <input type="radio" name="text_decoration" value=""<!-- IF not TEXT_DECORATION --> checked="checked"<!-- ENDIF --> /> {L_UNSET}</dd> + </dl> + <dl> + <dt><label for="line_height">{L_LINE_SPACING}</label></dt> + <dd><input id="line_height" name="line_height" type="text" value="{LINE_HEIGHT}" size="3" maxlength="3" /> <select id="line_height_unit" name="line_height_unit">{S_LINE_HEIGHT_UNITS}</select></dd> + </dl> + </fieldset> - <fieldset> - <legend>{L_BACKGROUND}</legend> - <dl> - <dt><label for="background_color">{L_BACKGROUND_COLOUR}:</label><br /><span>{L_CSS_COLOUR_EXPLAIN}</span></dt> - <dd><input id="background_color" name="background_color" type="text" value="{BACKGROUND_COLOR}" size="6" /> <span>[ <a href="#" onclick="swatch('background_color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> - </dl> - <dl> - <dt><label for="backround_image">{L_BACKGROUND_IMAGE}:</label></td> - <dd><select id="background_image" name="background_image">{S_BACKGROUND_IMAGE}</select></dd> - </dl> - <dl> - <dt><label for="background_repeat">{L_BACKGROUND_REPEAT}:</label></dt> - <dd><select id="background_repeat" name="background_repeat">{S_BACKGROUND_REPEAT}</select></dd> - </dl> - </fieldset> + <!-- ENDIF --> - <fieldset> - <legend>{L_FOREGROUND}</legend> - <dl> - <dt><label for="color">{L_FONT_COLOUR}:</label><br /><span>{L_CSS_COLOUR_EXPLAIN}</span></dt> - <dd><input id="color" name="color" type="text" value="{COLOR}" size="6" /> <span>[ <a href="#" onclick="swatch('color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> - </dl> - <dl> - <dt><label for="font_family">{L_FONT_FACE}:</label><br /><span>{L_FONT_FACE_EXPLAIN}</span></dt> - <dd><input id="font_family" name="font_family" type="text" value="{FONT_FAMILY}" size="40" maxlength="255" /></dd> - </dl> - <dl> - <dt><label for="font_size">{L_FONT_SIZE}:</label></dt> - <dd><input id="font_size" name="font_size" type="text" value="{FONT_SIZE}" size="3" maxlength="3" /> <select id="font_size_unit" name="font_size_unit">{S_FONT_SIZE_UNITS}</select></dd> - </dl> - <dl> - <dt><label for="font_weight">{L_BOLD}:</label></dt> - <dd><input id="font_weight" type="radio" name="font_weight" value="bold"<!-- IF FONT_WEIGHT eq "bold" --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" name="font_weight" value="normal"<!-- IF FONT_WEIGHT eq "normal" --> checked="checked"<!-- ENDIF --> /> {L_NO} <input type="radio" name="font_weight" value=""<!-- IF not FONT_WEIGHT --> checked="checked"<!-- ENDIF --> /> {L_UNSET}</dd> - </dl> - <dl> - <dt><label for="font_style">{L_ITALIC}:</label></dt> - <dd><input id="font_style" type="radio" name="font_style" value="italic"<!-- IF FONT_STYLE eq "italic" --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" name="font_style" value="normal"<!-- IF FONT_STYLE eq "normal" --> checked="checked"<!-- ENDIF --> /> {L_NO} <input type="radio" name="font_style" value=""<!-- IF not FONT_STYLE --> checked="checked"<!-- ENDIF --> /> {L_UNSET}</dd> - </dl> - <dl> - <dt><label for="text_decoration">{L_UNDERLINE}:</label></dt> - <dd><input id="text_decoration" type="radio" name="text_decoration" value="underline"<!-- IF TEXT_DECORATION eq "underline" --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" name="text_decoration" value="normal"<!-- IF TEXT_DECORATION eq "normal" --> checked="checked"<!-- ENDIF --> /> {L_NO} <input type="radio" name="text_decoration" value=""<!-- IF not TEXT_DECORATION --> checked="checked"<!-- ENDIF --> /> {L_UNSET}</dd> - </dl> - <dl> - <dt><label for="line_height">{L_LINE_SPACING}</label></dt> - <dd><input id="line_height" name="line_height" type="text" value="{LINE_HEIGHT}" size="3" maxlength="3" /> <select id="line_height_unit" name="line_height_unit">{S_LINE_HEIGHT_UNITS}</select></dd> - </dl> - </fieldset> + <fieldset class="submit-buttons"> + {S_HIDDEN_FIELDS} + <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> + <!-- IF S_SHOWCSS --> + <input class="button2" type="submit" id="hidecss" name="hidecss" value="{L_HIDE_CSS}" /> + <!-- ELSE --> + <input class="button2" type="submit" id="showcss" name="showcss" value="{L_SHOW_CSS}" /> + <!-- ENDIF --> + <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + </fieldset> - <!-- ENDIF --> + </form> - <fieldset class="submit-buttons"> - {S_HIDDEN_FIELDS} - <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> - <!-- IF S_SHOWCSS --> - <input class="button2" type="submit" id="hidecss" name="hidecss" value="{L_HIDE_CSS}" /> - <!-- ELSE --> - <input class="button2" type="submit" id="showcss" name="showcss" value="{L_SHOW_CSS}" /> <!-- ENDIF --> - <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> - </fieldset> - </form> - - <!-- ENDIF --> + <br /> + <h1>{L_CUSTOM_CLASS}</h1> - <br /> - <h1>{L_CUSTOM_CLASS}</h1> + <p>{L_CUSTOM_CLASS_EXPLAIN}</p> - <p>{L_CUSTOM_CLASS_EXPLAIN}</p> + <form id="acp_custom_class" method="post" action="{U_ACTION}"> - <form id="acp_custom_class" method="post" action="{U_ACTION}"> - - <fieldset> - <legend>{L_CUSTOM_CLASS}</legend> + <fieldset> + <legend>{L_CUSTOM_CLASS}</legend> <dl> <dt><label for="custom_class">{L_CSS_CLASS_NAME}:</label></dt></dt> <dd><input id="custom_class" name="custom_class" type="text" value="" maxlength="40" size="40" /></dd> </dl> - </fieldset> + </fieldset> - <fieldset class="quick"> - <input class="button1" type="submit" id="add_custom" name="add_custom" value="{L_SUBMIT}" /> - </fieldset> + <fieldset class="quick"> + <input class="button1" type="submit" id="add_custom" name="add_custom" value="{L_SUBMIT}" /> + </fieldset> + + </form> + + <!-- ENDIF --> - </form> -<!-- ENDIF --> <!-- ELSEIF S_CACHE --> + <script language="Javascript" type="text/javascript"> <!-- - function viewsource(url) - { - window.open(url, '_source', 'HEIGHT=550,resizable=yes,scrollbars=yes,WIDTH=750'); - return false; - } + function viewsource(url) + { + window.open(url, '_source', 'HEIGHT=550,resizable=yes,scrollbars=yes,WIDTH=750'); + return false; + } //--> </script> @@ -398,17 +413,17 @@ <form name="acp_styles" method="post" action="{U_ACTION}"> <table cellspacing="1"> - <thead> - <tr> - <th>{L_CACHE_FILENAME}</th> - <th>{L_CACHE_FILESIZE}</th> - <th>{L_CACHE_CACHED}</th> - <th>{L_CACHE_MODIFIED}</th> - <th>{L_MARK}</th> - </tr> - </thead> - <tbody> - <!-- BEGIN file --> + <thead> + <tr> + <th>{L_CACHE_FILENAME}</th> + <th>{L_CACHE_FILESIZE}</th> + <th>{L_CACHE_CACHED}</th> + <th>{L_CACHE_MODIFIED}</th> + <th>{L_MARK}</th> + </tr> + </thead> + <tbody> + <!-- BEGIN file --> <!-- IF file.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <td><a href="{file.U_VIEWSOURCE}" onclick="viewsource('{file.UA_VIEWSOURCE}');return false">{file.FILENAME}</a></td> <td>{file.FILESIZE}</td> @@ -416,11 +431,12 @@ <td>{file.MODIFIED}</td> <td><input type="checkbox" name="delete[]" value="{file.FILENAME}" /></td> </tr> - <!-- BEGINELSE --> + <!-- BEGINELSE --> <tr class="row1"> <td colspan="5">{L_TEMPLATE_CACHE_EMPTY}</td> </tr> - <!-- END file --> + <!-- END file --> + </tbody> </table> <fieldset class="quick"> @@ -428,7 +444,9 @@ <input class="button1" type="submit" id="submit" name="submit" value="{L_DELETE_MARKED}" /> </fieldset> + </form> + <!-- ELSEIF S_EXPORT --> <a href="{U_BACK}" style="float: right">« {L_BACK}</a> @@ -438,10 +456,10 @@ <p>{L_EXPLAIN}</p> <!-- IF S_ERROR_MSG --> - <div class="errorbox"> - <h3>{L_WARNING}</h3> - <p>{ERROR_MSG}</p> - </div> + <div class="errorbox"> + <h3>{L_WARNING}</h3> + <p>{ERROR_MSG}</p> + </div> <!-- ENDIF --> <form id="acp_styles" method="post" action="{U_ACTION}"> @@ -453,18 +471,18 @@ <dd><b>{NAME}</b></dd> </dl> <!-- IF S_STYLE --> - <dl> - <dt><label for="inc_template">{L_INCLUDE_TEMPLATE}:</label></dt> - <dd><input type="radio" class="radio" id="inc_template" name="inc_template" value="1" checked="checked" /> {L_YES} <input type="radio" class="radio" name="inc_template" value="0" /> {L_NO}</dd> - </dl> - <dl> - <dt><label for="inc_theme">{L_INCLUDE_THEME}:</label></dt> - <dd><input type="radio" class="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" /> {L_YES} <input type="radio" class="radio" name="inc_theme" value="0" /> {L_NO}</dd> - </dl> - <dl> - <dt><label for="inc_imageset">{L_INCLUDE_IMAGESET}:</label></dt> - <dd><input type="radio" class="radio" id="inc_imageset" name="inc_imageset" value="1" checked="checked" /> {L_YES} <input type="radio" class="radio" name="inc_imageset" value="0" /> {L_NO}</dd> - </dl> + <dl> + <dt><label for="inc_template">{L_INCLUDE_TEMPLATE}:</label></dt> + <dd><input type="radio" class="radio" id="inc_template" name="inc_template" value="1" checked="checked" /> {L_YES} <input type="radio" class="radio" name="inc_template" value="0" /> {L_NO}</dd> + </dl> + <dl> + <dt><label for="inc_theme">{L_INCLUDE_THEME}:</label></dt> + <dd><input type="radio" class="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" /> {L_YES} <input type="radio" class="radio" name="inc_theme" value="0" /> {L_NO}</dd> + </dl> + <dl> + <dt><label for="inc_imageset">{L_INCLUDE_IMAGESET}:</label></dt> + <dd><input type="radio" class="radio" id="inc_imageset" name="inc_imageset" value="1" checked="checked" /> {L_YES} <input type="radio" class="radio" name="inc_imageset" value="0" /> {L_NO}</dd> + </dl> <!-- ENDIF --> <dl> <dt><label for="store">{L_DOWNLOAD_STORE}:</label><br /><span>{L_DOWNLOAD_STORE_EXPLAIN}</span></dt> @@ -523,27 +541,27 @@ <td class="row3" colspan="{$COLSPAN}"><b>{L_UNINSTALLED}</b></td> </tr> <!-- IF not .uninstalled --> - <tr> - <td class="row1" colspan="{$COLSPAN}" style="text-align: center;">{L_NO_UNINSTALLED}</td> - </tr> + <tr> + <td class="row1" colspan="{$COLSPAN}" style="text-align: center;">{L_NO_UNINSTALLED}</td> + </tr> <!-- ENDIF --> <!-- BEGIN uninstalled --> - <tr> - <td<!-- IF S_STYLE --> colspan="2"<!-- ENDIF -->><b>{uninstalled.NAME}</b><br /><span>{L_COPYRIGHT}: {uninstalled.COPYRIGHT}</span></td> - <td style="text-align: center;"><a href="{uninstalled.U_INSTALL}">{L_INSTALL}</a></td> - </tr> + <tr> + <td<!-- IF S_STYLE --> colspan="2"<!-- ENDIF -->><b>{uninstalled.NAME}</b><br /><span>{L_COPYRIGHT}: {uninstalled.COPYRIGHT}</span></td> + <td style="text-align: center;"><a href="{uninstalled.U_INSTALL}">{L_INSTALL}</a></td> + </tr> <!-- END uninstalled --> </tbody> </table> <!-- IF S_STYLE --> - <form id="acp_styles" method="post" action="{U_ACTION}"> + <form id="acp_styles" method="post" action="{U_ACTION}"> <fieldset class="quick"> {L_CREATE}: <input type="text" name="name" value="" /> {L_FROM} <select name="basis">{S_BASIS_OPTIONS}</select> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /> </fieldset> - </form> + </form> <!-- ENDIF --> <!-- ELSEIF S_DETAILS --> @@ -555,10 +573,10 @@ <p>{L_EXPLAIN}</p> <!-- IF S_ERROR_MSG --> - <div class="errorbox"> - <h3>{L_WARNING}</h3> - <p>{ERROR_MSG}</p> - </div> + <div class="errorbox"> + <h3>{L_WARNING}</h3> + <p>{ERROR_MSG}</p> + </div> <!-- ENDIF --> <form id="acp_styles" method="post" action="{U_ACTION}"> diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index a787d9283f..8e0747a1ae 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -437,11 +437,11 @@ <fieldset> <legend>{L_ACP_USER_AVATAR}</legend> - <dl> - <dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> - <dd>{AVATAR_IMAGE}</dd> - <dd><input type="checkbox" name="delete" /> <span>{L_DELETE_AVATAR}</span></dd> - </dl> + <dl> + <dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> + <dd>{AVATAR_IMAGE}</dd> + <dd><input type="checkbox" name="delete" /> <span>{L_DELETE_AVATAR}</span></dd> + </dl> <!-- IF not S_IN_AVATAR_GALLERY --> <!-- IF S_CAN_UPLOAD --> <dl> @@ -474,26 +474,26 @@ <fieldset> <legend>{L_AVATAR_GALLERY}</legend> - <dl> - <dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt> - <dd><select name="category" id="category">{S_CAT_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd> - </dl> - <dl> - <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> - </dl> + <dl> + <dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt> + <dd><select name="category" id="category">{S_CAT_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd> + </dl> + <dl> + <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> + </dl> </fieldset> <fieldset class="quick" style="margin-top: -15px;"> @@ -515,10 +515,10 @@ <fieldset> <legend>{L_ACP_USER_RANK}</legend> - <dl> - <dt><label for="user_rank">{L_USER_RANK}:</label></dt> - <dd><select name="user_rank" id="user_rank">{S_RANK_OPTIONS}</select></dd> - </dl> + <dl> + <dt><label for="user_rank">{L_USER_RANK}:</label></dt> + <dd><select name="user_rank" id="user_rank">{S_RANK_OPTIONS}</select></dd> + </dl> </fieldset> <fieldset class="quick"> @@ -562,10 +562,10 @@ <form id="user_signature" method="post" action="{U_ACTION}"> <!-- IF SIGNATURE_PREVIEW --> - <fieldset> - <legend>{L_ADMIN_SIG_PREVIEW}</legend> - <p>{SIGNATURE_PREVIEW}</p> - </fieldset> + <fieldset> + <legend>{L_ADMIN_SIG_PREVIEW}</legend> + <p>{SIGNATURE_PREVIEW}</p> + </fieldset> <!-- ENDIF --> <fieldset> @@ -591,19 +591,19 @@ <a href="javascript:bbstyle(-1)" onmouseover="helpline('a')">{L_CLOSE_TAGS}</a> </div> <p><input type="text" name="helpbox" value="{L_STYLES_TIP}" class="full" style="border: 0; background: none;" /></p> - <dl> - <dt style="width: 110px;"><script type="text/javascript"><!-- - colorPalette('v', 17, 5); - //--></script> - </dt> - <dd style="text-align: left; margin-left: 110px;"><textarea name="signature" rows="10" cols="60" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></dd> - <dd style="text-align: left; margin-left: 110px;"> - <!-- IF S_BBCODE_ALLOWED --><input type="checkbox" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE} <!-- ENDIF --> - <!-- IF S_SMILIES_ALLOWED --><input type="checkbox" name="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES} <!-- ENDIF --> - <input type="checkbox" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL} - <br /><br /><strong>{L_OPTIONS}: </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {SMILIES_STATUS} - </dd> - </dl> + <dl> + <dt style="width: 110px;"><script type="text/javascript"><!-- + colorPalette('v', 17, 5); + //--></script> + </dt> + <dd style="text-align: left; margin-left: 110px;"><textarea name="signature" rows="10" cols="60" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></dd> + <dd style="text-align: left; margin-left: 110px;"> + <!-- IF S_BBCODE_ALLOWED --><input type="checkbox" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE} <!-- ENDIF --> + <!-- IF S_SMILIES_ALLOWED --><input type="checkbox" name="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES} <!-- ENDIF --> + <input type="checkbox" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL} + <br /><br /><strong>{L_OPTIONS}: </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {SMILIES_STATUS} + </dd> + </dl> </fieldset> <fieldset class="quick"> diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html index b17e80a8e8..ca02124956 100644 --- a/phpBB/adm/style/acp_words.html +++ b/phpBB/adm/style/acp_words.html @@ -40,11 +40,11 @@ <table cellspacing="1"> <thead> - <tr> - <th>{L_WORD}</th> - <th>{L_REPLACEMENT}</th> - <th colspan="2">{L_ACTION}</th> - </tr> + <tr> + <th>{L_WORD}</th> + <th>{L_REPLACEMENT}</th> + <th colspan="2">{L_ACTION}</th> + </tr> </thead> <tbody> <!-- BEGIN words --> diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 67cd36ae16..759a5e0749 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1,8 +1,6 @@ /* phpBB 3.0 Admin Style Sheet ------------------------------------------------------------------------ Original author: subBlue ( http://www.subBlue.com/ ) - Official update: $Id$ - Copyright 2006 phpBB Group ( http://www.phpbb.com/ ) ------------------------------------------------------------------------ */ @@ -14,12 +12,14 @@ /* Reset browsers default margin, padding and font sizes */ margin: 0; padding: 0; - } +} + html { font-size: 100%; height: 100%; margin-bottom: 1px; - } +} + body { /* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */ font-family: Verdana, Helvetica, Arial, sans-serif; @@ -27,48 +27,55 @@ body { background: #E4EDF0 url("../images/bg_header.gif") 0 0 repeat-x; font-size: 62.5%; /* This sets the default font size to be equivalent to 10px */ margin: 0; - } +} + img { border: 0; - } +} + h1 { font: bold 1.8em 'Trebuchet MS', Verdana, sans-serif; text-decoration: none; color: #333333; - } +} + h2, caption { font: bold 1.2em Arial, Helvetica, sans-serif; text-decoration: none; line-height: 120%; text-align: left; margin-top: 25px; - } +} + p { margin-bottom: 0.7em; line-height: 1.4em; font-size: 1.1em; - } +} + hr { border: 0 none; border-top: 1px solid #999999; margin-bottom: 5px; padding-bottom: 5px; height: 1px; - } +} + .small { font-size: 1em; - } +} /* General links */ a:link, a:active, a:visited { color: #006699; text-decoration: none; - } +} + a:hover { color: #DD6900; text-decoration: underline; - } +} /* Main blocks @@ -76,45 +83,54 @@ a:hover { #wrap { padding: 0 20px 15px 20px; min-width: 615px; - } +} + #page-header { text-align: right; background: url("../images/phpbb_logo.gif") 0 0 no-repeat; height: 84px; - } +} + #page-header h1 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 1.5em; font-weight: normal; padding-top: 15px; - } +} + #page-header p { font-size: 1.1em; - } +} + #page-body { clear: both; - } +} + #page-footer { clear: both; font-size: 1em; text-align: center; - } +} + #content { padding: 30px 10px 10px 10px; - } +} + #content h1 { line-height: 1.2em; margin-bottom: 0px; - } +} + #main { float:left; width: 76%; margin-left: 3%; min-height: 350px; - } +} + * html #main { height: 350px; - } +} /* Tabbed menu @@ -124,19 +140,22 @@ a:hover { line-height: normal; margin: 0 0 -6px 7px; min-width: 570px; - } +} + #tabs ul { margin:0; padding: 0; list-style: none; - } +} + #tabs li { display: inline; margin: 0; padding: 0; font-size: 1em; font-weight: bold; - } +} + #tabs a { float:left; background:url("../images/bg_tabs1.gif") no-repeat 0% -35px; @@ -144,7 +163,8 @@ a:hover { padding: 0 0 0 6px; text-decoration: none; position: relative; - } +} + #tabs a span { float: left; display: block; @@ -153,32 +173,38 @@ a:hover { color: #536482; white-space: nowrap; text-transform: uppercase; - } +} + /* Commented Backslash Hack hides rule from IE5-Mac \*/ #tabs a span { float:none; } /* End hack */ #tabs a:hover span { color: #DD6900; - } +} + #tabs #activetab a { background-position: 0 0px; border-bottom: 1px solid #FFFFFF; - } +} + #tabs #activetab a span { background-position: 100% 0px; padding-bottom: 7px; color: #333333; - } +} + #tabs a:hover { background-position: 0 -70px; - } +} + #tabs a:hover span { background-position:100% -70px; - } +} + #tabs #activetab a:hover span { color: #333333; - } +} /* Main Panel @@ -187,11 +213,12 @@ a:hover { margin: 4px 0; background-color: #FFFFFF; border: solid 1px #A9B8C2; - } +} + span.corners-top, span.corners-bottom, span.corners-top span, span.corners-bottom span { display: none; - } +} /* Sub-navigation Menu @@ -201,20 +228,22 @@ span.corners-top span, span.corners-bottom span { width: 20%; font-size: 100%; padding: 0; - } +} + #menu p { font-size: 1em; - } +} + #menu ul { list-style: none; - } +} /* Default list state */ #menu li { font-size: 1em; font-weight: bold; display: inline; - } +} /* Link styles for the sub-section links */ #menu li span { @@ -226,17 +255,20 @@ span.corners-top span, span.corners-bottom span { font-weight: bold; background-color: #ECECEC; border-top: 1px solid #FFFFFF; - } +} + #menu li a:hover span, #menu li#activemenu span { text-decoration: none; background-color: #FFA34F; color: #FFFFFF; - } +} + #menu li span.completed { text-decoration: none; background-color: #B9DBB3; color: #006699; - } +} + #menu li.header { display: block; padding: 5px; @@ -247,17 +279,19 @@ span.corners-top span, span.corners-bottom span { background: #006699 url("../images/cellpic3.gif") 0 0 repeat-x; margin-top: 5px; text-transform: uppercase; - } +} + #menu li#activemenu a span { text-decoration: none; font-weight: bold; color: #000; background-color: #DADFE4; - } +} + #menu li#activemenu a:hover span { text-decoration: none; color: #000; - } +} /* Table styles @@ -266,22 +300,25 @@ span.corners-top span, span.corners-bottom span { table { width: 100%; /*background-color: #ACBBC6;*/ - } +} + th, td { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 1.1em; text-align: left; - } -th { +} + +th { padding: 6px 4px; color: #FFA34F; font-weight: bold; background: #006699 url("../images/cellpic3.gif") 0 0 repeat-x; - } +} + td { padding: 4px; line-height: 1.2em; - } +} .row1 { background-color: #EFEFEF; } .row2 { background-color: #DEE3E7; } @@ -294,24 +331,26 @@ td { background-color: #D1D7DC; height: 1px; line-height: 1px; - } +} table.type2 { border: none; background: none; padding: 0; width: 0; - } +} + table.type2 th { background: none; border-top: none; text-align: center; color: #FFA34F; padding: 2px 0; - } +} + table.type2 td { padding: 0; - } +} /* General form styles @@ -325,13 +364,16 @@ fieldset { border-top: 1px solid #D5D5C8; background-color: #ECECEC; position: relative; - } +} + * html fieldset { padding: 0 10px 5px 10px; - } +} + fieldset p { font-size: 1.1em; - } +} + legend { padding: 1px 0; font-family: arial,Verdana,Sans-serif; @@ -343,12 +385,13 @@ legend { line-height: 100%; top: 0em; vertical-align:middle; - } +} + * html legend { margin-bottom: -10px; margin-left: -7px; top: -1.2em; - } +} input { font-family: Verdana, Helvetica, Arial, sans-serif; @@ -363,7 +406,8 @@ input { padding: 2px; cursor: text; vertical-align: middle; - } +} + select { font-family: Verdana, Helvetica, Arial, sans-serif; font-size: 100%; @@ -375,17 +419,21 @@ select { border: 1px solid #666666; padding: 1px; background-color: #FAFAFA; - } +} + optgroup { font-weight: bold; - } +} + option { padding-right: 1em; - } +} + .sep { color: black; background-color: #FFA34F; - } +} + textarea { font-family: Verdana, Helvetica, Arial, sans-serif; font-size: 100%; @@ -397,19 +445,22 @@ textarea { border-right: 1px solid #D5D5C8; border-bottom: 1px solid #D5D5C8; cursor: text; - } +} + label { cursor:pointer; font-size: 1.1em; padding-right: 5px; - } +} + label input { font-size: 100%; vertical-align: middle; - } +} + label img { vertical-align: middle; - } +} fieldset.quick { margin: 0 0 5px 0; @@ -418,14 +469,16 @@ fieldset.quick { background-color: transparent; text-align: right; font-size: 1.1em; - } +} + fieldset.nobg { margin: 15px 0 0 0; padding: 0; border: none; background-color: transparent; font-size: 1.1em; - } +} + fieldset.display-options { margin: 15px 0 2px 0; padding: 0 0 4px 0; @@ -433,21 +486,23 @@ fieldset.display-options { background-color: transparent; text-align: center; font-size: 1.1em; - } +} + fieldset.display-options select, fieldset.display-options input, fieldset.display-options label { font-size: 100%; vertical-align: middle; - } +} + select option.disabled { background-color: #bbb; color: #fff; - } +} /* Special case inputs */ select#board_timezone, select#full_folder_action { width: 95%; - } +} /* Definition list layout for forms @@ -455,11 +510,12 @@ select#full_folder_action { ---------------------------------------- */ dl { font-family: Verdana, Helvetica, Arial, sans-serif; - } +} + dt { float: left; width: auto; - } +} dd { color: #000; } dd + dd { padding-top: 5px; } @@ -471,46 +527,55 @@ dt label { font-size: 100%; text-align: left; font-weight: bold; - } +} + dd label { white-space: nowrap; margin-right: 10px; - } +} html>body dd label input { vertical-align: text-bottom; } /* Tweak for Moz to align checkboxes/radio buttons nicely */ + dd input, dd select { max-width: 100%; - } +} + dd textarea { width: 100%; - } +} + input.radio { width: auto !important; background-color: transparent; border: none; cursor: default; - } +} + dd select { width: auto; font-size: 100%; - } +} + fieldset dl { margin-bottom: 10px; font-size: 1.1em; - } +} + fieldset dt { width: 45%; text-align: left; border-right: 1px solid #CCC; padding-top: 3px; - } +} + fieldset dd { margin-left: 45%; padding-left: 5px; border-left: 1px solid #CCC; vertical-align: top; - } +} + dd.full { margin-left: 0; border: 0; @@ -518,15 +583,16 @@ dd.full { padding-top: 3px; text-align: center; width: 95%; - } +} /* Hover highlights for form rows */ fieldset dl:hover dt label { color: #000000; - } +} + input:focus, textarea:focus { color: #000000; - } +} /* Submit button fieldset @@ -537,10 +603,11 @@ fieldset.submit-buttons { margin: 0; padding: 4px; margin-top: -1px; - } +} + fieldset.submit-buttons input { padding: 3px 2px; - } +} /* Input field styles @@ -556,29 +623,33 @@ fieldset.submit-buttons input { padding:2px; cursor: text; width: 75%; - } +} + select.inputbox { cursor: pointer; padding: 0; width: auto; - } +} + .inputbox:hover { border-left: 1px solid #AFAEAA; border-top: 1px solid #AFAEAA; border-right: 1px solid #AFAEAA; border-bottom: 1px solid #AFAEAA; background-color: #E9E9E2; - } +} + .inputbox:focus { border: 1px solid #BC2A4D; background-color: #E9E9E2; color: #BC2A4D; - } +} input.full, textarea.full { width: 99%; - } +} + * html input.full, * html textarea.full { width: 95%; } input.medium { width: 50%; } input.narrow { width: 25%; } @@ -596,11 +667,13 @@ input.autowidth { width: auto !important; } margin-top: 5px; font-size: 1em; padding-bottom: 2px; - } +} + .pagination strong, .pagination b { font-weight: normal; - } +} + .pagination span strong { padding: 0 2px; margin: 0 2px; @@ -608,7 +681,8 @@ input.autowidth { width: auto !important; } color: #FFFFFF; background: #069; border: 1px solid #069; - } +} + .pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active { font-weight: normal; text-decoration: none; @@ -617,16 +691,18 @@ input.autowidth { width: auto !important; } padding: 0 2px; background: #ECEDEE; border: 1px solid #B4BAC0; - } +} + .pagination span a:hover { border-color: #069; background: #069; color: #FFF; text-decoration: none; - } +} + .pagination img { vertical-align: middle; - } +} /* Form button styles @@ -639,14 +715,16 @@ a.button2, input.button2 { color: #000; background-color: #EFEFEF; cursor: pointer; - } +} + a.button1, input.button1 { font-weight: bold; border: 1px solid #666666; - } +} + a.button2, input.button2 { border: 1px solid #666666; - } +} /* <a> button in the style of the form buttons */ a.button1, a.button1:link, a.button1:visited, a.button1:active, @@ -654,7 +732,7 @@ a.button2, a.button2:link, a.button2:visited, a.button2:active { text-decoration: none; color: #000000; padding: 4px 8px; - } +} /* Permission related ---------------------------------------- */ @@ -823,55 +901,65 @@ table.pmask td.name { ---------------------------------------- */ .success { color: #282 !important; - } +} + .error { color: #BC2A4D !important; - } +} + .successbox, .errorbox { padding: 10px; margin: 20px 0; color: #1F5B13; text-align: center; - } +} + .successbox { background-color: #B9DBB3; - } +} + .errorbox { background-color: #ECECEC; - } +} + .successbox h3, .errorbox h3 { font-weight: bold; font-size: 1.4em; margin-bottom: 0.5em; - } +} + .successbox p, .errorbox p { font-size: 1.1em; margin-bottom: 0; - } +} + .successbox a, .errorbox a { font-weight: bold; text-decoration: none; - } +} /* Special cases for the error page */ #errorpage #page-header a { font-weight: bold; line-height: 6em; - } +} + #errorpage #content { padding-top: 10px; - } +} + #errorpage #content h1 { color: #DF075C; - } +} + #errorpage #content h2 { margin-top: 20px; margin-bottom: 5px; border-bottom: 1px solid #CCCCCC; padding-bottom: 5px; color: #333333; - } +} /* Tooltip for permission roles */ .tooltip { @@ -896,10 +984,11 @@ table.pmask td.name { */ #format-buttons { margin: 15px 0 2px 0; - } +} + #format-buttons input, #format-buttons select { vertical-align: middle; - } +} /* Nice method for clearing floated blocks without having to insert any extra markup From http://www.positioniseverything.net/easyclearing.html */ @@ -910,6 +999,7 @@ table.pmask td.name { clear: both; visibility: hidden; } + /* Hide from Mac IE, Windows IE uses this as it doesn't support the :after method above \*/ .clearfix, #tabs, .row, #content, fieldset dl, #page-body { height: 1%; @@ -927,27 +1017,34 @@ table.pmask td.name { text-align: right; padding: 0px; } + .source { font-family: 'Courier New', monospace; font-size: 125%; line-height: 120%; padding: 0px; } + .syntaxbg { color: #FFFFFF; - } +} + .syntaxcomment { color: #FF8000; - } +} + .syntaxdefault { color: #0000BB; - } +} + .syntaxhtml { color: #000000; - } +} + .syntaxkeyword { color: #007700; - } +} + .syntaxstring { color: #DD0000; - }
\ No newline at end of file +} diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js index c9a93bd7bf..ef52b65998 100644 --- a/phpBB/adm/style/editor.js +++ b/phpBB/adm/style/editor.js @@ -1,5 +1,7 @@ -// bbCode control by subBlue design [ www.subBlue.com ] -// Includes unixsafe colour palette selector by SHS` +/** +* bbCode control by subBlue design [ www.subBlue.com ] +* Includes unixsafe colour palette selector by SHS` +*/ // Startup variables var imageTag = false; @@ -10,51 +12,74 @@ var theSelection = false; var clientPC = navigator.userAgent.toLowerCase(); // Get client info var clientVer = parseInt(navigator.appVersion); // Get browser version -var is_ie = ((clientPC.indexOf("msie") != -1) && (clientPC.indexOf("opera") == -1)); -var is_nav = ((clientPC.indexOf('mozilla')!=-1) && (clientPC.indexOf('spoofer')==-1) - && (clientPC.indexOf('compatible') == -1) && (clientPC.indexOf('opera')==-1) - && (clientPC.indexOf('webtv')==-1) && (clientPC.indexOf('hotjava')==-1)); +var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1)); +var is_nav = ((clientPC.indexOf('mozilla') != -1) && (clientPC.indexOf('spoofer') == -1) && (clientPC.indexOf('compatible') == -1) && (clientPC.indexOf('opera') == -1) && (clientPC.indexOf('webtv') == -1) && (clientPC.indexOf('hotjava') == -1)); -var is_win = ((clientPC.indexOf("win")!=-1) || (clientPC.indexOf("16bit") != -1)); -var is_mac = (clientPC.indexOf("mac")!=-1); +var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1)); +var is_mac = (clientPC.indexOf('mac') != -1); -// Shows the help messages in the helpline window -function helpline(help) { - document.forms[form_name].helpbox.value = eval(help + "_help"); +/** +* Shows the help messages in the helpline window +*/ +function helpline(help) +{ + document.forms[form_name].helpbox.value = eval(help + '_help'); } -// Replacement for arrayname.length property -function getarraysize(thearray) { - for (i = 0; i < thearray.length; i++) { - if ((thearray[i] == "undefined") || (thearray[i] == "") || (thearray[i] == null)) +/** +* Replacement for arrayname.length property +*/ +function getarraysize(thearray) +{ + for (i = 0; i < thearray.length; i++) + { + if (thearray[i] == 'undefined' || thearray[i] == '' || thearray[i] == null) + { return i; } + } + return thearray.length; } -// Replacement for arrayname.push(value) not implemented in IE until version 5.5 -// Appends element to the array -function arraypush(thearray,value) { - thearray[ getarraysize(thearray) ] = value; +/** +* Replacement for arrayname.push(value) not implemented in IE until version 5.5 +* Appends element to the array +*/ +function arraypush(thearray,value) +{ + thearray[getarraysize(thearray)] = value; } -// Replacement for arrayname.pop() not implemented in IE until version 5.5 -// Removes and returns the last element of an array -function arraypop(thearray) { +/** +* Replacement for arrayname.pop() not implemented in IE until version 5.5 +* Removes and returns the last element of an array +*/ +function arraypop(thearray) +{ thearraysize = getarraysize(thearray); retval = thearray[thearraysize - 1]; delete thearray[thearraysize - 1]; + return retval; } -function smiley(text) { +/** +* Insert emoticon +*/ +function smiley(text) +{ text = ' ' + text + ' '; - if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) { + + if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) + { var caretPos = document.forms[form_name].elements[text_name].caretPos; caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + text + ' ' : caretPos.text + text; document.forms[form_name].elements[text_name].focus(); - } else { + } + else + { var selStart = document.forms[form_name].elements[text_name].selectionStart; var selEnd = document.forms[form_name].elements[text_name].selectionEnd; @@ -65,30 +90,70 @@ function smiley(text) { } } -function bbfontstyle(bbopen, bbclose) { - if ((clientVer >= 4) && is_ie && is_win) { +/** +* Apply bbcodes +*/ +function bbfontstyle(bbopen, bbclose) +{ + theSelection = false; + document.forms[form_name].elements[text_name].focus(); + + if ((clientVer >= 4) && is_ie && is_win) + { + // Get text selection theSelection = document.selection.createRange().text; - if (!theSelection) { - insert_text(bbopen + bbclose); + + if (theSelection) + { + // Add tags around selection + document.selection.createRange().text = bbopen + theSelection + bbclose; document.forms[form_name].elements[text_name].focus(); + theSelection = ''; return; } - document.selection.createRange().text = bbopen + theSelection + bbclose; - document.forms[form_name].elements[text_name].focus(); - return; - } else { - insert_text(bbopen + bbclose); + } + else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) + { + mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose); document.forms[form_name].elements[text_name].focus(); + theSelection = ''; return; } + + // Close image tag before adding + if (imageTag) + { + insert_text(bbtags[15]); + + // Remove the close image tag from the list + lastValue = arraypop(bbcode) - 1; + + // Return button back to normal state + document.forms[form_name].addbbcode14.value = 'Img'; + imageTag = false; + } + + // Open tag + insert_text(bbopen + bbclose); + + document.forms[form_name].elements[text_name].focus(); + storeCaret(document.forms[form_name].elements[text_name]); + return; } -function insert_text(text) { - if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) { +/** +* Insert text at position +*/ +function insert_text(text) +{ + if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) + { var caretPos = document.forms[form_name].elements[text_name].caretPos; caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + text + ' ' : caretPos.text + text; - } else { + } + else if (document.forms[form_name].elements[text_name].selectionStart) + { var selStart = document.forms[form_name].elements[text_name].selectionStart; var selEnd = document.forms[form_name].elements[text_name].selectionEnd; @@ -96,44 +161,127 @@ function insert_text(text) { document.forms[form_name].elements[text_name].selectionStart = selStart + text.length; document.forms[form_name].elements[text_name].selectionEnd = selEnd + text.length; } + else + { + document.forms[form_name].elements[text_name].value = document.forms[form_name].elements[text_name].value + text; + } } -function attach_inline() { +/** +* Add inline attachment at position +*/ +function attach_inline() +{ insert_text('[attachment=' + document.forms[form_name].elements['attachments'].value + ']' + document.forms[form_name].elements['attachments'].options[document.forms[form_name].elements['attachments'].selectedIndex].text + '[/attachment]'); + document.forms[form_name].elements[text_name].focus(); } -function bbstyle(bbnumber) { +/** +* Add quote text to message +*/ +function addquote(post_id, username) +{ + var message_name = 'message_' + post_id; + var theSelection = ''; + var divarea = false; + if (document.all) + { + eval('divarea = document.all.' + message_name + ';'); + } + else + { + eval("divarea = document.getElementById('" + message_name + "');"); + } + + // Get text selection - not only the post content :( + if (window.getSelection) + { + theSelection = window.getSelection().toString(); + } + else if (document.getSelection) + { + theSelection = document.getSelection(); + } + else if (document.selection) + { + theSelection = document.selection.createRange().text; + } + + if (theSelection == '') + { + if (document.all) + { + theSelection = divarea.innerText; + } + else if (divarea.textContent) + { + theSelection = divarea.textContent; + } + else if (divarea.firstChild.nodeValue) + { + theSelection = divarea.firstChild.nodeValue; + } + } + + if (theSelection) + { + insert_text('[quote="' + username + '"]' + theSelection + '[/quote]'); + } + + return; +} + +/** +* bbstyle +*/ +function bbstyle(bbnumber) +{ donotinsert = false; theSelection = false; bblast = 0; document.forms[form_name].elements[text_name].focus(); - if (bbnumber == -1) { // Close all open tags & default button names - while (bbcode[0]) { + // Close all open tags & default button names + if (bbnumber == -1) + { + while (bbcode[0]) + { butnumber = arraypop(bbcode) - 1; document.forms[form_name].elements[text_name].value += bbtags[butnumber + 1]; buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value'); - if (buttext != "[*]") + + if (buttext != '[*]') { eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"'); } } - document.forms[form_name].addbbcode10.value = "List"; - bbtags[10] = "[list]"; - document.forms[form_name].addbbcode12.value = "List="; - bbtags[12] = "[list=]"; - imageTag = false; // All tags are closed including image tags :D + + document.forms[form_name].addbbcode10.value = 'List'; + bbtags[10] = '[list]'; + + document.forms[form_name].addbbcode12.value = 'List='; + bbtags[12] = '[list=]'; + + // All tags are closed including image tags :D + imageTag = false; document.forms[form_name].elements[text_name].focus(); + return; } + // [*] doesn't have an end tag + noEndTag = (bbtags[bbnumber] == '[*]') + if ((clientVer >= 4) && is_ie && is_win) { - theSelection = document.selection.createRange().text; // Get text selection - if (theSelection) { + // Get text selection + theSelection = document.selection.createRange().text; + + if (theSelection) + { // Add tags around selection - document.selection.createRange().text = bbtags[bbnumber] + theSelection + bbtags[bbnumber+1]; + document.selection.createRange().text = bbtags[bbnumber] + theSelection + ((!noEndTag) ? bbtags[bbnumber+1] : ''); document.forms[form_name].elements[text_name].focus(); theSelection = ''; return; @@ -141,99 +289,121 @@ function bbstyle(bbnumber) { } else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) { - mozWrap(document.forms[form_name].elements[text_name], bbtags[bbnumber], bbtags[bbnumber+1]); + mozWrap(document.forms[form_name].elements[text_name], bbtags[bbnumber], ((!noEndTag) ? bbtags[bbnumber+1] : '')); document.forms[form_name].elements[text_name].focus(); theSelection = ''; return; } // Find last occurance of an open tag the same as the one just clicked - for (i = 0; i < bbcode.length; i++) { - if (bbcode[i] == bbnumber+1) { + for (i = 0; i < bbcode.length; i++) + { + if (bbcode[i] == bbnumber+1) + { bblast = i; donotinsert = true; } } - if ((bbnumber == 10) && (bbtags[10] != "[*]")) + if (bbnumber == 10 && bbtags[10] != '[*]') { if (donotinsert) { - document.forms[form_name].addbbcode12.value = "List="; + document.forms[form_name].addbbcode12.value = 'List='; tmp_help = o_help; o_help = e_help; e_help = tmp_help; - bbtags[12] = "[list=]"; + bbtags[12] = '[list=]'; } else { - document.forms[form_name].addbbcode12.value = "[*]"; + document.forms[form_name].addbbcode12.value = '[*]'; tmp_help = o_help; o_help = e_help; e_help = tmp_help; - bbtags[12] = "[*]"; + bbtags[12] = '[*]'; } } - if ((bbnumber == 12) && (bbtags[12] != "[*]")) + if (bbnumber == 12 && bbtags[12] != '[*]') { if (donotinsert) { - document.forms[form_name].addbbcode10.value = "List"; + document.forms[form_name].addbbcode10.value = 'List'; tmp_help = l_help; l_help = e_help; e_help = tmp_help; - bbtags[10] = "[list]"; + bbtags[10] = '[list]'; } else { - document.forms[form_name].addbbcode10.value = "[*]"; + document.forms[form_name].addbbcode10.value = '[*]'; tmp_help = l_help; l_help = e_help; e_help = tmp_help; - bbtags[10] = "[*]"; + bbtags[10] = '[*]'; } } - if (donotinsert) { // Close all open tags up to the one just clicked & default button names - while (bbcode[bblast]) { - butnumber = arraypop(bbcode) - 1; - if (bbtags[butnumber] != "[*]") - { - insert_text(bbtags[butnumber + 1]); - } - else - { - insert_text(bbtags[butnumber]); - } - buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value'); - if (bbtags[butnumber] != "[*]") - { - eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"'); - } - imageTag = false; + // Close all open tags up to the one just clicked & default button names + if (donotinsert) + { + while (bbcode[bblast]) + { + butnumber = arraypop(bbcode) - 1; + + if (bbtags[butnumber] != '[*]') + { + insert_text(bbtags[butnumber + 1]); + } + else + { + insert_text(bbtags[butnumber]); } - document.forms[form_name].elements[text_name].focus(); - return; - } else { // Open tags - if (imageTag && (bbnumber != 14)) { // Close image tag before adding another + buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value'); + + if (bbtags[butnumber] != '[*]') + { + eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"'); + } + imageTag = false; + } + document.forms[form_name].elements[text_name].focus(); + return; + } + else + { + // Open tags + + // Close image tag before adding another + if (imageTag && (bbnumber != 14)) + { insert_text(bbtags[15]); - lastValue = arraypop(bbcode) - 1; // Remove the close image tag from the list - document.forms[form_name].addbbcode14.value = "Img"; // Return button back to normal state + // Remove the close image tag from the list + lastValue = arraypop(bbcode) - 1; + + // Return button back to normal state + document.forms[form_name].addbbcode14.value = 'Img'; imageTag = false; } // Open tag insert_text(bbtags[bbnumber]); - if ((bbnumber == 14) && (imageTag == false)) imageTag = 1; // Check to stop additional tags after an unclosed image tag - if (bbtags[bbnumber] != "[*]") + // Check to stop additional tags after an unclosed image tag + if (bbnumber == 14 && imageTag == false) + { + imageTag = 1; + } + + if (bbtags[bbnumber] != '[*]') { - arraypush(bbcode,bbnumber+1); + arraypush(bbcode, bbnumber + 1); eval('document.forms[form_name].addbbcode'+bbnumber+'.value += "*"'); } + document.forms[form_name].elements[text_name].focus(); return; } @@ -241,66 +411,94 @@ function bbstyle(bbnumber) { storeCaret(document.forms[form_name].elements[text_name]); } -// From http://www.massless.org/mozedit/ +/** +* From http://www.massless.org/mozedit/ +*/ function mozWrap(txtarea, open, close) { var selLength = txtarea.textLength; var selStart = txtarea.selectionStart; var selEnd = txtarea.selectionEnd; + var scrollTop = txtarea.scrollTop; + if (selEnd == 1 || selEnd == 2) + { selEnd = selLength; + } var s1 = (txtarea.value).substring(0,selStart); var s2 = (txtarea.value).substring(selStart, selEnd) var s3 = (txtarea.value).substring(selEnd, selLength); + txtarea.value = s1 + open + s2 + close + s3; + txtarea.selectionStart = selEnd + open.length + close.length; + txtarea.selectionEnd = txtarea.selectionStart; + txtarea.focus(); + txtarea.scrollTop = scrollTop; + return; } -// Insert at Claret position. Code from -// http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130 -function storeCaret(textEl) { - if (textEl.createTextRange) { textEl.caretPos = document.selection.createRange().duplicate(); } +/** +* Insert at Claret position. Code from +* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130 +*/ +function storeCaret(textEl) +{ + if (textEl.createTextRange) + { + textEl.caretPos = document.selection.createRange().duplicate(); + } } +/** +* Color pallette +*/ function colorPalette(dir, width, height) { var r = 0, g = 0, b = 0; var numberList = new Array(6); - numberList[0] = "00"; - numberList[1] = "40"; - numberList[2] = "80"; - numberList[3] = "BF"; - numberList[4] = "FF"; - document.writeln('<table class="type2">'); - for(r = 0; r < 5; r++) + + numberList[0] = '00'; + numberList[1] = '40'; + numberList[2] = '80'; + numberList[3] = 'BF'; + numberList[4] = 'FF'; + + document.writeln('<table cellspacing="1" cellpadding="0" border="0">'); + + for (r = 0; r < 5; r++) { if (dir == 'h') { document.writeln('<tr>'); } - for(g = 0; g < 5; g++) + + for (g = 0; g < 5; g++) { if (dir == 'v') { document.writeln('<tr>'); } - for(b = 0; b < 5; b++) + + for (b = 0; b < 5; b++) { color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]); document.write('<td bgcolor="#' + color + '">'); - document.write('<a href="javascript:bbfontstyle(\'[color=#' + color + ']\', \'[/color]\');" onmouseover="helpline(\'s\');"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>'); + document.write('<a href="javascript:bbfontstyle(\'[color=#' + color + ']\', \'[/color]\');" onmouseover="helpline(\'s\');"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" border="0" alt="#' + color + '" title="#' + color + '" /></a>'); document.writeln('</td>'); } + if (dir == 'v') { document.writeln('</tr>'); } } + if (dir == 'h') { document.writeln('</tr>'); } } document.writeln('</table>'); -}
\ No newline at end of file +} diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html index 7755cf957e..22f3426626 100755 --- a/phpBB/adm/style/install_convert.html +++ b/phpBB/adm/style/install_convert.html @@ -6,16 +6,16 @@ {BODY} <!-- IF S_LIST --> -<table cellspacing="1"> - <caption>{L_AVAILABLE_CONVERTORS}</caption> - <col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" /> + <table cellspacing="1"> + <caption>{L_AVAILABLE_CONVERTORS}</caption> + <col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" /> <thead> - <tr> - <th>{L_SOFTWARE}</th> - <th>{L_VERSION}</th> - <th>{L_AUTHOR}</th> - <th>{L_OPTIONS}</th> - </tr> + <tr> + <th>{L_SOFTWARE}</th> + <th>{L_VERSION}</th> + <th>{L_AUTHOR}</th> + <th>{L_OPTIONS}</th> + </tr> </thead> <tbody> <!-- IF .convertors --> @@ -36,7 +36,7 @@ </tr> <!-- ENDIF --> </tbody> -</table> + </table> <!-- ENDIF --> <!-- IF .checks --> @@ -88,13 +88,13 @@ <!-- ENDIF --> <!-- IF L_SUBMIT --> -<fieldset class="submit-buttons"> - <!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF --> - {S_HIDDEN} - <!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /><!-- ENDIF --> -</fieldset> + <fieldset class="submit-buttons"> + <!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF --> + {S_HIDDEN} + <!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /><!-- ENDIF --> + </fieldset> <!-- ENDIF --> - </form> + <!-- INCLUDE install_footer.html -->
\ No newline at end of file diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html index e46ca774c3..dd249d9259 100755 --- a/phpBB/adm/style/install_footer.html +++ b/phpBB/adm/style/install_footer.html @@ -1,4 +1,4 @@ - + </div> </div> <span class="corners-bottom"><span></span></span> diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html index 148097acc6..3d265af354 100755 --- a/phpBB/adm/style/install_install.html +++ b/phpBB/adm/style/install_install.html @@ -54,22 +54,24 @@ <!-- ENDIF --> <!-- IF S_SHOW_DOWNLOAD --> -<fieldset> - <legend>{L_DL_CONFIG}</legend> - <p>{L_DL_CONFIG_EXPLAIN}</p> -</fieldset> -<fieldset class="submit-buttons"> - {S_HIDDEN} - <input class="button1" type="submit" id="dlconfig" name="dlconfig" value="{L_DL_DOWNLOAD}" /> <input class="button1" type="submit" id="dldone" name="dldone" value="{L_DL_DONE}" /> -</fieldset> + <fieldset> + <legend>{L_DL_CONFIG}</legend> + <p>{L_DL_CONFIG_EXPLAIN}</p> + </fieldset> + + <fieldset class="submit-buttons"> + {S_HIDDEN} + <input class="button1" type="submit" id="dlconfig" name="dlconfig" value="{L_DL_DOWNLOAD}" /> <input class="button1" type="submit" id="dldone" name="dldone" value="{L_DL_DONE}" /> + </fieldset> <!-- ENDIF --> <!-- IF L_SUBMIT --> -<fieldset class="submit-buttons"> - {S_HIDDEN} - <!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /><!-- ENDIF --> -</fieldset> + <fieldset class="submit-buttons"> + {S_HIDDEN} + <!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /><!-- ENDIF --> + </fieldset> <!-- ENDIF --> </form> + <!-- INCLUDE install_footer.html -->
\ No newline at end of file diff --git a/phpBB/adm/style/install_main.html b/phpBB/adm/style/install_main.html index 983b6aa0c4..5624102612 100755 --- a/phpBB/adm/style/install_main.html +++ b/phpBB/adm/style/install_main.html @@ -1,5 +1,6 @@ <!-- INCLUDE install_header.html --> - <h2>{TITLE}</h2> - {BODY} + <h2>{TITLE}</h2> + {BODY} + <!-- INCLUDE install_footer.html -->
\ No newline at end of file diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index b81eba5000..1ca5c4304e 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -1,4 +1,4 @@ - + </div> </div> <span class="corners-bottom"><span></span></span> @@ -13,7 +13,7 @@ "phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our forums may be affected. - The phpBB Group : 2004 + The phpBB Group : 2006 // --> <div id="page-footer"> diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index 6d3e412347..518ce835f2 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -17,7 +17,9 @@ var on_page = '{ON_PAGE}'; var per_page = '{PER_PAGE}'; var base_url = '{BASE_URL}'; -// Jump to page +/** +* Jump to page +*/ function jumpto() { var page = prompt(jump_page, on_page); @@ -28,8 +30,10 @@ function jumpto() } } -// Set display of page element -// s[-1,0,1] = hide,toggle display,show +/** +* Set display of page element +* s[-1,0,1] = hide,toggle display,show +*/ function dE(n, s, type) { if (!type) @@ -45,8 +49,10 @@ function dE(n, s, type) e.style.display = (s == 1) ? type : 'none'; } -// Mark/unmark checkboxes -// id = ID of parent container, name = name prefix, state = state [true/false] +/** +* Mark/unmark checkboxes +* id = ID of parent container, name = name prefix, state = state [true/false] +*/ function marklist(id, name, state) { var parent = document.getElementById(id); @@ -71,6 +77,9 @@ function marklist(id, name, state) } } +/** +* Open trace popup +*/ function trace(link) { window.open(link, '_trace', 'height=515, resizable=yes, scrollbars=yes, width=680'); @@ -78,6 +87,9 @@ function trace(link) } <!-- IF S_INCLUDE_SWATCH --> + /** + * Color swatch + */ function swatch() { window.open('{UA_SWATCH}', '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636'); diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html index 5df845702d..beec9d011f 100644 --- a/phpBB/adm/style/permission_mask.html +++ b/phpBB/adm/style/permission_mask.html @@ -11,8 +11,10 @@ {S_ROLE_JS_ARRAY} <!-- ENDIF --> - // Show/hide option panels - // value = suffix for ID to show + /** + * Show/hide option panels + * value = suffix for ID to show + */ function swap_options(pmask, fmask, cat) { id = pmask + fmask + cat; @@ -38,19 +40,21 @@ active_cat = cat; } - // Mark all radio buttons in one panel - // id = table ID container, s = status ['y'/'u'/'n'] + /** + * Mark all radio buttons in one panel + * id = table ID container, s = status ['y'/'u'/'n'] + */ function mark_options(id, s) { var t = document.getElementById(id); - + if (!t) { return; } - + var rb = t.getElementsByTagName('input'); - + for (var r = 0; r < rb.length; r++ ) { if (rb[r].id.substr(rb[r].id.length-1) == s) @@ -60,19 +64,21 @@ } } - // Mark one radio button in one panel - // id = table ID container, field_name = the auth option, s = status ['y'/'u'/'n'] + /** + * Mark one radio button in one panel + * id = table ID container, field_name = the auth option, s = status ['y'/'u'/'n'] + */ function mark_one_option(id, field_name, s) { var t = document.getElementById(id); - + if (!t) { return; } var rb = t.getElementsByTagName('input'); - + for (var r = 0; r < rb.length; r++ ) { if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) == field_name && rb[r].id.substr(rb[r].id.length-1) == s) @@ -82,7 +88,9 @@ } } - // Reset role dropdown field to Select role... if an option gets changed + /** + * Reset role dropdown field to Select role... if an option gets changed + */ function reset_role(id) { var t = document.getElementById(id); @@ -95,7 +103,9 @@ t.options[0].selected = true; } - // Load role and set options accordingly + /** + * Load role and set options accordingly + */ function set_role_settings(role_id, target_id) { settings = role_options[role_id]; diff --git a/phpBB/adm/style/permission_trace.html b/phpBB/adm/style/permission_trace.html index 0bf889adaf..6b21865562 100644 --- a/phpBB/adm/style/permission_trace.html +++ b/phpBB/adm/style/permission_trace.html @@ -42,9 +42,9 @@ </tr> <!-- END trace --> </tbody> -</table> + </table> -<br /> + <br /> <!-- INCLUDE simple_footer.html --> diff --git a/phpBB/adm/style/search_index_progress_bar.html b/phpBB/adm/style/search_index_progress_bar.html index a55d4a3a77..ef9590119f 100644 --- a/phpBB/adm/style/search_index_progress_bar.html +++ b/phpBB/adm/style/search_index_progress_bar.html @@ -1,7 +1,10 @@ <!-- INCLUDE simple_header.html --> -<script language="javascript" type="text/javascript"> +<script type="text/javascript"> <!-- + /** + * Close previously opened popup + */ function close_popup() { if (opener != null) @@ -22,14 +25,13 @@ //--> </script> - <div class="successbox"> <h3>{L_PROGRESS}</h3> <img src="images/progress_bar.gif" alt="{L_PROGRESS}" /> <p>{L_PROGRESS_EXPLAIN}</p> </div> -<script language="javascript" type="text/javascript"> +<script type="text/javascript"> <!-- close_popup(); //--> diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html index 6fca6972c3..8dbec6ace3 100644 --- a/phpBB/adm/style/simple_footer.html +++ b/phpBB/adm/style/simple_footer.html @@ -10,13 +10,13 @@ "phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our forums may be affected. - The phpBB Group : 2004 + The phpBB Group : 2006 // --> <div id="page-footer"> <!-- IF S_COPYRIGHT_HTML --> - <br />Powered by phpBB {VERSION} © 2005 <a href="http://www.phpbb.com/">phpBB Group</a> + <br />Powered by phpBB {VERSION} © 2006 <a href="http://www.phpbb.com/">phpBB Group</a> <!-- ENDIF --> <!-- IF DEBUG_OUTPUT --> diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index 98138debc5..67e66b3a9d 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -17,7 +17,9 @@ var on_page = '{ON_PAGE}'; var per_page = '{PER_PAGE}'; var base_url = '{BASE_URL}'; -// Jump to page +/** +* Jump to page +*/ function jumpto() { var page = prompt(jump_page, on_page); @@ -28,8 +30,10 @@ function jumpto() } } -// Set display of page element -// s[-1,0,1] = hide,toggle display,show +/** +* Set display of page element +* s[-1,0,1] = hide,toggle display,show +*/ function dE(n, s, type) { if (!type) @@ -45,8 +49,10 @@ function dE(n, s, type) e.style.display = (s == 1) ? type : 'none'; } -// Mark/unmark checkboxes -// id = ID of parent container, name = name prefix, state = state [true/false] +/** +* Mark/unmark checkboxes +* id = ID of parent container, name = name prefix, state = state [true/false] +*/ function marklist(id, name, state) { var parent = document.getElementById(id); @@ -67,6 +73,9 @@ function marklist(id, name, state) } <!-- IF S_INCLUDE_SWATCH --> + /** + * Color swatch + */ function swatch() { window.open('{UA_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636'); diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js index 0b5a2408f4..20610b52fe 100644 --- a/phpBB/adm/style/tooltip.js +++ b/phpBB/adm/style/tooltip.js @@ -60,6 +60,9 @@ function enable_tooltips_link(id, headline, sub_id) tooltip_mode = 'link'; } +/** +* Enable tooltip replacements for selects +*/ function enable_tooltips_select(id, headline, sub_id) { var links, i, hold; @@ -105,6 +108,9 @@ function enable_tooltips_select(id, headline, sub_id) tooltip_mode = 'select'; } +/** +* Prepare elements to replace +*/ function prepare(element) { var tooltip, text, desc, title; @@ -132,14 +138,25 @@ function prepare(element) element.tooltip = tooltip; element.onmouseover = show_tooltip; element.onmouseout = hide_tooltip; + + if (tooltip_mode == 'link') + { + element.onmousemove = locate; + } } +/** +* Show tooltip +*/ function show_tooltip(e) { document.getElementById('_tooltip_container').appendChild(this.tooltip); locate(this); } +/** +* Hide tooltip +*/ function hide_tooltip(e) { var d = document.getElementById('_tooltip_container'); @@ -149,6 +166,9 @@ function hide_tooltip(e) } } +/** +* Set opacity on tooltip element +*/ function set_opacity(element) { element.style.filter = 'alpha(opacity:95)'; @@ -157,6 +177,9 @@ function set_opacity(element) element.style.opacity = '0.95'; } +/** +* Create new element +*/ function create_element(tag, c) { var x = document.createElement(tag); @@ -165,59 +188,64 @@ function create_element(tag, c) return x; } +/** +* Correct positioning of tooltip container +*/ function locate(e) { var posx = 0; var posy = 0; - if (tooltip_mode == 'link') - { - if (e == null) - { - e = window.event; - } + e = e.parentNode; - if (e.pageX || e.pageY) + if (e.offsetParent) + { + for (var posx = 0, posy = 0; e.offsetParent; e = e.offsetParent) { - posx = e.pageX; - posy = e.pageY; - } - else if (e.clientX || e.clientY) - { - if (document.documentElement.scrollTop) - { - posx = e.clientX+document.documentElement.scrollLeft; - posy = e.clientY+document.documentElement.scrollTop; - } - else - { - posx = e.clientX+document.body.scrollLeft; - posy = e.clientY+document.body.scrollTop; - } + posx += e.offsetLeft; + posy += e.offsetTop; } + } + else + { + posx = e.offsetLeft; + posy = e.offsetTop; + } - document.getElementById('_tooltip_container').style.top=(posy+10) + 'px'; + if (tooltip_mode == 'link') + { + document.getElementById('_tooltip_container').style.top=(posy+20) + 'px'; document.getElementById('_tooltip_container').style.left=(posx-20) + 'px'; } else { - e = e.parentNode; + document.getElementById('_tooltip_container').style.top=(posy+30) + 'px'; + document.getElementById('_tooltip_container').style.left=(posx-205) + 'px'; + } - if (e.offsetParent) +/* + if (e == null) + { + e = window.event; + } + + if (e.pageX || e.pageY) + { + posx = e.pageX; + posy = e.pageY; + } + else if (e.clientX || e.clientY) + { + if (document.documentElement.scrollTop) { - for (var posx = 0, posy = 0; e.offsetParent; e = e.offsetParent) - { - posx += e.offsetLeft; - posy += e.offsetTop; - } + posx = e.clientX+document.documentElement.scrollLeft; + posy = e.clientY+document.documentElement.scrollTop; } else { - posx = e.offsetLeft; - posy = e.offsetTop; + posx = e.clientX+document.body.scrollLeft; + posy = e.clientY+document.body.scrollTop; } - - document.getElementById('_tooltip_container').style.top=(posy+30) + 'px'; - document.getElementById('_tooltip_container').style.left=(posx-205) + 'px'; } +*/ } diff --git a/phpBB/adm/style/viewsource.html b/phpBB/adm/style/viewsource.html index 44b1ad6be4..da374037e8 100644 --- a/phpBB/adm/style/viewsource.html +++ b/phpBB/adm/style/viewsource.html @@ -1,19 +1,20 @@ <!-- INCLUDE simple_header.html --> -<div class="panel" style="padding:10px"> +<div class="panel" style="padding: 10px;"> <h1>{FILENAME}</h1> - + <table> - <tbody> - <!-- BEGIN source --> + <tbody> + <!-- BEGIN source --> <tr valign="top"> <td class="sourcenum">{source.LINENUM} </td> <td class="source">{source.LINE}</td> </tr> - <!-- END source --> - </tbody> + <!-- END source --> + </tbody> </table> + </div> <!-- INCLUDE simple_footer.html -->
\ No newline at end of file diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php index 8f73a93c06..ee3a5455c5 100644 --- a/phpBB/adm/swatch.php +++ b/phpBB/adm/swatch.php @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Style-Type" content="text/css" /> <meta http-equiv="imagetoolbar" content="no" /> -<title>phpBB3 Color Swatch</title> +<title>Color Swatch</title> <style type="text/css"> <!-- |