Added search zones to all included Orchard themes. Create a generic search form style and added them to theme styles sheet. Refactored the CSS code for Contoso search.

--HG--
branch : dev

src/Orchard.Web/Themes/ClassicDark/Styles/site.css

@@ -100,6 +100,32 @@ input[type="submit"], input[type="button"], .button {
     display:inline;
 }
 
+/* Search
+----------------------------------------------------------*/
+
+.search 
+{
+    margin: 0 0 14px 0;
+}
+
+.search fieldset 
+{
+    overflow: auto;
+}
+
+.search input 
+{
+    width: auto;
+    float: left;
+    padding: 3px;
+}
+
+.search button 
+{
+    float: left;
+    margin: 0 0 0 4px;
+}
+
 
 /* Tables
 ----------------------------------------------------------*/

src/Orchard.Web/Themes/ClassicDark/Views/Layout.ascx

@@ -28,7 +28,8 @@
         <%Html.ZoneBody("content");%>
         </div>
         <div id="sidebar">
-            <%Html.Zone("sidebar");%>
+            <% Html.Zone("search");
+               Html.Zone("sidebar");%>
         </div>
         <%-- End Content --%>
         <% Html.Include("Footer"); %>

src/Orchard.Web/Themes/Contoso/Styles/site.css

@@ -52,11 +52,11 @@ blockquote, q {
 /*- Clear Fix -*/
 
 .group:after {
-    content: ".";
+	content: ".";
-    display: block;
+	display: block;
-    height: 0;
+	height: 0;
-    clear: both;
+	clear: both;
-    visibility: hidden;
+	visibility: hidden;
 }
 
 
@@ -265,7 +265,7 @@ body { background: #f3f4f4 url('../Content/Images/bkg.jpg') repeat-x; }
 
 /*- Page Navigation -*/
 
-#nav { background: transparent url('../Content/Images/menu-right.png') no-repeat right top; margin: 0px 0px 20px 0px; }
+#nav { background: transparent url('../Content/Images/menu-right.png') no-repeat right top; margin: 0px 0px 20px 0px; position: relative; }
 #nav .menu { margin: 0px; padding: 0px; height: 40px; width:725px; background: transparent url('../Content/Images/menu-left.png') no-repeat left top; }
 #nav .menu li { float:left; list-style: none; background: transparent url('../Content/Images/menu-divider.png') repeat-y right top; }
 #nav .menu li a { display:block; margin: 0px 2px 1px 0px; padding: 11px 39px 4px 39px; height: 24px; color: #FFF; font-size: 1.2em; text-decoration: none; text-shadow: 0px -1px 0px #535550; }
@@ -280,10 +280,11 @@ body { background: #f3f4f4 url('../Content/Images/bkg.jpg') repeat-x; }
 .admin li a {}
 
 /*- Search -*/
-#nav .search { display: inline; float: right; height: 40px; margin: -40px 8px 0 0; }
+#nav .search { position: absolute; top: 0px; right: 12px; }
-#nav .search input { border-color: #6AA6BF; }
+#nav .search input { border-color: #6AA6BF; padding: 5px; }
-#nav .search input, #nav .search button { height: 1.8em; padding: 0 .5em; margin: .5em 0; vertical-align: middle; }
+#nav .search input, #nav .search button { vertical-align: middle; }
-#nav .search button { background: #87B7CB; border: 1px solid #6AA6BF; color: #FFF; height: 1.9em; text-shadow: 0px -1px 0px #A6A6A6; }
+#nav .search button { background: #87B7CB; border: 1px solid #6AA6BF; color: #FFF; padding: 4px; text-shadow: 0px -1px 0px #A6A6A6; }
+
 
 /*========= Footer =========*/
 
@@ -306,7 +307,7 @@ body { background: #f3f4f4 url('../Content/Images/bkg.jpg') repeat-x; }
 .home-hero .hero-gallery { float:left; position: relative; margin: 0px 0px 0px 40px; }
 .home-hero .hero-gallery #slider { position: relative; border: solid 1px #4d8298; }
 
-    
+	
 
 /*========= Page =========*/
 
@@ -383,35 +384,35 @@ body { background: #f3f4f4 url('../Content/Images/bkg.jpg') repeat-x; }
 /* Localization
 -------------------------------------------------------------- */
 .content-localization .content-localizations h4 {
-    float: left;
+	float: left;
-    margin: 0;
+	margin: 0;
-    padding:3px;
+	padding:3px;
 }
 
 .content-localization .content-localizations ul {
-    overflow: auto;
+	overflow: auto;
 }
 
 .content-localization .content-localizations li {
-    border-bottom: 1px;
+	border-bottom: 1px;
-    float: left;
+	float: left;
-    margin-left:.5em;
+	margin-left:.5em;
-    padding: 3px;
+	padding: 3px;
-    border: 1px solid #CCC;
+	border: 1px solid #CCC;
-    list-style: none;
+	list-style: none;
 }
 
 .content-localization .content-localizations li:hover {
-    background-color: #ebebeb;
+	background-color: #ebebeb;
 }
 
 
 .content-localization .content-localizations li a {
-    text-decoration: none;
+	text-decoration: none;
 }
 
 .content-localization .content-localizations li a:hover, .content-localization .content-localizations li a:visited {
-    text-decoration: none;
+	text-decoration: none;
 }
 
 /*========= PLUGINS =========*/

src/Orchard.Web/Themes/Corporate/Styles/site.css

@@ -242,6 +242,37 @@ form.inline p { margin-bottom:0; }
 .success a  { color: #264409; }
 
 
+/* Search
+----------------------------------------------------------*/
+
+.search 
+{
+    margin: 12px 0 12px 0;
+    position: absolute;
+    top: 24px;
+    right: 18px;
+}
+
+.search fieldset 
+{
+    overflow: auto;
+}
+
+.search input 
+{
+    width: 12em;
+    float: left;
+    padding: 3px;
+    margin: 0;
+}
+
+.search button 
+{
+    float: left;
+    margin: 0 0 0 4px;
+}
+
+
 /*========= GENERAL =========*/
 
 /* html, body {background-color: #434343; } */

src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx

@@ -21,6 +21,7 @@
                 <%: Html.SiteName() %></div>
         </div>
         <% Html.Zone("menu"); %>
+        <% Html.Zone("search"); %>
     </div>
 </div>
 

src/Orchard.Web/Themes/Corporate/Views/Layout.ascx

@@ -21,6 +21,7 @@
                 <%: Html.SiteName() %></div>
         </div>
         <% Html.Zone("menu"); %>
+        <% Html.Zone("search"); %>
     </div>
 </div>
 

src/Orchard.Web/Themes/Green/Styles/site.css

@@ -85,14 +85,14 @@ label {
     display: block;
     margin:8px 0 2px 0px;
     font-size:105%;
-    }
+}
 
 input[type="text"], textarea, #password {
     border-color:#cacec6;
     padding:2px;
     margin:2px 0 4px 0px;
     width:100%;
-    }
+}
 
 input[type="checkbox"] {
     margin:2px 0 4px 10px;
@@ -110,6 +110,33 @@ input[type="submit"], input[type="button"] {
     display:inline;
 }
 
+/* Search
+----------------------------------------------------------*/
+
+.search 
+{
+    margin: 12px 0 12px 0;
+}
+
+.search fieldset 
+{
+    overflow: auto;
+}
+
+.search input 
+{
+    width: auto;
+    float: left;
+    padding: 3px;
+    margin: 0;
+}
+
+.search button 
+{
+    float: left;
+    margin: 0 0 0 4px;
+}
+
 
 /* Tables
 ----------------------------------------------------------*/

src/Orchard.Web/Themes/Green/Views/Layout.ascx

@@ -52,6 +52,9 @@ return false;
 <div>
 <%Html.Zone("sidebar");%>
 <ul>
+<li>
+    <%Html.Zone("search"); %>
+</li>
 <li>
     <%Html.Zone("sideBarZone1"); %>
 </li>