Removed /u+/tags and replaced/added links to /g/links?u=X

The new tag link browser has replaced the crappy old user-tags-browser.

5 files changed, 14 insertions, 92 deletions

diff --git a/lib/VNDB/Handler/Misc.pm b/lib/VNDB/Handler/Misc.pm
index 081bbb25..b5fe95d6 100644
--- a/lib/VNDB/Handler/Misc.pm
+++ b/lib/VNDB/Handler/Misc.pm
@@ -19,6 +19,7 @@ YAWF::register(
   qr{opensearch\.xml},               \&opensearch,
 
   # redirects for old URLs
+  qr{u([1-9]\d*)/tags}, sub { $_[0]->resRedirect("/g/links?u=$_[1]", 'perm') },
   qr{(.*[^/]+)/+}, sub { $_[0]->resRedirect("/$_[1]", 'perm') },
   qr{([pv])},      sub { $_[0]->resRedirect("/$_[1]/all", 'perm') },
   qr{v/search},    sub { $_[0]->resRedirect("/v/all?q=".uri_escape($_[0]->reqParam('q')), 'perm') },
diff --git a/lib/VNDB/Handler/Tags.pm b/lib/VNDB/Handler/Tags.pm
index 1f5c70af..59bd0430 100644
--- a/lib/VNDB/Handler/Tags.pm
+++ b/lib/VNDB/Handler/Tags.pm
@@ -454,7 +454,7 @@ sub taglinks {
         a href => $url->(t=>$l->{tag}), class => 'setfil', '> ' if !$f->{t};
         a href => "/g$l->{tag}", $l->{name};
        end;
-       td class => 'tc5', !defined $l->{spoiler} ? ' ' : mt "_tagu_spoil$l->{spoiler}";
+       td class => 'tc5', !defined $l->{spoiler} ? ' ' : mt "_taglink_spoil$l->{spoiler}";
        td class => 'tc6';
         a href => $url->(v=>$l->{vid}), class => 'setfil', '> ' if !$f->{v};
         a href => "/v$l->{vid}", shorten $l->{title}, 50;
@@ -553,88 +553,6 @@ sub vntagmod {
 }
 
 
-sub usertags {
-  my($self, $uid) = @_;
-
-  my $u = $self->dbUserGet(uid => $uid)->[0];
-  return 404 if !$u;
-
-  my $f = $self->formValidate(
-    { name => 's', required => 0, default => 'count', enum => [ qw|count name| ] },
-    { name => 'o', required => 0, default => 'd', enum => [ 'a','d' ] },
-    { name => 'p', required => 0, default => 1, template => 'int' },
-  );
-  return 404 if $f->{_err};
-
-  # TODO: might want to use AJAX to load the VN list on request
-  my($list, $np) = $self->dbTagStats(
-    uid => $uid,
-    page => $f->{p},
-    sort => $f->{s}, reverse => $f->{o} eq 'd',
-    what => 'vns',
-  );
-
-  my $title = mt '_tagu_title', $u->{username};
-  $self->htmlHeader(title => $title, noindex => 1);
-  $self->htmlMainTabs('u', $u, 'tags');
-  div class => 'mainbox';
-   h1 $title;
-   if(@$list) {
-     p mt '_tagu_spoilerwarn';
-   } else {
-     p mt '_tagu_notags', $u->{username};
-   }
-  end;
-
-  if(@$list) {
-    $self->htmlBrowse(
-      class    => 'tagstats',
-      options  => $f,
-      nextpage => $np,
-      items    => $list,
-      pageurl  => "/u$u->{id}/tags?s=$f->{s};o=$f->{o}",
-      sorturl  => "/u$u->{id}/tags",
-      header   => [
-        sub {
-          td class => 'tc1';
-           b id => 'expandall';
-            lit '<i>&#9656;</i> '.mt('_tagu_col_num').' ';
-           end;
-           lit $f->{s} eq 'count' && $f->{o} eq 'a' ? "\x{25B4}" : qq|<a href="/u$u->{id}/tags?o=a;s=count">\x{25B4}</a>|;
-           lit $f->{s} eq 'count' && $f->{o} eq 'd' ? "\x{25BE}" : qq|<a href="/u$u->{id}/tags?o=d;s=count">\x{25BE}</a>|;
-          end;
-        },
-        [ mt('_tagu_col_name'),  'name' ],
-        [ ' ', '' ],
-      ],
-      row     => sub {
-        my($s, $n, $l) = @_;
-        Tr $n % 2 ? (class => 'odd') : ();
-         td class => 'tc1 collapse_but', id => "tag$l->{id}";
-          lit "<i>&#9656;</i> $l->{cnt}";
-         end;
-         td class => 'tc2', colspan => 2;
-          a href => "/g$l->{id}", $l->{name};
-         end;
-        end;
-        for(@{$l->{vns}}) {
-          Tr class => "collapse collapse_tag$l->{id}";
-           td class => 'tc1_1';
-            tagscore $_->{vote};
-           end;
-           td class => 'tc1_2';
-            a href => "/v$_->{vid}", title => $_->{original}||$_->{title}, shorten $_->{title}, 50;
-           end;
-           td class => 'tc1_3', !defined $_->{spoiler} ? ' ' : mt "_tagu_spoil$_->{spoiler}";
-          end;
-        }
-      },
-    );
-  }
-  $self->htmlFooter;
-}
-
-
 sub tagindex {
   my $self = shift;
 
diff --git a/lib/VNDB/Handler/Users.pm b/lib/VNDB/Handler/Users.pm
index a53a5193..46bd3489 100644
--- a/lib/VNDB/Handler/Users.pm
+++ b/lib/VNDB/Handler/Users.pm
@@ -86,7 +86,15 @@ sub userpage {
 
     Tr ++$i % 2 ? (class => 'odd') : ();
      td mt '_userpage_tags';
-     td !$u->{c_tags} ? '-' : mt '_userpage_tags_item', $u->{c_tags}, $u->{tagcount}, $u->{tagvncount};
+     td;
+      if(!$u->{c_tags}) {
+        txt '-';
+      } else {
+        txt mt '_userpage_tags_item', $u->{c_tags}, $u->{tagcount}, $u->{tagvncount};
+        txt ' ';
+        a href => "/g/links?u=$uid"; lit mt('_userpage_tags_browse').' &raquo;'; end;
+      }
+     end;
     end;
 
     Tr ++$i % 2 ? (class => 'odd') : ();
@@ -527,7 +535,7 @@ sub list {
         lit !$l->{c_changes} ? 0 : qq|<a href="/u$l->{id}/hist">$l->{c_changes}</a>|;
        end;
        td class => 'tc5';
-        lit !$l->{c_tags} ? 0 : qq|<a href="/u$l->{id}/tags">$l->{c_tags}</a>|;
+        lit !$l->{c_tags} ? 0 : qq|<a href="/g/links?u=$l->{id}">$l->{c_tags}</a>|;
        end;
       end;
     },
@@ -545,6 +553,7 @@ sub notifies {
   my $f = $self->formValidate(
     { name => 'p', required => 0, default => 1, template => 'int' },
     { name => 'r', required => 0, default => 0, enum => [0,1] },
+
   );
   return 404 if $f->{_err};
 
diff --git a/lib/VNDB/Util/CommonHTML.pm b/lib/VNDB/Util/CommonHTML.pm
index 941bf827..c7d67647 100644
--- a/lib/VNDB/Util/CommonHTML.pm
+++ b/lib/VNDB/Util/CommonHTML.pm
@@ -55,12 +55,6 @@ sub htmlMainTabs {
      end;
    }
 
-   if($type eq 'u') {
-     li $sel eq 'tags' ? (class => 'tabselected') : ();
-      a href => "/$id/tags", mt '_mtabs_tags';
-     end;
-   }
-
    if($type eq 'v' && $self->authCan('tag') && !$obj->{hidden}) {
      li $sel eq 'tagmod' ? (class => 'tabselected') : ();
       a href => "/$id/tagmod", mt '_mtabs_tagmod';
diff --git a/lib/VNDB/Util/LayoutHTML.pm b/lib/VNDB/Util/LayoutHTML.pm
index b5dc3e9c..f1a6dc2d 100644
--- a/lib/VNDB/Util/LayoutHTML.pm
+++ b/lib/VNDB/Util/LayoutHTML.pm
@@ -91,7 +91,7 @@ sub _menu {
        a href => "$uid/wish", mt '_menu_mywishlist'; br;
        a href => "$uid/notifies", $nc ? (class => 'notifyget') : (), mt('_menu_mynotifications').($nc?" ($nc)":''); br;
        a href => "$uid/hist", mt '_menu_mychanges'; br;
-       a href => "$uid/tags", mt '_menu_mytags'; br;
+       a href => '/g/links?u='.$self->authInfo->{id}, mt '_menu_mytags'; br;
        br;
        a href => '/v/new',    mt '_menu_addvn'; br;
        a href => '/p/new',    mt '_menu_addproducer'; br;