From 1b605bceaa9cc261a2dde623b95d93aa4aa9eaa8 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Tue, 7 Dec 2010 14:19:45 -0800
Subject: [PATCH 1/3] Removing the heading from the blog archives (widget)
 template to leave the heading display up to the widget.

work item: 16914

--HG--
branch : dev
---
 .../Modules/Orchard.Blogs/Views/Parts.Blogs.BlogArchives.cshtml  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogArchives.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogArchives.cshtml
index 5790f97fe..58b3575b6 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogArchives.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogArchives.cshtml
@@ -6,7 +6,6 @@
     IEnumerable<KeyValuePair<ArchiveData, int>> archives = Model.Archives;
 }
 <div class="archives">
-    <h3>@T("Archives")</h3>
     @if (archives.Count() > 20) {
     <ul class="years">
         @{

From c80af4ae1c96acd79f1969a3d90ca1b70b0052f0 Mon Sep 17 00:00:00 2001
From: Dave Reed <dareed@microsoft.com>
Date: Tue, 7 Dec 2010 14:30:21 -0800
Subject: [PATCH 2/3] #16959: Moving 'Comments' admin menu entry below 'Blogs'

--HG--
branch : dev
---
 src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs
index 95780f739..810c38235 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs
@@ -8,7 +8,7 @@ namespace Orchard.Comments {
         public string MenuName { get { return "admin"; } }
 
         public void GetNavigation(NavigationBuilder builder) {
-            builder.Add(T("Comments"), "10",
+            builder.Add(T("Comments"), "2.75",
                 menu => menu.Add(T("List"), "0", item => item.Action("Index", "Admin", new { area = "Orchard.Comments" })
                     .Permission(Permissions.ManageComments)));
         }

From 2f93a0b870fda0914b95c6f2336961518d4d211a Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Tue, 7 Dec 2010 15:12:49 -0800
Subject: [PATCH 3/3] Fixed search widget rendering and edit wrappers in the
 ThemeMachine. Work Item: 16941

--HG--
branch : dev
---
 .../Orchard.Search/Styles/orchard-search-search.css   | 11 ++++++++++-
 .../Views/Parts/Search.SearchForm.cshtml              |  5 +++++
 .../Themes/TheThemeMachine/Styles/Site.css            |  9 +--------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Search/Styles/orchard-search-search.css b/src/Orchard.Web/Modules/Orchard.Search/Styles/orchard-search-search.css
index 3240b4d1c..baae17673 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Styles/orchard-search-search.css
+++ b/src/Orchard.Web/Modules/Orchard.Search/Styles/orchard-search-search.css
@@ -15,4 +15,13 @@ form.search input {
 }
 .search-results {
     clear:both;
-}
\ No newline at end of file
+}
+
+.search-form input[type="text"] { float: left; }
+.search-form button[type="submit"] { float: left; margin: 0; margin-left: 6px; }
+
+/*Search widget styles. More syles could be added here to target specific zones.*/
+.widget-search-form {
+    float:right;
+ }
+
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Parts/Search.SearchForm.cshtml b/src/Orchard.Web/Modules/Orchard.Search/Views/Parts/Search.SearchForm.cshtml
index 187cf3b5c..8675100e2 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Views/Parts/Search.SearchForm.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Parts/Search.SearchForm.cshtml
@@ -1,5 +1,10 @@
 @using Orchard.Search.ViewModels;
 
+@{
+    Style.Require("Search");
+}
+
+
 @using(Html.BeginForm("index", "search", new { area = "Orchard.Search" }, FormMethod.Get, new { @class = "search-form" })) { 
     <fieldset>
         @Html.TextBox("q", (SearchViewModel)Model.ViewModel.Query)
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
index 767ef57bf..31f3fee51 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
@@ -71,7 +71,7 @@ header, footer, aside, nav, article { display: block; }
     visibility: hidden;
 }
 
-.zone:after /* Self clears every zone container */
+.zone:after, .widget-control:after /* .zone:after self clears every zone container - .widget-control:after self clears any floats used in a widget */
 {
     content: ".";
     display: block;
@@ -424,13 +424,6 @@ nav ul
 .widgets {}
 .widget h1 { font-size: 1.077em; }
 
-/* Search */
-/* Search widget shuld go into the sidebar for proper styling */
-/* TODO: (mibach) Generic any zone compatible search widget */
-.search-form {}
-.search-form input[type="text"] { float: left; }
-.search-form button[type="submit"] { float: left; margin: 0; margin-left: 6px; }
-
 /* Edit Mode Widgets */
 /* These are the edit controls that appear when you're logged-in */
 .widget-control { position: relative; border: 1px dotted #5f97af; }