From 4fa178ae3f0f612cf91b26a2dea498602794be3b Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Tue, 31 Dec 2013 13:48:41 +0100 Subject: Bug 920681: Remove the cellspacing and cellpadding attributes from tables r/a=justdave --- template/en/default/admin/groups/create.html.tmpl | 67 ++++---- template/en/default/admin/groups/delete.html.tmpl | 25 ++- template/en/default/admin/groups/edit.html.tmpl | 184 ++++++++++------------ 3 files changed, 134 insertions(+), 142 deletions(-) (limited to 'template/en/default/admin/groups') diff --git a/template/en/default/admin/groups/create.html.tmpl b/template/en/default/admin/groups/create.html.tmpl index db65629d0..ca95bab56 100644 --- a/template/en/default/admin/groups/create.html.tmpl +++ b/template/en/default/admin/groups/create.html.tmpl @@ -13,30 +13,35 @@ [% PROCESS global/header.html.tmpl title = "Add group" subheader = "This page allows you to define a new user group." + style_urls = ['skins/standard/admin.css'] doc_section = "groups.html#create-groups" %]
- - - - - - - - - - - - - - - - [% Hook.process('field') %] +
New NameNew DescriptionNew User RegExpUse For [% terms.Bugs %]
Icon URL:
+ + + + + + + + + + + + + + + + + + + + + [% Hook.process('field') %]
Group Name:
Description:
User Regexp:
Icon URL:
Use For [% terms.Bugs %]:
-
- @@ -46,7 +51,9 @@
-

Name is what is used with the Bugzilla->user->in_group() +

+ +

Group Name is what is used with the B[%%]ugzilla->user->in_group() function in any customized cgi files you write that use a given group. It can also be used by people submitting [% terms.bugs %] by email to limit [% terms.abug %] to a certain set of groups.

@@ -55,15 +62,6 @@ limit [% terms.abug %] to a certain set of groups.

to members of the group where they can choose whether the [% terms.bug %] will be restricted to others in the same group.

-

The Use For [% terms.Bugs %] flag determines whether or not the -group is eligible to be used for [% terms.bugs %]. If you clear this, it will -no longer be possible for users to add [% terms.bugs %] to this group, -although [% terms.bugs %] already in the group will remain in the group. -Doing so is a much less drastic way to stop a group from growing -than deleting the group would be. Note: If you are creating -a group, you probably want it to be usable for [% terms.bugs %], in which -case you should leave this checked.

-

User RegExp is optional, and if filled in, will automatically grant membership to this group to anyone with an email address that matches this regular expression.

@@ -75,6 +73,15 @@ email address that matches this regular expression.

in comments in [% terms.bugs %] besides the name of the author of comments.

+

The Use For [% terms.Bugs %] flag determines whether or not the +group is eligible to be used for [% terms.bugs %]. If you clear this, it will +no longer be possible for users to add [% terms.bugs %] to this group, +although [% terms.bugs %] already in the group will remain in the group. +Doing so is a much less drastic way to stop a group from growing +than deleting the group would be. Note: If you are creating +a group, you probably want it to be usable for [% terms.bugs %], in which +case you should leave this checked.

+ [% IF Param("makeproductgroups") %]

By default, the new group will be associated with existing products. Unchecking the "Insert new group into all existing products" option will @@ -87,8 +94,6 @@ email address that matches this regular expression.

a product.

[% END %] -

Back to the main [% terms.bugs %] page - -or to the group list. +

Back to the group list.

[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/groups/delete.html.tmpl b/template/en/default/admin/groups/delete.html.tmpl index 562b4cbae..e5a04d3a9 100644 --- a/template/en/default/admin/groups/delete.html.tmpl +++ b/template/en/default/admin/groups/delete.html.tmpl @@ -13,21 +13,28 @@ # group. #%] - +[% title = BLOCK %]Delete group '[% group.name FILTER html %]'[% END %] [% PROCESS global/header.html.tmpl - title = "Delete group" + title = title + style_urls = ['skins/standard/admin.css'] doc_section = "groups.html" %] - - - - - +
IdNameDescription
+ + + + + + + + + +
FieldValue
Id [% group.id FILTER html %]
Name [% group.name FILTER html %]
Description [% group.description FILTER html_light %]
@@ -150,7 +157,9 @@

Confirmation

-

Do you really want to delete this group?

+

+ Do you really want to delete this group? +

[% IF group.users.size || group.bugs.size || group.products.size || group.flags.size %] diff --git a/template/en/default/admin/groups/edit.html.tmpl b/template/en/default/admin/groups/edit.html.tmpl index 2f4101a13..de243b9a5 100644 --- a/template/en/default/admin/groups/edit.html.tmpl +++ b/template/en/default/admin/groups/edit.html.tmpl @@ -18,29 +18,20 @@ [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] doc_section = "groups.html#edit-groups" - style = " - .grant_table { border-collapse: collapse; } - .grant_table td, .grant_table th { - padding-left: .5em; - } - .grant_table td.one, .grant_table th.one { - border-right: 1px solid black; - padding-right: .5em; - } - " %]
- +
@@ -76,7 +67,7 @@ [% END %] @@ -95,78 +86,72 @@

Group Permissions

-
Group: [% IF group.is_bug_group %] - [% ELSE %] [% group.name FILTER html %] @@ -52,7 +43,7 @@ Description: [% IF group.is_bug_group %] - [% ELSE %] [% group.description FILTER html %] @@ -63,7 +54,7 @@
User Regexp: -
-
+
- - + + + - - - + [% PROCESS select_pair name = "members" size = 10 + items_available = members_available + items_current = members_current %] + + [% PROCESS select_pair name = "member_of" size = 10 + items_available = member_of_available + items_current = member_of_current %] -
Groups That Are a Member of This Group
- ("Users in X are automatically in - [%+ group.name FILTER html %]")		Groups That This Group Is a Member Of
- ("If you are in [% group.name FILTER html %], you are - automatically also in...")		 + Groups That Are a Member of This Group
+ ("Users in X are automatically in [% group.name FILTER html %]") + 		+ Groups That This Group Is a Member Of
+ ("If you are in [% group.name FILTER html %], you are automatically also in...") +
- [% PROCESS select_pair name = "members" size = 10 - items_available = members_available - items_current = members_current %] - [% PROCESS select_pair name = "member_of" size = 10 - items_available = member_of_available - items_current = member_of_current %]
- - + - + - - + [% PROCESS select_pair name = "bless_from" size = 10 + items_available = bless_from_available + items_current = bless_from_current %] + + [% PROCESS select_pair name = "bless_to" size = 10 + items_available = bless_to_available + items_current = bless_to_current %] -
+ Groups That Can Grant Membership in This Group
- ("Users in X can add other users to - [%+ group.name FILTER html %]") - + ("Users in X can add other users to [% group.name FILTER html %]") + 		+ Groups That This Group Can Grant Membership In
+ ("Users in [% group.name FILTER html %] can add users to...") 		Groups That This Group Can Grant Membership In
- ("Users in [% group.name FILTER html %] can add users to...") -
- [% PROCESS select_pair name = "bless_from" size = 10 - items_available = bless_from_available - items_current = bless_from_current %] - [% PROCESS select_pair name = "bless_to" size = 10 - items_available = bless_to_available - items_current = bless_to_current %] -
- [% IF Param('usevisibilitygroups') %] - + [% IF Param('usevisibilitygroups') %] - + - + - - + [% PROCESS select_pair name = "visible_from" size = 10 + items_available = visible_from_available + items_current = visible_from_current %] + + [% PROCESS select_pair name = "visible_to_me" size = 10 + items_available = visible_to_me_available + items_current = visible_to_me_current %] -
+ Groups That Can See This Group
- ("Users in X can see users in - [%+ group.name FILTER html %]") + ("Users in X can see users in [% group.name FILTER html %]") + 		+ Groups That This Group Can See
+ ("Users in [% group.name FILTER html %] can see users in...") 		Groups That This Group Can See
- ("Users in [% group.name FILTER html %] can see users in...") -
- [% PROCESS select_pair name = "visible_from" size = 10 - items_available = visible_from_available - items_current = visible_from_current %] - [% PROCESS select_pair name = "visible_to_me" size = 10 - items_available = visible_to_me_available - items_current = visible_to_me_current %] -
- [% END %] + [% END %] + @@ -178,9 +163,8 @@ This is often very useful if you upgraded from [% terms.Bugzilla %] 2.16.

-
-
+
Remove all explicit memberships from users whose login names match the following regular expression: @@ -193,41 +177,35 @@
-
- +

Back to the group list.

[% PROCESS global/footer.html.tmpl %] [% BLOCK select_pair %] - - - - - - - - - -
- - - -
+ + +
+ + + + + +
+ + [% END %] -- cgit v1.2.3-24-g4f1b