mark: A photo of Mark kneeling on top of the Taal Volcano in the Philippines. It was a long hike. (Default)
Mark Smith ([staff profile] mark) wrote in [site community profile] changelog2009-07-26 07:38 pm

[dw-free] Add search to the Explore menu

[commit: http://hg.dwscoalition.org/dw-free/rev/1ff00b9015f7]

http://bugs.dwscoalition.org/show_bug.cgi?id=1480

Add 'Search Journal' to the menu for paid users.

Patch by [personal profile] foxfirefey.

Files modified:
  • bin/upgrading/en.dat
  • cgi-bin/DW/Logic/MenuNav.pm
--------------------------------------------------------------------------------
diff -r 12c5f516dea2 -r 1ff00b9015f7 bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Sun Jul 26 19:31:11 2009 +0000
+++ b/bin/upgrading/en.dat	Sun Jul 26 19:38:27 2009 +0000
@@ -2167,6 +2167,8 @@ menunav.explore.interests=Interests
 
 menunav.explore.directorysearch=Directory Search
 
+menunav.explore.journalsearch=Journal Search
+
 menunav.explore.randomjournal=Random Journal
 
 menunav.explore.randomcommunity=Random Community
diff -r 12c5f516dea2 -r 1ff00b9015f7 cgi-bin/DW/Logic/MenuNav.pm
--- a/cgi-bin/DW/Logic/MenuNav.pm	Sun Jul 26 19:31:11 2009 +0000
+++ b/cgi-bin/DW/Logic/MenuNav.pm	Sun Jul 26 19:38:27 2009 +0000
@@ -54,6 +54,7 @@ sub get_menu_navigation {
     my $loggedin_hasjournal = ( $loggedin && !$u->is_identity ) ? 1 : 0;
     my $loggedin_canjoincomms = ( $loggedin && $u->is_person ) ? 1 : 0;   # note the semantic difference
     my $loggedin_hasnetwork = ( $loggedin && LJ::get_cap($u, "friendsfriendsview") ) ? 1 : 0;
+    my $loggedin_ispaid = ( $loggedin && $u->is_paid ) ? 1 : 0;
     my $loggedout = $loggedin ? 0 : 1;
     my $always = 1;
     my $never = 0;
@@ -199,6 +200,11 @@ sub get_menu_navigation {
                     display => $always,
                 },
                 {
+                    url => "$LJ::SITEROOT/search",
+                    text => "menunav.explore.journalsearch",
+                    display => $loggedin_ispaid && @LJ::SPHINX_SEARCHD ? 1 : 0,
+                },
+                {
                     url => "$LJ::SITEROOT/random",
                     text => "menunav.explore.randomjournal",
                     display => $always,
--------------------------------------------------------------------------------