Merge branch 'staff' into master

Conflicts:
	lib/VNDB/DB/VN.pm
	lib/VNDB/Handler/VNPage.pm

2 files changed, 16 insertions, 2 deletions

diff --git a/data/docs/7 b/data/docs/7
index f5046101..21def6c4 100644
--- a/data/docs/7
+++ b/data/docs/7
@@ -51,8 +51,9 @@
  <dl>
   <dt>Yorhel</dt><dd>Main developer.</dd>
   <dt>QCyph</dt><dd>Contributed the character filters.</dd>
-  <dt>3dB</dt><dd>Contributed the current user authentication code and post throttling on the discussion board.</dd>
+  <dt>3dB</dt><dd>Contributed an improved user authentication code and post throttling on the discussion board.</dd>
   <dt>SpaceRanger</dt><dd>Contributed the visual novel release comparison page, userlist columns to the VN list and dx.x.x link formatting.</dd>
+  <dt>morkt</dt><dd>Contributed improvements to the BBCode used on the forums.</dd>
  </dl>
  <br />
 
diff --git a/data/script.js b/data/script.js
index 6f8b497d..b84316f3 100644
--- a/data/script.js
+++ b/data/script.js
@@ -1738,7 +1738,7 @@ function ctrLoad() {
     }
   }
   if(q.length > 0)
-    ajax('/xml/traits.xml?r=100;'+q.join(';'), function (ht) {
+    ajax('/xml/traits.xml?r=200;'+q.join(';'), function (ht) {
       var t = ht.responseXML.getElementsByTagName('item');
       for(var i=0; i<t.length; i++)
         ctrAdd(t[i], v[t[i].getAttribute('id')]);
@@ -3181,6 +3181,7 @@ if(byId('expandall')) {
 if(byId('charspoil_sel')) {
   var k = byClass('charspoil');
   var h = byName(byId('charspoil_sel'), 'a');
+  var t = byClass('table', 'stripe');
   var setall = function(spoil) {
     for(var i=0; i<k.length; i++)
       setClass(k[i], 'hidden',
@@ -3189,6 +3190,18 @@ if(byId('charspoil_sel')) {
         hasClass(k[i], 'charspoil_1') ? spoil < 1 : spoil < 2);
     for(var i=0; i<h.length; i++)
       setClass(h[i], 'sel', spoil == i);
+    if(k.length) {
+      for(var i=0; i<t.length; i++) {
+        var b = byName(t[i], 'tbody');
+        if(!b.length) continue;
+        setClass(t[i], 'stripe', false);
+        var r = 1;
+        var rows = byName(b[0], 'tr');
+        for(var j=0; j<rows.length; j++)
+          if(!hasClass(rows[j], 'nostripe') && !hasClass(rows[j], 'hidden'))
+            setClass(rows[j], 'odd', r++&1);
+      }
+    }
   };
   for(var i=0; i<h.length; i++) {
     h[i].num = i;