Fix for bug 98658: Let administrator know which customised templates have been update...

Patch adds a version string to every template and a check in
t/004template.t to check for version strings in templates.
Note that two templates that were not included in the initial patch
now have version strings added.

r=justdave, r2=myk

diff --git a/t/004template.t b/t/004template.t
index 4c3c898c1c103d10c42083ba2f0e80fdc3ea0323..e831e42e4d065adb44585c7bd9429b46d020121a 100644 (file)
--- a/t/004template.t
+++ b/t/004template.t
@@ -18,15 +18,16 @@
 # Rights Reserved.
 #
 # Contributor(s): Jacob Steenhagen <jake@acutex.net>
+#                   Zach Lipton <zach@zachlipton.com>
 #
 
 #################
 #Bugzilla Test 4#
-##Templates######
+####Templates####
 
 BEGIN { use lib "t/"; }
 BEGIN { use Support::Templates; }
-BEGIN { $tests = @Support::Templates::testitems * 2; }
+BEGIN { $tests = @Support::Templates::testitems * 3; }
 BEGIN { use Test::More tests => $tests; }
 
 use strict;
@@ -80,10 +81,23 @@ foreach my $file(@testitems) {
         }
     }
     else {
-        ok(1, "$file doesn't exists, skipping test");
+        ok(1, "$file doesn't exist, skipping test");
     }
 }
 open STDOUT, ">&SAVEOUT";     # redirect back to original stream
 open STDERR, ">&SAVEERR";
 close SAVEOUT;
 close SAVEERR;
+
+# check to see that all templates have a version string:
+
+foreach my $file(@testitems) {
+    open(TMPL,"$include_path/$file");
+    my $firstline = <TMPL>;
+    if ($firstline =~ /<!-- \d+\.\d+\@[\w\._]+ -->/) {
+        ok(1,"$file has a version string");
+    } else {
+        ok(0,"$file does not have a version string --ERROR");
+    }
+    close(TMPL);
+}

diff --git a/template/default/admin/account_created.tmpl b/template/default/admin/account_created.tmpl
index f104eb0ac9c10eac5bd2525ca28030834b7a81bc..ad4310ec4b10eaba4a48ca9fc8406f7da5a287a7 100644 (file)
--- a/template/default/admin/account_created.tmpl
+++ b/template/default/admin/account_created.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/admin/account_exists.tmpl b/template/default/admin/account_exists.tmpl
index 0f1882b42c5c4fc73bd99137b22cda37b8c0cb31..23b9e03382a69c195280d6cb93cfe1d340458f4c 100644 (file)
--- a/template/default/admin/account_exists.tmpl
+++ b/template/default/admin/account_exists.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/admin/change-password.html.tmpl b/template/default/admin/change-password.html.tmpl
index d3c8f42a033add941bddeca172c4da49da4f687a..29d03c030b7e7e3224bd688a31adf30093db2ada 100644 (file)
--- a/template/default/admin/change-password.html.tmpl
+++ b/template/default/admin/change-password.html.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/admin/create_account.tmpl b/template/default/admin/create_account.tmpl
index 60effdf61e3c8db04f71ac44feaf6e8bd61b9728..61ad95b8a81b14504aa0470f686678f3c83a6e42 100644 (file)
--- a/template/default/admin/create_account.tmpl
+++ b/template/default/admin/create_account.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/attachment/created.atml b/template/default/attachment/created.atml
index 49db040fecaed66292427a8a6069b7feac02a771..ab5e5ef9cd7e64ec4b0294b17fba40420e39378d 100644 (file)
--- a/template/default/attachment/created.atml
+++ b/template/default/attachment/created.atml
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/attachment/edit.atml b/template/default/attachment/edit.atml
index 8b4f4ea781da260a40d4ecb905561b108b3274f6..599aff00aac4cf1440ebb3230e9535f3fdfb9349 100755 (executable)
--- a/template/default/attachment/edit.atml
+++ b/template/default/attachment/edit.atml
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/attachment/enter.atml b/template/default/attachment/enter.atml
index 7d83e77bcab3a4bb43a9865d7ec1dcf7532a16d6..9f7d359e588b5514e343de0daef3c7e39463db46 100644 (file)
--- a/template/default/attachment/enter.atml
+++ b/template/default/attachment/enter.atml
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/attachment/list.atml b/template/default/attachment/list.atml
index f8fe4c96d7802696351590da7f3bf305279813ff..72006cf29005085066e32f80852c432ff2075200 100755 (executable)
--- a/template/default/attachment/list.atml
+++ b/template/default/attachment/list.atml
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/attachment/updated.atml b/template/default/attachment/updated.atml
index 9e511e13383e08be436022d14243478c4c4b52b8..e245957474cfd08d0ce902b87291e4e0207f860f 100755 (executable)
--- a/template/default/attachment/updated.atml
+++ b/template/default/attachment/updated.atml
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/attachment/viewall.atml b/template/default/attachment/viewall.atml
index 43aca60192fa85d7e832dd0f883d87f3b8a21216..0500a09d4f4d91980e443305fec3122ae908553a 100755 (executable)
--- a/template/default/attachment/viewall.atml
+++ b/template/default/attachment/viewall.atml
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/attachstatus/create.atml b/template/default/attachstatus/create.atml
index 7387d82ade35535f60aa2d759f66b9f1f1250630..128d811dcd9a7ec8356f3b4e5d656450dc6cedf6 100755 (executable)
--- a/template/default/attachstatus/create.atml
+++ b/template/default/attachstatus/create.atml
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/attachstatus/delete.atml b/template/default/attachstatus/delete.atml
index 6f33ee0ed155a9b62120d935f62219f82a746da3..19648c6d0a67363e1133fb1390321ee39619e0de 100644 (file)
--- a/template/default/attachstatus/delete.atml
+++ b/template/default/attachstatus/delete.atml
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/attachstatus/edit.atml b/template/default/attachstatus/edit.atml
index a2200528ac058062a28e2aa24c27930189bf7c79..366f8eb7077f79b46c80cb4699f8de1d4134a7d8 100755 (executable)
--- a/template/default/attachstatus/edit.atml
+++ b/template/default/attachstatus/edit.atml
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/attachstatus/list.atml b/template/default/attachstatus/list.atml
index 60199a2926bcbc9331f7f9a83ab1956df4be5dd9..f2d0a4f512c17cedf2796e653bc328eab6fa7070 100755 (executable)
--- a/template/default/attachstatus/list.atml
+++ b/template/default/attachstatus/list.atml
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/buglist/colchange.tmpl b/template/default/buglist/colchange.tmpl
index 4aecf96563380033311dc4228b71918f1583efb7..d3b008c49e7b75f1b68c59b596c4a9cb294084db 100644 (file)
--- a/template/default/buglist/colchange.tmpl
+++ b/template/default/buglist/colchange.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/buglist/server-push.html.tmpl b/template/default/buglist/server-push.html.tmpl
index be10f7ab30eb3e89aa5395659849c1a084663da3..5a2dde0b1a9056efc9dfacdea4109e93c62a15fe 100644 (file)
--- a/template/default/buglist/server-push.html.tmpl
+++ b/template/default/buglist/server-push.html.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/entry/enter_bug.tmpl b/template/default/entry/enter_bug.tmpl
index 57e9b8689bc6a3ee4ee9963bdc01d1d715879c14..446aeb72964948226ab09f71f83d9d79bb419e83 100644 (file)
--- a/template/default/entry/enter_bug.tmpl
+++ b/template/default/entry/enter_bug.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/global/choose_product.tmpl b/template/default/global/choose_product.tmpl
index 03d3fcd63473de3515f9d95a49425e1d3045204a..31d9ea7bad814986f13c0351d83c6169707a5fe9 100644 (file)
--- a/template/default/global/choose_product.tmpl
+++ b/template/default/global/choose_product.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/global/footer b/template/default/global/footer
index e06d3d8e1fabfefa9a02a9e96896af8113703511..98d525a7881a8668feb436349e6f81bb2b603c68 100755 (executable)
--- a/template/default/global/footer
+++ b/template/default/global/footer
@@ -1,4 +1,4 @@
-
+<!-- 1.0@bugzilla.org -->
 [% PerformSubsts(Param('footerhtml')) %]
 
 </body>

diff --git a/template/default/global/header b/template/default/global/header
index d175dd4dfe5934ad93a0fc3e9698fd4c21618221..5e6a183dde79e49d43f717a6c4bb1f9b2cf047af 100755 (executable)
--- a/template/default/global/header
+++ b/template/default/global/header
@@ -1,3 +1,4 @@
+<!-- 1.0@bugzilla.org -->
 [% DEFAULT
   title = ""
   h1 = title

diff --git a/template/default/global/message.html.tmpl b/template/default/global/message.html.tmpl
index 912e9f32226139296248d3f11b5e001d1b52b31f..d0c8281eb50acaeb8feeee456d5c69844671b10a 100644 (file)
--- a/template/default/global/message.html.tmpl
+++ b/template/default/global/message.html.tmpl
@@ -1,3 +1,4 @@
+<!-- 1.0@bugzilla.org -->
 [% DEFAULT title = "Bugzilla Message" %]
 
 [% PROCESS global/header %]

diff --git a/template/default/index.tmpl b/template/default/index.tmpl
index 7620a3d69836402ccb9ced3b546065da357e1f45..2f3603c682d59958eb95eb60931494d6262e6f4c 100644 (file)
--- a/template/default/index.tmpl
+++ b/template/default/index.tmpl
@@ -1,3 +1,4 @@
+<!-- 1.0@bugzilla.org -->
 [%# -*- mode: html -*- %]
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file

diff --git a/template/default/info/describe-components.tmpl b/template/default/info/describe-components.tmpl
index 0685596670f3b691ce47232daf217422fa47187f..5ee8bf4a0b266ceb381eeaec996ee0656c102571 100644 (file)
--- a/template/default/info/describe-components.tmpl
+++ b/template/default/info/describe-components.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/info/describe-keywords.html.tmpl b/template/default/info/describe-keywords.html.tmpl
index 7e77423349ac237878d4ab153a67062492473c60..3c897026b363ca2fdacb21874ef00d9563baa74d 100644 (file)
--- a/template/default/info/describe-keywords.html.tmpl
+++ b/template/default/info/describe-keywords.html.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/info/quips.tmpl b/template/default/info/quips.tmpl
index b48bb631afffcac6db77aa0abc4add2cf0815b75..37e9d863fb3c268b21ebd147f8b9fcae046f8872 100644 (file)
--- a/template/default/info/quips.tmpl
+++ b/template/default/info/quips.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/prefs/userprefs.tmpl b/template/default/prefs/userprefs.tmpl
index 91bb4f02735cda6df85487b7c05677e451484517..8992794b1127ac3aedf4696053763abb3599e63f 100644 (file)
--- a/template/default/prefs/userprefs.tmpl
+++ b/template/default/prefs/userprefs.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/query/query.atml b/template/default/query/query.atml
index 94bcb5c5d99c593bc9fa8ca493b2537ccb25d074..8591b748ce74275c66618be0d339f2ebb93dbcaf 100644 (file)
--- a/template/default/query/query.atml
+++ b/template/default/query/query.atml
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/show/activity.html.tmpl b/template/default/show/activity.html.tmpl
index 12fcc2b6ee5d68064f376a7504386939443df3c9..3ebb970e3cbbdae8a5a82c31532169bcf9a32b4b 100644 (file)
--- a/template/default/show/activity.html.tmpl
+++ b/template/default/show/activity.html.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/show/bug-activity.html.tmpl b/template/default/show/bug-activity.html.tmpl
index b298eb0d9961a9d764309f1cc6644bf3c32dcd66..387ba6d6c6cf110c43d758eb87ac07bb68deed55 100644 (file)
--- a/template/default/show/bug-activity.html.tmpl
+++ b/template/default/show/bug-activity.html.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/show/choose_bug.html.tmpl b/template/default/show/choose_bug.html.tmpl
index 1df89ce8f54c1a0f92cb088a650fd171ddcc7dc9..b776ff255ed7226775761525e9bd4836adf28cbb 100644 (file)
--- a/template/default/show/choose_bug.html.tmpl
+++ b/template/default/show/choose_bug.html.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/show/choose_xml.html.tmpl b/template/default/show/choose_xml.html.tmpl
index 7418be91dc94534940c4163b6698b122a91d270a..4456534f5bad6bd173921e3dd40c8ce877032a26 100644 (file)
--- a/template/default/show/choose_xml.html.tmpl
+++ b/template/default/show/choose_xml.html.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/show/comments.tmpl b/template/default/show/comments.tmpl
index a840d63248a2606a4428903b7c14ff9cbb490d63..14828175d5543fd9246aadca9a370397e125178a 100644 (file)
--- a/template/default/show/comments.tmpl
+++ b/template/default/show/comments.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/show/multiple.tmpl b/template/default/show/multiple.tmpl
index 8706d891241108c2c7da1432e0e05d2743bfa4f7..2673c54571792607d933f7549719685f0e044f4d 100644 (file)
--- a/template/default/show/multiple.tmpl
+++ b/template/default/show/multiple.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/show/show_bug.html.tmpl b/template/default/show/show_bug.html.tmpl
index 5006a92eb2fdbe6706cbcfa2ee3e1f946d47a3a7..62e43f2225be482125d8347fb14d8c5d50ab0754 100644 (file)
--- a/template/default/show/show_bug.html.tmpl
+++ b/template/default/show/show_bug.html.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/sidebar/xul.tmpl b/template/default/sidebar/xul.tmpl
index 2991af580c9019a1a6c79bd24612f23efaa4594d..9f42ddf3ba7487c65f889a8fcbdb320ae1e5a494 100644 (file)
--- a/template/default/sidebar/xul.tmpl
+++ b/template/default/sidebar/xul.tmpl
@@ -1,3 +1,4 @@
+<!-- 1.0@bugzilla.org -->
 [%# -*- mode: sgml -*- %]
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file

diff --git a/template/default/token/confirmemail.html.tmpl b/template/default/token/confirmemail.html.tmpl
index 848828e6085f3919f1e5f5e638ffdd19fd029dfb..e34a93e63cf6302f42654823590013221705e6db 100644 (file)
--- a/template/default/token/confirmemail.html.tmpl
+++ b/template/default/token/confirmemail.html.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/token/emailchangenew.txt.tmpl b/template/default/token/emailchangenew.txt.tmpl
index 36bf02bf86a125cbd32d149fa1d580ba0e88f5a3..7fd195c6fe0a0ca5bf3d6439effdd6f6463c1a20 100644 (file)
--- a/template/default/token/emailchangenew.txt.tmpl
+++ b/template/default/token/emailchangenew.txt.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/token/emailchangeold.txt.tmpl b/template/default/token/emailchangeold.txt.tmpl
index ce7ccd08cdd3d20503a1833321ecc8d78fe1060f..14bea8a22534a77a00864bc324861612dcbfede6 100644 (file)
--- a/template/default/token/emailchangeold.txt.tmpl
+++ b/template/default/token/emailchangeold.txt.tmpl
@@ -1,3 +1,4 @@
+<!-- 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

diff --git a/template/default/token/tokencancel.txt.tmpl b/template/default/token/tokencancel.txt.tmpl
index bcab8c38865131b63ea69a4627bae2594b079c1f..1a9097115854e0c677a3e3f4a3dbe7b947f4c98b 100644 (file)
--- a/template/default/token/tokencancel.txt.tmpl
+++ b/template/default/token/tokencancel.txt.tmpl
@@ -1,3 +1,4 @@
+<!-- 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