diff options
| author | Aleksey Lim <alsroot@member.fsf.org> | 2010-09-12 23:57:16 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@member.fsf.org> | 2010-09-12 23:57:16 (GMT) |
| commit | 75c113a99a1f7762a0f136d118b59620de2583ca (patch) | |
| tree | 6406bef9924fa8b68921bbb753db2464c5cae2c2 | |
| parent | 5d639520af6317ce96839366230418e3844a03ab (diff) | |
Fix nav links on search page
| -rwxr-xr-x | cgi/search.pl | 6 | ||||
| -rw-r--r-- | cgi/template/search.tmpl | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cgi/search.pl b/cgi/search.pl index f59c5fe..9666084 100755 --- a/cgi/search.pl +++ b/cgi/search.pl @@ -47,10 +47,10 @@ my $dbh = get_dbh(); my $ch = $q->param('channel'); if ($ch && !($ch eq 'All')) { $ch =~ s/^\#//; - $t->param(CURRENT_CHANNEL => ";channel=$ch"); + $t->param(CHANNEL => $ch); push @channels, {CHANNEL => 'All'}; } else { - $t->param(CURRENT_CHANNEL => ''); + $t->param(CHANNEL => ''); push @channels, {CHANNEL => 'All', SELECTED => 1}; } while (my @row = $q1->fetchrow_array){ @@ -72,7 +72,7 @@ my $qs = $q->param('q') || ''; $qs = my_decode($qs); my $meetings = $q->param('meetings'); -$t->param(MEETINGS => $meetings); +$t->param(MEETINGS => $meetings ? '/meetings' : ''); $t->param(NICK => encode('utf8', $nick)); $t->param(Q => $qs); diff --git a/cgi/template/search.tmpl b/cgi/template/search.tmpl index 7576b96..4734185 100644 --- a/cgi/template/search.tmpl +++ b/cgi/template/search.tmpl @@ -24,7 +24,7 @@ <TMPL_IF DAYS> <p>Result pages: <TMPL_LOOP RESULT_PAGES> - <a href="<TMPL_VAR BASE_URL>search.pl?nick=<TMPL_VAR NICK ESCAPE=URL><TMPL_VAR CURRENT_CHANNEL ESCAPE=URL>;q=<TMPL_VAR Q>;offset=<TMPL_VAR OFFSET>"><TMPL_VAR PAGE></a> + <a href="<TMPL_VAR BASE_URL>search.pl?nick=<TMPL_VAR NAME=NICK ESCAPE=URL>;channel=<TMPL_VAR NAME=CHANNEL ESCAPE=URL>;q=<TMPL_VAR Q>;offset=<TMPL_VAR OFFSET><TMPL_IF MEETINGS>;meetings=1</TMPL_IF>"><TMPL_VAR PAGE></a> </TMPL_LOOP> </p> @@ -41,7 +41,7 @@ </TMPL_LOOP> <p>Result pages: <TMPL_LOOP RESULT_PAGES> - <a href="<TMPL_VAR BASE_URL>search.pl?nick=<TMPL_VAR NAME=NICK ESCAPE=URL><TMPL_VAR NAME=CURRENT_CHANNEL ESCAPE=URL>;q=<TMPL_VAR Q>;offset=<TMPL_VAR OFFSET>"><TMPL_VAR PAGE></a> + <a href="<TMPL_VAR BASE_URL>search.pl?nick=<TMPL_VAR NAME=NICK ESCAPE=URL>;channel=<TMPL_VAR NAME=CHANNEL ESCAPE=URL>;q=<TMPL_VAR Q>;offset=<TMPL_VAR OFFSET><TMPL_IF MEETINGS>;meetings=1</TMPL_IF>"><TMPL_VAR PAGE></a> </TMPL_LOOP> </p> </TMPL_IF> |