From 9c099ce02d3d54668585cbbad49650a32da6905e Mon Sep 17 00:00:00 2001 From: Thorsten Ludewig Date: Fri, 25 Mar 2011 10:19:12 +0100 Subject: [PATCH] tip message changes --- .../main/webapp/resources/js/sonia.config.js | 10 +++---- .../main/webapp/resources/js/sonia.group.js | 4 +-- .../webapp/resources/js/sonia.repository.js | 29 ++++++++++--------- .../main/webapp/resources/js/sonia.user.js | 8 ++--- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.config.js b/scm-webapp/src/main/webapp/resources/js/sonia.config.js index 81195a6692..219ac1f710 100644 --- a/scm-webapp/src/main/webapp/resources/js/sonia.config.js +++ b/scm-webapp/src/main/webapp/resources/js/sonia.config.js @@ -115,16 +115,16 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{ errorMsgText: 'Could not load config.', // help - servernameHelpText: 'The name of this server. This name would be part of the repository url.', + servernameHelpText: 'The name of this server. This name will be part of the repository url.', pluginRepositoryHelpText: 'The url of the plugin repository.
Explanation of the {placeholders}:\n\
version = SCM-Manager Version
os = Operation System
arch = Architecture', enableForwardingHelpText: 'Enbale mod_proxy port forwarding.', forwardPortHelpText: 'The forwarding port.', - allowAnonymousAccessHelpText: 'Anonymous users can see public repositories.', - enableSSLHelpText: 'Enable SSL.', + allowAnonymousAccessHelpText: 'Anonymous users have read access on public repositories.', + enableSSLHelpText: 'Enable secure connections via HTTPS.', sslPortHelpText: 'The ssl port.', - adminGroupsHelpText: 'Comma seperated list of groups with admin rights.', - adminUsersHelpText: 'Comma seperated list of users with admin rights.', + adminGroupsHelpText: 'Comma seperated list of groups with admin permissions.', + adminUsersHelpText: 'Comma seperated list of users with admin permissions.', initComponent: function(){ diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.group.js b/scm-webapp/src/main/webapp/resources/js/sonia.group.js index b2e89b1abb..d488e37417 100644 --- a/scm-webapp/src/main/webapp/resources/js/sonia.group.js +++ b/scm-webapp/src/main/webapp/resources/js/sonia.group.js @@ -155,9 +155,9 @@ Sonia.group.FormPanel = Ext.extend(Sonia.rest.FormPanel,{ createErrorMsgText: 'Group creation failed', // help - nameHelpText: 'The unique name of the group.', + nameHelpText: 'Unique name of the group.', descriptionHelpText: 'A short description of the group.', - membersHelpText: 'The usernames of the group members.', + membersHelpText: 'Usernames of the group members.', memberStore: null, diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.repository.js b/scm-webapp/src/main/webapp/resources/js/sonia.repository.js index 596024dff7..a5698d1d1a 100644 --- a/scm-webapp/src/main/webapp/resources/js/sonia.repository.js +++ b/scm-webapp/src/main/webapp/resources/js/sonia.repository.js @@ -178,9 +178,9 @@ Ext.reg('repositoryGrid', Sonia.repository.Grid); // RepositoryFormPanel Sonia.repository.FormPanel = Ext.extend(Sonia.rest.FormPanel,{ - colGroupPermissionText: 'Group Permission', + colGroupPermissionText: 'Is Group', colNameText: 'Name', - colTypeText: 'Type', + colTypeText: 'Permissions', formTitleText: 'Settings', nameText: 'Name', typeText: 'Type', @@ -193,14 +193,14 @@ Sonia.repository.FormPanel = Ext.extend(Sonia.rest.FormPanel,{ createErrorMsgText: 'Repository creation failed', // help - nameHelpText: 'The name of the repository. This name would be part of the repository url.', + nameHelpText: 'The name of the repository. This name will be part of the repository url.', typeHelpText: 'The type of the repository (e.g. Mercurial, Git or Subversion).', - contactHelpText: 'An email address of the person who is in charge for this repository.', + contactHelpText: 'Email address of the person who is responsible for this repository.', descriptionHelpText: 'A short description of the repository.', - publicHelpText: 'A public repository which is readable by every person.', - permissionHelpText: 'If the "Group Permission" box is checked, then the name represents the groupname otherwise the username.
\n\ - Type explenation:
READ = read permission
WRITE = read and write permission
\n\ - OWNER = read, write permissions and also the ability to manage the properties and permissions', + publicHelpText: 'Public repository, readable by everyone.', + permissionHelpText: 'Manage permissions for a specific user or group.
\n\ + Permissions explenation:
READ = read
WRITE = read and write
\n\ + OWNER = read, write and also the ability to manage the properties and permissions', permissionStore: null, @@ -226,12 +226,6 @@ Sonia.repository.FormPanel = Ext.extend(Sonia.rest.FormPanel,{ sortable: true }, columns: [{ - id: 'groupPermission', - xtype: 'checkcolumn', - header: this.colGroupPermissionText, - dataIndex: 'groupPermission', - width: 40 - },{ id: 'name', header: this.colNameText, dataIndex: 'name', @@ -257,6 +251,13 @@ Sonia.repository.FormPanel = Ext.extend(Sonia.rest.FormPanel,{ ] }) }) + }, + { + id: 'groupPermission', + xtype: 'checkcolumn', + header: this.colGroupPermissionText, + dataIndex: 'groupPermission', + width: 40 }], getCellEditor: function(colIndex, rowIndex) { diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.user.js b/scm-webapp/src/main/webapp/resources/js/sonia.user.js index 15acab126b..91eb1c7c57 100644 --- a/scm-webapp/src/main/webapp/resources/js/sonia.user.js +++ b/scm-webapp/src/main/webapp/resources/js/sonia.user.js @@ -165,10 +165,10 @@ Sonia.user.FormPanel = Ext.extend(Sonia.rest.FormPanel,{ passwordMinLengthText: 'Password must be at least 6 characters long', // help - usernameHelpText: 'The unique name of the user.', - displayNameHelpText: 'The display name of the user.', - mailHelpText: 'The email address of the user.', - passwordHelpText: 'The plain text password of the user.', + usernameHelpText: 'Unique name of the user.', + displayNameHelpText: 'Display name of the user.', + mailHelpText: 'Email address of the user.', + passwordHelpText: 'Plain text password of the user.', passwordConfirmHelpText: 'Repeat the password for validation.', adminHelpText: 'An administrator is able to create, modify and delete repositories, groups and users.',