Mercurial > hg > soundsoftware-site
changeset 284:23c69f60a959 cannam-pre-20110113-merge
Merge from branch "bug_95"
| author | Chris Cannam |
|---|---|
| date | Wed, 23 Mar 2011 11:19:50 +0000 |
| parents | 8746576e96b8 (current diff) 782d4fc319bb (diff) |
| children | 861eb230b8fe |
| files | config/locales/en-GB.yml config/locales/en.yml |
| diffstat | 3 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/app/views/projects/settings/_members.rhtml Wed Mar 23 10:41:00 2011 +0000 +++ b/app/views/projects/settings/_members.rhtml Wed Mar 23 11:19:50 2011 +0000 @@ -2,6 +2,7 @@ <% roles = Role.find_all_givable members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %> + <div class="splitcontentleft"> <% if members.any? %> <table class="list members"> @@ -73,9 +74,11 @@ <% end %> </div> - <p><%= l(:label_role_plural) %>: + <p><%= l(:label_set_role_plural) %>:</p> + <p> <% roles.each do |role| %> - <label><%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %></label> + <label><%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %> </label> + <i> <%=l( 'label_' + role.name.downcase + "_description").to_sym %></i> <% end %></p> <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
--- a/config/locales/en-GB.yml Wed Mar 23 10:41:00 2011 +0000 +++ b/config/locales/en-GB.yml Wed Mar 23 11:19:50 2011 +0000 @@ -959,3 +959,9 @@ label_user_search: "Search for user:" field_visible: Visible setting_emails_header: Emails header + + label_manager_description: All powers including adding and removing members and adjusting project settings + label_developer_description: Can commit to repository and carry out most project editing tasks + label_reporter_description: Can submit bug reports; has read access for private projects + + label_set_role_plural: Choose roles for new member \ No newline at end of file
--- a/config/locales/en.yml Wed Mar 23 10:41:00 2011 +0000 +++ b/config/locales/en.yml Wed Mar 23 11:19:50 2011 +0000 @@ -954,3 +954,9 @@ enumeration_activities: Activities (time tracking) enumeration_system_activity: System Activity + label_manager_description: All powers including adding and removing members and adjusting project settings + label_developer_description: Can commit to repository and carry out most project editing tasks + label_reporter_description: Can submit bug reports; has read access for private projects + + label_set_role_plural: Choose roles for new member +