diff options
Diffstat (limited to 'phpBB/adm')
61 files changed, 335 insertions, 790 deletions
| diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index bf4dc37044..4f4d9ccedd 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -18,6 +18,7 @@ define('NEED_SID', true);  $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';  $phpEx = substr(strrchr(__FILE__, '.'), 1);  require($phpbb_root_path . 'common.' . $phpEx); +require($phpbb_root_path . 'includes/functions_acp.' . $phpEx);  require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);  require($phpbb_root_path . 'includes/functions_module.' . $phpEx); @@ -52,11 +53,9 @@ $mode			= request_var('mode', '');  // Set custom template for admin area  $template->set_custom_template($phpbb_admin_path . 'style', 'admin'); +$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');  $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style'); -// the acp template is never stored in the database -$user->theme['template_storedb'] = false; -  // Instantiate new module  $module = new p_master(); @@ -81,545 +80,3 @@ $template->set_filenames(array(  ));  adm_page_footer(); - -/** -* Header for acp pages -*/ -function adm_page_header($page_title) -{ -	global $config, $db, $user, $template; -	global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID, $_SID; - -	if (defined('HEADER_INC')) -	{ -		return; -	} - -	define('HEADER_INC', true); - -	// gzip_compression -	if ($config['gzip_compress']) -	{ -		if (@extension_loaded('zlib') && !headers_sent()) -		{ -			ob_start('ob_gzhandler'); -		} -	} - -	$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'				=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'), -		'U_ADM_LOGOUT'			=> append_sid("{$phpbb_admin_path}index.$phpEx", 'action=admlogout'), -		'U_ADM_INDEX'			=> append_sid("{$phpbb_admin_path}index.$phpEx"), -		'U_INDEX'				=> append_sid("{$phpbb_root_path}index.$phpEx"), - -		'T_IMAGES_PATH'			=> "{$phpbb_root_path}images/", -		'T_SMILIES_PATH'		=> "{$phpbb_root_path}{$config['smilies_path']}/", -		'T_AVATAR_PATH'			=> "{$phpbb_root_path}{$config['avatar_path']}/", -		'T_AVATAR_GALLERY_PATH'	=> "{$phpbb_root_path}{$config['avatar_gallery_path']}/", -		'T_ICONS_PATH'			=> "{$phpbb_root_path}{$config['icons_path']}/", -		'T_RANKS_PATH'			=> "{$phpbb_root_path}{$config['ranks_path']}/", -		'T_UPLOAD_PATH'			=> "{$phpbb_root_path}{$config['upload_path']}/", - -		'ICON_MOVE_UP'				=> '<img src="' . $phpbb_admin_path . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />', -		'ICON_MOVE_UP_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_up_disabled.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />', -		'ICON_MOVE_DOWN'			=> '<img src="' . $phpbb_admin_path . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />', -		'ICON_MOVE_DOWN_DISABLED'	=> '<img src="' . $phpbb_admin_path . 'images/icon_down_disabled.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />', -		'ICON_EDIT'					=> '<img src="' . $phpbb_admin_path . 'images/icon_edit.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />', -		'ICON_EDIT_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_edit_disabled.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />', -		'ICON_DELETE'				=> '<img src="' . $phpbb_admin_path . 'images/icon_delete.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />', -		'ICON_DELETE_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_delete_disabled.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />', -		'ICON_SYNC'					=> '<img src="' . $phpbb_admin_path . 'images/icon_sync.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />', -		'ICON_SYNC_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_sync_disabled.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />', - -		'S_USER_LANG'			=> $user->lang['USER_LANG'], -		'S_CONTENT_DIRECTION'	=> $user->lang['DIRECTION'], -		'S_CONTENT_ENCODING'	=> 'UTF-8', -		'S_CONTENT_FLOW_BEGIN'	=> ($user->lang['DIRECTION'] == 'ltr') ? 'left' : 'right', -		'S_CONTENT_FLOW_END'	=> ($user->lang['DIRECTION'] == 'ltr') ? 'right' : 'left', -	)); - -	// application/xhtml+xml not used because of IE -	header('Content-type: text/html; charset=UTF-8'); - -	header('Cache-Control: private, no-cache="set-cookie"'); -	header('Expires: 0'); -	header('Pragma: no-cache'); - -	return; -} - -/** -* Page footer for acp pages -*/ -function adm_page_footer($copyright_html = true) -{ -	global $db, $config, $template, $user, $auth, $cache; -	global $starttime, $phpbb_root_path, $phpbb_admin_path, $phpEx; - -	// Output page creation time -	if (defined('DEBUG')) -	{ -		$mtime = explode(' ', microtime()); -		$totaltime = $mtime[0] + $mtime[1] - $starttime; - -		if (!empty($_REQUEST['explain']) && $auth->acl_get('a_') && defined('DEBUG_EXTRA') && method_exists($db, 'sql_report')) -		{ -			$db->sql_report('display'); -		} - -		$debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime); - -		if ($auth->acl_get('a_') && defined('DEBUG_EXTRA')) -		{ -			if (function_exists('memory_get_usage')) -			{ -				if ($memory_usage = memory_get_usage()) -				{ -					global $base_memory_usage; -					$memory_usage -= $base_memory_usage; -					$memory_usage = get_formatted_filesize($memory_usage); - -					$debug_output .= ' | Memory Usage: ' . $memory_usage; -				} -			} - -			$debug_output .= ' | <a href="' . build_url() . '&explain=1">Explain</a>'; -		} -	} - -	$template->assign_vars(array( -		'DEBUG_OUTPUT'		=> (defined('DEBUG')) ? $debug_output : '', -		'TRANSLATION_INFO'	=> (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', -		'S_COPYRIGHT_HTML'	=> $copyright_html, -		'VERSION'			=> $config['version']) -	); - -	$template->display('body'); - -	garbage_collection(); -	exit_handler(); -} - -/** -* 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; - -	$html = ''; -	foreach ($option_ary as $value => $title) -	{ -		$selected = ($option_default !== false && $value == $option_default) ? ' selected="selected"' : ''; -		$html .= '<option value="' . $value . '"' . $selected . '>' . $user->lang[$title] . '</option>'; -	} - -	return $html; -} - -/** -* Build radio fields in acp pages -*/ -function h_radio($name, $input_ary, $input_default = false, $id = false, $key = false, $separator = '') -{ -	global $user; - -	$html = ''; -	$id_assigned = false; -	foreach ($input_ary as $value => $title) -	{ -		$selected = ($input_default !== false && $value == $input_default) ? ' checked="checked"' : ''; -		$html .= '<label><input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title] . '</label>' . $separator; -		$id_assigned = true; -	} - -	return $html; -} - -/** -* Build configuration template for acp configuration pages -*/ -function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) -{ -	global $user, $module; - -	$tpl = ''; -	$name = 'config[' . $config_key . ']'; - -	// Make sure there is no notice printed out for non-existent config options (we simply set them) -	if (!isset($new[$config_key])) -	{ -		$new[$config_key] = ''; -	} - -	switch ($tpl_type[0]) -	{ -		case 'text': -		case 'password': -			$size = (int) $tpl_type[1]; -			$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] . '"' . (($tpl_type[0] === 'password') ?  ' autocomplete="off"' : '') . ' />'; -		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 . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />'; -		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; - -		case 'radio': -			$key_yes	= ($new[$config_key]) ? ' checked="checked"' : ''; -			$key_no		= (!$new[$config_key]) ? ' checked="checked"' : ''; - -			$tpl_type_cond = explode('_', $tpl_type[1]); -			$type_no = ($tpl_type_cond[0] == 'disabled' || $tpl_type_cond[0] == 'enabled') ? false : true; - -			$tpl_no = '<label><input type="radio" name="' . $name . '" value="0"' . $key_no . ' class="radio" /> ' . (($type_no) ? $user->lang['NO'] : $user->lang['DISABLED']) . '</label>'; -			$tpl_yes = '<label><input type="radio" id="' . $key . '" name="' . $name . '" value="1"' . $key_yes . ' class="radio" /> ' . (($type_no) ? $user->lang['YES'] : $user->lang['ENABLED']) . '</label>'; - -			$tpl = ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') ? $tpl_yes . $tpl_no : $tpl_no . $tpl_yes; -		break; - -		case 'select': -		case 'custom': - -			$return = ''; - -			if (isset($vars['method'])) -			{ -				$call = array($module->module, $vars['method']); -			} -			else if (isset($vars['function'])) -			{ -				$call = $vars['function']; -			} -			else -			{ -				break; -			} - -			if (isset($vars['params'])) -			{ -				$args = array(); -				foreach ($vars['params'] as $value) -				{ -					switch ($value) -					{ -						case '{CONFIG_VALUE}': -							$value = $new[$config_key]; -						break; - -						case '{KEY}': -							$value = $key; -						break; -					} - -					$args[] = $value; -				} -			} -			else -			{ -				$args = array($new[$config_key], $key); -			} - -			$return = call_user_func_array($call, $args); - -			if ($tpl_type[0] == 'select') -			{ -				$tpl = '<select id="' . $key . '" name="' . $name . '">' . $return . '</select>'; -			} -			else -			{ -				$tpl = $return; -			} - -		break; - -		default: -		break; -	} - -	if (isset($vars['append'])) -	{ -		$tpl .= $vars['append']; -	} - -	return $tpl; -} - -/** -* Going through a config array and validate values, writing errors to $error. The validation method  accepts parameters separated by ':' for string and int. -* The first parameter defines the type to be used, the second the lower bound and the third the upper bound. Only the type is required. -*/ -function validate_config_vars($config_vars, &$cfg_array, &$error) -{ -	global $phpbb_root_path, $user; -	$type	= 0; -	$min	= 1; -	$max	= 2; - -	foreach ($config_vars as $config_name => $config_definition) -	{ -		if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false) -		{ -			continue; -		} - -		if (!isset($config_definition['validate'])) -		{ -			continue; -		} - -		$validator = explode(':', $config_definition['validate']); - -		// Validate a bit. ;) (0 = type, 1 = min, 2= max) -		switch ($validator[$type]) -		{ -			case 'string': -				$length = utf8_strlen($cfg_array[$config_name]); - -				// the column is a VARCHAR -				$validator[$max] = (isset($validator[$max])) ? min(255, $validator[$max]) : 255; - -				if (isset($validator[$min]) && $length < $validator[$min]) -				{ -					$error[] = sprintf($user->lang['SETTING_TOO_SHORT'], $user->lang[$config_definition['lang']], $validator[$min]); -				} -				else if (isset($validator[$max]) && $length > $validator[2]) -				{ -					$error[] = sprintf($user->lang['SETTING_TOO_LONG'], $user->lang[$config_definition['lang']], $validator[$max]); -				} -			break; - -			case 'bool': -				$cfg_array[$config_name] = ($cfg_array[$config_name]) ? 1 : 0; -			break; - -			case 'int': -				$cfg_array[$config_name] = (int) $cfg_array[$config_name]; - -				if (isset($validator[$min]) && $cfg_array[$config_name] < $validator[$min]) -				{ -					$error[] = sprintf($user->lang['SETTING_TOO_LOW'], $user->lang[$config_definition['lang']], $validator[$min]); -				} -				else if (isset($validator[$max]) && $cfg_array[$config_name] > $validator[$max]) -				{ -					$error[] = sprintf($user->lang['SETTING_TOO_BIG'], $user->lang[$config_definition['lang']], $validator[$max]); -				} - -				if (strpos($config_name, '_max') !== false) -				{ -					// Min/max pairs of settings should ensure that min <= max -					// Replace _max with _min to find the name of the minimum -					// corresponding configuration variable -					$min_name = str_replace('_max', '_min', $config_name); - -					if (isset($cfg_array[$min_name]) && is_numeric($cfg_array[$min_name]) && $cfg_array[$config_name] < $cfg_array[$min_name]) -					{ -						// A minimum value exists and the maximum value is less than it -						$error[] = sprintf($user->lang['SETTING_TOO_LOW'], $user->lang[$config_definition['lang']], (int) $cfg_array[$min_name]); -					} -				} -			break; - -			// Absolute path -			case 'script_path': -				if (!$cfg_array[$config_name]) -				{ -					break; -				} - -				$destination = str_replace('\\', '/', $cfg_array[$config_name]); - -				if ($destination !== '/') -				{ -					// Adjust destination path (no trailing slash) -					if (substr($destination, -1, 1) == '/') -					{ -						$destination = substr($destination, 0, -1); -					} - -					$destination = str_replace(array('../', './'), '', $destination); - -					if ($destination[0] != '/') -					{ -						$destination = '/' . $destination; -					} -				} - -				$cfg_array[$config_name] = trim($destination); - -			break; - -			// Absolute path -			case 'lang': -				if (!$cfg_array[$config_name]) -				{ -					break; -				} - -				$cfg_array[$config_name] = basename($cfg_array[$config_name]); - -				if (!file_exists($phpbb_root_path . 'language/' . $cfg_array[$config_name] . '/')) -				{ -					$error[] = $user->lang['WRONG_DATA_LANG']; -				} -			break; - -			// Relative path (appended $phpbb_root_path) -			case 'rpath': -			case 'rwpath': -				if (!$cfg_array[$config_name]) -				{ -					break; -				} - -				$destination = $cfg_array[$config_name]; - -				// Adjust destination path (no trailing slash) -				if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\') -				{ -					$destination = substr($destination, 0, -1); -				} - -				$destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination); -				if ($destination && ($destination[0] == '/' || $destination[0] == "\\")) -				{ -					$destination = ''; -				} - -				$cfg_array[$config_name] = trim($destination); - -			// Path being relative (still prefixed by phpbb_root_path), but with the ability to escape the root dir... -			case 'path': -			case 'wpath': - -				if (!$cfg_array[$config_name]) -				{ -					break; -				} - -				$cfg_array[$config_name] = trim($cfg_array[$config_name]); - -				// Make sure no NUL byte is present... -				if (strpos($cfg_array[$config_name], "\0") !== false || strpos($cfg_array[$config_name], '%00') !== false) -				{ -					$cfg_array[$config_name] = ''; -					break; -				} - -				if (!file_exists($phpbb_root_path . $cfg_array[$config_name])) -				{ -					$error[] = sprintf($user->lang['DIRECTORY_DOES_NOT_EXIST'], $cfg_array[$config_name]); -				} - -				if (file_exists($phpbb_root_path . $cfg_array[$config_name]) && !is_dir($phpbb_root_path . $cfg_array[$config_name])) -				{ -					$error[] = sprintf($user->lang['DIRECTORY_NOT_DIR'], $cfg_array[$config_name]); -				} - -				// Check if the path is writable -				if ($config_definition['validate'] == 'wpath' || $config_definition['validate'] == 'rwpath') -				{ -					if (file_exists($phpbb_root_path . $cfg_array[$config_name]) && !phpbb_is_writable($phpbb_root_path . $cfg_array[$config_name])) -					{ -						$error[] = sprintf($user->lang['DIRECTORY_NOT_WRITABLE'], $cfg_array[$config_name]); -					} -				} - -			break; -		} -	} - -	return; -} - -/** -* Checks whatever or not a variable is OK for use in the Database -* param mixed $value_ary An array of the form array(array('lang' => ..., 'value' => ..., 'column_type' =>))' -* param mixed $error The error array -*/ -function validate_range($value_ary, &$error) -{ -	global $user; - -	$column_types = array( -		'BOOL'	=> array('php_type' => 'int', 		'min' => 0, 				'max' => 1), -		'USINT'	=> array('php_type' => 'int',		'min' => 0, 				'max' => 65535), -		'UINT'	=> array('php_type' => 'int', 		'min' => 0, 				'max' => (int) 0x7fffffff), -		// Do not use (int) 0x80000000 - it evaluates to different -		// values on 32-bit and 64-bit systems. -		// Apparently -2147483648 is a float on 32-bit systems, -		// despite fitting in an int, thus explicit cast is needed. -		'INT'	=> array('php_type' => 'int', 		'min' => (int) -2147483648,	'max' => (int) 0x7fffffff), -		'TINT'	=> array('php_type' => 'int',		'min' => -128,				'max' => 127), - -		'VCHAR'	=> array('php_type' => 'string', 	'min' => 0, 				'max' => 255), -	); -	foreach ($value_ary as $value) -	{ -		$column = explode(':', $value['column_type']); -		$max = $min = 0; -		$type = 0; -		if (!isset($column_types[$column[0]])) -		{ -			continue; -		} -		else -		{ -			$type = $column_types[$column[0]]; -		} - -		switch ($type['php_type']) -		{ -			case 'string' : -				$max = (isset($column[1])) ? min($column[1],$type['max']) : $type['max']; -				if (utf8_strlen($value['value']) > $max) -				{ -					$error[] = sprintf($user->lang['SETTING_TOO_LONG'], $user->lang[$value['lang']], $max); -				} -			break; - -			case 'int': -				$min = (isset($column[1])) ? max($column[1],$type['min']) : $type['min']; -				$max = (isset($column[2])) ? min($column[2],$type['max']) : $type['max']; -				if ($value['value'] < $min) -				{ -					$error[] = sprintf($user->lang['SETTING_TOO_LOW'], $user->lang[$value['lang']], $min); -				} -				else if ($value['value'] > $max) -				{ -					$error[] = sprintf($user->lang['SETTING_TOO_BIG'], $user->lang[$value['lang']], $max); -				} -			break; -		} -	} -} - -?>
\ No newline at end of file diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index 9573c34248..33ef8062a6 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF U_BACK -->  	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> @@ -371,6 +371,79 @@  	</fieldset>  	</form> +<!-- ELSEIF S_MANAGE --> + +	<form id="attachments" method="post" action="{U_ACTION}"> + +	<fieldset class="tabulated"> +	<legend>{L_TITLE}</legend> + +	<!-- IF PAGINATION  or TOTAL_FILES --> +	<div class="pagination"> +		{L_NUMBER_FILES}: {TOTAL_FILES} • {L_TOTAL_SIZE}: {TOTAL_SIZE}<!-- IF S_ON_PAGE --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {S_ON_PAGE}<!-- ENDIF --><!-- ENDIF --> +	</div> +	<!-- ENDIF --> + +	<table cellspacing="1"> +	<thead> +	<tr> +		<th>{L_FILENAME}</th> +		<th>{L_POSTED}</th> +		<th>{L_FILESIZE}</th> +		<th>{L_DELETE}</th> +	</tr> +	</thead> +	<tbody> +	<!-- BEGIN attachments --> +		<!-- IF attachments.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> +			<td> +				<!-- IF attachments.S_IN_MESSAGE -->{L_EXTENSION_GROUP}: <strong><!-- IF attachments.EXT_GROUP_NAME -->{attachments.EXT_GROUP_NAME}<!-- ELSE -->{L_NO_EXT_GROUP}<!-- ENDIF --></strong><br />{attachments.L_DOWNLOAD_COUNT}<br />{L_IN} {L_PRIVATE_MESSAGE} +				<!-- ELSE --><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br /><!-- IF attachments.COMMENT -->{attachments.COMMENT}<br /><!-- ENDIF -->{attachments.L_DOWNLOAD_COUNT}<br />{L_TOPIC}: <a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a><!-- ENDIF --> +			</td> +			<td>{attachments.FILETIME}<br />{L_POST_BY_AUTHOR} {attachments.ATTACHMENT_POSTER}</td> +			<td>{attachments.FILESIZE}</td> +			<td><input type="checkbox" class="radio" name="delete[{attachments.ATTACH_ID}]" /></td> +		</tr> +	<!-- END attachments --> +	<tr class="row4"> +		<td colspan="3"> </td> +		<td class="small"><a href="#" onclick="marklist('attachments', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('attachments', 'delete', false); return false;">{L_UNMARK_ALL}</a></td> +	</tr> +	</tbody> +	</table> + +	<!-- IF TOTAL_FILES --> +	<fieldset class="display-options"> +		{L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} +		<input class="button2" type="submit" value="{L_GO}" name="sort" /> +	</fieldset> + +	<hr /> + +	<div class="pagination"> +		{L_NUMBER_FILES}: {TOTAL_FILES} • {L_TOTAL_SIZE}: {TOTAL_SIZE}<!-- IF S_ON_PAGE --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {S_ON_PAGE}<!-- ENDIF --><!-- ENDIF --> +	</div> +	<!-- ENDIF --> + +	<p 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}" /> +	</p> +	{S_FORM_TOKEN} +	</fieldset> +	</form> + +	<!-- IF S_ACTION_OPTIONS --> +	<fieldset> +		<legend>{L_RESYNC_STATS}</legend> +		<form id="action_stats_form" method="post" action="{U_ACTION}"> +			<dl> +				<dt><label for="action_stats">{L_RESYNC_FILES_STATS}</label><br /><span>{L_RESYNC_FILES_STATS_EXPLAIN}</span></dt> +				<dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd> +			</dl> +		</form> +	</fieldset> +	<!-- ENDIF -->  <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index 0e2e71822e..d564e89312 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <p>{L_ACP_BAN_EXPLAIN}</p> @@ -121,4 +121,4 @@  </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index c81c198fd5..b85e8eca81 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT_BBCODE --> diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html index bb16204801..781f5c6bce 100644 --- a/phpBB/adm/style/acp_board.html +++ b/phpBB/adm/style/acp_board.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_TITLE}</h1> diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index 7783356574..886005caa3 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT_BOT --> diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 8eee370284..83314ab633 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_ACP_VC_SETTINGS}</h1> diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index de02ac6dbe..28ac2db1b9 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF MODE eq 'restore' -->  	<h1>{L_ACP_RESTORE}</h1> diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html index b68d3ab3c0..776f54d66c 100644 --- a/phpBB/adm/style/acp_disallow.html +++ b/phpBB/adm/style/acp_disallow.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_ACP_DISALLOW_USERNAMES}</h1> diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index ff52500dca..1339ac6529 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_ACP_MASS_EMAIL}</h1> diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 8577c08860..447c0ce466 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT_FORUM --> diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 07f7d072e8..158751623a 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT --> @@ -71,6 +71,10 @@  		<dd><input name="group_legend" type="checkbox" value="1" class="radio" id="group_legend"{GROUP_LEGEND} /></dd>  	</dl>  	<dl> +		<dt><label for="group_teampage">{L_GROUP_TEAMPAGE}:</label></dt> +		<dd><input name="group_teampage" type="checkbox" value="1" class="radio" id="group_teampage"{GROUP_TEAMPAGE} /></dd> +	</dl> +	<dl>  		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt>  		<dd><input name="group_receive_pm" type="checkbox" value="1" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>  	</dl> diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html new file mode 100644 index 0000000000..54c1cee769 --- /dev/null +++ b/phpBB/adm/style/acp_groups_position.html @@ -0,0 +1,158 @@ +<!-- INCLUDE overall_header.html --> + +<a id="maincontent"></a> + +	<h1>{L_MANAGE_LEGEND}</h1> + +	<form id="legend_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->> + +	<fieldset> +		<legend>{L_LEGEND_SETTINGS}</legend> +		<dl> +			<dt><label for="legend_sort_groupname">{L_LEGEND_SORT_GROUPNAME}:</label><br /><span>{L_LEGEND_SORT_GROUPNAME_EXPLAIN}</span></dt> +			<dd> +				<label><input type="radio" name="legend_sort_groupname" class="radio" value="1"<!-- IF LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> +				<label><input type="radio" name="legend_sort_groupname" class="radio" value="0"<!-- IF not LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> +			</dd> +		</dl> + +	<p class="submit-buttons"> +		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />  +		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> +		<input type="hidden" name="action" value="set_config_legend" /> +		{S_FORM_TOKEN} +	</p> +	</fieldset> +	</form> + +	<p>{L_LEGEND_EXPLAIN}</p> + +	<table cellspacing="1"> +		<col class="col1" /><col class="col2" /><col class="col2" /> +	<thead> +	<tr> +		<th style="width: 50%">{L_GROUP}</th> +		<th>{L_GROUP_TYPE}</th> +		<th>{L_ACTION}</th> +	</tr> +	</thead> +	<tbody> +	<!-- BEGIN legend --> +		<tr> +			<td><strong{legend.GROUP_COLOUR}>{legend.GROUP_NAME}</strong></td> +			<td style="text-align: center;">{legend.GROUP_TYPE}</td> +			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;"> +				<!-- IF legend.S_FIRST_ROW && not legend.S_LAST_ROW --> +					{ICON_MOVE_UP_DISABLED} +					<a href="{legend.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> +				<!-- ELSEIF not legend.S_FIRST_ROW && not legend.S_LAST_ROW --> +					<a href="{legend.U_MOVE_UP}">{ICON_MOVE_UP}</a> +					<a href="{legend.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> +				<!-- ELSEIF legend.S_LAST_ROW && not legend.S_FIRST_ROW --> +					<a href="{legend.U_MOVE_UP}">{ICON_MOVE_UP}</a> +					{ICON_MOVE_DOWN_DISABLED} +				<!-- ELSE --> +					{ICON_MOVE_UP_DISABLED} +					{ICON_MOVE_DOWN_DISABLED} +				<!-- ENDIF --> +				<a href="{legend.U_DELETE}">{ICON_DELETE}</a> +			</td> +		</tr> +	<!-- BEGINELSE --> +		<tr> +			<td colspan="3" class="row3">{L_NO_GROUPS_ADDED}</td> +		</tr> +	<!-- END legend --> +	</tbody> +	</table> + +	<form id="acp_groups" method="post" action="{U_ACTION_LEGEND}"> +		<fieldset class="quick"> +			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_LEGEND}</select> +			<input class="button2" type="submit" name="submit" value="{L_ADD}" /> +			<input type="hidden" name="action" value="add" /> +			{S_FORM_TOKEN} +		</fieldset> +	</form> + +	<h1>{L_MANAGE_TEAMPAGE}</h1> + +	<form id="teampage_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->> + +	<fieldset> +		<legend>{L_TEAMPAGE_SETTINGS}</legend> +		<dl> +			<dt><label for="teampage_multiple">{L_TEAMPAGE_MULTIPLE}:</label><br /><span>{L_TEAMPAGE_MULTIPLE_EXPLAIN}</span></dt> +			<dd> +				<label><input type="radio" name="teampage_multiple" class="radio" value="1"<!-- IF DISPLAY_MULTIPLE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> +				<label><input type="radio" name="teampage_multiple" class="radio" value="0"<!-- IF not DISPLAY_MULTIPLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> +			</dd> +		</dl> +		<dl> +			<dt><label for="teampage_forums">{L_TEAMPAGE_FORUMS}:</label><br /><span>{L_TEAMPAGE_FORUMS_EXPLAIN}</span></dt> +			<dd> +				<label><input type="radio" name="teampage_forums" class="radio" value="1"<!-- IF DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> +				<label><input type="radio" name="teampage_forums" class="radio" value="0"<!-- IF not DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> +			</dd> +		</dl> + +	<p class="submit-buttons"> +		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />  +		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> +		<input type="hidden" name="action" value="set_config_teampage" /> +		{S_FORM_TOKEN} +	</p> +	</fieldset> +	</form> + +	<p>{L_TEAMPAGE_EXPLAIN}</p> + +	<table cellspacing="1"> +		<col class="col1" /><col class="col2" /><col class="col2" /> +	<thead> +	<tr> +		<th style="width: 50%">{L_GROUP}</th> +		<th>{L_GROUP_TYPE}</th> +		<th>{L_ACTION}</th> +	</tr> +	</thead> +	<tbody> +	<!-- BEGIN teampage --> +		<tr> +			<td><strong{teampage.GROUP_COLOUR}>{teampage.GROUP_NAME}</strong></td> +			<td style="text-align: center;">{teampage.GROUP_TYPE}</td> +			<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;"> +				<!-- IF teampage.S_FIRST_ROW && not teampage.S_LAST_ROW --> +					{ICON_MOVE_UP_DISABLED} +					<a href="{teampage.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> +				<!-- ELSEIF not teampage.S_FIRST_ROW && not teampage.S_LAST_ROW --> +					<a href="{teampage.U_MOVE_UP}">{ICON_MOVE_UP}</a> +					<a href="{teampage.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> +				<!-- ELSEIF teampage.S_LAST_ROW && not teampage.S_FIRST_ROW --> +					<a href="{teampage.U_MOVE_UP}">{ICON_MOVE_UP}</a> +					{ICON_MOVE_DOWN_DISABLED} +				<!-- ELSE --> +					{ICON_MOVE_UP_DISABLED} +					{ICON_MOVE_DOWN_DISABLED} +				<!-- ENDIF --> +				<a href="{teampage.U_DELETE}">{ICON_DELETE}</a> +			</td> +		</tr> +	<!-- BEGINELSE --> +		<tr> +			<td colspan="3" class="row3">{L_NO_GROUPS_ADDED}</td> +		</tr> +	<!-- END teampage --> +	</tbody> +	</table> + +	<form id="acp_groups" method="post" action="{U_ACTION_TEAMPAGE}"> +		<fieldset class="quick"> +			<select name="g"><option value="0">{L_SELECT_GROUP}</option>{S_GROUP_SELECT_TEAMPAGE}</select> +			<input class="button2" type="submit" name="submit" value="{L_ADD}" /> +			<input type="hidden" name="action" value="add" /> +			{S_FORM_TOKEN} +		</fieldset> +	</form> + +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index eedf39b440..9ec7111848 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT --> diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index 3b20043dd9..0889eaf400 100644 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h2>{L_INACTIVE_USERS}</h2> @@ -74,4 +74,4 @@  </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html index 0c4512ba98..2ba1424bda 100644 --- a/phpBB/adm/style/acp_jabber.html +++ b/phpBB/adm/style/acp_jabber.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_ACP_JABBER_SETTINGS}</h1> diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index 95ac1d5852..81276287c1 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_SELECT_METHOD --> @@ -98,7 +98,7 @@  		<br /><br />  	<!-- ENDIF --> -	<a name="entries"></a> +	<a id="entries"></a>  	<h1>{L_LANGUAGE_ENTRIES}</h1> diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index f2fa5dbc26..f1c770d33b 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_TITLE}</h1> diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 7d3b6945ac..8946903e28 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_RESTORE_PERMISSIONS --> @@ -252,4 +252,4 @@  <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 5396e78557..3f1c0bf50b 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT_MODULE --> diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 220e7dafbe..658d8dd0c8 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT --> @@ -60,7 +60,7 @@  	<p> -	<a name="acl"></a> +	<a id="acl"></a>  	<a href="#maincontent">» {L_BACK_TO_TOP}</a><br />  	<br /><br /> @@ -189,7 +189,7 @@  	<!-- IF S_DISPLAY_ROLE_MASK --> -		<a name="assigned_to"></a> +		<a id="assigned_to"></a>  		<h1>{L_ROLE_ASSIGNED_TO}</h1> @@ -199,4 +199,4 @@  <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index 63583093b0..b44cca782e 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_INTRO --> @@ -354,4 +354,4 @@  <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_php_info.html b/phpBB/adm/style/acp_php_info.html index de065c4896..760cd0e9f6 100644 --- a/phpBB/adm/style/acp_php_info.html +++ b/phpBB/adm/style/acp_php_info.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_ACP_PHP_INFO}</h1> @@ -10,4 +10,4 @@  	{PHPINFO}  </div> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index 85d37568c2..0ac0d78a64 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT --> @@ -56,6 +56,10 @@  			<dd><input type="checkbox" class="radio" id="field_show_on_reg" name="field_show_on_reg" value="1"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		<dl> +			<dt><label for="field_show_on_pm">{L_DISPLAY_ON_PM}:</label><br /><span>{L_DISPLAY_ON_PM_EXPLAIN}</span></dt> +			<dd><input type="checkbox" class="radio" id="field_show_on_pm" name="field_show_on_pm" value="1"<!-- IF S_SHOW_ON_PM --> checked="checked"<!-- ENDIF --> /></dd> +		</dl> +		<dl>  			<dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}:</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt>  			<dd><input type="checkbox" class="radio" id="field_show_on_vt" name="field_show_on_vt" value="1"<!-- IF S_SHOW_ON_VT --> checked="checked"<!-- ENDIF --> /></dd>  		</dl> diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html index 069d2c91c3..dfc5827117 100644 --- a/phpBB/adm/style/acp_prune_forums.html +++ b/phpBB/adm/style/acp_prune_forums.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_PRUNED --> diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html index 0f2b23dcef..968d307832 100644 --- a/phpBB/adm/style/acp_prune_users.html +++ b/phpBB/adm/style/acp_prune_users.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_ACP_PRUNE_USERS}</h1> diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index 1f45109517..2f77a256b1 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT --> diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html index 23fcfbdeb8..522aec5930 100644 --- a/phpBB/adm/style/acp_reasons.html +++ b/phpBB/adm/style/acp_reasons.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT_REASON --> diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index 5fd7a23d97..ff83f6b792 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_SETTINGS -->  	<h1>{L_ACP_SEARCH_SETTINGS}</h1> @@ -139,9 +139,11 @@  			<p class="quick">  			<!-- IF backend.S_INDEXED --> -				<input class="button2" type="submit" name="action[delete]" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" /> +				<input type="hidden" name="action" value="delete" /> +				<input class="button2" type="submit" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" />  			<!-- ELSE --> -				<input class="button2" type="submit" name="action[create]" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" /> +				<input type="hidden" name="action" value="create" /> +				<input class="button2" type="submit" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" />  			<!-- ENDIF -->  			</p>  			{S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_send_statistics.html b/phpBB/adm/style/acp_send_statistics.html index 2a9b61f314..2d6c4837fd 100644 --- a/phpBB/adm/style/acp_send_statistics.html +++ b/phpBB/adm/style/acp_send_statistics.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_SEND_STATISTICS}</h1> @@ -68,4 +68,4 @@ function iframe_updated()  //]]>  </script> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 098cc723d9..fdab2ecf88 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_DELETE --> @@ -32,10 +32,6 @@  			<dt><label for="new_theme_id">{L_DELETE_THEME}:</label><br /><span>{L_REPLACE_THEME_EXPLAIN}</span></dt>  			<dd><select id="new_theme_id" name="new_theme_id">{S_REPLACE_THEME_OPTIONS}</select></dd>  		</dl> -		<dl> -			<dt><label for="new_imageset_id">{L_DELETE_IMAGESET}:</label><br /><span>{L_REPLACE_IMAGESET_EXPLAIN}</span></dt> -			<dd><select id="new_imageset_id" name="new_imageset_id">{S_REPLACE_IMAGESET_OPTIONS}</select></dd> -		</dl>  	<!-- ENDIF -->  	<p class="quick"> @@ -45,127 +41,6 @@  	</fieldset>  	</form> -<!-- ELSEIF S_EDIT_IMAGESET --> - -	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> - -	<h1>{L_TITLE}</h1> - -	<p>{L_EXPLAIN}</p> - -	<!-- IF SUCCESS --> -		<div class="successbox"> -			<p>{L_IMAGESET_UPDATED}</p> -		</div> -	<!-- ENDIF --> - -	<!-- IF ERROR --> -		<div class="errorbox"> -			<p>{L_NO_IMAGE}</p> -		</div> -	<!-- ENDIF --> - -	<script type="text/javascript" defer="defer"> -	// <![CDATA[ -		function update_image(newimage) -		{ -			document.getElementById('newimg').src = (newimage) ? '../styles/{A_PATH}/imageset/' + encodeURI(newimage) : 'images/no_image.png'; -		} -	// ]]> -	</script> -	<script type="text/javascript"> -	// <![CDATA[ -		/** -		* Handle displaying/hiding the dimension fields -		*/ -		function display_options(value) -		{ -			if (value == 0) -			{ -				dE('img_dimensions', -1); -			} -			else -			{ -				dE('img_dimensions', 1); -			} -		} - -		/** -		* Init the wanted display functionality if javascript is enabled. -		* If javascript is not available, the user is still able to properly administer. -		*/ -		onload = function() -		{ -			<!-- IF not IMAGE_SIZE --> -				dE('img_dimensions', -1); -			<!-- ENDIF --> -		} -	// ]]> -	</script> - -	<form method="post" action="{U_ACTION}"> - -	<fieldset class="quick" style="text-align: left;"> -		<legend>{L_SELECT_IMAGE}</legend> -		{L_SELECT_IMAGE}: <select name="imgname" onchange="this.form.submit();"> -		<!-- BEGIN category --> -			<option class="sep" value="" disabled="disabled">{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="button1" type="submit" value="{L_SELECT}" tabindex="100" /> -	</fieldset> - -	<fieldset> -		<legend>{L_EDIT_IMAGESET}</legend> -	<dl> -		<dt><label>{L_CURRENT_IMAGE}:</label></dt> -		<dd><img src="<!-- IF IMAGE_REQUEST -->{IMAGE_REQUEST}<!-- ELSE -->images/no_image.png<!-- ENDIF -->" alt="" /></dd> -	</dl> -	<dl> -		<dt><label>{L_SELECTED_IMAGE}:</label></dt> -		<dd><img src="{IMG_SRC}" id="newimg" alt="" /></dd> -	</dl> -	</fieldset> - -	<fieldset> -	<legend>{L_IMAGE}</legend> -	<dl> -		<dt><label for="imgpath">{L_IMAGE}:</label></dt> -		<dd><select id="imgpath" name="imgpath" onchange="update_image(this.options[selectedIndex].value);"><option value=""<!-- IF not IMAGE_SELECT--> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</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> -		</dd> -	</dl> -	<dl> -		<dt><label for="imgsize">{L_INCLUDE_DIMENSIONS}:</label><br /><span>{L_DIMENSIONS_EXPLAIN}</span></dt> -		<dd><label><input type="radio" class="radio" name="imgsize" id="imgsize" onclick="display_options(1);" value="1"<!-- IF IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> -			<label><input type="radio" class="radio" name="imgsize" onclick="display_options(0);" value="0"<!-- IF not IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> -	</dl> -	<div id="img_dimensions"> -		<dl> -			<dt><label for="imgwidth">{L_IMAGE_WIDTH}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt> -			<dd><input id="imgwidth" type="text" name="imgwidth" value="{IMAGE_SIZE}" /></dd> -		</dl> -		<dl> -			<dt><label for="imgheight">{L_IMAGE_HEIGHT}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt> -			<dd><input id="imgheight" type="text" name="imgheight" value="{IMAGE_HEIGHT}" /></dd> -		</dl> -	</div> -	</fieldset> - -	<fieldset class="submit-buttons"> -		<legend>{L_SUBMIT}</legend> -		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />  <input class="button2" type="reset" value="{L_RESET}" /> -		{S_FORM_TOKEN} -	</fieldset> -	</form> -  <!-- ELSEIF S_EDIT_TEMPLATE or S_EDIT_THEME -->  	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> @@ -354,11 +229,6 @@  			<dd><label><input type="radio" class="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" /> {L_YES}</label>  				<label><input type="radio" class="radio" name="inc_theme" value="0" /> {L_NO}</label></dd>  		</dl> -		<dl> -			<dt><label for="inc_imageset">{L_INCLUDE_IMAGESET}:</label></dt> -			<dd><label><input type="radio" class="radio" id="inc_imageset" name="inc_imageset" value="1" checked="checked" /> {L_YES}</label> -				<label><input type="radio" class="radio" name="inc_imageset" value="0" /> {L_NO}</label></dd> -		</dl>  	<!-- ENDIF -->  	<dl>  		<dt><label for="store">{L_DOWNLOAD_STORE}:</label><br /><span>{L_DOWNLOAD_STORE_EXPLAIN}</span></dt> @@ -491,17 +361,6 @@  			<dt><label for="theme_id">{L_STYLE_THEME}:</label></dt>  			<dd><!-- IF S_INSTALL --><strong id="theme_id">{THEME_NAME}</strong><!-- ELSE --><select id="theme_id" name="theme_id">{S_THEME_OPTIONS}</select><!-- ENDIF --></dd>  		</dl> -		<dl> -			<dt><label for="imageset_id">{L_STYLE_IMAGESET}:</label></dt> -			<dd><!-- IF S_INSTALL --><strong id="imageset_id">{IMAGESET_NAME}</strong><!-- ELSE --><select id="imageset_id" name="imageset_id">{S_IMAGESET_OPTIONS}</select><!-- ENDIF --></dd> -		</dl> -	<!-- ENDIF --> -	<!-- IF (S_TEMPLATE or S_THEME) and (S_LOCATION or not S_INSTALL) --> -		<dl> -			<dt><label for="store_db">{L_LOCATION}:</label><br /><span><!-- IF S_STORE_DB_DISABLED -->{L_LOCATION_DISABLED_EXPLAIN}<!-- ELSE -->{L_LOCATION_EXPLAIN}<!-- ENDIF --></span></dt> -			<dd><label><input type="radio" class="radio" name="store_db" value="0"<!-- IF not S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF --> />{L_STORE_FILESYSTEM}</label> -				<label><input type="radio" class="radio" name="store_db" value="1"<!-- IF S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF -->/> {L_STORE_DATABASE}</label></dd> -		</dl>  	<!-- ENDIF -->  	<!-- IF S_STYLE -->  		</fieldset> diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html index a87366a78b..00d37515b3 100644 --- a/phpBB/adm/style/acp_update.html +++ b/phpBB/adm/style/acp_update.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_VERSION_CHECK --> @@ -49,4 +49,4 @@  <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index e266654649..87bd9ac882 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_SELECT_USER --> diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html index 2b2676a19a..35d8374237 100644 --- a/phpBB/adm/style/acp_users_avatar.html +++ b/phpBB/adm/style/acp_users_avatar.html @@ -75,4 +75,4 @@  		{S_FORM_TOKEN}  	</fieldset> -	</form>
\ No newline at end of file +	</form> diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html index e11a8e6ec1..aa92353807 100644 --- a/phpBB/adm/style/acp_users_feedback.html +++ b/phpBB/adm/style/acp_users_feedback.html @@ -73,4 +73,4 @@  		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />  	</fieldset>  	{S_FORM_TOKEN} -	</form>
\ No newline at end of file +	</form> diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html index 07a9bc5c78..a519447b2f 100644 --- a/phpBB/adm/style/acp_users_prefs.html +++ b/phpBB/adm/style/acp_users_prefs.html @@ -155,4 +155,4 @@  		{S_FORM_TOKEN}  	</fieldset> -	</form>
\ No newline at end of file +	</form> diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html index 0d1c6f8e46..ea7204e2e4 100644 --- a/phpBB/adm/style/acp_users_profile.html +++ b/phpBB/adm/style/acp_users_profile.html @@ -63,4 +63,4 @@  		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />  		{S_FORM_TOKEN}  	</fieldset> -	</form>
\ No newline at end of file +	</form> diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html index 0fd6c04fa5..d55deac808 100644 --- a/phpBB/adm/style/acp_users_signature.html +++ b/phpBB/adm/style/acp_users_signature.html @@ -113,4 +113,4 @@  		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />  		{S_FORM_TOKEN}  	</fieldset> -</form>
\ No newline at end of file +</form> diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html index 3fa4cfc91c..113f58ef92 100644 --- a/phpBB/adm/style/acp_words.html +++ b/phpBB/adm/style/acp_words.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <!-- IF S_EDIT_WORD --> diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html index d0bb758cfe..e2804bbc7d 100644 --- a/phpBB/adm/style/captcha_gd_acp.html +++ b/phpBB/adm/style/captcha_gd_acp.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  	<a href="{U_ACTION}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a>  <h1>{L_ACP_VC_SETTINGS}</h1> diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html index e0fc6fc67e..4eb46d2d3c 100644 --- a/phpBB/adm/style/captcha_qa_acp.html +++ b/phpBB/adm/style/captcha_qa_acp.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  	<a href="<!-- IF U_LIST -->{U_LIST}<!-- ELSE -->{U_ACTION}<!-- ENDIF -->" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html index 5b97cff984..34912c7955 100644 --- a/phpBB/adm/style/captcha_recaptcha_acp.html +++ b/phpBB/adm/style/captcha_recaptcha_acp.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  <h1>{L_ACP_VC_SETTINGS}</h1> diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html index c9e89980d8..e731620bd3 100644 --- a/phpBB/adm/style/colour_swatch.html +++ b/phpBB/adm/style/colour_swatch.html @@ -1,10 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> +<!DOCTYPE html> +<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">  <head> -<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" /> -<meta http-equiv="Content-Style-Type" content="text/css" /> -<meta http-equiv="Content-Language" content="{S_USER_LANG}" /> -<meta http-equiv="imagetoolbar" content="no" /> +<meta charset="utf-8">  <title>{L_COLOUR_SWATCH}</title>  <style type="text/css"> @@ -75,4 +72,4 @@  </script>  </body> -</html>
\ No newline at end of file +</html> diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js index 217aa699e2..c9e8afe08e 100644 --- a/phpBB/adm/style/editor.js +++ b/phpBB/adm/style/editor.js @@ -400,4 +400,4 @@ function getCaretPosition(txtarea)  	}  	return caretPos; -}
\ No newline at end of file +} diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html index 783e89d6bf..cf78f30b50 100644 --- a/phpBB/adm/style/install_convert.html +++ b/phpBB/adm/style/install_convert.html @@ -131,4 +131,4 @@  	</form>  <!-- ENDIF --> -<!-- INCLUDE install_footer.html -->
\ No newline at end of file +<!-- INCLUDE install_footer.html --> diff --git a/phpBB/adm/style/install_error.html b/phpBB/adm/style/install_error.html index ad53433207..3f7c8b9ed4 100644 --- a/phpBB/adm/style/install_error.html +++ b/phpBB/adm/style/install_error.html @@ -5,4 +5,4 @@  	<p>{MESSAGE_TEXT}</p>  </div> -<!-- INCLUDE install_footer.html -->
\ No newline at end of file +<!-- INCLUDE install_footer.html --> diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html index 26a3c6ab3d..a3b2294025 100644 --- a/phpBB/adm/style/install_footer.html +++ b/phpBB/adm/style/install_footer.html @@ -12,5 +12,8 @@  	</div>  </div> +<script type="text/javascript" src="{T_JQUERY_LINK}"></script> +<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> +  </body> -</html>
\ No newline at end of file +</html> diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index fbb6a7b409..e306d8f6bf 100644 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -1,11 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> +<!DOCTYPE html> +<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">  <head> - -<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" /> -<meta http-equiv="Content-Style-Type" content="text/css" /> -<meta http-equiv="Content-Language" content="{S_USER_LANG}" /> -<meta http-equiv="imagetoolbar" content="no" /> +<meta charset="utf-8">  <!-- IF META -->{META}<!-- ENDIF -->  <title>{PAGE_TITLE}</title> diff --git a/phpBB/adm/style/install_main.html b/phpBB/adm/style/install_main.html index 2c318bfd65..73e73ad578 100644 --- a/phpBB/adm/style/install_main.html +++ b/phpBB/adm/style/install_main.html @@ -3,4 +3,4 @@  	<h1>{TITLE}</h1>  	<p>{BODY}</p> -<!-- INCLUDE install_footer.html -->
\ No newline at end of file +<!-- INCLUDE install_footer.html --> diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index b65a014312..39c73d5652 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -1,11 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> +<!DOCTYPE html> +<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">  <head> - -<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" /> -<meta http-equiv="Content-Style-Type" content="text/css" /> -<meta http-equiv="Content-Language" content="{S_USER_LANG}" /> -<meta http-equiv="imagetoolbar" content="no" /> +<meta charset="utf-8">  <!-- IF META -->{META}<!-- ENDIF -->  <title>{PAGE_TITLE}</title> @@ -259,4 +255,4 @@ table.hrdiff caption span {  	</div> -<!-- INCLUDE simple_footer.html -->
\ No newline at end of file +<!-- INCLUDE simple_footer.html --> diff --git a/phpBB/adm/style/message_body.html b/phpBB/adm/style/message_body.html index 5d907e911c..3ea9e5bc24 100644 --- a/phpBB/adm/style/message_body.html +++ b/phpBB/adm/style/message_body.html @@ -5,4 +5,4 @@  	<p>{MESSAGE_TEXT}</p>  </div> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index b48b449597..f05e9c56c5 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -20,5 +20,8 @@  	</div>  </div> +<script type="text/javascript" src="{T_JQUERY_LINK}"></script> +<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> +  </body> -</html>
\ No newline at end of file +</html> diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index a376884507..be5ac29131 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -1,11 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> +<!DOCTYPE html> +<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">  <head> - -<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" /> -<meta http-equiv="Content-Style-Type" content="text/css" /> -<meta http-equiv="Content-Language" content="{S_USER_LANG}" /> -<meta http-equiv="imagetoolbar" content="no" /> +<meta charset="utf-8">  <!-- IF META -->{META}<!-- ENDIF -->  <title>{PAGE_TITLE}</title> diff --git a/phpBB/adm/style/permission_forum_copy.html b/phpBB/adm/style/permission_forum_copy.html index c919310035..a4c00c12ae 100644 --- a/phpBB/adm/style/permission_forum_copy.html +++ b/phpBB/adm/style/permission_forum_copy.html @@ -1,6 +1,6 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a>  	<h1>{L_ACP_FORUM_PERMISSIONS_COPY}</h1> diff --git a/phpBB/adm/style/permission_roles_mask.html b/phpBB/adm/style/permission_roles_mask.html index e88c5fd2ba..485858da74 100644 --- a/phpBB/adm/style/permission_roles_mask.html +++ b/phpBB/adm/style/permission_roles_mask.html @@ -35,4 +35,4 @@  	<p>{L_ROLE_NOT_ASSIGNED}</p> -<!-- END role_mask -->
\ No newline at end of file +<!-- END role_mask --> diff --git a/phpBB/adm/style/progress_bar.html b/phpBB/adm/style/progress_bar.html index 00e1e5e885..1822675c15 100644 --- a/phpBB/adm/style/progress_bar.html +++ b/phpBB/adm/style/progress_bar.html @@ -37,4 +37,4 @@  // ]]>  </script> -<!-- INCLUDE simple_footer.html -->
\ No newline at end of file +<!-- INCLUDE simple_footer.html --> diff --git a/phpBB/adm/style/simple_body.html b/phpBB/adm/style/simple_body.html index 0b1e11b9a2..ca06bc4f10 100644 --- a/phpBB/adm/style/simple_body.html +++ b/phpBB/adm/style/simple_body.html @@ -5,4 +5,4 @@  	<p>{MESSAGE_TEXT}</p>  </div> -<!-- INCLUDE simple_footer.html -->
\ No newline at end of file +<!-- INCLUDE simple_footer.html --> diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html index ac9c26a690..0d697aec1d 100644 --- a/phpBB/adm/style/simple_footer.html +++ b/phpBB/adm/style/simple_footer.html @@ -16,5 +16,8 @@  </div> +<script type="text/javascript" src="{T_JQUERY_LINK}"></script> +<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> +  </body>  </html> diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index 2339b70a93..84ff665acc 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -1,11 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> +<!DOCTYPE html> +<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">  <head> - -<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" /> -<meta http-equiv="Content-Style-Type" content="text/css" /> -<meta http-equiv="Content-Language" content="{S_USER_LANG}" /> -<meta http-equiv="imagetoolbar" content="no" /> +<meta charset="utf-8">  <!-- IF META -->{META}<!-- ENDIF -->  <title>{PAGE_TITLE}</title> diff --git a/phpBB/adm/style/viewsource.html b/phpBB/adm/style/viewsource.html index f127c9626f..03e9ff50e5 100644 --- a/phpBB/adm/style/viewsource.html +++ b/phpBB/adm/style/viewsource.html @@ -18,4 +18,4 @@  </div>  </div>  </div> -<!-- INCLUDE simple_footer.html -->
\ No newline at end of file +<!-- INCLUDE simple_footer.html --> diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php index e372c16b9b..3696740200 100644 --- a/phpBB/adm/swatch.php +++ b/phpBB/adm/swatch.php @@ -49,5 +49,3 @@ $template->assign_vars(array(  $template->display('body');  garbage_collection(); - -?>
\ No newline at end of file | 
