From 53d58fc3374268484a6eb5d8aae2c82719ec782d Mon Sep 17 00:00:00 2001 From: Potapov Max Date: Mon, 12 Oct 2015 12:20:59 +0300 Subject: PLT-590: Change "Manage Team" to "Manage Members" --- doc/README.md | 2 +- doc/help/Manage-Members.md | 37 +++++++++++++++++++++++++++++ doc/help/Manage-Team.md | 37 ----------------------------- doc/help/README.md | 2 +- web/react/components/navbar_dropdown.jsx | 2 +- web/react/components/sidebar_right_menu.jsx | 2 +- 6 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 doc/help/Manage-Members.md delete mode 100644 doc/help/Manage-Team.md diff --git a/doc/README.md b/doc/README.md index fcda4fd08..7ee2bb46c 100644 --- a/doc/README.md +++ b/doc/README.md @@ -33,7 +33,7 @@ Set up Mattermost in your data center _Note: End user help documentation is a new feature being completed for the v1.2 release. The materials below are work in progress._ - User Interface - - [Manage Team](help/Manage-Team.md) + - [Manage Members](help/Manage-Members.md) - Team Settings - [Slack Import](help/Slack-Import.md) diff --git a/doc/help/Manage-Members.md b/doc/help/Manage-Members.md new file mode 100644 index 000000000..04243f9fb --- /dev/null +++ b/doc/help/Manage-Members.md @@ -0,0 +1,37 @@ +# Manage Members + +The Manage Members menu is used to change the user roles assigned to members belonging to a team. + +## User Roles + +The following user roles are assigned from the **Manage Members** menu option in the team site main menu. + +### System Admin + +The System Administrator is typically a member of the IT staff and has the follow privileges: + +- Access to the System Console from the main menu in any team site. +- Change any setting on the Mattermost server available in the System Console. +- Promote and demote other users to and from the System Admin role. +- This role also has all the privileges of the Team Administrator as described below + +The first user added to a newly installed Mattermost system is assigned the System Admin role. + +### Team Admin + +The Team Administrator is typically a non-technical end user and has the following privileges: + +- Access to the "Team Settings" menu from the team site main menu +- Ability to change the team name and import data from Slack export files +- Access to the "Manage Members" menu and change user roles to the levels of Team Administrator, Member and Inactive + +### Member + +This is the default role given to end users who join the system. Members have basic permissions to use the Mattermost team site. + +### Inactive + +This status is given to users whose accounts are marked inactive. These users can no longer log into the system. + +Because Mattermost is designed as a system-of-record, there is not an option to delete users from the Mattermost system, as such an operation could compromise the integrity of message archives. + diff --git a/doc/help/Manage-Team.md b/doc/help/Manage-Team.md deleted file mode 100644 index b45ea4283..000000000 --- a/doc/help/Manage-Team.md +++ /dev/null @@ -1,37 +0,0 @@ -# Manage Team - -The Manage Team menu is used to change the user roles assigned to members belonging to a team. - -## User Roles - -The following user roles are assigned from the **Manage Team** menu option in the team site main menu. - -### System Admin - -The System Administrator is typically a member of the IT staff and has the follow privileges: - -- Access to the System Console from the main menu in any team site. -- Change any setting on the Mattermost server available in the System Console. -- Promote and demote other users to and from the System Admin role. -- This role also has all the privileges of the Team Administrator as described below - -The first user added to a newly installed Mattermost system is assigned the System Admin role. - -### Team Admin - -The Team Administrator is typically a non-technical end user and has the following privileges: - -- Access to the "Team Settings" menu from the team site main menu -- Ability to change the team name and import data from Slack export files -- Access to the "Manage Team" menu and change user roles to the levels of Team Administrator, Member and Inactive - -### Member - -This is the default role given to end users who join the system. Members have basic permissions to use the Mattermost team site. - -### Inactive - -This status is given to users whose accounts are marked inactive. These users can no longer log into the system. - -Because Mattermost is designed as a system-of-record, there is not an option to delete users from the Mattermost system, as such an operation could compromise the integrity of message archives. - diff --git a/doc/help/README.md b/doc/help/README.md index d07424c70..9271d64dd 100644 --- a/doc/help/README.md +++ b/doc/help/README.md @@ -8,5 +8,5 @@ _Note: Help documentation is a work-in-progress. Community contributions highly You can access the **Team Site Main Menu** by clicking on the three vertical dots at the top of the left sidebar in a team site. Here we describe the various options available from the menu: -- [Manage Teams](Manage-Team.md) +- [Manage Members](Manage-Members.md) diff --git a/web/react/components/navbar_dropdown.jsx b/web/react/components/navbar_dropdown.jsx index b6defc393..49d517419 100644 --- a/web/react/components/navbar_dropdown.jsx +++ b/web/react/components/navbar_dropdown.jsx @@ -111,7 +111,7 @@ export default class NavbarDropdown extends React.Component { data-toggle='modal' data-target='#team_members' > - {'Manage Team'} + {'Manage Members'} ); diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx index ea2bcf9a4..ac101d631 100644 --- a/web/react/components/sidebar_right_menu.jsx +++ b/web/react/components/sidebar_right_menu.jsx @@ -75,7 +75,7 @@ export default class SidebarRightMenu extends React.Component { data-toggle='modal' data-target='#team_members' > - Manage Team + Manage Members ); } -- cgit v1.2.3-1-g7c22