From ac8796ba2733be5e0e618148ee12488cc567d34e Mon Sep 17 00:00:00 2001 From: "jocuri%softhome.net" <> Date: Tue, 13 Jul 2004 12:12:29 +0000 Subject: Patch for bug 190222: templatize editgroups.cgi; r=joel, a=justdave. --- template/en/default/admin/groups/change.html.tmpl | 111 ++++++++++++++ template/en/default/admin/groups/create.html.tmpl | 3 + template/en/default/admin/groups/created.html.tmpl | 38 +++++ template/en/default/admin/groups/delete.html.tmpl | 100 +++++++++++++ template/en/default/admin/groups/deleted.html.tmpl | 54 +++++++ template/en/default/admin/groups/edit.html.tmpl | 159 +++++++++++++++++++++ template/en/default/admin/groups/list.html.tmpl | 119 +++++++++++++++ template/en/default/admin/groups/remove.html.tmpl | 60 ++++++++ 8 files changed, 644 insertions(+) create mode 100644 template/en/default/admin/groups/change.html.tmpl create mode 100644 template/en/default/admin/groups/created.html.tmpl create mode 100644 template/en/default/admin/groups/delete.html.tmpl create mode 100644 template/en/default/admin/groups/deleted.html.tmpl create mode 100644 template/en/default/admin/groups/edit.html.tmpl create mode 100644 template/en/default/admin/groups/list.html.tmpl create mode 100644 template/en/default/admin/groups/remove.html.tmpl (limited to 'template/en/default/admin') diff --git a/template/en/default/admin/groups/change.html.tmpl b/template/en/default/admin/groups/change.html.tmpl new file mode 100644 index 000000000..c2f2c8f9f --- /dev/null +++ b/template/en/default/admin/groups/change.html.tmpl @@ -0,0 +1,111 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Dave Miller + # Joel Peshkin + # Jacob Steenhagen + # Vlad Dascalu + #%] + +[%# INTERFACE: + # action: integer. Can be 1, 2 or 3, depending on the action + # performed: + # 1 - remove_explicit_members + # 2 - remove_explicit_members_regexp + # 3 - no conversion, just save the changes + # changes: boolean int. Is 1 if changes occured. + # gid: integer. The ID of the group. + # name: the name of the product where removal is performed. + # regexp: the regexp according to which the update is performed. + #%] + +[% IF (action == 1) %] + [% title = "Confirm: Remove All Explicit Members?" %] +[% ELSIF (action == 2) %] + [% title = "Confirm: Remove Explicit Members in the Regular Expression?" %] +[% ELSE %] + [% title = "Updating group hierarchy" %] +[% END %] + +[% PROCESS global/header.html.tmpl %] + +

+ Checking.... + + [% IF changes %] + changed. + [% END %] +

+ +[% IF (action == 1) || (action == 2) %] + [% IF changes %] +

Group updated, please confirm removal:

+ [% END %] + + [% IF (action == 1) %] +

This option will remove all explicitly defined users + [% ELSIF regexp %] +

This option will remove all users included in the regular expression: + [% regexp FILTER html %] + [% ELSE %] +

+ There is no regular expression defined. + No users will be removed. +

+ [% END %] + + [% IF ((action == 1) || regexp) %] + from group [% name FILTER html %].

+ +

+ Generally, you will only need to do this when upgrading groups + created with [% terms.Bugzilla %] versions 2.16 and prior. Use + this option with extreme care and consult the documentation + for further information. +

+ +
+ + + [% IF (action == 2) %] + + [% ELSE %] + + [% END %] + + +

Or return to the Edit Groups page.

+
+ [% END %] +[% ELSE %] + [%# if we got this far, the admin doesn't want to convert, so just save + # their changes %] + + [% IF changes %] +

Done.

+ [% ELSE %] +

+ You didn't change anything! If you really meant it, hit the Back + button and try again. +

+ [% END %] + +

Back to the group list.

+[% END %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/groups/create.html.tmpl b/template/en/default/admin/groups/create.html.tmpl index 239d7f984..8da00a799 100644 --- a/template/en/default/admin/groups/create.html.tmpl +++ b/template/en/default/admin/groups/create.html.tmpl @@ -20,7 +20,10 @@ # Joel Peshkin # Jacob Steenhagen # Vlad Dascalu + #%] +[%# INTERFACE: + # none #%] [% PROCESS global/header.html.tmpl diff --git a/template/en/default/admin/groups/created.html.tmpl b/template/en/default/admin/groups/created.html.tmpl new file mode 100644 index 000000000..4ac051c2d --- /dev/null +++ b/template/en/default/admin/groups/created.html.tmpl @@ -0,0 +1,38 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Dave Miller + # Joel Peshkin + # Jacob Steenhagen + # Vlad Dascalu + #%] + +[%# INTERFACE: + # none + #%] + +[% PROCESS global/header.html.tmpl + title = "Adding new group" +%] + +

OK, done.

+ +

Add another group or +go 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 new file mode 100644 index 000000000..0e17cbb1c --- /dev/null +++ b/template/en/default/admin/groups/delete.html.tmpl @@ -0,0 +1,100 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Dave Miller + # Joel Peshkin + # Jacob Steenhagen + # Vlad Dascalu + #%] + +[%# INTERFACE: + # gid: number. The group ID. + # name: string. The name of the group. + # description: string. The description of the group. + # hasusers: boolean int. True if the group includes users in it. + # hasbugs: boolean int. True if the group includes bugs in it. + # hasproduct: boolean int. True if the group is binded to a product. + # buglist: string. The list of bugs included in this group. + #%] + + +[% PROCESS global/header.html.tmpl + title = "Delete group" +%] + + + + + + + + + + + + +
IdNameDescription
[% gid FILTER html %][% name FILTER html %][% desc FILTER html %]
+ +
+ [% IF hasusers %] +

One or more users belong to this group. You cannot delete + this group while there are users in it. + +
Show + me which users - Remove + all users from this group for me.

+ [% END %] + + [% IF hasbugs %] +

One or more [% terms.bug %] reports are visible only to this group. + You cannot delete this group while any [% terms.bugs %] are using it. + +
Show me + which [% terms.bugs %] - Remove + all [% terms.bugs %] from this group restriction for me.

+ +

NOTE: It's quite possible to make confidential [% terms.bugs %] + public by checking this box. It is strongly suggested + that you review the [% terms.bugs %] in this group before checking + the box.

+ [% END %] + + [% IF hasproduct %] +

This group is tied to the [% name FILTER html %] product. + You cannot delete this group while it is tied to a product. + +
Delete this group anyway, + and make the [% name FILTER html %] publicly visible.

+ [% END %] + +

Confirmation

+ +

Do you really want to delete this group?

+ [% IF (hasusers || hasbugs || hasproduct) %] +

You must check all of the above boxes or correct the + indicated problems first before you can proceed.

+ [% END %] + +

+ + +

+ +Go back to the group list. + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/groups/deleted.html.tmpl b/template/en/default/admin/groups/deleted.html.tmpl new file mode 100644 index 000000000..fc91190cb --- /dev/null +++ b/template/en/default/admin/groups/deleted.html.tmpl @@ -0,0 +1,54 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Dave Miller + # Joel Peshkin + # Jacob Steenhagen + # Vlad Dascalu + #%] + +[%# INTERFACE: + # gid: number. The group ID. + # name: string. The name of the group. + # cantdelete: boolean int. Is 1 if the group couldn't have been deleted. + #%] + + +[% PROCESS global/header.html.tmpl + title = "Deleting group" +%] + +[% IF cantdelete %] +

+ This group cannot be deleted because there are records + in the database which refer to it. All such records + must be removed or altered to remove the reference to this + group before the group can be deleted. +

+ +

+ View + the list of which records are affected. +

+[% ELSE %] +

The group [% name FILTER html %] has been deleted.

+[% END %] + +

Go back to the group list. + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/groups/edit.html.tmpl b/template/en/default/admin/groups/edit.html.tmpl new file mode 100644 index 000000000..619db777c --- /dev/null +++ b/template/en/default/admin/groups/edit.html.tmpl @@ -0,0 +1,159 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Dave Miller + # Joel Peshkin + # Jacob Steenhagen + # Vlad Dascalu + #%] + +[%# INTERFACE: + # group_id: number. The group ID. + # name: string. The name of the group. + # description: string. The description of the group. + # rexp: string. The regular expression for the users of the group. + # isactive: boolean int. Shows if the group is still active. + # isbuggroup: boolean int. Is 1 if this is a bug group. + # groups: array with group objects having the properties: + # - grpid: number. The ID of the group. + # - grpname: string. The name of the group. + # - grpdesc: string. The description of the group. + # - grpmember: boolean int. Is 1 if the current user is a group member. + # - blessmember: boolean int. Is 1 if the current user can bless members + # in the current group. + #%] + + +[% PROCESS global/header.html.tmpl + title = "Change Group" +%] + +

+ + + + + + + + + + + + + + + + + [% IF isbuggroup %] + + + + + [% END %] +
Group: + [% IF isbuggroup %] + + + [% ELSE %] + [% name FILTER html %] + [% END %] +
Description: + [% IF isbuggroup %] + + + [% ELSE %] + [% description FILTER html %] + [% END %] +
User Regexp: + + +
Use For [% terms.Bugs %]: + + +
+ +

+ Users become members of this group in one of three ways: +

    +
  • by being explicity included when the user is edited. +
  • by matching the user regexp above. +
  • by being a member of one of the groups included in this group + by checking the boxes below. +
+

+ + + + + + + + + + + + + + + [% FOREACH group = groups %] + + + + + + + [% END %] +
Members of these groups can grant membership to this group
|Members of these groups are included in this group
||
+ + + + + + [% group.grpnam FILTER html %][% group.grpdesc FILTER html %]
+ + + +

+ + + + +
+

Conversion of groups created with [% terms.Bugzilla %] + versions 2.16 and prior:

+ +
    +
  • Remove all explicit memberships from this group: + +
    • + +
  • Remove all explicit memberships that are included in the above + regular expression: + +
    • +
+
+ + + +

+ +Back to the group list. + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/groups/list.html.tmpl b/template/en/default/admin/groups/list.html.tmpl new file mode 100644 index 000000000..9e6520244 --- /dev/null +++ b/template/en/default/admin/groups/list.html.tmpl @@ -0,0 +1,119 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Dave Miller + # Joel Peshkin + # Jacob Steenhagen + # Vlad Dascalu + #%] + +[%# INTERFACE: + # groups: array with group objects having the properties: + # - id: number. The ID of the group. + # - name: string. The name of the group. + # - description: string. The description of the group. + # - regexp: string. The user regexp for the given group. + # - isactive: boolean int. Specifies if the group is active or not. + # - isbuggroup: boolean int. Specifies if it can be used for bugs. + #%] + +[% PROCESS global/header.html.tmpl + title = "Edit Groups" + h2 = "This lets you edit the groups available to put users in." +%] + + + + + + + + + + + + + [% FOREACH group = groups %] + + + + + + + + + + + + [% END %] + + + + + +
NameDescriptionUser RegExpUse For [% terms.Bugs %]TypeAction
[% group.name FILTER html %][% group.description FILTER html %][% group.regexp FILTER html %]  + [% IF (group.isactive != 0) && (group.isbuggroup) %] + X + [% ELSE %] +   + [% END %] + + [% (group.isbuggroup) ? "user" : "system" %] + + Edit + [% IF (group.isbuggroup) %] + | Delete + [% END %] +
Add Group
+ +

+ Name is what is used with the UserInGroup() 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. +

+ +

+ Description is what will be shown in the [% terms.bug %] reports +to members of the group where they can choose whether the [% terms.bug %] +will be restricted to others in the same group. +

+ +

+ User RegExp is optional, and if filled in, will automatically +grant membership to this group to anyone with an email address +that matches this perl regular expression. Do not forget +the trailing '$'. Example '@mycompany\.com$' +

+ +

+ The Use For [% terms.Bugs %] flag determines whether or not +the group is eligible to be used for [% terms.bugs %]. If you remove +this flag, 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 as well as a way to maintain +lists of users without cluttering the lists of groups used +for [% terms.bug %] restrictions. +

+ +

+ The Type field identifies system groups. +

+ +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/groups/remove.html.tmpl b/template/en/default/admin/groups/remove.html.tmpl new file mode 100644 index 000000000..0eed2d9fb --- /dev/null +++ b/template/en/default/admin/groups/remove.html.tmpl @@ -0,0 +1,60 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Dave Miller + # Joel Peshkin + # Jacob Steenhagen + # Vlad Dascalu + #%] + +[%# INTERFACE: + # remove_all: boolean int. Is 1 if the action was remove_all, + # and 0 if the action was remove_all_regexp. + # name: string. The place where removal is performed. + # regexp: string. The regexp according to which the removal is performed. + # users: array with group objects having the properties: + # - login: string. The login which is removed. + #%] + + +[% IF remove_all %] + [% title = "Removing All Explicit Group Memberships from '" + _ name _ "'" %] +[% ELSE %] + [% title = "Removing All Explicit Group Memberships Matching " + _ "Group RegExp from '" _ name _ "'" %] +[% END %] + +[% PROCESS global/header.html.tmpl %] + +[% IF remove_all %] +

Removing explicit membership

+[% ELSE %] +

Removing explicit memberships of users matching + '[% regexp FILTER html %]'...

+[% END %] + +[% FOREACH user = users %] + [% user.login FILTER html %] removed
+[% END %] + +

Done.

+ +

Back to the group list.

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