summaryrefslogtreecommitdiffstats
path: root/template/en/default/admin/keywords
diff options
context:
space:
mode:
authorMax Kanat-Alexander <mkanat@bugzilla.org>2010-02-01 22:39:54 +0100
committerMax Kanat-Alexander <mkanat@bugzilla.org>2010-02-01 22:39:54 +0100
commitd495a972854500ce323f15d024605ec395fab155 (patch)
tree841efc7d2bf92cfd90098b6a32b1d80e52c1ac4d /template/en/default/admin/keywords
parenta456dea4447c9ddd1e79e04b2456740de19ce112 (diff)
downloadbugzilla-d495a972854500ce323f15d024605ec395fab155.tar.gz
bugzilla-d495a972854500ce323f15d024605ec395fab155.tar.xz
Fix the data in the bzr repo to match the data in the CVS repo.
During the CVS imports into Bzr, there were some inconsistencies introduced (mostly that files that were deleted in CVS weren't being deleted in Bzr). So this checkin makes the bzr repo actually consistent with the CVS repo, including fixing permissions of files.
Diffstat (limited to 'template/en/default/admin/keywords')
-rw-r--r--[-rwxr-xr-x]template/en/default/admin/keywords/create.html.tmpl0
-rwxr-xr-xtemplate/en/default/admin/keywords/created.html.tmpl35
-rw-r--r--[-rwxr-xr-x]template/en/default/admin/keywords/edit.html.tmpl0
-rwxr-xr-xtemplate/en/default/admin/keywords/rebuild-cache.html.tmpl55
4 files changed, 0 insertions, 90 deletions
diff --git a/template/en/default/admin/keywords/create.html.tmpl b/template/en/default/admin/keywords/create.html.tmpl
index e5d6aa0df..e5d6aa0df 100755..100644
--- a/template/en/default/admin/keywords/create.html.tmpl
+++ b/template/en/default/admin/keywords/create.html.tmpl
diff --git a/template/en/default/admin/keywords/created.html.tmpl b/template/en/default/admin/keywords/created.html.tmpl
deleted file mode 100755
index b39981d85..000000000
--- a/template/en/default/admin/keywords/created.html.tmpl
+++ /dev/null
@@ -1,35 +0,0 @@
-[%# 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): Terry Weissman <terry@mozilla.org>
- # Vlad Dascalu <jocuri@softhome.net>
- #%]
-
-[%# INTERFACE:
- # name: string; the name of the current keyword.
- #%]
-
-[% PROCESS global/header.html.tmpl
- title = "Adding new keyword"
-%]
-
-<p>The keyword [% name FILTER html %] has been added.</p>
-
-<p><a href="editkeywords.cgi">Edit existing keywords</a> or
-<a href="editkeywords.cgi?action=add">add another keyword</a>.</p>
-
-[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/keywords/edit.html.tmpl b/template/en/default/admin/keywords/edit.html.tmpl
index c4b9a64d7..c4b9a64d7 100755..100644
--- a/template/en/default/admin/keywords/edit.html.tmpl
+++ b/template/en/default/admin/keywords/edit.html.tmpl
diff --git a/template/en/default/admin/keywords/rebuild-cache.html.tmpl b/template/en/default/admin/keywords/rebuild-cache.html.tmpl
deleted file mode 100755
index fc491c97a..000000000
--- a/template/en/default/admin/keywords/rebuild-cache.html.tmpl
+++ /dev/null
@@ -1,55 +0,0 @@
-[%# 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): Terry Weissman <terry@mozilla.org>
- # Vlad Dascalu <jocuri@softhome.net>
- # Max Kanat-Alexander <mkanat@bugzilla.org>
- #%]
-
-[%# INTERFACE:
- # action: string; the current action (either "update" or "delete").
- # keyword: A Bugzilla::Keyword object
- #%]
-
-[% IF action == "update" %]
- [% title = "Update keyword"%]
- [% status = "updated" %]
-[% ELSIF action == "delete" %]
- [% title = "Delete keyword" %]
- [% status = "deleted" %]
-[% END %]
-
-[% PROCESS global/header.html.tmpl %]
-
-Keyword [% keyword.name FILTER html %] [%+ status FILTER html %].
-
-<p>
- <b>After you have finished deleting or modifying keywords,
- you need to rebuild the keyword cache.</b><br>
-
- Warning: on a very large installation of [% terms.Bugzilla %],
- this can take several minutes.
-</p>
-
-<p>
- <b><a href="sanitycheck.cgi?rebuildkeywordcache=1">Rebuild
- keyword cache</a></b>
-</p>
-
-<p><a href="editkeywords.cgi">Edit more keywords</a>.</p>
-
-[% PROCESS global/footer.html.tmpl %]