diff options
Diffstat (limited to 'phpBB/adm')
65 files changed, 730 insertions, 1184 deletions
diff --git a/phpBB/adm/images/alert_close.png b/phpBB/adm/images/alert_close.png Binary files differnew file mode 100644 index 0000000000..79750a013c --- /dev/null +++ b/phpBB/adm/images/alert_close.png diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 3c984f8290..e20bbe4bec 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -2,9 +2,8 @@  /**  *  * @package acp -* @version $Id$  * @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2  *  */ @@ -18,6 +17,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); @@ -50,13 +50,12 @@ $file_uploads	= (@ini_get('file_uploads') == '1' || strtolower(@ini_get('file_up  $module_id		= request_var('i', '');  $mode			= request_var('mode', ''); -// Set custom template for admin area -$template->set_custom_template($phpbb_admin_path . 'style', 'admin'); +// Set custom style for admin area +$phpbb_style->set_ext_dir_prefix('adm/'); +$phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', ''); +$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,546 +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, -		'CREDIT_LINE'		=> $user->lang('POWERED_BY', '<a href="http://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Group'), -		'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..c2f8b34792 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> @@ -248,7 +248,7 @@  					<!-- ELSE --><br /><span>» {L_ALLOWED_IN_PM_POST}</span><!-- ENDIF -->  				</td>  				<td>{groups.CATEGORY}</td> -				<td align="center" valign="middle" style="white-space: nowrap;"> <a href="{groups.U_EDIT}">{ICON_EDIT}</a>  <a href="{groups.U_DELETE}">{ICON_DELETE}</a> </td> +				<td align="center" valign="middle" style="white-space: nowrap;"> <a href="{groups.U_EDIT}">{ICON_EDIT}</a>  <a href="{groups.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a> </td>  			</tr>  		<!-- END groups -->  		</tbody> @@ -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..5939af24ae 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 --> @@ -101,7 +101,7 @@  	<!-- BEGIN bbcodes -->  		<!-- IF bbcodes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->  			<td style="text-align: center;">{bbcodes.BBCODE_TAG}</td> -			<td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}">{ICON_DELETE}</a></td> +			<td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a></td>  		</tr>  	<!-- BEGINELSE -->  		<tr class="row3"> 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..87679fc33a 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 --> @@ -76,9 +76,9 @@  		<!-- IF bots.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->  			<td style="width: 50%;">{bots.BOT_NAME}</td>  			<td style="width: 15%; white-space: nowrap;" align="center"> {bots.LAST_VISIT} </td> -			<td style="text-align: center;"> <a href="{bots.U_ACTIVATE_DEACTIVATE}">{bots.L_ACTIVATE_DEACTIVATE}</a> </td> +			<td style="text-align: center;"> <a href="{bots.U_ACTIVATE_DEACTIVATE}" data-ajax="activate_deactivate">{bots.L_ACTIVATE_DEACTIVATE}</a> </td>  			<td style="text-align: center;"> <a href="{bots.U_EDIT}">{L_EDIT}</a> </td> -			<td style="text-align: center;"> <a href="{bots.U_DELETE}">{L_DELETE}</a> </td> +			<td style="text-align: center;"> <a href="{bots.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a> </td>  			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{bots.BOT_ID}" /></td>  		</tr>  	<!-- END bots --> 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..048a24a328 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 --> @@ -443,7 +443,7 @@  			<col class="row1" /><col class="row1" /><col class="row2" />  		<tbody>  		<!-- BEGIN forums --> -			<tr> +			<tr data-down="{forums.U_MOVE_DOWN}" data-up="{forums.U_MOVE_UP}">  				<td style="width: 5%; text-align: center;">{forums.FOLDER_IMAGE}</td>  				<td>  					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF --> @@ -453,17 +453,17 @@  				</td>  				<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">  					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW --> -						{ICON_MOVE_UP_DISABLED} -						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> +						<span class="up">{ICON_MOVE_UP_DISABLED}</span> +						<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="forum_down">{ICON_MOVE_DOWN}</a></span>  					<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW --> -						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a> -						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> +						<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="forum_up">{ICON_MOVE_UP}</a></span> +						<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="forum_down">{ICON_MOVE_DOWN}</a></span>  					<!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW --> -						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a> -						{ICON_MOVE_DOWN_DISABLED} +						<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="forum_up">{ICON_MOVE_UP}</a></span> +						<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>  					<!-- ELSE --> -						{ICON_MOVE_UP_DISABLED} -						{ICON_MOVE_DOWN_DISABLED} +						<span class="up">{ICON_MOVE_UP_DISABLED}</span> +						<span class="down">{ICON_MOVE_DOWN_DISABLED}</span>  					<!-- ENDIF -->  					<a href="{forums.U_EDIT}">{ICON_EDIT}</a>  					<!-- IF not forums.S_FORUM_LINK --> @@ -500,6 +500,14 @@  	</fieldset>  	</form> +	<div class="hidden"> +		<a class="template-up-img" href="#">{ICON_MOVE_UP}</a> +		<span class="template-up-img-disabled">{ICON_MOVE_UP_DISABLED}</span> + +		<a class="template-down-img" href="#">{ICON_MOVE_DOWN}</a> +		<span class="template-down-img-disabled">{ICON_MOVE_DOWN_DISABLED}</span> +	</div> +  <!-- ENDIF -->  <!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 07f7d072e8..ed94fa985e 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> @@ -346,7 +350,7 @@  			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>  			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>  			<td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td> -			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td> +			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>  		</tr>  		<!-- ENDIF -->  	<!-- END groups --> diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html new file mode 100644 index 0000000000..3a03573756 --- /dev/null +++ b/phpBB/adm/style/acp_groups_position.html @@ -0,0 +1,159 @@ +<!-- 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_MEMBERSHIPS}:</label></dt> +			<dd> +				<label><input type="radio" name="teampage_memberships" class="radio" value="0"<!-- IF DISPLAY_MEMBERSHIPS == 0 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_FIRST}</label><br /> +				<label><input type="radio" name="teampage_memberships" class="radio" value="1"<!-- IF DISPLAY_MEMBERSHIPS == 1 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_DEFAULT}</label><br /> +				<label><input type="radio" name="teampage_memberships" class="radio" value="2"<!-- IF DISPLAY_MEMBERSHIPS == 2 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_ALL}</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 a34a91043c..a8864d42f7 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 --> @@ -245,7 +245,7 @@  			<td style="text-align: right; white-space: nowrap;">  				<!-- IF items.S_FIRST_ROW and not PREVIOUS_PAGE -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->   				<!-- IF items.S_LAST_ROW and not NEXT_PAGE -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF --> -				 <a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}">{ICON_DELETE}</a> +				 <a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>  			</td>  		</tr>  	<!-- BEGINELSE --> 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 c665c9d893..d9f833d878 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 --> @@ -152,35 +152,35 @@  		<fieldset>  			<legend>{L_STATISTIC_RESYNC_OPTIONS}</legend> -			<form id="action_online_form" method="post" action="{U_ACTION}"> +			<form id="action_online_form" method="post" action="{U_ACTION}" data-ajax="true">  				<dl>  					<dt><label for="action_online">{L_RESET_ONLINE}</label><br /><span> </span></dt>  					<dd><input type="hidden" name="action" value="online" /><input class="button2" type="submit" id="action_online" name="action_online" value="{L_RUN}" /></dd>  				</dl>  			</form> -			<form id="action_date_form" method="post" action="{U_ACTION}"> +			<form id="action_date_form" method="post" action="{U_ACTION}" data-ajax="true">  				<dl>  					<dt><label for="action_date">{L_RESET_DATE}</label><br /><span> </span></dt>  					<dd><input type="hidden" name="action" value="date" /><input class="button2" type="submit" id="action_date" name="action_date" value="{L_RUN}" /></dd>  				</dl>  			</form> -			<form id="action_stats_form" method="post" action="{U_ACTION}"> +			<form id="action_stats_form" method="post" action="{U_ACTION}" data-ajax="true">  				<dl>  					<dt><label for="action_stats">{L_RESYNC_STATS}</label><br /><span>{L_RESYNC_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> -			<form id="action_user_form" method="post" action="{U_ACTION}"> +			<form id="action_user_form" method="post" action="{U_ACTION}" data-ajax="true">  				<dl>  					<dt><label for="action_user">{L_RESYNC_POSTCOUNTS}</label><br /><span>{L_RESYNC_POSTCOUNTS_EXPLAIN}</span></dt>  					<dd><input type="hidden" name="action" value="user" /><input class="button2" type="submit" id="action_user" name="action_user" value="{L_RUN}" /></dd>  				</dl>  			</form> -			<form id="action_db_track_form" method="post" action="{U_ACTION}"> +			<form id="action_db_track_form" method="post" action="{U_ACTION}" data-ajax="true">  				<dl>  					<dt><label for="action_db_track">{L_RESYNC_POST_MARKING}</label><br /><span>{L_RESYNC_POST_MARKING_EXPLAIN}</span></dt>  					<dd><input type="hidden" name="action" value="db_track" /><input class="button2" type="submit" id="action_db_track" name="action_db_track" value="{L_RUN}" /></dd> @@ -188,19 +188,20 @@  			</form>  			<!-- IF S_FOUNDER --> -			<form id="action_purge_sessions_form" method="post" action="{U_ACTION}"> +			<form id="action_purge_sessions_form" method="post" action="{U_ACTION}" data-ajax="true">  				<dl>  					<dt><label for="action_purge_sessions">{L_PURGE_SESSIONS}</label><br /><span>{L_PURGE_SESSIONS_EXPLAIN}</span></dt>  					<dd><input type="hidden" name="action" value="purge_sessions" /><input class="button2" type="submit" id="action_purge_sessions" name="action_purge_sessions" value="{L_RUN}" /></dd>  				</dl>  			</form> -			<form id="action_purge_cache_form" method="post" action="{U_ACTION}"> +			<!-- ENDIF --> + +			<form id="action_purge_cache_form" method="post" action="{U_ACTION}" data-ajax="true">  				<dl>  					<dt><label for="action_purge_cache">{L_PURGE_CACHE}</label><br /><span>{L_PURGE_CACHE_EXPLAIN}</span></dt>  					<dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>  				</dl>  			</form> -			<!-- ENDIF -->    		</fieldset>  	<!-- ENDIF --> @@ -282,4 +283,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..6c4645e80c 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 --> @@ -164,7 +164,7 @@  						{ICON_MOVE_DOWN_DISABLED}  					<!-- ENDIF -->  					<a href="{modules.U_EDIT}">{ICON_EDIT}</a>  -					<a href="{modules.U_DELETE}">{ICON_DELETE}</a> +					<a href="{modules.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>  				</td>  			</tr>  		<!-- END modules --> diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 220e7dafbe..2ac77af25d 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 /> @@ -174,7 +174,7 @@  				{ICON_MOVE_DOWN_DISABLED}  			<!-- ENDIF -->	  			<a href="{roles.U_EDIT}" title="{L_EDIT_ROLE}">{ICON_EDIT}</a>  -			<a href="{roles.U_REMOVE}" title="{L_REMOVE_ROLE}">{ICON_DELETE}</a> +			<a href="{roles.U_REMOVE}" title="{L_REMOVE_ROLE}" data-ajax="row_delete">{ICON_DELETE}</a>  		</td>  	</tr>  	<!-- END roles --> @@ -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..4a6df768a8 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> @@ -191,7 +195,7 @@  		<td>{fields.FIELD_IDENT}</td>  		<td>{fields.FIELD_TYPE}</td> -		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td> +		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}" data-ajax="activate_deactivate">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td>  		<td style="width: 80px; text-align: right; white-space: nowrap;">  			<!-- IF fields.S_FIRST_ROW && not fields.S_LAST_ROW --> @@ -209,7 +213,7 @@  			<!-- ELSE -->  				{ICON_EDIT_DISABLED}  			<!-- ENDIF --> -			<a href="{fields.U_DELETE}">{ICON_DELETE}</a> +			<a href="{fields.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>  		</td>  	</tr> 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..7fb7da7095 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 --> @@ -80,7 +80,7 @@  		<td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}" /><!-- ELSE -->  -  <!-- ENDIF --></td>  		<td style="text-align: center;">{ranks.RANK_TITLE}</td>  		<td style="text-align: center;"><!-- IF ranks.S_SPECIAL_RANK -->  -  <!-- ELSE -->{ranks.MIN_POSTS}<!-- ENDIF --></td> -		<td style="text-align: center;"><a href="{ranks.U_EDIT}">{ICON_EDIT}</a> <a href="{ranks.U_DELETE}">{ICON_DELETE}</a></td> +		<td style="text-align: center;"><a href="{ranks.U_EDIT}">{ICON_EDIT}</a> <a href="{ranks.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a></td>  	</tr>  	<!-- END ranks -->  	</tbody> diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html index 23fcfbdeb8..7cf2cce4c9 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 --> @@ -99,7 +99,7 @@  					<!-- ENDIF -->  					<a href="{reasons.U_EDIT}">{ICON_EDIT}</a>   					<!-- IF reasons.U_DELETE --> -						<a href="{reasons.U_DELETE}">{ICON_DELETE}</a> +						<a href="{reasons.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>  					<!-- ELSE -->  						{ICON_DELETE_DISABLED}  					<!-- ENDIF --> 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 6aa1c0ccc9..b09cbafc95 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -1,541 +1,168 @@  <!-- INCLUDE overall_header.html --> -<a name="maincontent"></a> +<a id="maincontent"></a> -<!-- IF S_DELETE --> +<!-- IF S_CONFIRM_ACTION --> +<form id="confirm" method="post" action="{S_CONFIRM_ACTION}"> -	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> - -	<h1>{L_TITLE}</h1> - -	<p>{L_EXPLAIN}</p> - -	<form id="acp_styles" method="post" action="{U_ACTION}"> - -	<fieldset> -		<legend>{L_TITLE}</legend> -	<dl> -		<dt><label>{L_NAME}:</label></dt> -		<dd><strong>{NAME}</strong></dd> -	</dl> -	<dl> -		<dt><label for="new_id">{L_REPLACE}:</label><br /><span>{L_REPLACE_EXPLAIN}</span></dt> -		<dd><select id="new_id" name="new_id">{S_REPLACE_OPTIONS}</select></dd> -	</dl> -	<!-- IF S_DELETE_STYLE --> -		<hr /> -		<dl> -			<dt><label for="new_template_id">{L_DELETE_TEMPLATE}:</label><br /><span>{L_REPLACE_TEMPLATE_EXPLAIN}</span></dt> -			<dd><select id="new_template_id" name="new_template_id">{S_REPLACE_TEMPLATE_OPTIONS}</select></dd> -		</dl> -		<dl> -			<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> +<fieldset> +	<h1>{MESSAGE_TITLE}</h1> +	<p>{MESSAGE_TEXT}</p> +	<!-- IF S_CONFIRM_DELETE --> +	<label><input type="checkbox" class="checkbox" name="confirm_delete_files" /> {L_DELETE_FROM_FS}</label>  	<!-- ENDIF --> -	<p class="quick"> -		<input class="button1" type="submit" name="update" value="{L_DELETE}" /> -		{S_FORM_TOKEN} -	</p> -	</fieldset> -	</form> +	{S_HIDDEN_FIELDS} -<!-- 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 --> +	<div style="text-align: center;"> +		<input type="submit" name="confirm" value="{L_YES}" class="button2" />   +		<input type="submit" name="cancel" value="{L_NO}" class="button2" /> +	</div> -	<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); -			} -		} +</fieldset> +		 +</form> +<!-- ELSE --> -		/** -		* 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> +<!-- IF L_TITLE --><h1>{L_TITLE}</h1><!-- ENDIF --> -	<form method="post" action="{U_ACTION}"> +<!-- IF L_EXPLAIN --><p>{L_EXPLAIN}</p><!-- ENDIF --> -	<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> +<form id="acp_styles" method="post" action="{U_ACTION}"> +{S_HIDDEN_FIELDS} +{S_FORM_TOKEN} +<!-- IF S_STYLE_DETAILS --> +	<input type="hidden" name="id" value="{STYLE_ID}" />  	<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> +		<dt><label for="name">{L_STYLE_NAME}:</label></dt> +		<dd><input type="text" id="name" name="style_name" value="{STYLE_NAME}" /></dd>  	</dl>  	<dl> -		<dt><label>{L_SELECTED_IMAGE}:</label></dt> -		<dd><img src="{IMG_SRC}" id="newimg" alt="" /></dd> +		<dt><label>{L_STYLE_PATH}</label></dt> +		<dd><strong>{STYLE_PATH}</strong></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> +		<dt><label for="name">{L_COPYRIGHT}:</label></dt> +		<dd><strong>{STYLE_COPYRIGHT}</strong></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> +		<dt><label for="style_parent">{L_INHERITING_FROM}:</label></dt> +		<dd><select id="style_parent" name="style_parent"> +			<option value=""<!-- IF STYLE_PARENT == 0 --> selected="selected"<!-- ENDIF -->> - </option> +			<!-- BEGIN parent_styles --> +				<option value="{parent_styles.STYLE_ID}"<!-- IF parent_styles.STYLE_ID == STYLE_PARENT --> selected="selected"<!-- ENDIF -->>{parent_styles.SPACER}{parent_styles.STYLE_NAME}</option> +			<!-- END parent_styles --> +		</select></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> - -	<h1>{L_EDIT}</h1> - -	<p>{L_EDIT_EXPLAIN}</p> - -	<p>{L_SELECTED}: <strong>{SELECTED_TEMPLATE}</strong></p> - -	<form id="acp_styles" method="post" action="{U_ACTION}"> - -	<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) --> -	<fieldset> -		<legend>{L_SELECT}</legend>  	<dl> -		<dt><label for="template_file">{L_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="button2" type="submit" value="{L_SELECT}" /></dd> +		<dt><label for="style_active">{L_STYLE_ACTIVE}:</label></dt> +		<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label> +			<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl> -	{S_FORM_TOKEN} -	</fieldset> -	<!-- ENDIF --> -	</form> - -	<!-- IF TEMPLATE_FILE or (S_EDIT_THEME and S_THEME_IN_DB) --> -		<script type="text/javascript" defer="defer"> -		// <![CDATA[ - -			function change_editor_height(height) -			{ -				height = Number(height); - -				if (isNaN(height)) -				{ -					return; -				} - -				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) -			{ -				value = Number(value); - -				if (isNaN(value)) -				{ -					return; -				} - -				url = document.getElementById(form_name).action; - -				// Make sure & is actually... & -				url = url.replace(/&/g, '&'); - -				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_EDITOR}</legend> -		<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) --> +	<!-- IF not S_STYLE_DEFAULT -->  		<dl> -			<dt><label>{L_SELECTED_FILE}:</label></dt> -			<dd>{TEMPLATE_FILE}</dd> +			<dt><label for="style_default">{L_STYLE_DEFAULT}:</label></dt> +			<dd><label><input type="radio" class="radio" name="style_default" value="1" /> {L_YES}</label> +				<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" /> {L_NO}</label></dd>  		</dl> -		<!-- ENDIF --> -		<dl> -			<dt><label for="text_rows">{L_EDITOR_HEIGHT}:</label></dt> -			<dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="button2" 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"> -			<legend>{L_SUBMIT}</legend> -			{S_HIDDEN_FIELDS} -			{S_FORM_TOKEN} -			<input class="button1" id="save" type="submit" name="save" value="{L_SUBMIT}" /> -		</fieldset> -		</form>  	<!-- ENDIF --> - -<!-- ELSEIF S_CACHE --> - -	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> - -	<h1>{L_TEMPLATE_CACHE}</h1> - -	<p>{L_TEMPLATE_CACHE_EXPLAIN}</p> - -	<form id="acp_styles" method="post" action="{U_ACTION}"> -	<fieldset class="tabulated"> -	<legend>{L_TEMPLATE_CACHE}</legend> - -	<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 --> -		<!-- IF file.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> -			<td><a href="{file.U_VIEWSOURCE}" onclick="popup(this.href, 750, 550, '_source'); return false;">{file.FILENAME_PATH}</a></td> -			<td>{file.FILESIZE}</td> -			<td>{file.CACHED}</td> -			<td>{file.MODIFIED}</td> -			<td><input type="checkbox" class="radio" name="delete[]" value="{file.FILENAME}" /></td> -		</tr> -	<!-- BEGINELSE --> -		<tr class="row1"> -			<td colspan="5">{L_TEMPLATE_CACHE_EMPTY}</td> -		</tr> -	<!-- END file --> -	</tbody> -	</table> - -	<p class="quick"> -		<span class="small"><a href="#" onclick="marklist('acp_styles', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('acp_styles', 'delete', false); return false;">{L_UNMARK_ALL}</a></span><br /> -		{S_FORM_TOKEN} -		<input class="button1" type="submit" id="submit" name="submit" value="{L_DELETE_MARKED}" /> -	</p>  	</fieldset> -	</form> - -<!-- ELSEIF S_EXPORT --> - -	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> - -	<h1>{L_TITLE}</h1> -	<p>{L_EXPLAIN}</p> - -	<!-- IF S_ERROR_MSG --> -		<div class="errorbox"> -			<h3>{L_WARNING}</h3> -			<p>{ERROR_MSG}</p> -		</div> -	<!-- ENDIF --> - -	<form id="acp_styles" method="post" action="{U_ACTION}"> - -	<fieldset> -		<legend>{L_TITLE}</legend> -	<dl> -		<dt><label>{L_NAME}:</label></dt> -		<dd><strong>{NAME}</strong></dd> -	</dl> -	<!-- IF S_STYLE --> -		<dl> -			<dt><label for="inc_template">{L_INCLUDE_TEMPLATE}:</label></dt> -			<dd><label><input type="radio" class="radio" id="inc_template" name="inc_template" value="1" checked="checked" /> {L_YES}</label> -				<label><input type="radio" class="radio" name="inc_template" value="0" /> {L_NO}</label></dd> -		</dl> -		<dl> -			<dt><label for="inc_theme">{L_INCLUDE_THEME}:</label></dt> -			<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> -		<dd><label><input type="radio" class="radio" id="store" name="store" value="1" checked="checked" /> {L_EXPORT_STORE}</label> -			<label><input type="radio" class="radio" name="store" value="0" /> {L_EXPORT_DOWNLOAD}</label></dd> -	</dl> -	<dl> -		<dt><label for="format">{L_ARCHIVE_FORMAT}:</label></dt> -		<dd>{FORMAT_BUTTONS}</dd> -	</dl> - -	<p class="quick"> -		{S_FORM_TOKEN} +	<fieldset class="submit-buttons"> +		<legend>{L_SUBMIT}</legend>  		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> -	</p> +		<a href="{U_ACTION}" class="button2">{L_BACK}</a> +		{S_FORM_TOKEN}  	</fieldset> +<!-- ENDIF --> - -	</form> - -<!-- ELSEIF S_FRONTEND --> - -	<h1>{L_TITLE}</h1> - -	<p>{L_EXPLAIN}</p> - -	<!-- IF S_STYLE --> <!-- DEFINE $COLSPAN = 5 --> <!-- ELSE --> <!-- DEFINE $COLSPAN = 4 --> <!-- ENDIF --> - +<!-- IF .styles_list -->  	<table cellspacing="1"> -		<col class="row1" /><!-- IF S_STYLE --><col class="row1" /><!-- ENDIF --><col class="row2" /><col class="row2" />  	<thead>  	<tr> -		<th>{L_NAME}</th> -		<!-- IF S_STYLE --><th>{L_STYLE_USED_BY}</th><!-- ENDIF --> -		<th>{L_OPTIONS}</th> -		<th>{L_ACTIONS}</th> +		<th>{L_STYLE_NAME}</th> +		<!-- IF not STYLES_LIST_HIDE_COUNT --><th width="10%" style="white-space: nowrap; text-align: center;">{L_STYLE_USED_BY}</th><!-- ENDIF --> +		<th width="25%" style="white-space: nowrap; text-align: center;">{L_ACTIONS}</th> +		{STYLES_LIST_EXTRA} +		<th> </th>  	</tr>  	</thead> -	<tbody> -	<tr> -		<td class="row3" colspan="{$COLSPAN}"><strong>{L_INSTALLED}</strong></td> -	</tr> -	<!-- BEGIN installed --> -	<!-- IF installed.S_INACTIVE and not $INACTIVE_STYLES --> -		<!-- DEFINE $INACTIVE_STYLES = 1 --> -		<tr> -			<td class="row3" colspan="{$COLSPAN}"><strong>{L_INACTIVE_STYLES}</strong></td> -		</tr> -	<!-- ENDIF --> -	<tr> -		<td><strong>{installed.NAME}</strong><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td> -		<!-- IF S_STYLE --> -			<td style="text-align: center;">{installed.STYLE_COUNT}</td> +	<!-- BEGIN styles_list --> +	<tbody id="styles-list-{styles_list.S_ROW_COUNT}"> +	<tr<!-- IF styles_list.STYLE_ID and not styles_list.STYLE_ACTIVE --> class="row-inactive"<!-- ENDIF -->> +		<!-- IF styles_list.LEVEL is odd --> +			<!-- IF $ROW_CLASS == 'row1a' --><!-- DEFINE $ROW_CLASS = 'row1b' --><!-- ELSE --><!-- DEFINE $ROW_CLASS = 'row1a' --><!-- ENDIF --> +		<!-- ELSE --> +			<!-- IF $ROW_CLASS == 'row2a' --><!-- DEFINE $ROW_CLASS = 'row2b' --><!-- ELSE --><!-- DEFINE $ROW_CLASS = 'row2a' --><!-- ENDIF -->  		<!-- ENDIF --> -		<td style="text-align: center;"> -			{installed.S_OPTIONS} -		</td> -		<td style="text-align: center;"> -			<!-- IF S_STYLE --> -				<a href="{installed.U_STYLE_ACT_DEACT}">{installed.L_STYLE_ACT_DEACT}</a> | +		<td class="{$ROW_CLASS}" style="padding-left: {styles_list.PADDING}px;"> +			<!-- IF styles_list.STYLE_ID and styles_list.COMMENT == '' and styles_list.STYLE_ACTIVE --> +				<div class="default-style" style="display: none; float: right;"> +					<input class="radio" type="radio" name="default" value="{styles_list.STYLE_ID}"<!-- IF styles_list.DEFAULT --> checked="checked"<!-- ELSE --><!-- DEFINE $S_DEFAULT = 1 --><!-- ENDIF --> title="{L_STYLE_DEFAULT}" /> +				</div> +			<!-- ENDIF --> +			<!-- IF styles_list.DEFAULT or styles_list.SHOW_COPYRIGHT --> +				<strong>{styles_list.STYLE_NAME}</strong> +				<!-- IF styles_list.SHOW_COPYRIGHT and styles_list.COMMENT == '' --><span><br />{styles_list.STYLE_COPYRIGHT}</span><!-- ENDIF --> +			<!-- ELSE --> +				<span>{styles_list.STYLE_NAME}</span>  			<!-- ENDIF --> -			{installed.S_ACTIONS} -			<!-- IF S_STYLE --> -				| <a href="{installed.U_PREVIEW}">{L_PREVIEW}</a> +			<!-- IF styles_list.COMMENT != '' --> +				<span class="error"><br />{styles_list.COMMENT}</span> +			<!-- ENDIF --> +			<!-- IF not styles_list.STYLE_ID and styles_list.COMMENT == '' --> +				<span class="style-path"><br />{L_STYLE_PATH} {styles_list.STYLE_PATH_FULL}</span> +			<!-- ENDIF --> +		</td> +		<!-- IF not STYLES_LIST_HIDE_COUNT --> +			<td class="{$ROW_CLASS}" style="text-align: center;">{styles_list.USERS}</td> +		<!-- ENDIF --> +		<td class="{$ROW_CLASS}" style="text-align: center;"> +			<!-- BEGIN actions --> +				<!-- IF styles_list.actions.S_ROW_COUNT > 0 --> | <!-- ENDIF --> +				<!-- IF styles_list.actions.U_ACTION --> +					<a href="{styles_list.actions.U_ACTION}"{styles_list.actions.U_ACTION_ATTR}>{styles_list.actions.L_ACTION}</a> +				<!-- ENDIF --> +				{styles_list.actions.HTML} +			<!-- END actions --> +		</td> +		{styles_list.EXTRA} +		<td class="{$ROW_CLASS}" width="20" style="text-align: center;"> +			<!-- IF styles_list.STYLE_ID --> +				<input class="checkbox" type="checkbox" name="ids[]" value="{styles_list.STYLE_ID}" /> +			<!-- ELSE --> +				<!-- IF styles_list.COMMENT != '' --> +					  +				<!-- ELSE --> +					<input class="checkbox" type="checkbox" name="dirs[]" value="{styles_list.STYLE_PATH}" /> +				<!-- ENDIF -->  			<!-- ENDIF -->  		</td>  	</tr> -	<!-- END installed --> -	<tr> -		<td class="row3" colspan="{$COLSPAN}"><strong>{L_UNINSTALLED}</strong></td> -	</tr> -	<!-- IF not .uninstalled --> -		<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 -->><strong>{uninstalled.NAME}</strong><br /><span>{L_COPYRIGHT}: {uninstalled.COPYRIGHT}</span></td> -			<td style="text-align: center;" colspan="2"><a href="{uninstalled.U_INSTALL}">{L_INSTALL}</a></td> -		</tr> -	<!-- END uninstalled -->  	</tbody> +	<!-- END styles_list -->  	</table> +<!-- ENDIF --> -	<!-- IF S_STYLE --> -		<form id="acp_styles" method="post" action="{U_ACTION}"> - -		<fieldset class="quick"> -			<legend>{L_CREATE}</legend> -			{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> -	<!-- ENDIF --> - -<!-- ELSEIF S_DETAILS --> - -	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> - -	<h1>{L_TITLE}</h1> - -	<p>{L_EXPLAIN}</p> - -	<!-- IF S_ERROR_MSG --> -		<div class="errorbox"> -			<h3>{L_WARNING}</h3> -			<p>{ERROR_MSG}</p> -		</div> -	<!-- ENDIF --> - -	<form id="acp_styles" method="post" action="{U_ACTION}"> - -	<fieldset> -		<legend>{L_TITLE}</legend> -	<dl> -		<dt><label for="name">{L_NAME}:</label></dt> -		<dd><!-- IF S_INSTALL --><strong id="name">{NAME}</strong><!-- ELSE --><input type="text" id="name" name="name" value="{NAME}" /><!-- ENDIF --></dd> -	</dl> -	<dl> -		<dt><label for="copyright">{L_COPYRIGHT}:</label></dt> -		<dd><!-- IF S_INSTALL --><strong id="copyright">{COPYRIGHT}</strong><!-- ELSE --><input type="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd> -	</dl> -	<!-- IF S_SUPERTEMPLATE --> -	<dl> -		<dt><label for="inheriting">{L_INHERITING_FROM}:</label></dt> -		<dd><strong id="inheriting">{S_SUPERTEMPLATE}</strong></dd> -	</dl> -	<!-- ENDIF --> -	<!-- IF S_STYLE and not S_BASIS --> -		<dl> -			<dt><label for="template_id">{L_STYLE_TEMPLATE}:</label></dt> -			<dd><!-- IF S_INSTALL --><strong id="template_id">{TEMPLATE_NAME}</strong><!-- ELSE --><select id="template_id" name="template_id">{S_TEMPLATE_OPTIONS}</select><!-- ENDIF --></dd> -		</dl> -		<dl> -			<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> - -		<fieldset> -			<legend>{L_OPTIONS}</legend> -		<dl> -			<dt><label for="style_active">{L_STYLE_ACTIVE}:</label></dt> -			<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label> -				<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> -		</dl> -		<!-- IF not S_STYLE_DEFAULT --> -			<dl> -				<dt><label for="style_default">{L_STYLE_DEFAULT}:</label></dt> -				<dd><label><input type="radio" class="radio" name="style_default" value="1" /> {L_YES}</label> -					<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" /> {L_NO}</label></dd> -			</dl> -		<!-- ENDIF --> -	<!-- ENDIF --> +<!-- IF .extra_actions --> +	<fieldset class="quick"> +		<!-- BEGIN extra_actions --> +			<input type="submit" name="{extra_actions.ACTION_NAME}" class="button2" value="{extra_actions.L_ACTION}" /> +		<!-- END extra_actions -->  	</fieldset> +<!-- ENDIF --> -	<fieldset class="submit-buttons"> -		<legend>{L_SUBMIT}</legend> -		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> -		{S_FORM_TOKEN} +<!-- IF .extra_links --> +	<fieldset class="quick"> +		<!-- BEGIN extra_links --> +			<a class="button2" href="{extra_links.U_ACTION}">{extra_links.L_ACTION}</a> +		<!-- END extra_links -->  	</fieldset> +<!-- ENDIF --> -	</form> +</form>  <!-- ENDIF --> 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 d5a29a21cc..a8794176a9 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_overview.html b/phpBB/adm/style/acp_users_overview.html index 9237e45daf..1f10e7f66e 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -46,10 +46,6 @@  	<dd><input class="text medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" autocomplete="off" /></dd>  </dl>  <dl> -	<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt> -	<dd><input class="text medium" type="text" id="email_confirm" name="email_confirm" value="" autocomplete="off" /></dd> -</dl> -<dl>  	<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>  	<dd><input type="password" id="new_password" name="new_password" value="" autocomplete="off" /></dd>  </dl> 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..4acd75f933 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 --> @@ -60,7 +60,7 @@  		<!-- IF words.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->  		<td style="text-align: center;">{words.WORD}</td>  		<td style="text-align: center;">{words.REPLACEMENT}</td> -		<td> <a href="{words.U_EDIT}">{ICON_EDIT}</a>  <a href="{words.U_DELETE}">{ICON_DELETE}</a> </td> +		<td> <a href="{words.U_EDIT}">{ICON_EDIT}</a>  <a href="{words.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a> </td>  	</tr>  	<!-- BEGINELSE -->  	<tr class="row3"> diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 666f4921ba..94f421030d 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1,4 +1,4 @@ -/*  phpBB 3.0 Admin Style Sheet +/*  phpBB 3.1 Admin Style Sheet  	------------------------------------------------------------------------  	Original author:	subBlue ( http://www.subblue.com/ )  	Copyright 2007 phpBB Group ( http://www.phpbb.com/ ) @@ -101,6 +101,10 @@ hr {  	font-size: 0.85em;  } +.hidden { +	display: none; +} +  /* General links  */  a:link, a:visited {  	color: #105289; @@ -626,12 +630,29 @@ td.name {  .col1 { background-color: #DCEBFE; }  .col2 { background-color: #F9F9F9; } +/* 4 row background colours for trees */ +.row1a { background-color: #F9F9F9; } +.row1b { background-color: #F6F6F6; } +.row2a { background-color: #E7EEF4; } +.row2b { background-color: #E3EBF2; } +  .spacer {  	background-color: #DBDFE2;  	height: 1px;  	line-height: 1px;  } +/* Deactivated row */ +.row-inactive {  +	color: #999;  +} +.row-inactive a, .row-inactive strong {  +	color: #888; +} +.row-inactive a:hover { +	color: #BC2A4D; +} +  /* General form styles  ----------------------------------------*/  fieldset { @@ -1007,11 +1028,11 @@ fieldset.submit-buttons legend {  /* Input field styles  ---------------------------------------- */ -input.radio, input.permissions-checkbox { +input.radio, input.checkbox, input.permissions-checkbox {  	width: auto !important;  	background-color: transparent;  	border: none; -	cursor: default; +	cursor: pointer;  }  input.full, @@ -1070,6 +1091,56 @@ input.disabled {  	color: #666666;  } +/* jQuery popups +---------------------------------------- */ +.phpbb_alert { +	background-color: #FFFFFF; +	border: 1px solid #999999; +	position: fixed; +	display: none; +	top: 100px; +	left: 35%; +	width: 30%; +	z-index: 50; +	padding: 25px; +	padding: 0 25px 20px 25px; +} + +.phpbb_alert .alert_close { +	display: block; +	float: right; +	width: 16px; +	height: 16px; +	overflow: hidden; +	text-decoration: none !important; +	background: transparent url("../images/alert_close.png") 0 0 no-repeat; +	margin-top: -7px; +	margin-right: -31px; +} +.phpbb_alert .alert_close:hover { +	background-position: 0 -16px; +} + + +.phpbb_alert p { +	margin: 8px 0; +	padding-bottom: 8px; +} + +#darkenwrapper { +	display: none; +} + +#darken { +	position: fixed; +	left: 0; +	top: 0; +	width: 100%; +	height: 100%; +	background-color: #000000; +	opacity: 0.5; +} +  /* Pagination  ---------------------------------------- */  .pagination { diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js new file mode 100644 index 0000000000..12541cb057 --- /dev/null +++ b/phpBB/adm/style/ajax.js @@ -0,0 +1,139 @@ +(function($) {  // Avoid conflicts with other libraries + +"use strict"; + +var img_templates = { +	up: $('.template-up-img'), +	up_disabled: $('.template-up-img-disabled'), +	down: $('.template-down-img'), +	down_disabled: $('.template-down-img-disabled') +}; + +/** + * The following callbacks are  for reording forums in acp_forums. forum_down + * is triggered when a forum is moved down, and forum_up is triggered when + * a forum is moved up. It moves the row up or down, and deactivates / + * activates any up / down icons that require it (the ones at the top or bottom). + */ +phpbb.add_ajax_callback('forum_down', function() { +	var el = $(this), +		tr = el.parents('tr'); + +	if (tr.is(':first-child')) +	{ +		var up_img = img_templates.up.clone().attr('href', tr.attr('data-up')); +		el.parents('span').siblings('.up').html(up_img); + +		tr.next().find('.up').html(img_templates.up_disabled); + +		phpbb.ajaxify({ +			selector: el.parents('span').siblings('.up').children('a'), +			callback: 'forum_up', +			overlay: false +		}); +	} + +	tr.insertAfter(tr.next()); + +	if (tr.is(':last-child')) +	{ +		el.replaceWith(img_templates.down_disabled); + +		var down_img = img_templates.down.clone().attr('href', tr.attr('data-down')); +		tr.prev().find('.down').html(down_img); + +		phpbb.ajaxify({ +			selector: tr.prev().find('.down').children('a'), +			callback: 'forum_down', +			overlay: false +		}); +	} +}); + +phpbb.add_ajax_callback('forum_up', function() { +	var el = $(this), +		tr = el.parents('tr'); + +	if (tr.is(':last-child')) +	{ +		var down_img = img_templates.down.clone().attr('href', tr.attr('data-down')); +		el.parents('span').siblings('.down').html(down_img); + +		tr.prev().find('.down').html(img_templates.down_disabled); + +		phpbb.ajaxify({ +			selector: el.parents('span').siblings('.down').children('a'), +			callback: 'forum_down', +			overlay: false +		}); +	} + +	tr.insertBefore(tr.prev()); + +	if (tr.is(':first-child')) +	{ +		el.replaceWith(img_templates.up_disabled); + +		var up_img = img_templates.up.clone().attr('href', tr.attr('data-up')); +		tr.next().find('.up').html(up_img); + +		phpbb.ajaxify({ +			selector: tr.next().find('.up').children('a'), +			callback: 'forum_up', +			overlay: false +		}); +	} +}); + +/** + * This callback replaces activate links with deactivate links and vice versa. + * It does this by replacing the text, and replacing all instances of "activate" + * in the href with "deactivate", and vice versa. + */ +phpbb.add_ajax_callback('activate_deactivate', function(res) { +	var el = $(this), +		new_href = el.attr('href'); + +	el.text(res.text); + +	if (new_href.indexOf('deactivate') !== -1) +	{ +		new_href = new_href.replace('deactivate', 'activate') +	} +	else +	{ +		new_href = new_href.replace('activate', 'deactivate') +	} + +	el.attr('href', new_href); +}); + +/** + * The removes the parent row of the link or form that triggered the callback, + * and is good for stuff like the removal of forums. + */ +phpbb.add_ajax_callback('row_delete', function() { +	$(this).parents('tr').remove(); +}); + + + +$('[data-ajax]').each(function() { +	var $this = $(this), +		ajax = $this.attr('data-ajax'), +		fn; + +	if (ajax !== 'false') +	{ +		fn = (ajax !== 'true') ? ajax : null; +		phpbb.ajaxify({ +			selector: this, +			refresh: $this.attr('data-refresh') !== undefined, +			callback: fn +		}); +	} +}); + + + +})(jQuery); // Avoid conflicts with other libraries 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 922b4aca31..b5d25e82f2 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> @@ -255,4 +251,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 361d3185fd..2bc9ee52d7 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -17,8 +17,30 @@  			<!-- IF S_COPYRIGHT_HTML --><br /><!-- ENDIF -->  			{DEBUG_OUTPUT}  		<!-- ENDIF --> + +		<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}"> +			<div id="darken"> </div> +			<div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div> +		</div> + +		<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}"> +			<a href="#" class="alert_close"></a> +			<h3 class="alert_title"></h3><p class="alert_text"></p> +		</div> +		<div id="phpbb_confirm" class="phpbb_alert"> +			<a href="#" class="alert_close"></a> +			<p class="alert_text"></p> +			<input type="button" class="button1" value="{L_YES}" />  +			<input type="button" class="button2" value="{L_NO}" /> +		</div>  	</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?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> +<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> +<!-- INCLUDEJS ajax.js --> +{SCRIPTS} +  </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..f79c0318b5 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -1,15 +1,11 @@ -<!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> -<link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" /> +<link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" />  <script type="text/javascript">  // <![CDATA[ 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 6395eace6c..1d5c62b0a3 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?assets_version={T_ASSETS_VERSION}" 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..d4cbcb6cbe 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -1,15 +1,11 @@ -<!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> -<link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" /> +<link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" />  <script type="text/javascript">  // <