Index: trunk/wb/install/save.php
===================================================================
--- trunk/wb/install/save.php	(revision 255)
+++ trunk/wb/install/save.php	(revision 256)
@@ -421,6 +421,7 @@
 	." ('', 'default_time_format', 'g:i A'),"
 	." ('', 'home_folders', 'true'),"
 	." ('', 'default_template', 'round'),"
+	." ('', 'default_charset', 'utf-8'),"
 	." ('', 'multiple_menus', 'false'),"
 	." ('', 'page_level_limit', '4'),"
 	." ('', 'intro_page', 'false'),"
Index: trunk/wb/languages/EN.php
===================================================================
--- trunk/wb/languages/EN.php	(revision 255)
+++ trunk/wb/languages/EN.php	(revision 256)
@@ -389,6 +389,8 @@
 $TEXT['ADMINISTRATION_TOOL'] = 'Administration tool';
 $TEXT['CAPTCHA_VERIFICATION'] = 'Captcha Verification';
 $TEXT['VERIFICATION'] = 'Verification';
+$TEXT['DEFAULT_CHARSET'] = 'Default Charset';
+$TEXT['CHARSET'] = 'Charset';
 
 
 // Success/error messages
Index: trunk/wb/admin/interface/charsets.php
===================================================================
--- trunk/wb/admin/interface/charsets.php	(nonexistent)
+++ trunk/wb/admin/interface/charsets.php	(revision 256)
@@ -0,0 +1,43 @@
+<?php
+
+// $Id$
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2005, Ryan Djurovich
+
+ Website Baker is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+/*
+
+Charset list file
+
+This file is used to generate a list of charsets for the user to select
+
+*/
+
+if(!defined('WB_URL')) {
+	header('Location: ../index.php');
+}
+
+// Create array
+$CHARSETS = array();
+$CHARSETS['utf-8'] = 'Unicode (utf-8)';
+$CHARSETS['iso-8859-1'] = 'Latin 1 (iso-8859-1)';
+
+?>
\ No newline at end of file

Property changes on: trunk/wb/admin/interface/charsets.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/wb/admin/settings/index.php
===================================================================
--- trunk/wb/admin/settings/index.php	(revision 255)
+++ trunk/wb/admin/settings/index.php	(revision 256)
@@ -174,6 +174,20 @@
 	}
 }
 
+// Insert default charset values
+require(ADMIN_PATH.'/interface/charsets.php');
+$template->set_block('main_block', 'charset_list_block', 'charset_list');
+foreach($CHARSETS AS $code => $title) {
+	$template->set_var('VALUE', $code);
+	$template->set_var('NAME', $title);
+	if(DEFAULT_CHARSET == $code) {
+		$template->set_var('SELECTED', 'selected');
+	} else {
+		$template->set_var('SELECTED', '');
+	}
+	$template->parse('charset_list', 'charset_list_block', true);
+}
+
 // Insert date format list
 require(ADMIN_PATH.'/interface/date_formats.php');
 $template->set_block('main_block', 'date_format_list_block', 'date_format_list');
@@ -507,6 +521,7 @@
 								'TEXT_DEFAULT' => $TEXT['DEFAULT'],
 								'TEXT_LANGUAGE' => $TEXT['LANGUAGE'],
 								'TEXT_TIMEZONE' => $TEXT['TIMEZONE'],
+								'TEXT_CHARSET' => $TEXT['CHARSET'],
 								'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'],
 								'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'],
 								'TEXT_TEMPLATE' => $TEXT['TEMPLATE'],
Index: trunk/wb/admin/settings/template.html
===================================================================
--- trunk/wb/admin/settings/template.html	(revision 255)
+++ trunk/wb/admin/settings/template.html	(revision 256)
@@ -263,6 +263,17 @@
 		</select>
 	</td>
 </tr>
+<tr class="advanced">
+	<td class="setting_name">{TEXT_CHARSET}:</td>
+	<td class="setting_value" colspan="2">
+		<select name="default_charset">
+			<option value="">{TEXT_PLEASE_SELECT}...</option>
+			<!-- BEGIN charset_list_block -->
+				<option value="{VALUE}" {SELECTED}>{NAME}</option>
+			<!-- END charset_list_block -->
+		</select>
+	</td>
+</tr>
 <tr>
 	<td class="setting_name">{TEXT_TIMEZONE}:</td>
 	<td class="setting_value" colspan="2">
Index: trunk/wb/templates/allcss/index.php
===================================================================
--- trunk/wb/templates/allcss/index.php	(revision 255)
+++ trunk/wb/templates/allcss/index.php	(revision 256)
@@ -28,7 +28,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <title><?php page_title(); ?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Type" content="text/html; charset=<?php if(defined('DEFAULT_CHARSET')) { echo DEFAULT_CHARSET; } else { echo 'utf-8'; }?>" />
 <meta name="description" content="<?php page_description(); ?>" />
 <meta name="keywords" content="<?php page_keywords(); ?>" />
 <link href="<?php echo TEMPLATE_DIR; ?>/screen.css" rel="stylesheet" type="text/css" media="screen" />
Index: trunk/wb/templates/round/index.php
===================================================================
--- trunk/wb/templates/round/index.php	(revision 255)
+++ trunk/wb/templates/round/index.php	(revision 256)
@@ -28,7 +28,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <title><?php page_title(); ?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Type" content="text/html; charset=<?php if(defined('DEFAULT_CHARSET')) { echo DEFAULT_CHARSET; } else { echo 'utf-8'; }?>" />
 <meta name="description" content="<?php page_description(); ?>" />
 <meta name="keywords" content="<?php page_keywords(); ?>" />
 <link href="<?php echo TEMPLATE_DIR; ?>/screen.css" rel="stylesheet" type="text/css" media="screen" />
Index: trunk/wb/templates/simple/index.php
===================================================================
--- trunk/wb/templates/simple/index.php	(revision 255)
+++ trunk/wb/templates/simple/index.php	(revision 256)
@@ -28,7 +28,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <title><?php page_title(); ?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Type" content="text/html; charset=<?php if(defined('DEFAULT_CHARSET')) { echo DEFAULT_CHARSET; } else { echo 'utf-8'; }?>" />
 <meta name="description" content="<?php page_description(); ?>" />
 <meta name="keywords" content="<?php page_keywords(); ?>" />
 <link href="<?php echo TEMPLATE_DIR; ?>/screen.css" rel="stylesheet" type="text/css" media="screen" />
