mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
couple new changes
git-svn-id: file:///svn/phpbb/trunk@3450 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
cdbb2931f0
commit
cb57724972
2 changed files with 53 additions and 20 deletions
|
@ -60,7 +60,7 @@ switch ($action)
|
||||||
{
|
{
|
||||||
$group_name = $_POST['group_name'];
|
$group_name = $_POST['group_name'];
|
||||||
$group_description = $_POST['group_description'];
|
$group_description = $_POST['group_description'];
|
||||||
|
$group_type = $_POST['group_type'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($action == 'edit' && empty($_POST['submit']))
|
if ($action == 'edit' && empty($_POST['submit']))
|
||||||
|
@ -114,7 +114,19 @@ switch ($action)
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<form method="post" action="admin_groups.<?php echo "$phpEx$SID&action=edit"; ?>"><table class="bg" width="90%" cellspacing="1" cellpadding="4" border="0" align="center">
|
<script language="javascript" type="text/javascript">
|
||||||
|
<!--
|
||||||
|
|
||||||
|
function swatch()
|
||||||
|
{
|
||||||
|
window.open('./swatch.php?form=settings&name=group_color', '_swatch', 'HEIGHT=115,resizable=yes,scrollbars=no,WIDTH=636');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
//-->
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<form name="settings" method="post" action="admin_groups.<?php echo "$phpEx$SID&action=edit&g=$group_id"; ?>"><table class="bg" width="90%" cellspacing="1" cellpadding="4" border="0" align="center">
|
||||||
<tr>
|
<tr>
|
||||||
<th colspan="2"><?php echo $user->lang['GROUP_DETAILS']; ?></th>
|
<th colspan="2"><?php echo $user->lang['GROUP_DETAILS']; ?></th>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -160,10 +172,7 @@ switch ($action)
|
||||||
<th colspan="2"><?php echo $user->lang['GROUP_SETTINGS_SAVE']; ?></th>
|
<th colspan="2"><?php echo $user->lang['GROUP_SETTINGS_SAVE']; ?></th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="row3" colspan="2"><span class="gensmall"><?php echo $user->lang['GROUP_SETTINGS_SAVE_EXPLAIN']; ?></span></td>
|
<td class="row2"><?php echo $user->lang['GROUP_COLOR']; ?>:<br /><span class="gensmall"><?php echo sprintf($user->lang['GROUP_COLOR_EXPLAIN'], '<a href="swatch.html" onclick="swatch();return false" target="_swatch">', '</a>'); ?></span></td>
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="row2"><?php echo $user->lang['GROUP_COLOR']; ?>:<br /><span class="gensmall"><?php echo $user->lang['GROUP_COLOR_EXPLAIN']; ?></span></td>
|
|
||||||
<td class="row1"><input type="text" name="group_color" value="<?php echo (!empty($group_color)) ? $group_color : ''; ?>" size="6" maxlength="6" /></td>
|
<td class="row1"><input type="text" name="group_color" value="<?php echo (!empty($group_color)) ? $group_color : ''; ?>" size="6" maxlength="6" /></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -175,10 +184,30 @@ switch ($action)
|
||||||
<td class="row1"> </td>
|
<td class="row1"> </td>
|
||||||
</tr -->
|
</tr -->
|
||||||
<tr>
|
<tr>
|
||||||
<th colspan="2"><?php echo $user->lang['GROUP_SETTINGS']; ?></th>
|
<td class="row2"><?php echo $user->lang['GROUP_FORCE_SET']; ?>:<br /><span class="gensmall"><?php echo $user->lang['GROUP_FORCE_SET_EXPLAIN']; ?></span></td>
|
||||||
|
<td class="row1" nowrap="nowrap"><input type="radio" name="force_set" value="1" checked="checked" /> <?php echo $user->lang['YES']; ?> <input type="radio" name="force_set" value="0" /> <?php echo $user->lang['NO']; ?></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="row3" colspan="2"><span class="gensmall"><?php echo $user->lang['GROUP_SETTINGS_EXPLAIN']; ?></span></td>
|
<td class="cat" colspan="2" align="center"><?php
|
||||||
|
|
||||||
|
if ($group_type == GROUP_SPECIAL)
|
||||||
|
{
|
||||||
|
|
||||||
|
?><input type="hidden" name="group_type" value="<?php echo GROUP_SPECIAL; ?>" /><?php
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
?><input class="mainoption" type="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" /> <input class="liteoption" type="reset" value="<?php echo $user->lang['RESET']; ?>" /></td>
|
||||||
|
</tr>
|
||||||
|
</table></form>
|
||||||
|
|
||||||
|
<h1><?php echo $user->lang['GROUP_SETTINGS']; ?></h1>
|
||||||
|
|
||||||
|
<p><?php echo $user->lang['GROUP_SETTINGS_EXPLAIN']; ?></p>
|
||||||
|
|
||||||
|
<form method="post" action="admin_groups.<?php echo "$phpEx$SID&action=edit&g=$group_id"; ?>"><table class="bg" width="90%" cellspacing="1" cellpadding="4" border="0" align="center">
|
||||||
|
<tr>
|
||||||
|
<th colspan="2"><?php echo $user->lang['GROUP_SETTINGS']; ?></th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="row2"><?php echo $user->lang['GROUP_LANG']; ?>:</td>
|
<td class="row2"><?php echo $user->lang['GROUP_LANG']; ?>:</td>
|
||||||
|
@ -190,14 +219,19 @@ switch ($action)
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="row2"><?php echo $user->lang['GROUP_DST']; ?>:</td>
|
<td class="row2"><?php echo $user->lang['GROUP_DST']; ?>:</td>
|
||||||
<td class="row1"><input type="radio" name="dst" value="0" /> <?php echo $user->lang['DISABLED']; ?> <input type="radio" name="dst" value="1" /> <?php echo $user->lang['ENABLED']; ?> <input type="radio" name="dst" value="-1" checked="checked" /> <?php echo $user->lang['USER_DEFAULT']; ?></td>
|
<td class="row1" nowrap="nowrap"><input type="radio" name="dst" value="0" /> <?php echo $user->lang['DISABLED']; ?> <input type="radio" name="dst" value="1" /> <?php echo $user->lang['ENABLED']; ?> <input type="radio" name="dst" value="-1" checked="checked" /> <?php echo $user->lang['USER_DEFAULT']; ?></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="row2"><?php echo $user->lang['GROUP_FORCE_SET']; ?>:<br /><span class="gensmall"><?php echo $user->lang['GROUP_FORCE_SET_EXPLAIN']; ?></span></td>
|
<td class="cat" colspan="2" align="center"><?php
|
||||||
<td class="row1"><input type="radio" name="force_set" value="1" checked="checked" /> <?php echo $user->lang['YES']; ?> <input type="radio" name="force_set" value="0" /> <?php echo $user->lang['NO']; ?></td>
|
|
||||||
</tr>
|
if ($group_type == GROUP_SPECIAL)
|
||||||
<tr>
|
{
|
||||||
<td class="cat" colspan="2" align="center"><input class="mainoption" type="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" /> <input class="liteoption" type="reset" value="<?php echo $user->lang['RESET']; ?>" /></td>
|
|
||||||
|
?><input type="hidden" name="group_type" value="<?php echo GROUP_SPECIAL; ?>" /><?php
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
?><input class="mainoption" type="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" /> <input class="liteoption" type="reset" value="<?php echo $user->lang['RESET']; ?>" /></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table></form>
|
</table></form>
|
||||||
|
|
||||||
|
|
|
@ -607,22 +607,21 @@ $lang = array_merge($lang, array(
|
||||||
'GROUP_MEMBERS_EXPLAIN' => 'This is a complete listing of all the members of this usergroup. You can delete, approve or disprove of existing and new members.',
|
'GROUP_MEMBERS_EXPLAIN' => 'This is a complete listing of all the members of this usergroup. You can delete, approve or disprove of existing and new members.',
|
||||||
'GROUP_EDIT_EXPLAIN' => 'Here you can edit an existing group. You can change its name, description and type (open, closed, etc.). You can also impose certain settings for all members of this group. For example, group wide avatars, ranks, colouration, etc. can all be set. Please note that certain settings are imposed just once (e.g. daylight savings, timezone, etc.) and are not stored for future use. Others, such as colouration can be changed independently by users unless appropriate user or group permissions are set.',
|
'GROUP_EDIT_EXPLAIN' => 'Here you can edit an existing group. You can change its name, description and type (open, closed, etc.). You can also impose certain settings for all members of this group. For example, group wide avatars, ranks, colouration, etc. can all be set. Please note that certain settings are imposed just once (e.g. daylight savings, timezone, etc.) and are not stored for future use. Others, such as colouration can be changed independently by users unless appropriate user or group permissions are set.',
|
||||||
'ADD_NEW_GROUP' => 'Create new group',
|
'ADD_NEW_GROUP' => 'Create new group',
|
||||||
'GROUP_SETTINGS_SAVE' => 'Saved group settings',
|
'GROUP_SETTINGS_SAVE' => 'Groupwide settings',
|
||||||
'GROUP_SETTINGS_SAVE_EXPLAIN' => 'These settings are defined and stored for this group.',
|
'GROUP_SETTINGS' => 'Set user preferences',
|
||||||
'GROUP_SETTINGS' => 'Unsaved group settings',
|
'GROUP_SETTINGS_EXPLAIN' => 'Here you can force changes in users current preferences. Please note these settings are not saved for the group itself. They are intended as a quick method of altering the preferences of all users in this group.',
|
||||||
'GROUP_SETTINGS_EXPLAIN' => 'These settings are applied to each user once upon submission, they are not stored.',
|
|
||||||
'GROUP_DETAILS' => 'Group details',
|
'GROUP_DETAILS' => 'Group details',
|
||||||
'GROUP_NAME' => 'Group name',
|
'GROUP_NAME' => 'Group name',
|
||||||
'GROUP_DESC' => 'Group description',
|
'GROUP_DESC' => 'Group description',
|
||||||
'GROUP_MODERATORS' => 'Group moderators',
|
'GROUP_MODERATORS' => 'Group moderators',
|
||||||
'GROUP_TYPE' => 'Group type',
|
'GROUP_TYPE' => 'Group type',
|
||||||
'GROUP_TYPE_EXPLAIN' => '<u>Open</u>: any user can join,<br /><u>Request</u>: any user can request to join,<br /><u>Closed</u>: normal users can only view group,<br /><u>Hidden</u>: prevents display of users.',
|
'GROUP_TYPE_EXPLAIN' => 'This determines which users can join or view this group.',
|
||||||
'GROUP_OPEN' => 'Open',
|
'GROUP_OPEN' => 'Open',
|
||||||
'GROUP_REQUEST' => 'Request',
|
'GROUP_REQUEST' => 'Request',
|
||||||
'GROUP_CLOSED' => 'Closed',
|
'GROUP_CLOSED' => 'Closed',
|
||||||
'GROUP_HIDDEN' => 'Hidden',
|
'GROUP_HIDDEN' => 'Hidden',
|
||||||
'GROUP_COLOR' => 'Group colour',
|
'GROUP_COLOR' => 'Group colour',
|
||||||
'GROUP_COLOR_EXPLAIN' => 'Defines the colour (as hex triplet) members usernames will appear in, leave blank if not needed.',
|
'GROUP_COLOR_EXPLAIN' => 'Defines the colour members usernames will appear in, leave blank if not needed. Display %swebsafe colour swatch%s.',
|
||||||
'GROUP_RANK' => 'Group rank',
|
'GROUP_RANK' => 'Group rank',
|
||||||
'GROUP_AVATAR' => 'Group avatar',
|
'GROUP_AVATAR' => 'Group avatar',
|
||||||
'GROUP_AVATAR_EXPLAIN' => 'This image will be displayed in the Group Control Panel. You can also apply this avatar to all members.',
|
'GROUP_AVATAR_EXPLAIN' => 'This image will be displayed in the Group Control Panel. You can also apply this avatar to all members.',
|
||||||
|
|
Loading…
Add table
Reference in a new issue