Merge

--HG--
branch : dev

src/Orchard.Web/Core/Shapes/CoreShapes.cs

@@ -244,13 +244,16 @@ namespace Orchard.Core.Shapes {
             if (Items == null)
                 return;
 
+            var count = Items.Count();
+            if (count < 1)
+                return;
+
             var listTagName = string.IsNullOrEmpty(Tag) ? "ul" : Tag;
             const string itemTagName = "li";
 
             var listTag = GetTagBuilder(listTagName, Id, Classes, Attributes);
             Output.Write(listTag.ToString(TagRenderMode.StartTag));
 
-            var count = Items.Count();
             var index = 0;
             foreach (var item in Items) {
                 var itemTag = GetTagBuilder(itemTagName, null, ItemClasses, ItemAttributes);

src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs

@@ -28,7 +28,7 @@ namespace Orchard.Blogs.Drivers {
         }
 
         protected override DriverResult Editor(BlogArchivesPart part, dynamic shapeHelper) {
-            return ContentShape("Parts_Blogs_BlogArchives_Editor",
+            return ContentShape("Parts_Blogs_BlogArchives_Edit",
                                 () => shapeHelper.EditorTemplate(TemplateName: "Parts/Blogs.BlogArchives", Model: part, Prefix: Prefix));
         }
 

src/Orchard.Web/Modules/Orchard.Blogs/Placement.info

@@ -11,8 +11,8 @@
     <!-- widget and edit shapes just get default placement -->
     <!-- edit "shapes" -->
     <Place Parts_Blogs_Blog_Fields="Primary:2"/>
-    <Place Parts_Blogs_BlogArchives_Editor="Primary:5"/>
-    <Place Parts_Blogs_RecentBlogPosts_Editor="Primary:5"/>
+    <Place Parts_Blogs_BlogArchives_Edit="Primary:5"/>
+    <Place Parts_Blogs_RecentBlogPosts_Edit="Primary:5"/>
     <!-- widgets -->
     <Place Parts_Blogs_BlogArchives="Content"/>
     <Place Parts_Blogs_RecentBlogPosts="Content"/>

src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Pager.cshtml

@@ -3,7 +3,7 @@
     Style.Include("pagination.css");
 }
 @if (Model.ThereIsANextPage || Model.Page > 1) {
-    <ul class="blog-pagination">
+    <ul class="blog-pagination group">
     @if(Model.ThereIsANextPage) {
         <li class="older">
         @Html.ActionLink(T("Older Posts").Text, "Item", new { Area = "Orchard.Blogs", blogSlug = Model.BlogSlug, page = Model.Page + 1 })

src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml

@@ -1,5 +1,9 @@
 @model Orchard.ContentTypes.ViewModels.EditTypeViewModel
-@{ Style.Require("ContentTypesAdmin"); }
+@{
+    Style.Require("ContentTypesAdmin");
+	Script.Require("jQuery");
+    Script.Include("admin.js");
+}
 <h1>@Html.TitleForPage(T("Edit Content Type").ToString())</h1>
 <p class="breadcrumb">@Html.ActionLink(T("Content Types").Text, "index")@T(" &#62; ")@T("Edit Content Type")</p>
 @using (Html.BeginFormAntiForgeryPost()) {

src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.cshtml

@@ -1,6 +1,9 @@
 @model Orchard.ContentTypes.ViewModels.EditPartViewModel
-@{ Style.Require("ContentTypesAdmin"); }
-
+@{
+    Style.Require("ContentTypesAdmin");
+	Script.Require("jQuery");
+    Script.Include("admin.js");
+}
 <h1>@Html.TitleForPage(T("Edit Part").ToString())</h1>
 <p class="breadcrumb">@Html.ActionLink(T("Content Types").Text, "index")@T(" &#62; ")@Html.ActionLink(T("Content Parts").Text, "listparts")@T(" &#62; ")@T("Edit Part")</p>
 @using (Html.BeginFormAntiForgeryPost()) {

src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs

@@ -275,7 +275,7 @@ namespace Orchard.Setup.Services {
             // create a welcome page that's promoted to the home page
             var page = contentManager.Create("Page");
             page.As<RoutePart>().Title = T("Welcome to Orchard!").Text;
-            page.As<BodyPart>().Text = "<p>Congratulations, you've successfully set-up your Orchard site.</p><p>This is the home page of your new site. We've taken the liberty to write here about a few things you could look at next in order to get familiar with the application. Once you feel confident you don't need this anymore, just click <a href=\"/Admin/Contents/Edit/7\">Edit</a> to go into edit mode and replace this with whatever you want on your home page to make it your own.</p><p>One thing you could do (but you don't have to) is go into <a href=\"Admin/Settings\">Manage Settings</a> (follow the <a href=\"Admin\">Admin</a> link and then look for it under \"Settings\" in the menu on the left) and check that everything is configured the way you want.</p><p>You probably want to make the site your own. One of the ways you can do that is by clicking <a href=\"Admin/Themes\">Manage Themes</a> in the admin menu. A theme is a packaged look and feel that affects the whole site.</p><p>Next, you can start playing with the content types that we installed. For example, go ahead and click <a href=\"Admin/Pages/Create\">Add New Page</a> in the admin menu and create an \"about\" page. Then, add it to the navigation menu by going to <a href=\"Admin/Navigation\">Manage Menu</a>. You can also click <a href=\"Admin/Blogs/Create\">Add New Blog</a> and start posting by clicking \"Add New Post\".</p><p>Finally, Orchard has been designed to be extended. It comes with a few built-in modules such as pages and blogs or themes. You can install new themes by going to <a href=\"Admin/Themes\">Manage Themes</a> and clicking <a href=\"Admin/Themes/Install\">Install a new Theme</a>. Like for themes, modules are created by other users of Orchard just like you so if you feel up to it, please <a href=\"http://www.orchardproject.net/\">consider participating</a>.</p><p>--The Orchard Crew</p>";
+            page.As<BodyPart>().Text = "<p>You’ve successfully setup your Orchard Site and this is the homepage of your new site. Here are a few things you can look at to get familiar with the application. Once you feel confident you don’t need this anymore, you can <a href=\"/Admin/Contents/Edit/7\">remove this by going into editing mode</a> and replacing it with whatever you want.</p><p>First things first - You’ll probably want to <a href=\"Admin/Settings\">manage your settings</a> and configure Orchard to your liking. After that, you can head over to <a href=\"Admin/Themes\">manage themes to change or install new themes</a> and really make it your own. Once you’re happy with a look and feel, it’s time for some content. You can start creating new custom content types or start with some built-in ones by <a href=\"Admin/Pages/Create\">adding a page</a>, <a href=\"Admin/Blogs/Create\">creating a blog</a> or <a href=\"Admin/Navigation\">managing your menus.</a></p><p>Finally, Orchard has been designed to be extended. It comes with a few built-in modules such as pages and blogs or themes. If you’re looking to add additional functionality, you can do so by creating your own module or installing a new one that someone has made. Modules are created by other users of Orchard just like you so if you feel up to it, <a href=\"http://www.orchardproject.net/\">please consider participating</a>. XOXO – The Orchard Team </p>";
 
             contentManager.Publish(page);
             siteSettings.Record.HomePage = "RoutableHomePageProvider;" + page.Id;

src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.Edit.cshtml

@@ -3,7 +3,7 @@
         @Display(Model.Primary)
     </div>
     <div class="secondary">
-        @Display(Model.secondary)
+        @Display(Model.Secondary)
         <fieldset>
             <input class="button primaryAction" type="submit" name="submit.Save" value="@T("Save")"/>
         </fieldset>

src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js

@@ -18,7 +18,7 @@
 
                 glyph.data("controllees", getControllees(controller));
 
-                if (glyph.data("controllees").length === 0) {
+                if (glyph.data("controllees").length === 0 || glyph.data("controllees").height() < 1) {
                     return;
                 }
 

src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css

@@ -14,7 +14,6 @@ Text: #434343
 Secondary Text: #999999
 Main Accent: #999
 Links: #5f97af
-Hovers: #85b35c
 */
 
 
@@ -136,7 +135,7 @@ p img.left  { float: left; margin: 1.5em 1.5em 1.5em 0; padding: 0; }
 p img.right { float: right; margin: 1.5em 0 1.5em 1.5em; }
 
 a:focus, 
-a:hover     { color: #85b35c; }
+a:hover     { text-decoration: underline; }
 a           { color: #5f97af; text-decoration: none; }
 
 blockquote  { margin: 1.5em; color: #666; font-style: italic; }
@@ -229,7 +228,7 @@ nav ul
 	#branding 
 	{   
 		font-family: 'Lobster', Tahoma, Arial, Helvetica, sans-serif;
-		font-size: 3.4em;
+		font-size: 3.8em;
 		padding: 0;
 		margin: 0;
 	}
@@ -274,7 +273,7 @@ nav ul
 	-webkit-box-shadow:inset 0 0 1px purple;
     */
 } 
-.zone-header { padding: 30px 0 30px 12px; }
+.zone-header { padding: 30px 0 30px 12px; position: relative; }
 .zone-navigation { padding: 0; }
 .zone-featured {}
 .zone-beforemain {}
@@ -313,7 +312,7 @@ nav ul
 .blog-posts .blog-post header h1 a:hover {}
 .blog-posts .blog-post .tags { margin-top: 12px; }
 .blog-posts .blog-post .tags a { background-color: #dbdbdb; padding: 3px; color: #434343; }
-.blog-posts .blog-post .tags a:hover { background-color: #434343; padding: 3px; color: #fff; }
+.blog-posts .blog-post .tags a:hover { background-color: #434343; padding: 3px; color: #fff; text-decoration: none; }
 .blog-posts .blog-post .metadata { margin: 0 0 12px 0; color: #999; font-size: 1.1em; }
 .blog-posts .blog-post .metadata .published { display: inline; margin: 0 6px 0 0; }
 .blog-posts .blog-post .metadata .commentcount { display: inline; }
@@ -321,6 +320,11 @@ nav ul
 .blog-post-title {}
 .meta {}
 
+.blog-pagination { list-style: none; padding: 0; margin: 12px 0 0 0; }
+.blog-pagination li { float: left; padding: 0 12px 0 0; margin: 0; }
+.blog-pagination a { font-size: 1.4em; display: block; background-color: #dbdbdb; padding: 6px 6px; color: #434343;}
+.blog-pagination a:hover { background-color: #434343; color: #fff; }
+
 /* Comments */
 #comments { margin: 24px 0 0 0; padding: 0; }
 .comment-form { margin: 24px 0 0 0; padding: 0; }
@@ -348,7 +352,7 @@ nav ul
 .tagged-posts .blog-post header h1 a:hover {}
 .tagged-posts .blog-post .tags { margin-top: 12px; }
 .tagged-posts .blog-post .tags a { background-color: #dbdbdb; padding: 3px; color: #434343; }
-.tagged-posts .blog-post .tags a:hover { background-color: #434343; padding: 3px; color: #fff; }
+.tagged-posts .blog-post .tags a:hover { background-color: #434343; padding: 3px; color: #fff; text-decoration: none; }
 .tagged-posts .blog-post .metadata { margin: 0 0 12px 0; color: #999; font-size: 1.1em; }
 .tagged-posts .blog-post .metadata .published { display: inline; margin: 0 6px 0 0; }
 .tagged-posts .blog-post .metadata .commentcount { display: inline; }
@@ -364,7 +368,7 @@ nav ul
 .search-results .blog-post header h1 a:hover {}
 .search-results .blog-post .tags { margin-top: 12px; }
 .search-results .blog-post .tags a { background-color: #dbdbdb; padding: 3px; color: #434343; }
-.search-results .blog-post .tags a:hover { background-color: #434343; padding: 3px; color: #fff; }
+.search-results .blog-post .tags a:hover { background-color: #434343; padding: 3px; color: #fff; text-decoration: none; }
 .search-results .blog-post .metadata { margin: 0 0 12px 0; color: #999; font-size: 1.1em; }
 .search-results .blog-post .metadata .published { display: inline; margin: 0 6px 0 0; }
 .search-results .blog-post .metadata .commentcount { display: inline; }
@@ -451,6 +455,38 @@ nav ul
 .widgets {}
 
 /* Search */
+/* Search widget shuld go into the sidebar for proper styling */
+/* TODO: (mibach) Generic any zone compatible search widget */
+.widget-search-form 
+{
+    position: absolute;
+    top: 30px;
+    right: 12px;
+}
+.widget-search-form h1 { font-size: 1.4em; }
+
+.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; }
+.widget-control .manage-actions { position:absolute; top: 0px; right: 0px; }
+.widget-control .manage-actions a { display: block; background-color: #dbdbdb; font-size: 1.3em; color: #434343; padding: 3px 6px;  }
+.widget-control .manage-actions a:hover { background-color: #434343; color: #fff; text-decoration: none; }
+.widget-control .widget-search-form /* TODO: (mibach) Remove special case for Search Widget */
+{
+    position: absolute;
+    top: 0px;
+    right: 12px;
+}
+
+/* Content Mode */
+.content-control { position: relative; border: 1px dotted #5f97af; }
+.content-control .manage-actions { position:absolute; top: 0px; right: 0px; }
+.content-control .manage-actions a { display: block; background-color: #dbdbdb; font-size: 1.3em; color: #434343; padding: 3px 6px;  }
+.content-control .manage-actions a:hover { background-color: #434343; color: #fff; text-decoration: none; }
 
 
 

src/Orchard.Web/Themes/TheThemeMachine/Theme.txt

@@ -1,6 +1,6 @@
 Name: The Theme Machine
 Author: jowall, mibach, loudej, heskew
-Description: It's a *really* good theme, yo.
+Description: Orchard Theme Machine is a flexible multi-zone theme that provides a solid foundation to build your site. It features 20 collapsible widget zones and is flexible enough to cover a wide range of layouts.
 Version: 0.1
 Tags: Awesome
 Website: http://orchardproject.net