瀏覽代碼

! And some rearrangement of the stuff a little. I'm not happy with it but that profile area is currently huge and needs to be split a bit. Too much in one place.

Signed-off-by: Peter Spicer <[email protected]>
Peter Spicer 10 年之前
父節點
當前提交
995d7286b2
共有 2 個文件被更改,包括 22 次插入21 次删除
  1. 4 4
      Sources/ManagePermissions.php
  2. 18 17
      Themes/default/languages/ManagePermissions.english.php

+ 4 - 4
Sources/ManagePermissions.php

@@ -1445,19 +1445,19 @@ function loadAllPermissions()
 			'send_mail' => array(false, 'member_admin'),
 			'issue_warning' => array(false, 'member_admin'),
 			'profile_view' => array(false, 'profile'),
-			'profile_identity' => array(true, 'profile'),
 			'profile_forum' => array(true, 'profile'),
-			'profile_password' => array(true, 'profile'),
 			'profile_extra' => array(true, 'profile'),
 			'profile_signature' => array(true, 'profile'),
 			'profile_other' => array(true, 'profile'),
 			'profile_title' => array(true, 'profile'),
-			'profile_displayed_name' => array(true, 'profile'),
 			'profile_blurb' => array(true, 'profile'),
-			'profile_remove' => array(true, 'profile'),
 			'profile_server_avatar' => array(false, 'profile'),
 			'profile_upload_avatar' => array(false, 'profile'),
 			'profile_remote_avatar' => array(false, 'profile'),
+			'profile_identity' => array(true, 'profile_account'),
+			'profile_displayed_name' => array(true, 'profile_account'),
+			'profile_password' => array(true, 'profile_account'),
+			'profile_remove' => array(true, 'profile_account'),
 		),
 		'board' => array(
 			'moderate_board' => array(false, 'general_board'),

+ 18 - 17
Themes/default/languages/ManagePermissions.english.php

@@ -35,11 +35,6 @@ $txt['permissions_profile_used_by_none'] = 'No Boards';
 $txt['permissions_profile_do_edit'] = 'Edit';
 $txt['permissions_profile_do_delete'] = 'Delete';
 
-$txt['permissionname_profile_displayed_name'] = 'Edit displayed name';
-$txt['permissionhelp_profile_displayed_name'] = 'Allow the member to edit the displayed name field in their profile';
-$txt['permissionname_profile_displayed_name_own'] = 'Own displayed name';
-$txt['permissionname_profile_displayed_name_any'] = 'Any displayed name';
-
 $txt['permissionname_profile_signature'] = 'Edit signature';
 $txt['permissionhelp_profile_signature'] = 'Allow the member to edit the signature field in their profile';
 $txt['permissionname_profile_signature_own'] = 'Own signature';
@@ -52,10 +47,6 @@ $txt['permissionname_profile_other'] = 'Edit website and location';
 $txt['permissionhelp_profile_other'] = 'Allow the member to edit the website, and location fields in their profile';
 $txt['permissionname_profile_other_own'] = 'Own profile';
 $txt['permissionname_profile_other_any'] = 'Any profile';
-$txt['permissionname_profile_password'] = 'Change password';
-$txt['permissionhelp_profile_password'] = 'Allow the member to change the password or the secret question fields';
-$txt['permissionname_profile_password_own'] = 'Own profile';
-$txt['permissionname_profile_password_any'] = 'Any profile';
 $txt['permissionname_profile_blurb'] = 'Edit personal text';
 $txt['permissionhelp_profile_blurb'] = 'Allow the member to edit the personal text field in their profile';
 $txt['permissionname_profile_blurb_own'] = 'Own profile';
@@ -159,10 +150,6 @@ $txt['permissionhelp_issue_warning'] = 'Issue a warning to members of the forum
 $txt['permissiongroup_profile'] = 'Member Profiles';
 $txt['permissionname_profile_view'] = 'View other members\' profile summary and stats pages';
 $txt['permissionhelp_profile_view'] = 'This permission allows users clicking on a username to see a summary of other users\' profile settings, some statistics and their posts.';
-$txt['permissionname_profile_identity'] = 'Edit account settings';
-$txt['permissionhelp_profile_identity'] = 'Account settings are the basic settings of a profile, like password, email address, membergroup and preferred language.';
-$txt['permissionname_profile_identity_own'] = 'Own profile';
-$txt['permissionname_profile_identity_any'] = 'Any profile';
 $txt['permissionname_profile_extra'] = 'Edit additional profile settings';
 $txt['permissionhelp_profile_extra'] = 'Additional profile settings include settings for avatars, theme preferences, notifications and Personal Messages.';
 $txt['permissionname_profile_extra_own'] = 'Own profile';
@@ -171,10 +158,6 @@ $txt['permissionname_profile_title'] = 'Edit custom title';
 $txt['permissionhelp_profile_title'] = 'The custom title is shown on the topic display page, under the profile of each user that has a custom title.';
 $txt['permissionname_profile_title_own'] = 'Own profile';
 $txt['permissionname_profile_title_any'] = 'Any profile';
-$txt['permissionname_profile_remove'] = 'Delete account';
-$txt['permissionhelp_profile_remove'] = 'This permission allows a user to delete his account, when set to \'Own Account\'.';
-$txt['permissionname_profile_remove_own'] = 'Own account';
-$txt['permissionname_profile_remove_any'] = 'Any account';
 $txt['permissionname_profile_server_avatar'] = 'Select an avatar from the server';
 $txt['permissionhelp_profile_server_avatar'] = 'If enabled this will allow a user to select an avatar from the avatar collections installed on the server.';
 $txt['permissionname_profile_upload_avatar'] = 'Upload an avatar to the server';
@@ -182,6 +165,24 @@ $txt['permissionhelp_profile_upload_avatar'] = 'This permission will allow a use
 $txt['permissionname_profile_remote_avatar'] = 'Choose a remotely stored avatar';
 $txt['permissionhelp_profile_remote_avatar'] = 'Because avatars might influence the page creation time negatively, it is possible to disallow certain membergroups to use avatars from external servers.';
 
+$txt['permissiongroup_profile_account'] = 'Member Accounts';
+$txt['permissionname_profile_identity'] = 'Edit account settings';
+$txt['permissionhelp_profile_identity'] = 'Account settings are the basic settings of a profile, like password, email address, membergroup and preferred language.';
+$txt['permissionname_profile_identity_own'] = 'Own profile';
+$txt['permissionname_profile_identity_any'] = 'Any profile';
+$txt['permissionname_profile_displayed_name'] = 'Edit displayed name';
+$txt['permissionhelp_profile_displayed_name'] = 'Allow the member to edit the displayed name field in their profile';
+$txt['permissionname_profile_displayed_name_own'] = 'Own displayed name';
+$txt['permissionname_profile_displayed_name_any'] = 'Any displayed name';
+$txt['permissionname_profile_password'] = 'Change password';
+$txt['permissionhelp_profile_password'] = 'Allow the member to change the password or the secret question fields';
+$txt['permissionname_profile_password_own'] = 'Own profile';
+$txt['permissionname_profile_password_any'] = 'Any profile';
+$txt['permissionname_profile_remove'] = 'Delete account';
+$txt['permissionhelp_profile_remove'] = 'This permission allows a user to delete his account, when set to \'Own Account\'.';
+$txt['permissionname_profile_remove_own'] = 'Own account';
+$txt['permissionname_profile_remove_any'] = 'Any account';
+
 $txt['permissiongroup_general_board'] = 'General';
 $txt['permissionname_moderate_board'] = 'Moderate board';
 $txt['permissionhelp_moderate_board'] = 'The moderate board permission adds a few small permissions that make a moderator a real moderator. Permissions include replying to locked topics, changing the poll expire time and viewing poll results.';