Project

General

Profile

« Previous | Next » 

Revision 337

Added by stefan over 18 years ago

Fixed ticket #146 - problems removing groups from private, registered viewer lists of page.

View differences:

trunk/CHANGELOG
11 11 
! = Update/Change
12 12 

  		




  13
  13
  
    
------------------------------------- 2.6.3 -------------------------------------


  		




  
  14
  
    
19-Mar-2006 Stefan Braunewell


  		




  
  15
  
    
#	Fixed ticket #146: problems removing groups from viewers list of a page


  		




  14
  16
  
    
16-Mar-2006 Stefan Braunewell


  		




  15
  17
  
    
!	Changed link target selection. Now self, top and new. (Ticket #145)


  		




  16
  18
  
    
#	Fixed ticket #143. Charset setting is now used in admin login and forgot


  		












  

    
      trunk/wb/languages/EN.php
    
  





  332
  332
  
    
$TEXT['START'] = 'Start';


  		




  333
  333
  
    
$TEXT['SECTION_BLOCKS'] = 'Section Blocks';


  		




  334
  334
  
    
$TEXT['REGISTERED_VIEWERS'] = 'Registered Viewers';


  		




  
  335
  
    
$TEXT['ALLOWED_VIEWERS'] = 'Allowed Viewers';


  		




  335
  336
  
    
$TEXT['SUBMISSION_ID'] = 'Submission ID';


  		




  336
  337
  
    
$TEXT['SUBMISSIONS'] = 'Submissions';


  		




  337
  338
  
    
$TEXT['SUBMITTED'] = 'Submitted';


  		












  

    
      trunk/wb/admin/pages/settings.php
    
  





  217
  217
  
    
		$template->parse('group_list2', 'group_list_block2', true);


  		




  218
  218
  
    
	}


  		




  219
  219
  
    
// Show private viewers


  		




  220
  
  
    
if($results_array['visibility'] == 'private') {


  		




  221
  
  
    
	$template->set_var('DISPLAY_PRIVATE', '');


  		




  
  220
  
    
if($results_array['visibility'] == 'private' OR $results_array['visibility'] == 'registered') {


  		




  
  221
  
    
	$template->set_var('DISPLAY_VIEWERS', '');


  		




  222
  222
  
    
} else {


  		




  223
  
  
    
	$template->set_var('DISPLAY_PRIVATE', 'none');


  		




  
  223
  
    
	$template->set_var('DISPLAY_VIEWERS', 'none');


  		




  224
  224
  
    
}


  		




  225
  225
  
    

  		




  226
  
  
    
if($results_array['visibility'] == 'registered') {


  		




  227
  
  
    
	$template->set_var('DISPLAY_REGISTERED', '');


  		




  228
  
  
    
} else {


  		




  229
  
  
    
	$template->set_var('DISPLAY_REGISTERED', 'none');


  		




  230
  
  
    
}


  		




  231
  
  
    

  		




  232
  226
  
    
// Parent page list


  		




  233
  227
  
    
$database = new database();


  		




  234
  228
  
    
function parent_list($parent) {


  		




  ......




  403
  397
  
    
								'TEXT_SAME_WINDOW' => $TEXT['SAME_WINDOW'],


  		




  404
  398
  
    
								'TEXT_TOP_FRAME' => $TEXT['TOP_FRAME'],


  		




  405
  399
  
    
								'TEXT_ADMINISTRATORS' => $TEXT['ADMINISTRATORS'],


  		




  406
  
  
    
								'TEXT_PRIVATE_VIEWERS' => $TEXT['PRIVATE_VIEWERS'],


  		




  407
  
  
    
								'TEXT_REGISTERED_VIEWERS' => $TEXT['REGISTERED_VIEWERS'],


  		




  
  400
  
    
								'TEXT_ALLOWED_VIEWERS' => $TEXT['ALLOWED_VIEWERS'],


  		




  408
  401
  
    
								'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'],


  		




  409
  402
  
    
								'TEXT_KEYWORDS' => $TEXT['KEYWORDS'],


  		




  410
  403
  
    
								'TEXT_SEARCHING' => $TEXT['SEARCHING'],


  		












  

    
      trunk/wb/admin/pages/settings.html
    
  





  2
  2
  
    

  		




  3
  3
  
    
<script type="text/javascript" language="javascript">


  		




  4
  4
  
    
function toggle_viewers() {


  		




  5
  
  
    
	if(document.settings.visibility.value == 'private') {


  		




  6
  
  
    
		document.getElementById('private_viewers').style.display = 'block';


  		




  7
  
  
    
		document.getElementById('registered_viewers').style.display = 'none';


  		




  8
  
  
    
	} else if(document.settings.visibility.value == 'registered') {


  		




  9
  
  
    
		document.getElementById('private_viewers').style.display = 'none';


  		




  10
  
  
    
		document.getElementById('registered_viewers').style.display = 'block';


  		




  
  5
  
    
	if(document.settings.visibility.value == 'private' || document.settings.visibility.value == 'registered') {


  		




  
  6
  
    
		document.getElementById('allowed_viewers').style.display = 'block';


  		




  11
  7
  
    
	} else {


  		




  12
  
  
    
		document.getElementById('private_viewers').style.display = 'none';


  		




  13
  
  
    
		document.getElementById('registered_viewers').style.display = 'none';


  		




  
  8
  
    
		document.getElementById('allowed_viewers').style.display = 'none';


  		




  14
  9
  
    
	}


  		




  15
  10
  
    
}


  		




  16
  11
  
    
</script>


  		




  ......




  57
  52
  
    
		</ul>


  		




  58
  53
  
    
	</td>


  		




  59
  54
  
    
	<td rowspan="10" valign="top" style="padding-left: 20px; padding-top: 8px;">


  		




  60
  
  
    
		<div id="private_viewers" style="display: {DISPLAY_PRIVATE};">


  		




  61
  
  
    
			{TEXT_PRIVATE_VIEWERS}:


  		




  
  55
  
    
		<div id="allowed_viewers" style="display: {DISPLAY_VIEWERS};">


  		




  
  56
  
    
			{TEXT_ALLOWED_VIEWERS}:


  		




  62
  57
  
    
			<ul style="list-style-type: none; margin: 0; padding: 0;">


  		




  63
  58
  
    
				<!-- BEGIN group_list_block2 -->


  		




  64
  59
  
    
				<li>


  		




  ......




  69
  64
  
    
			</ul>


  		




  70
  65
  
    
		</div>


  		




  71
  66
  
    
	</td>


  		




  72
  
  
    
	<td rowspan="10" valign="top" style="padding-left: 20px; padding-top: 8px;">


  		




  73
  
  
    
		<div id="registered_viewers" style="display: {DISPLAY_REGISTERED};">


  		




  74
  
  
    
			{TEXT_REGISTERED_VIEWERS}:


  		




  75
  
  
    
			<ul style="list-style-type: none; margin: 0; padding: 0;">


  		




  76
  
  
    
				<!-- BEGIN group_list_block2 -->


  		




  77
  
  
    
				<li>


  		




  78
  
  
    
				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />


  		




  79
  
  
    
				<label for="viewing_group_{TOGGLE}">{NAME}</label>


  		




  80
  
  
    
				</li>


  		




  81
  
  
    
				<!-- END group_list_block2 -->


  		




  82
  
  
    
			</ul>


  		




  83
  
  
    
		</div>


  		




  84
  
  
    
	</td>


  		




  85
  67
  
    
</tr>


  		




  86
  68
  
    
<tr height="20">


  		




  87
  69
  
    
	<td width="100" height="20">{TEXT_MENU_TITLE}:</td>


  		












Also available in:  Unified diff