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

[mark]

[commit: http://hg.dwscoalition.org/dw-nonfree/rev/f079f1d6536c]

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

Add widget for the site search dropdown.

Patch by janinedog.

--------------------------------------------------------------------------------
diff -r 583586641e92 -r f079f1d6536c bin/upgrading/en_DW.dat
--- a/bin/upgrading/en_DW.dat	Fri Feb 27 02:24:19 2009 +0000
+++ b/bin/upgrading/en_DW.dat	Fri Feb 27 03:11:10 2009 +0000
@@ -106,20 +106,4 @@ tropo.nav.read.syndicatedfeeds=Syndicate
 
 tropo.nav.read.tags=Tags
 
-tropo.search=Search…
-
-tropo.search.btn.go=Go
-
-tropo.search.email=Email
-
-tropo.search.faq=FAQ
-
-tropo.search.iminfo=IM Info
-
-tropo.search.interest=Interest
-
-tropo.search.region=Region
-
-tropo.search.siteuser=Site & User
-
 tropo.footer.sitemap=Site Map
diff -r 583586641e92 -r f079f1d6536c cgi-bin/bml/scheme/tropo-red.look
--- a/cgi-bin/bml/scheme/tropo-red.look	Fri Feb 27 02:24:19 2009 +0000
+++ b/cgi-bin/bml/scheme/tropo-red.look	Fri Feb 27 03:11:10 2009 +0000
@@ -223,20 +223,7 @@ page<=
                 </div>
                 <div id="menu">
                     <?menunav?>
-                    <div id="site-search">
-                        <form action='<?siteroot?>/multisearch.bml' method='post'>
-                        <input type="text" name="q" value="" id="search" title="<?_ml tropo.search _ml?>" size="20" />
-                        <select name="type">
-                            <option value='int' selected='selected'><?_ml tropo.search.interest _ml?></option>
-                            <option value='region'><?_ml tropo.search.region _ml?></option>
-                            <option value='nav_and_user'><?_ml tropo.search.siteuser _ml?></option>
-                            <option value='faq'><?_ml tropo.search.faq _ml?></option>
-                            <option value='email'><?_ml tropo.search.email _ml?></option>
-                            <option value='im'><?_ml tropo.search.iminfo _ml?></option>
-                        </select>
-                        <input type="submit" value="<?_ml tropo.search.btn.go _ml?>" />
-                        </form>
-                    </div>
+                    <?_code return LJ::Widget::Search->render; _code?>
                 </div>
                 <div id="footer">
                     <?footer?>
diff -r 583586641e92 -r f079f1d6536c htdocs/stc/tropo/red.css
--- a/htdocs/stc/tropo/red.css	Fri Feb 27 02:24:19 2009 +0000
+++ b/htdocs/stc/tropo/red.css	Fri Feb 27 03:11:10 2009 +0000
@@ -191,12 +191,13 @@ a:active,
     display: block;
     width: 100%;
 }
-#menu #site-search {
+#menu .appwidget-search {
     text-align: right;
     line-height: 2.1em;
     padding-right: 0.833333em;
+    position: static;
 }
-#menu #site-search input#search {
+#menu .appwidget-search input#search {
     width: 15.5em;
 }
 /**
--------------------------------------------------------------------------------