Use same browsing-table on trait pages and char browser

3 files changed, 18 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index b8304b6f..d0c8c426 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2.20 - ?
 	- Order the VNs listed on char browser by release date
 	- Order the traits groups on /i by their 'order' column
+	- Use same browsing-table on trait pages and char browser
 	- CSS: Hide links in [spoiler] tags
 	- Bugfix: don't accidentally remove char traits when editing
 	- Bugfix: fixed possible SQL table name clash on history browser
diff --git a/lib/VNDB/Handler/Chars.pm b/lib/VNDB/Handler/Chars.pm
index ed7b5388..06c2ecde 100644
--- a/lib/VNDB/Handler/Chars.pm
+++ b/lib/VNDB/Handler/Chars.pm
@@ -7,7 +7,7 @@ use TUWF ':html', 'uri_escape';
 use Exporter 'import';
 use VNDB::Func;
 
-our @EXPORT = ('charTable');
+our @EXPORT = ('charTable', 'charBrowseTable');
 
 TUWF::register(
   qr{c([1-9]\d*)(?:\.([1-9]\d*))?} => \&page,
@@ -474,8 +474,17 @@ sub list {
     end;
   }
 
-  my $uri = "/c/$fch?q=$quri";
-  @$list && $self->htmlBrowse(
+  @$list && $self->charBrowseTable($list, $np, $f, "/c/$fch?q=$quri");
+
+  $self->htmlFooter;
+}
+
+
+# Also used on Handler::Traits
+sub charBrowseTable {
+  my($self, $list, $np, $f, $uri) = @_;
+
+  $self->htmlBrowse(
     class    => 'charb',
     items    => $list,
     options  => $f,
@@ -504,9 +513,7 @@ sub list {
        end;
       end;
     }
-  );
-
-  $self->htmlFooter;
+  )
 }
 
 
diff --git a/lib/VNDB/Handler/Traits.pm b/lib/VNDB/Handler/Traits.pm
index 3e08f6bf..1f3c2872 100644
--- a/lib/VNDB/Handler/Traits.pm
+++ b/lib/VNDB/Handler/Traits.pm
@@ -86,7 +86,9 @@ sub traitpage {
     my($chars, $np) = $self->dbCharGet(
       trait_inc => $trait,
       traitspoil => $f->{m},
-      results => 50, page => $f->{p},
+      results => 50,
+      page => $f->{p},
+      what => 'vns',
     );
 
     div class => 'mainbox';
@@ -106,24 +108,7 @@ sub traitpage {
      # p; br; txt mt '_traitp_cached'; end;
     end 'div';
 
-    # TODO: proper table with info and such
-    $self->htmlBrowse(
-      class    => 'traitchars',
-      options  => $f,
-      nextpage => $np,
-      items    => $chars,
-      pageurl  => "/i$trait?m=$f->{m}",
-      sorturl  => "/i$trait?m=$f->{m}",
-      header   => [
-        [ 'Name'  ],
-      ],
-      row => sub {
-        my($s, $n, $l) = @_;
-        Tr $n%2?(class => 'odd') : ();
-         td class => 'tc1'; a href => "/c$l->{id}", $l->{name}; end;
-        end;
-      },
-    ) if @$chars;
+    @$chars && $self->charBrowseTable($chars, $np, $f, "/i$trait?m=$f->{m}");
   }
 
   $self->htmlFooter;