Bug 725923: backport bug 663835 to extend test coverage to extensions

15 files changed, 168 insertions, 271 deletions

diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index e8b8e5173..3de85dbec 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -302,9 +302,10 @@ sub bugmail_recipients {
     if (@$diffs) {
         # Changed bug
         foreach my $ref (@$diffs) {
-            my ($who, $whoname, $what, $when, 
-                $old, $new, $attachid, $fieldname) = (@$ref);
-            
+            my $old = $ref->{old};
+            my $new = $ref->{new};
+            my $fieldname = $ref->{field_name};
+
             if ($fieldname eq "bug_group") {
                 _cc_if_special_group($old, $recipients);
                 _cc_if_special_group($new, $recipients);
diff --git a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
index 35f086abf..ccf008a38 100644
--- a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
@@ -19,123 +19,19 @@
   # Contributor(s): Matthew Tuck <matty@chariot.net.au>
   #%]
 
-[%# Migration note: this file corresponds to the old Param
-  # 'entryheaderhtml'
-  #%]
-
-[%# You can make the output of this template product-specific by using
-  # Template Toolkit IF statements.  The current product name is stored in
-  # the 'product' variable.
-  #%]
-
 [% PROCESS global/variables.none.tmpl %]
 
-[% IF product == "Bugzilla" %]
-  [% IF format == "guided" %]
-<p align="center">
-<table WIDTH="90%" BGCOLOR="#FFFFFF" style="border: 8px double red;"><tr>
-<td valign="middle" align="center"><img width="200" height="200" src="extensions/BMO/web/images/stop-sign.gif"></td>
-<td align="center" valign="middle">
-<font size="+2"><b>
-Are you here because you have a problem with
-<a href="http://www.mozilla.com/firefox/">Firefox</a> or
-<a href="http://www.mozilla.com/thunderbird/">Thunderbird</a>?</b><br>
-<b>If so, you're in the wrong place.</b></font><br>
-
-If you are having a problem with Firefox,
-<a href="https://bugzilla.mozilla.org/enter_bug.cgi?product=Firefox">file
-your [% terms.bug %] in the Firefox product</a>.<br>
-
-If you are having a problem with Thunderbird,
-<a href="https://bugzilla.mozilla.org/enter_bug.cgi?product=Thunderbird">file
-your [% terms.bug %] in the Thunderbird product</a>.<br>
-
-If none of those is a good fit for your [% terms.bug %], you can pick from
-the <a href="https://bugzilla.mozilla.org/enter_bug.cgi">full product list</a>.
-</td></tr></table>
-
-</p>
-
-<h3>Step 0 - Make sure you are in the right place</h3>
-
-  [% END %]
-
-<p>
-<b>The product you have chosen is for [% terms.bug %] reports and enhancement requests for the 
-<a href="http://www.bugzilla.org/">[% terms.Bugzilla +%] [%+ terms.bug %] tracking software</a> only.</b>
-If your [% terms.bug %] is not reporting that [% terms.Bugzilla %] is broken or that you'd like
-a new feature in [% terms.Bugzilla %], your [% terms.bug %] report does not belong in this product.
-[% IF format == "guided" %]
-   See the instructions next to the stop sign above.
-[% ELSE %]
-   Please <a href="https://bugzilla.mozilla.org/enter_bug.cgi">choose a different product</a>.
-[% END %]
-</p>
-
-<p><b>We WILL NOT accept [% terms.bug %] reports for [% terms.Bugzilla %]
-installed via the Debian packaging system.  If you obtained [% terms.Bugzilla %] from Debian,
-please visit the <a href="http://www.debian.org/support">Debian Support page</a>,
-or file a [% terms.bug %] on the <a href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=bugzilla">Debian
-[% terms.Bug %] Tracker</a>.</b>  The Debian package maintainer will then determine whether the [% terms.bug %]
-is specific to the package or not, and can move the [% terms.bug %] "upstream" if needed.</p>
-
-<p>
-[% terms.Bugs %] specific to bugzilla.mozilla.org, rather than the [% terms.Bugzilla %] software in
-general (which is used by many sites), should be filed in the
-<a href="enter_bug.cgi?product=mozilla.org">mozilla.org product</a>.
-</p>
-
-<p>
-Please do not file test [% terms.bugs %] or support requests here!  You 
-can test [% terms.Bugzilla %] at 
-<a href="http://landfill.bugzilla.org/">landfill.bugzilla.org</a> and ask
-for support in the 
-<a href="news://news.mozilla.org/mozilla.support.bugzilla">
-mozilla.support.bugzilla newsgroup</a>,
-<a href="mailto:support-bugzilla&#64;lists.mozilla.org">
-support-bugzilla&#64;lists.mozilla.org mailing list</a>, or 
-<a href="irc://irc.mozilla.org/mozwebtools">#mozwebtools IRC channel</a>.
-</p>
-
-<hr>
-
-[% ELSE %]
-
-  [% IF format != "guided" %]
-<p>
-[% UNLESS cloned_bug_id %]
-Consider using the
-<a href="enter_bug.cgi?product=[% product.name FILTER html %]&amp;format=guided"
-><img src="extensions/BMO/web/images/guided.png" width="16" height="16" align="absmiddle" border="0">
-[% terms.Bugzilla %] Helper</a> instead of this form.
-[% END +%]
-Before reporting a [% terms.bug %], make sure you've read our
-<a href="http://www.mozilla.org/quality/bug-writing-guidelines.html">
-[% terms.bug %] writing guidelines</a> and double checked that your [% terms.bug %] hasn't already
-been reported. Consult our list of
-<a href="https://bugzilla.mozilla.org/duplicates.cgi">
-most frequently reported [% terms.bugs %]</a> and
-<a href="https://bugzilla.mozilla.org/query.cgi">search through descriptions</a>
-of previously reported [% terms.bugs %].
-</p>
-  [% ELSE %]
 <p>
-  This form prompts you for the information required to
-  file a good [% terms.bug %] report (or enhancement request.)
-  It may seem lengthy, but developers need all this information
-  to understand and reproduce the [% terms.bug %], which is the first step towards
-  fixing it. Please note that <strong>we do not accept [% terms.bug %] reports by
-  email</strong> - please do not email developers or mozilla.org staff
-  with [% terms.bug %] reports. <font color="red">Also, please do not
-  file [% terms.bugs %] on browser/email software older than two weeks - first,
-  download a newer build of
-  <a href="http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/">Firefox</a>,
-  <a href="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-comm-central/">Thunderbird</a>,
-  <a href="http://ftp.mozilla.org/pub/mozilla.org/seamonkey/nightly/latest-comm-central-trunk/">SeaMonkey</a>,
-  or
-  <a href="http://ftp.mozilla.org/pub/mozilla.org/camino/nightly/">Camino</a>
-  and check that the problem is still present.
-  </font>
+  [% UNLESS cloned_bug_id %]
+    Consider using the
+    <a href="enter_bug.cgi?product=[% product.name FILTER html %]&amp;format=guided"
+    ><img src="extensions/BMO/web/images/guided.png" width="16" height="16" align="absmiddle" border="0">
+    [%+ terms.Bugzilla %] Helper</a> instead of this form.
+  [% END +%]
+  Before reporting a [% terms.bug %], make sure you've read our
+  <a href="http://www.mozilla.org/quality/bug-writing-guidelines.html">
+  [% terms.bug %] writing guidelines</a> and double checked that your [% terms.bug %] hasn't already
+  been reported. Consult our list of <a href="https://bugzilla.mozilla.org/duplicates.cgi">
+  most frequently reported [% terms.bugs %]</a> and <a href="https://bugzilla.mozilla.org/query.cgi">
+  search through descriptions</a> of previously reported [% terms.bugs %].
 </p>
-  [% END %]
-[% END %]
diff --git a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
index 8bccaea9d..23302cbb5 100644
--- a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
@@ -20,16 +20,16 @@
   #                 Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl 
-   title = "$terms.Bugzilla Etiquette" 
+[% PROCESS global/header.html.tmpl 
+   title = "Bugzilla Etiquette" 
    style = "li { margin: 5px } .heading { font-weight: bold }" %]
 
 <p>
   There's a number of <i lang="fr">faux pas</i> you can commit when using 
-  [% terms.Bugzilla %]. At the very   
+  [%+ terms.Bugzilla %]. At the very   
   least, these will make Mozilla contributors upset at you; if committed enough    
   times they will cause those contributors to demand the disabling of your
-  [% terms.Bugzilla %] account. So, ignore this advice at your peril. 
+  [%+ terms.Bugzilla %] account. So, ignore this advice at your peril. 
 </p>
 
 <p>
diff --git a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
index 6982148cd..3e6695484 100644
--- a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
@@ -144,7 +144,7 @@
           [% END %]
           <td>
             [% IF change.attachid %]
-              <a href="attachment.cgi?id=[% change.attachid FILTER url %]"
+              <a href="attachment.cgi?id=[% change.attachid FILTER uri %]"
                  title="[% change.attach.description FILTER html %]
                         [%- %] - [% change.attach.filename FILTER html %]"
               >Attachment #[% change.attachid FILTER html %]</a>
@@ -164,7 +164,7 @@
     [% END %]
   </table>
   <p>
-    <a href="buglist.cgi?bug_id=[% bug_ids.join(',') FILTER url %]">
+    <a href="buglist.cgi?bug_id=[% bug_ids.join(',') FILTER uri %]">
     Show as a [% terms.Bug %] List</a>
   </p>
 
@@ -204,16 +204,16 @@
 
 [% BLOCK sort_when_link %]
   <a href="page.cgi?id=user_activity.html&amp;action=run&amp;
-    [%~%]who=[% who FILTER url %]&amp;
-    [%~%]from=[% from FILTER url %]&amp;
-    [%~%]to=[% to FILTER url %]&amp;
+    [%~%]who=[% who FILTER uri %]&amp;
+    [%~%]from=[% from FILTER uri %]&amp;
+    [%~%]to=[% to FILTER uri %]&amp;
     [%~%]sort=when">When</a>
 [% END %]
 
 [% BLOCK sort_bug_link %]
   <a href="page.cgi?id=user_activity.html&amp;action=run&amp;
-    [%~%]who=[% who FILTER url %]&amp;
-    [%~%]from=[% from FILTER url %]&amp;
-    [%~%]to=[% to FILTER url %]&amp;
+    [%~%]who=[% who FILTER uri %]&amp;
+    [%~%]from=[% from FILTER uri %]&amp;
+    [%~%]to=[% to FILTER uri %]&amp;
     [%~%]sort=bug">[% terms.Bug %]</a>
 [% END %]
diff --git a/extensions/BMO/web/js/sorttable.js b/extensions/BMO/web/js/sorttable.js
index 1703a06ae..33b35de88 100644
--- a/extensions/BMO/web/js/sorttable.js
+++ b/extensions/BMO/web/js/sorttable.js
@@ -588,66 +588,66 @@ window.onload = sorttable.init;
 // http://dean.edwards.name/weblog/2005/10/add-event/
 
 function dean_addEvent(element, type, handler) {
-	if (element.addEventListener) {
-		element.addEventListener(type, handler, false);
-	} else {
-		// assign each event handler a unique ID
-		if (!handler.$$guid) handler.$$guid = dean_addEvent.guid++;
-		// create a hash table of event types for the element
-		if (!element.events) element.events = {};
-		// create a hash table of event handlers for each element/event pair
-		var handlers = element.events[type];
-		if (!handlers) {
-			handlers = element.events[type] = {};
-			// store the existing event handler (if there is one)
-			if (element["on" + type]) {
-				handlers[0] = element["on" + type];
-			}
-		}
-		// store the event handler in the hash table
-		handlers[handler.$$guid] = handler;
-		// assign a global event handler to do all the work
-		element["on" + type] = handleEvent;
-	}
+  if (element.addEventListener) {
+    element.addEventListener(type, handler, false);
+  } else {
+    // assign each event handler a unique ID
+    if (!handler.$$guid) handler.$$guid = dean_addEvent.guid++;
+    // create a hash table of event types for the element
+    if (!element.events) element.events = {};
+    // create a hash table of event handlers for each element/event pair
+    var handlers = element.events[type];
+    if (!handlers) {
+      handlers = element.events[type] = {};
+      // store the existing event handler (if there is one)
+      if (element["on" + type]) {
+        handlers[0] = element["on" + type];
+      }
+    }
+    // store the event handler in the hash table
+    handlers[handler.$$guid] = handler;
+    // assign a global event handler to do all the work
+    element["on" + type] = handleEvent;
+  }
 };
 // a counter used to create unique IDs
 dean_addEvent.guid = 1;
 
 function removeEvent(element, type, handler) {
-	if (element.removeEventListener) {
-		element.removeEventListener(type, handler, false);
-	} else {
-		// delete the event handler from the hash table
-		if (element.events && element.events[type]) {
-			delete element.events[type][handler.$$guid];
-		}
-	}
+  if (element.removeEventListener) {
+    element.removeEventListener(type, handler, false);
+  } else {
+    // delete the event handler from the hash table
+    if (element.events && element.events[type]) {
+      delete element.events[type][handler.$$guid];
+    }
+  }
 };
 
 function handleEvent(event) {
-	var returnValue = true;
-	// grab the event object (IE uses a global event object)
-	event = event || fixEvent(((this.ownerDocument || this.document || this).parentWindow || window).event);
-	// get a reference to the hash table of event handlers
-	var handlers = this.events[event.type];
-	// execute each event handler
-	for (var i in handlers) {
-		this.$$handleEvent = handlers[i];
-		if (this.$$handleEvent(event) === false) {
-			returnValue = false;
-		}
-	}
-	return returnValue;
+  var returnValue = true;
+  // grab the event object (IE uses a global event object)
+  event = event || fixEvent(((this.ownerDocument || this.document || this).parentWindow || window).event);
+  // get a reference to the hash table of event handlers
+  var handlers = this.events[event.type];
+  // execute each event handler
+  for (var i in handlers) {
+    this.$$handleEvent = handlers[i];
+    if (this.$$handleEvent(event) === false) {
+      returnValue = false;
+    }
+  }
+  return returnValue;
 };
 
 function fixEvent(event) {
-	// add W3C standard event methods
-	event.preventDefault = fixEvent.preventDefault;
-	event.stopPropagation = fixEvent.stopPropagation;
-	return event;
+  // add W3C standard event methods
+  event.preventDefault = fixEvent.preventDefault;
+  event.stopPropagation = fixEvent.stopPropagation;
+  return event;
 };
 fixEvent.preventDefault = function() {
-	this.returnValue = false;
+  this.returnValue = false;
 };
 fixEvent.stopPropagation = function() {
   this.cancelBubble = true;
@@ -655,55 +655,55 @@ fixEvent.stopPropagation = function() {
 
 // Dean's forEach: http://dean.edwards.name/base/forEach.js
 /*
-	forEach, version 1.0
-	Copyright 2006, Dean Edwards
-	License: http://www.opensource.org/licenses/mit-license.php
+  forEach, version 1.0
+  Copyright 2006, Dean Edwards
+  License: http://www.opensource.org/licenses/mit-license.php
 */
 
 // array-like enumeration
 if (!Array.forEach) { // mozilla already supports this
-	Array.forEach = function(array, block, context) {
-		for (var i = 0; i < array.length; i++) {
-			block.call(context, array[i], i, array);
-		}
-	};
+  Array.forEach = function(array, block, context) {
+    for (var i = 0; i < array.length; i++) {
+      block.call(context, array[i], i, array);
+    }
+  };
 }
 
 // generic enumeration
 Function.prototype.forEach = function(object, block, context) {
-	for (var key in object) {
-		if (typeof this.prototype[key] == "undefined") {
-			block.call(context, object[key], key, object);
-		}
-	}
+  for (var key in object) {
+    if (typeof this.prototype[key] == "undefined") {
+      block.call(context, object[key], key, object);
+    }
+  }
 };
 
 // character enumeration
 String.forEach = function(string, block, context) {
-	Array.forEach(string.split(""), function(chr, index) {
-		block.call(context, chr, index, string);
-	});
+  Array.forEach(string.split(""), function(chr, index) {
+    block.call(context, chr, index, string);
+  });
 };
 
 // globally resolve forEach enumeration
 var forEach = function(object, block, context) {
-	if (object) {
-		var resolve = Object; // default
-		if (object instanceof Function) {
-			// functions have a "length" property
-			resolve = Function;
-		} else if (object.forEach instanceof Function) {
-			// the object implements a custom forEach method so use that
-			object.forEach(block, context);
-			return;
-		} else if (typeof object == "string") {
-			// the object is a string
-			resolve = String;
-		} else if (typeof object.length == "number") {
-			// the object is array-like
-			resolve = Array;
-		}
-		resolve.forEach(object, block, context);
-	}
+  if (object) {
+    var resolve = Object; // default
+    if (object instanceof Function) {
+      // functions have a "length" property
+      resolve = Function;
+    } else if (object.forEach instanceof Function) {
+      // the object implements a custom forEach method so use that
+      object.forEach(block, context);
+      return;
+    } else if (typeof object == "string") {
+      // the object is a string
+      resolve = String;
+    } else if (typeof object.length == "number") {
+      // the object is array-like
+      resolve = Array;
+    }
+    resolve.forEach(object, block, context);
+  }
 };
 
diff --git a/extensions/BMO/web/js/swag.js b/extensions/BMO/web/js/swag.js
index 47886b2a9..cd9561b54 100644
--- a/extensions/BMO/web/js/swag.js
+++ b/extensions/BMO/web/js/swag.js
@@ -19,42 +19,42 @@ function evalToNumberString(numberString) {
 function getTotal(item_array) {
     var total = 0;
     for(var i in item_array) {
-	total += evalToNumber(document.getElementById(item_array[i]).value);
+        total += evalToNumber(document.getElementById(item_array[i]).value);
     }
     return total;
 }
 
 function calculateTotalSwag() {   
     document.getElementById('Totalswag').value = 
-	getTotal( new Array('Lanyards',
-			'Stickers',
-			'Bracelets',
-			'Tattoos',
-			'Buttons',
-			'Posters'));
+        getTotal( new Array('Lanyards',
+            'Stickers',
+            'Bracelets',
+            'Tattoos',
+            'Buttons',
+            'Posters'));
     
 }
 
 
 function calculateTotalMensShirts() {   
     document.getElementById('mens_total').value = 
-	getTotal( new Array('mens_s',
-			'mens_m',
-			'mens_l',
-			'mens_xl',
-			'mens_xxl',
-			'mens_xxxl'));
+    getTotal( new Array('mens_s',
+            'mens_m',
+            'mens_l',
+            'mens_xl',
+            'mens_xxl',
+            'mens_xxxl'));
     
 }
 
 
 function calculateTotalWomensShirts() {   
     document.getElementById('womens_total').value = 
-	getTotal( new Array('womens_s',
-			'womens_m',
-			'womens_l',
-			'womens_xl',
-			'womens_xxl',
-			'womens_xxxl'));
+    getTotal( new Array('womens_s',
+            'womens_m',
+            'womens_l',
+            'womens_xl',
+            'womens_xxl',
+            'womens_xxxl'));
     
 }
diff --git a/extensions/ComponentWatching/template/en/default/account/prefs/component_watch.html.tmpl b/extensions/ComponentWatching/template/en/default/account/prefs/component_watch.html.tmpl
index 225cca3bb..dd2fb0560 100644
--- a/extensions/ComponentWatching/template/en/default/account/prefs/component_watch.html.tmpl
+++ b/extensions/ComponentWatching/template/en/default/account/prefs/component_watch.html.tmpl
@@ -113,7 +113,7 @@ You are currently watching:
 [% FOREACH watch IN watches %]
   <tr>
   [% IF (watch.component) %]
-    <td><input type="checkbox" name="del_[% watch.product.id FILTER uri %]_[% watch.component.id FILTER uri %]" value="1"></td>
+    <td><input type="checkbox" name="del_[% watch.product.id FILTER html %]_[% watch.component.id FILTER html %]" value="1"></td>
     <td>[% watch.component.product.name FILTER html %]</td>
     <td>
       <a href="buglist.cgi?product=[% watch.product.name FILTER uri ~%]
@@ -122,10 +122,10 @@ You are currently watching:
       </a>
     </td>
   [% ELSE %]
-    <td><input type="checkbox" name="del_[% watch.product.id FILTER uri %]" value="1"></td>
+    <td><input type="checkbox" name="del_[% watch.product.id FILTER html %]" value="1"></td>
     <td>[% watch.product.name FILTER html %]</td>
     <td>
-      <a href="describecomponents.cgi?product=[% watch.product.name FILTER uri %]">
+      <a href="describecomponents.cgi?product=[% watch.product.name FILTER html %]">
       __Any__
       </a>
     </td>
diff --git a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
index 053bcdd99..6e511b4a6 100644
--- a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
+++ b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
@@ -146,7 +146,7 @@ dupes.setLabels(
     <td class="product_img">
       <a href="javascript:void(0)"
       [% IF onclick %]
-      onclick="[% onclick FILTER none %]"
+      onclick="[% onclick FILTER html %]"
       [% ELSE %]
       onclick="product.select('[% name FILTER js %]')"
       [% END %]
@@ -157,7 +157,7 @@ dupes.setLabels(
       <h2>
         <a href="javascript:void(0)"
         [% IF onclick %]
-        onclick="[% onclick FILTER none %]"
+        onclick="[% onclick FILTER html %]"
         [% ELSE %]
         onclick="product.select('[% name FILTER js %]')"
         [% END %]
diff --git a/extensions/GuidedBugEntry/web/js/guided.js b/extensions/GuidedBugEntry/web/js/guided.js
index f9506f09c..a285d6303 100644
--- a/extensions/GuidedBugEntry/web/js/guided.js
+++ b/extensions/GuidedBugEntry/web/js/guided.js
@@ -500,7 +500,7 @@ var dupes = {
       // run the search
       Dom.removeClass(dupes._elList, 'hidden');
 
-	    dupes._dataTable.showTableMessage(
+      dupes._dataTable.showTableMessage(
         'Searching for similar issues...&nbsp;&nbsp;&nbsp;' +
         '<img src="extensions/GuidedBugEntry/web/images/throbber.gif"' + 
         ' width="16" height="11">',
diff --git a/extensions/REMO/web/js/swag.js b/extensions/REMO/web/js/swag.js
index 47886b2a9..3b69bbab8 100644
--- a/extensions/REMO/web/js/swag.js
+++ b/extensions/REMO/web/js/swag.js
@@ -19,42 +19,42 @@ function evalToNumberString(numberString) {
 function getTotal(item_array) {
     var total = 0;
     for(var i in item_array) {
-	total += evalToNumber(document.getElementById(item_array[i]).value);
+    total += evalToNumber(document.getElementById(item_array[i]).value);
     }
     return total;
 }
 
 function calculateTotalSwag() {   
     document.getElementById('Totalswag').value = 
-	getTotal( new Array('Lanyards',
-			'Stickers',
-			'Bracelets',
-			'Tattoos',
-			'Buttons',
-			'Posters'));
+    getTotal( new Array('Lanyards',
+            'Stickers',
+            'Bracelets',
+            'Tattoos',
+            'Buttons',
+            'Posters'));
     
 }
 
 
 function calculateTotalMensShirts() {   
     document.getElementById('mens_total').value = 
-	getTotal( new Array('mens_s',
-			'mens_m',
-			'mens_l',
-			'mens_xl',
-			'mens_xxl',
-			'mens_xxxl'));
+    getTotal( new Array('mens_s',
+            'mens_m',
+            'mens_l',
+            'mens_xl',
+            'mens_xxl',
+            'mens_xxxl'));
     
 }
 
 
 function calculateTotalWomensShirts() {   
     document.getElementById('womens_total').value = 
-	getTotal( new Array('womens_s',
-			'womens_m',
-			'womens_l',
-			'womens_xl',
-			'womens_xxl',
-			'womens_xxxl'));
+    getTotal( new Array('womens_s',
+            'womens_m',
+            'womens_l',
+            'womens_xl',
+            'womens_xxl',
+            'womens_xxxl'));
     
 }
diff --git a/extensions/Splinter/template/en/default/pages/splinter.html.tmpl b/extensions/Splinter/template/en/default/pages/splinter.html.tmpl
index 352c97d2f..f2a78f7ce 100644
--- a/extensions/Splinter/template/en/default/pages/splinter.html.tmpl
+++ b/extensions/Splinter/template/en/default/pages/splinter.html.tmpl
@@ -30,7 +30,7 @@
                  "js/yui/assets/skins/sam/button.css",
                  "js/yui/assets/skins/sam/datatable.css",
                  "extensions/Splinter/web/splinter.css",
-                 "skins/standard/bug_groups.css" ]
+                 "skins/custom/bug_groups.css" ]
   javascript_urls = [ "js/yui/element/element-min.js",
                       "js/yui/container/container-min.js",
                       "js/yui/button/button-min.js", 
diff --git a/extensions/Splinter/template/en/default/pages/splinter/help.html.tmpl b/extensions/Splinter/template/en/default/pages/splinter/help.html.tmpl
index 3e4ca4787..87f082427 100644
--- a/extensions/Splinter/template/en/default/pages/splinter/help.html.tmpl
+++ b/extensions/Splinter/template/en/default/pages/splinter/help.html.tmpl
@@ -27,7 +27,7 @@
 <p>
   Splinter is an add-on for [% terms.Bugzilla %] to allow conveniently
   reviewing patches that people have attached to
-  [% terms.Bugzilla %]. <a href="http://fishsoup.net/software/splinter">More
+  [%+ terms.Bugzilla %]. <a href="http://fishsoup.net/software/splinter">More
   information about Splinter</a>.
 </p>
 <h3>The patch review view</h3>
@@ -82,7 +82,7 @@
   </li>
   <li>
     A change to the attachment status. (This is specific to
-    [% terms.Bugzilla %] instances that have attachment status, which is a
+    [%+ terms.Bugzilla %] instances that have attachment status, which is a
     non-upstream patch. It's somewhat similar to attachment flags,
     which splinter doesn't currently support displaying or
     changing.) This allows you to mark a patch as read to commit
@@ -93,7 +93,7 @@
 <p>
   Once you are done writing your review, go back to Overview page
   and click the "Publish" button to submit it as a comment on the
-  [% terms.bug %]. The comment will have a link back to the review page so
+  [%+ terms.bug %]. The comment will have a link back to the review page so
   that people can see your comments with the full context.
 </p>
 <h3>Saved drafts</h3>
@@ -122,7 +122,7 @@
 <h3>Uploading patches for review</h3>
 <p>
   Splinter doesn't really care how patches are provided to
-  [% terms.Bugzilla %], as long as tmey are well-formatted patches. If you are
+  [%+ terms.Bugzilla %], as long as tmey are well-formatted patches. If you are
   using Git for version control, you can either format changes as
   patches
   using <a href="http://www.kernel.org/pub/software/scm/git/docs/git-format-patch.html">'git
diff --git a/skins/custom/global.css b/skins/custom/global.css
index 8f233e556..41494cc2e 100644
--- a/skins/custom/global.css
+++ b/skins/custom/global.css
@@ -4,26 +4,26 @@
  */
 
 body {
-	margin: 0;
-	padding: 15px 15px 2px 15px;
-	background: none;
+    margin: 0;
+    padding: 15px 15px 2px 15px;
+    background: none;
 }
 
 #header {
-	margin-bottom: 0.5em;
+    margin-bottom: 0.5em;
 }
 
 #header .links {
-	font-size: 90%;
+    font-size: 90%;
 }
 
 #header .btn, #header .txt {
-	font-size: 100%;
+    font-size: 100%;
 }
 
 #header #information {
-	color: #dddddd;
-	font-size: small;
+    color: #dddddd;
+    font-size: small;
 }
 
 pre {
diff --git a/skins/custom/show_bug.css b/skins/custom/show_bug.css
index 9da001d0d..8a88909f7 100644
--- a/skins/custom/show_bug.css
+++ b/skins/custom/show_bug.css
@@ -55,7 +55,7 @@
 }
 
 .bz_comment_number {
-	float: right;
+    float: right;
 }
 
 /* style all field labels the same */
diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl
index b84b9972c..30fb7e8fb 100644
--- a/template/en/default/bug/show-header.html.tmpl
+++ b/template/en/default/bug/show-header.html.tmpl
@@ -49,7 +49,7 @@
   [% END %]
 [% END %]
 [% style_urls = [ "skins/standard/show_bug.css", 
-                  "skins/standard/bug_groups.css" ] %]
+                  "skins/custom/bug_groups.css" ] %]
 [% doc_section = "bug_page.html" %]
 [% bodyclasses = ['bz_bug',
                   "bz_status_$bug.bug_status",