Normal and anon users should have the 'Firehose' menu item active by …

…default. ^user/tags/tagname now correctly lists items tagged with that tagname.
scc · Oct 27, 2008 · a87813d · a87813d
1 parent a528bfe
commit a87813d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/Slash/Apache/User/User.pm b/Slash/Apache/User/User.pm
@@ -887,7 +887,9 @@ sub userdir_handler {
 
 		} elsif ($op eq 'tags') {
                         if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)]) {
-                                $r->args("nick=$nick&dp=tags&uid=$uid");
+                                my $args = "nick=$nick&dp=tags&uid=$uid";
+                                $args .= "&tagname=$extra" if $extra;
+                                $r->args($args);
                                 $r->uri('/users2.pl');
                                 $r->filename($constants->{basedir} . '/users2.pl');
                         } else {

diff --git a/plugins/Tags/templates/usertagsforname;users;default b/plugins/Tags/templates/usertagsforname;users;default
@@ -23,7 +23,7 @@ __template__
    url_base = "$gSkin.rootdir/~$url_nick/";
    uid = useredit.uid;
    title = "Items tagged <a href=\"$gSkin.rootdir/tags/$url_tagname\">$thistagname</a> by <a href=\"$url_base\">$thisnickname ($uid)</a>";
-   PROCESS user_titlebar tab_selected='tags' %]
+   UNLESS notitle; PROCESS user_titlebar tab_selected='tags'; END; %]
 
 [% IF user.tags_canread_stories && tags.size %]
 <div><table border="0" cellpadding="0" cellspacing="0" width="100%" class="tagslist">

diff --git a/themes/slashcode/htdocs/users2.pl b/themes/slashcode/htdocs/users2.pl
@@ -1765,6 +1765,7 @@ sub showTags {
                         useredit        => $user_edit,
                         tagname         => $tagname,
                         tags            => $tags_ar,
+                        notitle         => 1,
                 }, { Page => 'users', Return => 1 });
         } else {
                 my $tags_hr = $tags_reader->getGroupedTagsFromUser($user_edit->{uid});

diff --git a/themes/slashcode/templates/userInfo2;users;default b/themes/slashcode/templates/userInfo2;users;default
@@ -134,7 +134,7 @@ __template__
 
         <div class="nav">
                 <ul class="menu" id="tablist">
-                <li[% IF data_pane == 'firehose' %] class="active"[% END %]><a href="[% gSkin.rootdir %]/^[% useredit.nickname %]/firehose">Firehose</a></li>
+                <li[% IF data_pane == 'firehose' || (data_pane = '' && !user.is_admin) %] class="active"[% END %]><a href="[% gSkin.rootdir %]/^[% useredit.nickname %]/firehose">Firehose</a></li>
                 [% IF latest_comments.size != 0 %]<li[% IF data_pane == 'comments' %] class="active"[% END %]><a href="[% gSkin.rootdir %]/^[% useredit.nickname %]/comments">Comments</a></li>[% END %]
                 [% IF latest_journals.size != 0 %]<li[% IF data_pane == 'journal' %] class="active"[% END %]><a href="[% gSkin.rootdir %]/^[% useredit.nickname %]/journal">Journals</a></li>[% END %]
                 [% IF latest_submissions.size != 0 %]<li[% IF data_pane == 'submissions' %] class="active"[% END %]><a href="[% gSkin.rootdir %]/^[% useredit.nickname %]/submissions">Submissions</a></li>[% END %]