Merge

--HG--
branch : dev

src/Orchard.Tests.Modules/Setup/SetupControllerTests.cs

@@ -69,7 +69,7 @@ namespace Orchard.Tests.Modules.Setup {
         [Test]
         public void IndexNormallyReturnsWithDefaultAdminUsername() {
             var controller = _container.Resolve<SetupController>();
-            var result = controller.Index(null);
+            var result = controller.Index();
 
             Assert.That(result, Is.Not.Null);
             Assert.That(result, Is.TypeOf<ViewResult>());

src/Orchard.Web/Core/Common/Records/BodyRecord.cs

@@ -1,8 +1,11 @@
 using Orchard.ContentManagement.Records;
+using Orchard.Data.Conventions;
 
 namespace Orchard.Core.Common.Records {
     public class BodyRecord : ContentPartVersionRecord {
+        [StringLengthMax]
         public virtual string Text { get; set; }
+
         public virtual string Format { get; set; }
     }
 }

src/Orchard.Web/Core/Common/Records/RoutableRecord.cs

@@ -1,8 +1,11 @@
-using Orchard.ContentManagement.Records;
+using System.ComponentModel.DataAnnotations;
+using Orchard.ContentManagement.Records;
 
 namespace Orchard.Core.Common.Records {
     public class RoutableRecord : ContentPartVersionRecord {
+        [StringLength(1024)]
         public virtual string Title { get; set; }
+
         public virtual string Slug { get; set; }
     }
 }

src/Orchard.Web/Core/Navigation/AdminMenu.cs

@@ -7,7 +7,7 @@ namespace Orchard.Core.Navigation {
         public void GetNavigation(NavigationBuilder builder) {
             builder.Add("Site", "12",
                         menu => menu
-                                    .Add("Manage Main Menu", "6.0", item => item.Action("Index", "Admin", new { area = "Navigation" }).Permission(Permissions.ManageMainMenu)));
+                                    .Add("Manage Menu", "6.0", item => item.Action("Index", "Admin", new { area = "Navigation" }).Permission(Permissions.ManageMainMenu)));
         }
     }
 }

src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx

@@ -24,9 +24,9 @@ using (Html.BeginFormAntiForgeryPost()) { %>
     foreach (var menuPartEntry in Model.MenuItemEntries) {
         var i = menuPartEntryIndex; %>
         <tr>
-            <td><input type="text" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItem.Text) %>" value="<%=menuPartEntry.MenuItem.Text %>" /></td>
+            <td><input type="text" class="text-box" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItem.Text) %>" value="<%=menuPartEntry.MenuItem.Text %>" /></td>
-            <td><input type="text" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItem.Position) %>" value="<%=menuPartEntry.MenuItem.Position %>" /></td>
+            <td><input type="text" class="text-box" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItem.Position) %>" value="<%=menuPartEntry.MenuItem.Position %>" /></td>
-            <td><% if (!menuPartEntry.IsMenuItem) { %><input type="text" disabled="disabled" value="<%=menuPartEntry.MenuItem.Url %>" /><% } else { %><input type="text" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItem.Url) %>" value="<%=menuPartEntry.MenuItem.Url %>" /><% } %></td>
+            <td><% if (!menuPartEntry.IsMenuItem) { %><input type="text" class="text-box" disabled="disabled" value="<%=menuPartEntry.MenuItem.Url %>" /><% } else { %><input type="text" class="text-box" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItem.Url) %>" value="<%=menuPartEntry.MenuItem.Url %>" /><% } %></td>
             <td><input type="hidden" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItemId) %>" value="<%=menuPartEntry.MenuItemId %>" /><a href="<%=Url.Action("Delete", new {id = menuPartEntry.MenuItemId, __RequestVerificationToken = Html.AntiForgeryTokenValueOrchard()}) %>" class="remove button">delete</a></td>
         </tr><%
         ++menuPartEntryIndex;

src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{63FBD4D9-E1DA-4A7B-AA6A-D6074FE50867}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -201,8 +201,6 @@
           <IISUrl>
           </IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://orchard.codeplex.com/</CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx

@@ -7,7 +7,8 @@
 </h1>
 
 <%--<form>
-<fieldset class="actions bulk">
+<div class="actions bulk">
+<fieldset>
     <label for="filterResults"><%=_Encoded("Filter:")%></label>
         <select id="filterResults" name="">
             <option value="">All Posts</option>
@@ -15,9 +16,10 @@
         </select>
     <input class="button" type="submit" name="submit.Filter" value="<%=_Encoded("Apply") %>"/>
 </fieldset>
+</div>
 </form>--%>
 
 
-<div class="actions"><a href="<%=Url.BlogPostCreate(Model.Item.Slug) %>" class="add button"><%=_Encoded("New Post")%></a></div>
+<div class="actions"><a href="<%=Url.BlogPostCreate(Model.Item.Slug) %>" class="add button primaryAction"><%=_Encoded("New Post")%></a></div>
 <% Html.Zone("primary");
    Html.ZonesAny(); %>

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx

@@ -7,8 +7,8 @@
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 
-<ul>
+<div class="blogPost summary">
-    <li class="properties">
+<div class="properties">
     <h3><%=Html.Link(Html.Encode(Model.Item.Title), Url.BlogPostEdit(Model.Item.Blog.Slug, Model.Item.Id))%></h3>
 
         <ul>
@@ -45,9 +45,9 @@
             <%=_Encoded("By {0}", Model.Item.Creator.UserName)%>
              </li>                   
         </ul>               
-    </li>
+    </div>
 
-    <li class="related">
+    <div class="related">
     
             <%if (Model.IsPublished){ %>
         <a href="<%=Url.BlogPost(Model.Item.Blog.Slug, Model.Item.Slug) %>" title="<%=_Encoded("View Post")%>"><%=_Encoded("View")%></a><%=_Encoded(" | ")%>
@@ -68,7 +68,7 @@
                 } %>
                 
         <br /><%Html.Zone("meta");%>
-    </li>
+    </div>
 
-    <li style="clear:both;"></li>
+    <div style="clear:both;"></div>
-</ul>
+</div>

src/Orchard.Web/Modules/Orchard.Media/AdminMenu.cs

@@ -7,7 +7,7 @@ namespace Orchard.Media {
         public void GetNavigation(NavigationBuilder builder) {
             builder.Add("Media", "4",
                         menu => menu
-                                    .Add("Manage Folders", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Media" }).Permission(Permissions.ManageMediaFiles))
+                                    .Add("Manage Media", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Media" }).Permission(Permissions.ManageMediaFiles))
                                     );
         }
     }

src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs

@@ -112,7 +112,7 @@ namespace Orchard.Setup.Controllers {
                         menuItem.As<MenuPart>().MenuPosition = "1";
                         menuItem.As<MenuPart>().MenuText = T("Home").ToString();
                         menuItem.As<MenuPart>().OnMainMenu = true;
-                        menuItem.As<MenuItem>().Url = "";
+                        menuItem.As<MenuItem>().Url = "~";
 
                         var authenticationService = finiteEnvironment.Resolve<IAuthenticationService>();
                         authenticationService.SignIn(user, true);
@@ -132,7 +132,10 @@ namespace Orchard.Setup.Controllers {
                 return Redirect("~/");
             }
             catch (Exception exception) {
-                _notifier.Error(T("Setup failed: " + exception.Message));
+                _notifier.Error(T("Setup failed:"));
+                for(var scan = exception; scan !=null; scan = scan.InnerException){
+                    _notifier.Error(scan.Message);
+                }
                 return IndexViewResult(model);
             }
         }

src/Orchard.Web/Orchard.Web.csproj

@@ -217,12 +217,9 @@
     <Content Include="Themes\Orchard\Theme.txt" />
     <Content Include="Themes\Orchard\Views\Footer.ascx" />
     <Content Include="Themes\Orchard\Views\Layout.ascx" />
-    <Content Include="Themes\SafeMode\Content\Images\background_content.jpg" />
+    <Content Include="Themes\SafeMode\Styles\images\backgroundHeader.gif" />
-    <Content Include="Themes\SafeMode\Content\Images\background_footer.jpg" />
+    <Content Include="Themes\SafeMode\Styles\images\backgroundVines.gif" />
-    <Content Include="Themes\SafeMode\Content\Images\background_module.gif" />
+    <Content Include="Themes\SafeMode\Styles\images\orchardLogo.gif" />
-    <Content Include="Themes\SafeMode\Content\Images\background_page.jpg" />
-    <Content Include="Themes\SafeMode\Content\Images\background_pageTop.gif" />
-    <Content Include="Themes\SafeMode\Content\Images\orchardLogo.jpg" />
     <Content Include="Themes\SafeMode\Styles\site.css" />
     <Content Include="Themes\SafeMode\Theme.png" />
     <Content Include="Themes\SafeMode\Theme.txt" />
@@ -234,7 +231,6 @@
     <Content Include="Themes\TheAdminClassic\Styles\images\tableHeaderBackground.gif" />
     <Content Include="Themes\TheAdminClassic\Styles\images\tableHeaderBackgroundRed.gif" />
     <Content Include="Themes\TheAdminClassic\Styles\site.css" />
-    <Content Include="Themes\TheAdminClassic\Theme.gif" />
     <Content Include="Themes\TheAdminClassic\Theme.txt" />
     <Content Include="Themes\TheAdminClassic\Views\Header.ascx" />
     <Content Include="Themes\TheAdminClassic\Views\Layout.ascx" />
@@ -251,6 +247,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="Themes\SafeMode\Content\Images\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />

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

@@ -148,14 +148,13 @@ h3 { font-size:1.8em; } /* 18px */
 h4 { font-size:1.6em; } /* 16px */
 h5 { font-size:1.4em; } /* 14px */
 
-h6, p, label, input, select, .button,
+h6, p, label, /*input, select,*/ .button,
 .message, .validation-summary-errors,
 table.items th, table.items td, table.items caption { font-size:1.4em; line-height:1.4em; } /* 14px */
+table.items p, table.items label, table.items input, table.items .button { font-size:1em; line-height:1em; }
 p .button { font-size:inherit; }
 .meta, .hint { font-size:1.2em; } /* 12px */
 
-
-
 /* Links
 ----------------------------------------------------------*/
 a, a:link, a:visited {
@@ -327,13 +326,8 @@ span.message {
 	color:#fff;
 }
 .info.message {
-    background:#e4ebef; /* blue */
+    background:#e6f1c9; /* green*/
-	border:1px solid #4687AD;
+	border:1px solid #d4deb9;
-	color:#062232;
-}
-.info.message {
-    background:#e6e7ef; /* blue */
-	border:1px solid #b5b9c4;
 	color:#062232;
 }
 .debug.message {
@@ -464,7 +458,7 @@ button, .button, .button:link, .button:visited {
 	text-align:center;
 	padding:0 .8em .1em .8em;
 }
-.primaryAction{
+.primaryAction, .primaryAction:link, .primaryAction:visited {
 	background:#4687ad;
 	border:1px solid #8f8f8f;
 	color:#fff;
@@ -619,7 +613,6 @@ button.ibutton {
     margin-left:8px;
     margin-right:0;
 }
-#main .contentItems li:hover { background:#f8f8f8; }
 #main .contentItems li:hover .ibutton { background-position:0 0; }
 #main .contentItems li:hover .ibutton.remove { background-position:-20px 0; }
 #main .contentItems li:hover .ibutton.view { background-position:-40px 0; }
@@ -633,7 +626,8 @@ button.ibutton {
 ----------------------------------------------------------*/
 table.items {
 	background:#fff;
-	border:1px solid #999;
+	border:1px solid #eaeaea;
+	border-bottom:none;
 	border-collapse:separate;
 	border-spacing:0;
 	width:100%;
@@ -668,12 +662,19 @@ table.items tr.hover {
 table.items tr.critical {background:#e68585; border:inherit;}
 table.items tr.warning {background:#fdf5bc; border:inherit;}
 table.items th, table.items td {
-	border-bottom:1px solid #ccc;
+	border-bottom:1px solid #eaeaea;
 	border-spacing:0px;
 	display:table-cell;
 	padding:8px 12px;
 	vertical-align:middle;
 }
+/* todo: Find a better way to do this. These are a fix for buttons and label fonts becomming too large in a table.*/
+table label {
+    font-size:1em;
+}
+table .button {
+    font-size:1em;
+}
 
 
 /* MISC.
@@ -731,6 +732,10 @@ table.items, textarea, input.text, input.text-box,
 
 /* Added classes for new blog list layout
 ---------------------------------------------------------- */
+
+.blogPost.summary {
+    padding:.6em .4em;
+}
 .actions {
     height:auto;
     overflow:visible;
@@ -740,28 +745,24 @@ table.items, textarea, input.text, input.text-box,
 .contentItems {
     padding:0;
 }
-.contentItems li ul li {
+.properties {
-    border:0;
-    background:inherit;
-}
-li.properties {
     float:left;
 }
-#main .contentItems li.properties h3 {
+#main .contentItems .properties h3 {
     border-bottom:none;
     margin:0;
+    margin:0 0 0 .2em;
     padding:0;
 }
-li.related{
+.related{
      font-size:1.4em;
      float:right;
-     padding:.4em 0;
      text-align:right;
 }
-li.related .commentcount{
+.related .commentcount{
      line-height:2em;
 }
-li.properties ul li{
+.contentItems .properties ul li{
     border:0;
     float:left;
     padding:.8em 0;
@@ -769,7 +770,6 @@ li.properties ul li{
     background:inherit;
 }
 .icon {
-    margin:0 0 -2px 4px;
     margin:0 .2em -.2em .2em;
 }
 .linkButton {

src/Orchard/Data/Conventions/StringLengthConvention.cs

@@ -0,0 +1,17 @@
+using System.ComponentModel.DataAnnotations;
+using FluentNHibernate.Conventions;
+using FluentNHibernate.Conventions.Instances;
+
+namespace Orchard.Data.Conventions {
+    public class StringLengthMaxAttribute : StringLengthAttribute {
+        public StringLengthMaxAttribute() : base(10000) {
+            // 10000 is an arbitrary number large enough to be in the nvarchar(max) range 
+        }
+    }
+
+    public class StringLengthConvention : AttributePropertyConvention<StringLengthAttribute> {
+        protected override void Apply(StringLengthAttribute attribute, IPropertyInstance instance) {
+            instance.Length(attribute.MaximumLength);
+        }
+    }
+}

src/Orchard/Orchard.csproj

@@ -138,6 +138,7 @@
     <Compile Include="Data\Builders\ISessionFactoryBuilder.cs" />
     <Compile Include="Data\Builders\SQLiteBuilder.cs" />
     <Compile Include="Data\Builders\SqlServerBuilder.cs" />
+    <Compile Include="Data\Conventions\StringLengthConvention.cs" />
     <Compile Include="Data\SessionFactoryHolder.cs" />
     <Compile Include="Environment\Configuration\AppDataFolder.cs" />
     <Compile Include="Environment\Configuration\ShellSettingsLoader.cs" />