[dw-free] Fix display of navstrip and add ?style=mine/?format=light options

[mark]

[commit: http://hg.dwscoalition.org/dw-free/rev/209cebc62d5a]

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

Add widget for the site search dropdown.

Patch by janinedog.

--------------------------------------------------------------------------------
diff -r a075f0ed5aed -r 209cebc62d5a bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Fri Feb 27 03:09:35 2009 +0000
+++ b/bin/upgrading/en.dat	Fri Feb 27 03:11:03 2009 +0000
@@ -3654,11 +3654,17 @@ widget.s2propgroup.presentation.note=Not
 
 widget.search.aim=AIM
 
+widget.search.btn.go=Go
+
 widget.search.email=Email
 
 widget.search.existingtitle=Or search for an individual user:
 
+widget.search.faq=FAQ
+
 widget.search.icq=ICQ Number
+
+widget.search.iminfo=IM Info
 
 widget.search.interest=Interest
 
@@ -3674,9 +3680,11 @@ widget.search.note=If you know some info
 
 widget.search.region=Region
 
+widget.search.siteuser=Site & User
+
 widget.search.submit=Search existing users
 
-widget.search.title=Search for
+widget.search.title=Search...
 
 widget.search.username=Username
 
diff -r a075f0ed5aed -r 209cebc62d5a cgi-bin/LJ/Widget/Search.pm
--- a/cgi-bin/LJ/Widget/Search.pm	Fri Feb 27 03:09:35 2009 +0000
+++ b/cgi-bin/LJ/Widget/Search.pm	Fri Feb 27 03:11:03 2009 +0000
@@ -12,33 +12,29 @@ sub render_body {
     my $ret;
 
     my $single_search = $opts{single_search};
-    my ($select_box, $search_btn);
+    my ( $select_box, $search_btn );
 
     my @search_opts = (
-        'int' => $class->ml('.widget.search.interest'),
-        'region' => $class->ml('.widget.search.region'),
-        'user' => $class->ml('.widget.search.username'),
-        'email' => $class->ml('.widget.search.email'),
-        'aolim' => $class->ml('.widget.search.aim'),
-        'icq' => $class->ml('.widget.search.icq'),
-        'jabber' => $class->ml('.widget.search.jabber'),
-        'msn' => $class->ml('.widget.search.msn'),
-        'yahoo' => $class->ml('.widget.search.yahoo'),
+        int => $class->ml( 'widget.search.interest' ),
+        region => $class->ml( 'widget.search.region' ),
+        nav_and_user => $class->ml( 'widget.search.siteuser' ),
+        faq => $class->ml( 'widget.search.faq' ),
+        email => $class->ml( 'widget.search.email' ),
+        im => $class->ml( 'widget.search.iminfo' ),
     );
 
-    if ($single_search eq "interest") {
-        $ret .= "<p class='search-interestonly'>" . $class->ml('widget.search.interestonly') . "</p>";
+    if ( $single_search eq "interest" ) {
+        $ret .= "<p class='search-interestonly'>" . $class->ml( 'widget.search.interestonly' ) . "</p>";
         $select_box = LJ::html_hidden( type => "int" );
-        $search_btn = LJ::html_submit($class->ml('widget.search.interestonly.btn'));
+        $search_btn = LJ::html_submit( $class->ml( 'widget.search.interestonly.btn' ) );
     } else {
-        $ret .= "<h2>" . $class->ml('.widget.search.title') . "</h2>\n";
-        $select_box = LJ::html_select({name => 'type', selected => 'int', class => 'select'}, @search_opts) . " ";
-        $search_btn = LJ::html_submit($class->ml('.widget.search.submit'));
+        $select_box = LJ::html_select( { name => 'type', selected => 'int', class => 'select' }, @search_opts ) . " ";
+        $search_btn = LJ::html_submit( $class->ml( 'widget.search.btn.go' ) );
     }
 
     $ret .= "<form action='$LJ::SITEROOT/multisearch.bml' method='post'>\n";
+    $ret .= LJ::html_text( { name => 'q', id => 'search', class => 'text', title => $class->ml( 'widget.search.title' ), size => 20 } ) . " ";
     $ret .= $select_box;
-    $ret .= LJ::html_text({name => 'q', 'class' => 'text', 'size' => 30}) . " ";
     $ret .= $search_btn;
     $ret .= "</form>";
 
--------------------------------------------------------------------------------