Index: trunk/wb/search/search.php
===================================================================
--- trunk/wb/search/search.php	(revision 239)
+++ trunk/wb/search/search.php	(revision 240)
@@ -113,19 +113,6 @@
 	$values = array($search_string, WB_URL, PAGE_EXTENSION, $TEXT['SEARCH'], $TEXT['ALL_WORDS'], $TEXT['ANY_WORDS'], $TEXT['EXACT_MATCH'], $TEXT['MATCH'], $TEXT['MATCHING'], $all_checked, $any_checked, $exact_checked);
 	$search_header = str_replace($vars, $values, ($fetch_header['value']));
 	
-	// Insert js code
-	?>
-	<script language="javascript" type="text/javascript">
-	function toggle_radio(checkbox_id) {
-		if(document.getElementById(checkbox_id).checked == true) {
-			document.getElementById(checkbox_id).checked = false;
-		} else {
-			document.getElementById(checkbox_id).checked = true;
-		}
-	}
-	</script>
-	<?php
-	
 	// Show search header
 	echo $search_header;
 	
Index: trunk/wb/install/save.php
===================================================================
--- trunk/wb/install/save.php	(revision 239)
+++ trunk/wb/install/save.php	(revision 240)
@@ -517,11 +517,11 @@
 <tr>
 <td colspan="2">
 <input type="radio" name="match" id="match_all" value="all"[ALL_CHECKED] />
-<a href="javascript: toggle_radio(\'match_all\');">[TEXT_ALL_WORDS]</a>
+<label for="match_all">[TEXT_ALL_WORDS]</label>
 <input type="radio" name="match" id="match_any" value="any"[ANY_CHECKED] />
-<a href="javascript: toggle_radio(\'match_any\');">[TEXT_ANY_WORDS]</a>
+<label for="match_any">[TEXT_ANY_WORDS]</label>
 <input type="radio" name="match" id="match_exact" value="exact"[EXACT_CHECKED] />
-<a href="javascript: toggle_radio(\'match_exact\');">[TEXT_EXACT_MATCH]</a>
+<label for="match_exact">[TEXT_EXACT_MATCH]</label>
 </td>
 </tr>
 </table>
Index: trunk/wb/install/index.php
===================================================================
--- trunk/wb/install/index.php	(revision 239)
+++ trunk/wb/install/index.php	(revision 240)
@@ -53,19 +53,6 @@
 <link href="stylesheet.css" rel="stylesheet" type="text/css">
 <script language="javascript" type="text/javascript">
 
-function toggle_checkbox(checkbox_id) {
-
-	if(document.getElementById(checkbox_id).checked == true) {
-
-		document.getElementById(checkbox_id).checked = false;
-
-	} else {
-
-		document.getElementById(checkbox_id).checked = true;
-
-	}
-
-}
 function confirm_link(message, url) {
 	if(confirm(message)) location.href = url;
 }
@@ -256,9 +243,9 @@
 			<td>
 				<div name="file_perms_box" id="file_perms_box" style="margin: 0; padding: 0; display: <?php if(isset($_SESSION['operating_system']) AND $_SESSION['operating_system'] == 'windows') { echo 'none'; } else { echo 'block'; } ?>;">
 					<input type="checkbox" tabindex="6" name="world_writeable" id="world_writeable" value="true"<?php if(isset($_SESSION['world_writeable']) AND $_SESSION['world_writeable'] == true) { echo 'checked'; } ?> />
-					<font style="cursor: pointer;" onclick="javascript: toggle_checkbox('world_writeable');">
+					<label for="world_writeable">
 						World-writeable file permissions (777)
-					</font>
+					</label>
 					<br />
 					<font class="note">(Please note: this is only recommended for testing environments)</font>
 				</div>
@@ -299,9 +286,9 @@
 			<td>&nbsp;</td>
 			<td colspan="2">
 				<input type="checkbox" tabindex="12" name="install_tables" id="install_tables" value="true"<?php if(!isset($_SESSION['install_tables'])) { echo ' checked'; } elseif($_SESSION['install_tables'] == 'true') { echo ' checked'; } ?> />
-				<font style="cursor: pointer; color: #666666;" onclick="javascript: toggle_checkbox('install_tables');">Install Tables</font>
+				<label for="install_tables" style="color: #666666;">Install Tables</label>
 				<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-				<font style="font-size: 10px; color: #666666;">(Please note: May remove existing tables and data)</font></td>		
+				<span style="font-size: 10px; color: #666666;">(Please note: May remove existing tables and data)</span></td>		
 			</td>
 		</tr>
 		<tr>
@@ -380,4 +367,4 @@
 </table>
 
 </body>
-</html>
\ No newline at end of file
+</html>
Index: trunk/wb/admin/groups/group_form.html
===================================================================
--- trunk/wb/admin/groups/group_form.html	(revision 239)
+++ trunk/wb/admin/groups/group_form.html	(revision 240)
@@ -31,37 +31,37 @@
 		<tr>
 			<td>
 				<input type="checkbox" name="pages" id="pages" value="1" {pages_checked} />
-				<a href="javascript: toggle_checkbox('pages');">{SECTION_PAGES}</a>
+				<label for="pages">{SECTION_PAGES}</label>
 			</td>
 			<td>
 				<input type="checkbox" name="media" id="media" value="1" {media_checked} />
-				<a href="javascript: toggle_checkbox('media');">{SECTION_MEDIA}</a>
+				<label for="media">{SECTION_MEDIA}</label>
 			</td>
 			<td>
 				<input type="checkbox" name="modules" id="modules" value="1" {modules_checked} />
-				<a href="javascript: toggle_checkbox('modules');">{SECTION_MODULES}</a>
+				<label for="modules">{SECTION_MODULES}</label>
 			</td>
 			<td>
 				<input type="checkbox" name="templates" id="templates" value="1" {templates_checked} />
-				<a href="javascript: toggle_checkbox('templates');">{SECTION_TEMPLATES}</a>
+				<label for="templates">{SECTION_TEMPLATES}</label>
 			</td>
 		</tr>
 		<tr>
 			<td>
 				<input type="checkbox" name="languages" id="languages" value="1" {languages_checked} />
-				<a href="javascript: toggle_checkbox('languages');">{SECTION_LANGUAGES}</a>
+				<label for="languages">{SECTION_LANGUAGES}</label>
 			</td>
 			<td>		
 				<input type="checkbox" name="settings" id="settings" value="1" {settings_checked} />
-				<a href="javascript: toggle_checkbox('settings');">{SECTION_SETTINGS}</a>
+				<label for="settings">{SECTION_SETTINGS}</label>
 			</td>
 			<td>
 				<input type="checkbox" name="users" id="users" value="1" {users_checked} />
-				<a href="javascript: toggle_checkbox('users');">{SECTION_USERS}</a>
+				<label for="users">{SECTION_USERS}</label>
 			</td>
 			<td>
 				<input type="checkbox" name="groups" id="groups" value="1" {groups_checked} />
-				<a href="javascript: toggle_checkbox('groups');">{SECTION_GROUPS}</a>
+				<label for="groups">{SECTION_GROUPS}</label>
 			</td>
 		</tr>
 		</table>
@@ -83,26 +83,26 @@
 </tr>
 <tr>
 	<td><input name="pages_view" id="pages_view" type="checkbox" value="1" {pages_view_checked}></td>
-	<td><a href="javascript: toggle_checkbox('pages_view');">{TEXT_VIEW}</a></td>
+	<td><label for="pages_view">{TEXT_VIEW}</label></td>
 	<td><input name="pages_add" id="pages_add" type="checkbox" value="1" {pages_add_checked}></td>
 	<td>
-		<a href="javascript: toggle_checkbox('pages_add');">{TEXT_ADD}</a>
+		<label for="pages_add">{TEXT_ADD}</label>
 		&nbsp;
 		(<input name="pages_add_l0" id="pages_add_l0" type="checkbox" value="1" {pages_add_l0_checked}>
-		<a href="javascript: toggle_checkbox('pages_add_l0');">{TEXT_LEVEL} 0</a>)
+		<label for="pages_add_l0">{TEXT_LEVEL} 0</label>)
 	</td>
 </tr>
 <tr>
 	<td><input name="pages_settings" id="pages_settings" type="checkbox" value="1" {pages_settings_checked}></td>
-	<td><a href="javascript: toggle_checkbox('pages_settings');">{TEXT_MODIFY_SETTINGS}</a></td>
+	<td><label for="pages_settings">{TEXT_MODIFY_SETTINGS}</label></td>
 	<td><input name="pages_modify" id="pages_modify" type="checkbox" value="1" {pages_modify_checked}></td>
-	<td><a href="javascript: toggle_checkbox('pages_modify');">{TEXT_MODIFY_CONTENT}</a></td>
+	<td><label for="pages_modify">{TEXT_MODIFY_CONTENT}</label></td>
 </tr>
 <tr>
 	<td><input name="pages_intro" id="pages_intro" type="checkbox" value="1" {pages_intro_checked}></td>
-	<td><a href="javascript: toggle_checkbox('pages_intro');">{HEADING_MODIFY_INTRO_PAGE}</a></td>
+	<td><label for="pages_intro">{HEADING_MODIFY_INTRO_PAGE}</label></td>
 	<td><input name="pages_delete" id="pages_delete" type="checkbox" value="1" {pages_delete_checked}></td>
-	<td><a href="javascript: toggle_checkbox('pages_delete');">{TEXT_DELETE}</a></td>
+	<td><label for="pages_delete">{TEXT_DELETE}</label></td>
 </tr>
 <tr>
 	<td colspan="4">
@@ -111,19 +111,19 @@
 </tr>
 <tr>
 	<td><input name="media_view" id="media_view" type="checkbox" value="1" {media_view_checked}></td>
-	<td><a href="javascript: toggle_checkbox('media_view');">{TEXT_VIEW}</a></td>
+	<td><label for="media_view">{TEXT_VIEW}</label></td>
 	<td><input name="media_upload" id="media_upload" type="checkbox" value="1" {media_upload_checked}></td>
-	<td><a href="javascript: toggle_checkbox('media_upload');">{TEXT_UPLOAD_FILES}</a></td>
+	<td><label for="media_upload">{TEXT_UPLOAD_FILES}</label></td>
 </tr>
 <tr>
 	<td><input name="media_rename" id="media_rename" type="checkbox" value="1" {media_rename_checked}></td>
-	<td><a href="javascript: toggle_checkbox('media_rename');">{TEXT_RENAME}</a></td>
+	<td><label for="media_rename">{TEXT_RENAME}</label></td>
 	<td><input name="media_delete" id="media_delete" type="checkbox" value="1" {media_delete_checked}></td>
-	<td><a href="javascript: toggle_checkbox('media_delete');">{TEXT_DELETE}</a></td>
+	<td><label for="media_delete">{TEXT_DELETE}</label></td>
 </tr>
 <tr>
 	<td><input name="media_create" id="media_create" type="checkbox" value="1" {media_create_checked}></td>
-	<td><a href="javascript: toggle_checkbox('media_create');">{TEXT_CREATE_FOLDER}</a></td>
+	<td><label for="media_create">{TEXT_CREATE_FOLDER}</label></td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>
 </tr>
@@ -134,13 +134,13 @@
 </tr>
 <tr>
 	<td><input name="modules_view" id="modules_view" type="checkbox" value="1" {modules_view_checked}></td>
-	<td><a href="javascript: toggle_checkbox('modules_view');">{TEXT_VIEW}</a></td>
+	<td><label for="modules_view">{TEXT_VIEW}</label></td>
 	<td><input name="modules_install" id="modules_install" type="checkbox" value="1" {modules_install_checked}></td>
-	<td><a href="javascript: toggle_checkbox('modules_install');">{TEXT_ADD}</a></td>
+	<td><label for="modules_install">{TEXT_ADD}</label></td>
 </tr>
 <tr>
 	<td><input name="modules_uninstall" id="modules_uninstall" type="checkbox" value="1" {modules_uninstall_checked}></td>
-	<td><a href="javascript: toggle_checkbox('modules_uninstall');">{TEXT_DELETE}</a></td>
+	<td><label for="modules_uninstall">{TEXT_DELETE}</label></td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>
 </tr>
@@ -151,13 +151,13 @@
 </tr>
 <tr>
 	<td><input name="templates_view" id="templates_view" type="checkbox" value="1" {templates_view_checked}></td>
-	<td><a href="javascript: toggle_checkbox('templates_view');">{TEXT_VIEW}</a></td>
+	<td><label for="templates_view">{TEXT_VIEW}</label></td>
 	<td><input name="templates_install" id="templates_install" type="checkbox" value="1" {templates_install_checked}></td>
-	<td><a href="javascript: toggle_checkbox('templates_install');">{TEXT_ADD}</a></td>
+	<td><label for="templates_install">{TEXT_ADD}</label></td>
 </tr>
 <tr>
 	<td><input name="templates_uninstall" id="templates_uninstall" type="checkbox" value="1" {templates_uninstall_checked}></td>
-	<td><a href="javascript: toggle_checkbox('templates_uninstall');">{TEXT_DELETE}</a></td>
+	<td><label for="templates_uninstall">{TEXT_DELETE}</label></td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>
 </tr>
@@ -168,13 +168,13 @@
 </tr>
 <tr>
 	<td><input name="languages_view" id="languages_view" type="checkbox" value="1" {languages_view_checked}></td>
-	<td><a href="javascript: toggle_checkbox('languages_view');">{TEXT_VIEW}</a></td>
+	<td><label for="languages_view">{TEXT_VIEW}</label></td>
 	<td><input name="languages_install" id="languages_install" type="checkbox" value="1" {languages_install_checked}></td>
-	<td><a href="javascript: toggle_checkbox('languages_install');">{TEXT_ADD}</a></td>
+	<td><label for="languages_install">{TEXT_ADD}</label></td>
 </tr>
 <tr>
 	<td><input name="languages_uninstall" id="languages_uninstall" type="checkbox" value="1" {languages_uninstall_checked}></td>
-	<td><a href="javascript: toggle_checkbox('languages_uninstall');">{TEXT_DELETE}</a></td>
+	<td><label for="languages_uninstall">{TEXT_DELETE}</label></td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>
 </tr>
@@ -185,9 +185,9 @@
 </tr>
 <tr>
 	<td><input name="settings_basic" id="settings_basic" type="checkbox" value="1" {settings_basic_checked}></td>
-	<td><a href="javascript: toggle_checkbox('settings_basic');">{TEXT_BASIC}</a></td>
+	<td><label for="settings_basic">{TEXT_BASIC}</label></td>
 	<td><input name="settings_advanced" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked}></td>
-	<td><a href="javascript: toggle_checkbox('settings_advanced');">{TEXT_ADVANCED}</a></td>
+	<td><label for="settings_advanced">{TEXT_ADVANCED}</label></td>
 </tr>
 <tr>
 	<td colspan="4">
@@ -196,15 +196,15 @@
 </tr>
 <tr>
 	<td><input name="users_view" id="users_view" type="checkbox" value="1" {users_view_checked}></td>
-	<td><a href="javascript: toggle_checkbox('users_view');">{TEXT_VIEW}</a></td>
+	<td><label for="users_view">{TEXT_VIEW}</label></td>
 	<td><input name="users_add" id="users_add" type="checkbox" value="1" {users_add_checked}></td>
-	<td><a href="javascript: toggle_checkbox('users_add');">{TEXT_ADD}</a></td>
+	<td><label for="users_add">{TEXT_ADD}</label></td>
 </tr>
 <tr>
 	<td><input name="users_modify" id="users_modify" type="checkbox" value="1" {users_modify_checked}></td>
-	<td><a href="javascript: toggle_checkbox('users_modify');">{TEXT_MODIFY}</a></td>
+	<td><label for="users_modify">{TEXT_MODIFY}</label></td>
 	<td><input name="users_delete" id="users_delete" type="checkbox" value="1" {users_delete_checked}></td>
-	<td><a href="javascript: toggle_checkbox('users_delete');">{TEXT_DELETE}</a></td>
+	<td><label for="users_delete">{TEXT_DELETE}</label></td>
 </tr>
 <tr>
 	<td colspan="4">
@@ -213,15 +213,15 @@
 </tr>
 <tr>
 	<td><input name="groups_view" id="groups_view" type="checkbox" value="1" {groups_view_checked}></td>
-	<td><a href="javascript: toggle_checkbox('groups_view');">{TEXT_VIEW}</a></td>
+	<td><label for="groups_view">{TEXT_VIEW}</label></td>
 	<td><input name="groups_add" id="groups_add" type="checkbox" value="1" {groups_add_checked}></td>
-	<td><a href="javascript: toggle_checkbox('groups_add');">{TEXT_ADD}</a></td>
+	<td><label for="groups_add">{TEXT_ADD}</label></td>
 </tr>
 <tr>
 	<td><input name="groups_modify" id="groups_modify" type="checkbox" value="1" {groups_modify_checked}></td>
-	<td><a href="javascript: toggle_checkbox('groups_modify');">{TEXT_MODIFY}</a></td>
+	<td><label for="groups_modify">{TEXT_MODIFY}</label></td>
 	<td><input name="groups_delete" id="groups_delete" type="checkbox" value="1" {groups_delete_checked}></td>
-	<td><a href="javascript: toggle_checkbox('groups_delete');">{TEXT_DELETE}</a></td>
+	<td><label for="groups_delete">{TEXT_DELETE}</label></td>
 </tr>
 </table>
 
@@ -240,7 +240,7 @@
 			<!-- BEGIN module_list_block -->
 			<li>
 				<input type="checkbox" name="module_permissions[]" id="m_{VALUE}" value="{VALUE}" {CHECKED} />
-				<a href="javascript: toggle_checkbox('m_{VALUE}');">{NAME}</a>
+				<label for="m_{VALUE}">{NAME}</label>
 			</li>
 			<!-- END module_list_block -->
 		</ul>
@@ -253,7 +253,7 @@
 			<!-- BEGIN template_list_block -->
 			<li>
 				<input type="checkbox" name="template_permissions[]" id="t_{VALUE}" value="{VALUE}" {CHECKED} />
-				<a href="javascript: toggle_checkbox('t_{VALUE}');">{NAME}</a>
+				<label for="t_{VALUE}">{NAME}</label>
 			</li>
 			<!-- END template_list_block -->
 		</ul>
Index: trunk/wb/admin/media/rename.html
===================================================================
--- trunk/wb/admin/media/rename.html	(revision 239)
+++ trunk/wb/admin/media/rename.html	(revision 240)
@@ -29,9 +29,9 @@
 <tr>
 	<td colspan="2">
 		<input type="checkbox" name="overwrite" id="overwrite" value="yes" />
-		<a href="javascript: toggle_checkbox('overwrite');">
+		<label for="overwrite">
 		{TEXT_OVERWRITE_EXISTING} {TYPE}
-		</a>
+		</label>
 	</td>
 </tr>
 <tr>
Index: trunk/wb/admin/media/basic_header.html
===================================================================
--- trunk/wb/admin/media/basic_header.html	(revision 239)
+++ trunk/wb/admin/media/basic_header.html	(revision 240)
@@ -14,15 +14,6 @@
 	height: 100px;
 }
 </style>
-<script language="javascript" type="text/javascript">
-function toggle_checkbox(checkbox_id) {
-	if(document.getElementById(checkbox_id).checked == true) {
-		document.getElementById(checkbox_id).checked = false;
-	} else {
-		document.getElementById(checkbox_id).checked = true;
-	}
-}
-</script>
 </head>
 <body>
 
Index: trunk/wb/admin/media/template.html
===================================================================
--- trunk/wb/admin/media/template.html	(revision 239)
+++ trunk/wb/admin/media/template.html	(revision 240)
@@ -69,9 +69,9 @@
 <tr>
 	<td>
 		<input type="checkbox" name="overwrite" id="overwrite" value="yes" />
-		<a href="javascript: toggle_checkbox('overwrite');">
+		<label for="overwrite">
 		{TEXT_OVERWRITE_EXISTING} {TEXT_FILES}
-		</a>
+		</label>
 	</td>
 	<td width="160">
 		<input type="submit" name="submit" value="{TEXT_UPLOAD_FILES}" style="width: 160px;" />
Index: trunk/wb/admin/pages/settings.html
===================================================================
--- trunk/wb/admin/pages/settings.html	(revision 239)
+++ trunk/wb/admin/pages/settings.html	(revision 240)
@@ -51,7 +51,7 @@
 			<!-- BEGIN group_list_block -->
 			<li>
 			<input type="checkbox" name="admin_groups[]" id="admin_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
-			<a href="javascript: toggle_checkbox('admin_group_{TOGGLE}');" style="color: #{LINK_COLOR}; cursor: {CURSOR};">{NAME}</a>
+			<label for="admin_group_{TOGGLE}">{NAME}</label>
 			</li>
 			<!-- END group_list_block -->
 		</ul>
@@ -63,7 +63,7 @@
 				<!-- BEGIN group_list_block2 -->
 				<li>
 				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
-				<a href="javascript: toggle_checkbox('viewing_group_{TOGGLE}');" style="color: #{LINK_COLOR}; cursor: {CURSOR};">{NAME}</a>
+				<label for="viewing_group_{TOGGLE}">{NAME}</label>
 				</li>
 				<!-- END group_list_block2 -->
 			</ul>
@@ -76,7 +76,7 @@
 				<!-- BEGIN group_list_block2 -->
 				<li>
 				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
-				<a href="javascript: toggle_checkbox('viewing_group_{TOGGLE}');" style="color: #{LINK_COLOR}; cursor: {CURSOR};">{NAME}</a>
+				<label for="viewing_group_{TOGGLE}">{NAME}</label>
 				</li>
 				<!-- END group_list_block2 -->
 			</ul>
Index: trunk/wb/admin/pages/template.html
===================================================================
--- trunk/wb/admin/pages/template.html	(revision 239)
+++ trunk/wb/admin/pages/template.html	(revision 240)
@@ -21,7 +21,7 @@
 			<!-- BEGIN group_list_block -->
 			<li>
 			<input type="checkbox" name="admin_groups[]" id="admin_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
-			<a href="javascript: toggle_checkbox('admin_group_{TOGGLE}');" style="color: #{LINK_COLOR}; cursor: {CURSOR};">{NAME}</a>
+			<label for="admin_group_{TOGGLE}">{NAME}</label>
 			</li>
 			<!-- END group_list_block -->
 		</ul>
@@ -33,7 +33,7 @@
 				<!-- BEGIN group_list_block2 -->
 				<li>
 				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
-				<a href="javascript: toggle_checkbox('viewing_group_{TOGGLE}');" style="color: #{LINK_COLOR}; cursor: {CURSOR};">{NAME}</a>
+				<label for="viewing_group_{TOGGLE}">{NAME}</label>
 				</li>
 				<!-- END group_list_block2 -->
 			</ul>
@@ -46,7 +46,7 @@
 				<!-- BEGIN group_list_block2 -->
 				<li>
 				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
-				<a href="javascript: toggle_checkbox('viewing_group_{TOGGLE}');" style="color: #{LINK_COLOR}; cursor: {CURSOR};">{NAME}</a>
+				<label for="viewing_group_{TOGGLE}">{NAME}</label>
 				</li>
 				<!-- END group_list_block2 -->
 			</ul>
Index: trunk/wb/admin/interface/header.html
===================================================================
--- trunk/wb/admin/interface/header.html	(revision 239)
+++ trunk/wb/admin/interface/header.html	(revision 240)
@@ -5,13 +5,6 @@
 <title>{WEBSITE_TITLE} >> {TEXT_ADMINISTRATION} - {SECTION_NAME}</title>
 <link href="{INTERFACE_DIR}/stylesheet.css" rel="stylesheet" type="text/css" />
 <script language="javascript" type="text/javascript">
-function toggle_checkbox(checkbox_id) {
-	if(document.getElementById(checkbox_id).checked == true) {
-		document.getElementById(checkbox_id).checked = false;
-	} else {
-		document.getElementById(checkbox_id).checked = true;
-	}
-}
 function confirm_link(message, url) {
 	if(confirm(message)) location.href = url;
 }</script>
Index: trunk/wb/admin/settings/template.html
===================================================================
--- trunk/wb/admin/settings/template.html	(revision 239)
+++ trunk/wb/admin/settings/template.html	(revision 240)
@@ -400,7 +400,7 @@
 			<input type="checkbox" name="world_writeable" id="world_writeable" style="width: 14px; height: 14px;" value="true"{WORLD_WRITEABLE_SELECTED} />
 			<label for="world_writeable">
 				{TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS} (777)
-			</font>
+			</label>
 			<br />
 			<font class="note">({WORLD_WRITEABLE_WARNING})</font>
 		</div>
Index: trunk/wb/admin/users/user_form.html
===================================================================
--- trunk/wb/admin/users/user_form.html	(revision 239)
+++ trunk/wb/admin/users/user_form.html	(revision 240)
@@ -1,10 +1,10 @@
 <!-- BEGIN main_block -->
 
-<script language="javascript" type="text/javascript">
-function toggle_radio(radio_on, radio_off) {
+<script language="javascript" type="text/javascript">
+function toggle_radio(radio_on, radio_off) {
 	document.getElementById(radio_on).checked = true;
-	document.getElementById(radio_off).checked = true;
-}
+	document.getElementById(radio_off).checked = true;
+}
 </script>
 
 <style>
@@ -81,9 +81,9 @@
 	<td>&nbsp;</td>
 	<td>
 		<input type="radio" name="active[]" id="active" value="1" {ACTIVE_CHECKED} />
-		<a href="javascript: toggle_radio('disabled', 'active');">{TEXT_ACTIVE}</a>
+		<label for="active">{TEXT_ACTIVE}</label>
 		<input type="radio" name="active[]" id="disabled" value="0" {DISABLED_CHECKED} />
-		<a href="javascript: toggle_radio('active', 'disabled');">{TEXT_DISABLED}</a>
+		<label for="disabled">{TEXT_DISABLED}</label>
 	</td>
 </tr>
 <tr>
Index: trunk/wb/admin/login/template.html
===================================================================
--- trunk/wb/admin/login/template.html	(revision 239)
+++ trunk/wb/admin/login/template.html	(revision 240)
@@ -4,15 +4,6 @@
 <head>
 <title>{TEXT_LOGIN}</title>
 <link href="{INTERFACE_DIR_URL}/stylesheet.css" rel="stylesheet" type="text/css">
-<script language="javascript" type="text/javascript">
-function toggle_checkbox(checkbox_id) {
-	if(document.getElementById(checkbox_id).checked == true) {
-		document.getElementById(checkbox_id).checked = false;
-	} else {
-		document.getElementById(checkbox_id).checked = true;
-	}
-}
-</script>
 </head>
 <body onload="document.login.{USERNAME_FIELDNAME}.focus();">
 
@@ -56,9 +47,9 @@
 			<td>&nbsp;</td>
 			<td>
 				<input type="checkbox" name="remember" id="remember" value="true" />
-				<font onclick="javascript: toggle_checkbox('remember');" style="cursor: pointer;">
+				<label for="remember">
 					{TEXT_REMEMBER_ME}
-				</font>
+				</label>
 			</td>
 		</tr>
 		<tr height="30">
Index: trunk/wb/modules/news/modify_group.php
===================================================================
--- trunk/wb/modules/news/modify_group.php	(revision 239)
+++ trunk/wb/modules/news/modify_group.php	(revision 240)
@@ -61,7 +61,7 @@
 		<a href="<?php echo WB_URL.MEDIA_DIRECTORY; ?>/.news/image<?php echo $group_id; ?>.jpg" target="_blank">View</a>
 		&nbsp;
 		<input type="checkbox" name="delete_image" id="delete_image" value="true" />
-		<a href="javascript: toggle_checkbox('delete_image');">Delete</a>
+		<label for="delete_image">Delete</label>
 	</td>
 	<?php } else { ?>
 	<td>
Index: trunk/wb/account/login_form.php
===================================================================
--- trunk/wb/account/login_form.php	(revision 239)
+++ trunk/wb/account/login_form.php	(revision 240)
@@ -53,16 +53,6 @@
 }
 </style>
 
-<script language="javascript" type="text/javascript">
-function toggle_checkbox(checkbox_id) {
-	if(document.getElementById(checkbox_id).checked == true) {
-		document.getElementById(checkbox_id).checked = false;
-	} else {
-		document.getElementById(checkbox_id).checked = true;
-	}
-}
-</script>
-
 <h1>&nbsp;Login</h1>
 &nbsp;<?php echo $thisApp->message; ?>
 <br />
@@ -94,9 +84,9 @@
 	<td>&nbsp;</td>
 	<td>
 		<input type="checkbox" name="remember" id="remember" value="true" />
-		<font onclick="javascript: toggle_checkbox('remember');" style="cursor: pointer;">
+		<label for="remember">
 			<?php echo $TEXT['REMEMBER_ME']; ?>
-		</font>
+		</label>
 	</td>
 </tr>
 <?php } ?>