Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 336)
+++ trunk/CHANGELOG	(revision 337)
@@ -11,6 +11,8 @@
 ! = Update/Change
 
 ------------------------------------- 2.6.3 -------------------------------------
+19-Mar-2006 Stefan Braunewell
+#	Fixed ticket #146: problems removing groups from viewers list of a page
 16-Mar-2006 Stefan Braunewell
 !	Changed link target selection. Now self, top and new. (Ticket #145)
 #	Fixed ticket #143. Charset setting is now used in admin login and forgot
Index: trunk/wb/languages/EN.php
===================================================================
--- trunk/wb/languages/EN.php	(revision 336)
+++ trunk/wb/languages/EN.php	(revision 337)
@@ -332,6 +332,7 @@
 $TEXT['START'] = 'Start';
 $TEXT['SECTION_BLOCKS'] = 'Section Blocks';
 $TEXT['REGISTERED_VIEWERS'] = 'Registered Viewers';
+$TEXT['ALLOWED_VIEWERS'] = 'Allowed Viewers';
 $TEXT['SUBMISSION_ID'] = 'Submission ID';
 $TEXT['SUBMISSIONS'] = 'Submissions';
 $TEXT['SUBMITTED'] = 'Submitted';
Index: trunk/wb/admin/pages/settings.php
===================================================================
--- trunk/wb/admin/pages/settings.php	(revision 336)
+++ trunk/wb/admin/pages/settings.php	(revision 337)
@@ -217,18 +217,12 @@
 		$template->parse('group_list2', 'group_list_block2', true);
 	}
 // Show private viewers
-if($results_array['visibility'] == 'private') {
-	$template->set_var('DISPLAY_PRIVATE', '');
+if($results_array['visibility'] == 'private' OR $results_array['visibility'] == 'registered') {
+	$template->set_var('DISPLAY_VIEWERS', '');
 } else {
-	$template->set_var('DISPLAY_PRIVATE', 'none');
+	$template->set_var('DISPLAY_VIEWERS', 'none');
 }
 
-if($results_array['visibility'] == 'registered') {
-	$template->set_var('DISPLAY_REGISTERED', '');
-} else {
-	$template->set_var('DISPLAY_REGISTERED', 'none');
-}
-
 // Parent page list
 $database = new database();
 function parent_list($parent) {
@@ -403,8 +397,7 @@
 								'TEXT_SAME_WINDOW' => $TEXT['SAME_WINDOW'],
 								'TEXT_TOP_FRAME' => $TEXT['TOP_FRAME'],
 								'TEXT_ADMINISTRATORS' => $TEXT['ADMINISTRATORS'],
-								'TEXT_PRIVATE_VIEWERS' => $TEXT['PRIVATE_VIEWERS'],
-								'TEXT_REGISTERED_VIEWERS' => $TEXT['REGISTERED_VIEWERS'],
+								'TEXT_ALLOWED_VIEWERS' => $TEXT['ALLOWED_VIEWERS'],
 								'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'],
 								'TEXT_KEYWORDS' => $TEXT['KEYWORDS'],
 								'TEXT_SEARCHING' => $TEXT['SEARCHING'],
Index: trunk/wb/admin/pages/settings.html
===================================================================
--- trunk/wb/admin/pages/settings.html	(revision 336)
+++ trunk/wb/admin/pages/settings.html	(revision 337)
@@ -2,15 +2,10 @@
 
 <script type="text/javascript" language="javascript">
 function toggle_viewers() {
-	if(document.settings.visibility.value == 'private') {
-		document.getElementById('private_viewers').style.display = 'block';
-		document.getElementById('registered_viewers').style.display = 'none';
-	} else if(document.settings.visibility.value == 'registered') {
-		document.getElementById('private_viewers').style.display = 'none';
-		document.getElementById('registered_viewers').style.display = 'block';
+	if(document.settings.visibility.value == 'private' || document.settings.visibility.value == 'registered') {
+		document.getElementById('allowed_viewers').style.display = 'block';
 	} else {
-		document.getElementById('private_viewers').style.display = 'none';
-		document.getElementById('registered_viewers').style.display = 'none';
+		document.getElementById('allowed_viewers').style.display = 'none';
 	}
 }
 </script>
@@ -57,8 +52,8 @@
 		</ul>
 	</td>
 	<td rowspan="10" valign="top" style="padding-left: 20px; padding-top: 8px;">
-		<div id="private_viewers" style="display: {DISPLAY_PRIVATE};">
-			{TEXT_PRIVATE_VIEWERS}:
+		<div id="allowed_viewers" style="display: {DISPLAY_VIEWERS};">
+			{TEXT_ALLOWED_VIEWERS}:
 			<ul style="list-style-type: none; margin: 0; padding: 0;">
 				<!-- BEGIN group_list_block2 -->
 				<li>
@@ -69,19 +64,6 @@
 			</ul>
 		</div>
 	</td>
-	<td rowspan="10" valign="top" style="padding-left: 20px; padding-top: 8px;">
-		<div id="registered_viewers" style="display: {DISPLAY_REGISTERED};">
-			{TEXT_REGISTERED_VIEWERS}:
-			<ul style="list-style-type: none; margin: 0; padding: 0;">
-				<!-- BEGIN group_list_block2 -->
-				<li>
-				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
-				<label for="viewing_group_{TOGGLE}">{NAME}</label>
-				</li>
-				<!-- END group_list_block2 -->
-			</ul>
-		</div>
-	</td>
 </tr>
 <tr height="20">
 	<td width="100" height="20">{TEXT_MENU_TITLE}:</td>