From 1c2c78c586e4a9a4fa73703e694410f0b0f60122 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Wed, 17 Feb 2010 13:44:04 -0800 Subject: [PATCH 01/11] (Re)Fixing a little CSS for the main menu management --HG-- branch : dev --- src/Orchard.Web/Themes/TheAdmin/Styles/site.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index 4c3f9f5ad..21e789db9 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -151,6 +151,7 @@ h5 { font-size:1.4em; } /* 14px */ 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 */ From 5fe62671ad5697f37b2ceec6ee9df0a7689b8656 Mon Sep 17 00:00:00 2001 From: jowall Date: Fri, 19 Feb 2010 13:53:07 -0800 Subject: [PATCH 02/11] Updated the html and CSS of the BlogPostSummary page in the admin. Checked changes with W3C validation service. Added status icons. --HG-- branch : dev --- .../Content/Admin/images/draft.gif | Bin 0 -> 379 bytes .../Content/Admin/images/offline.gif | Bin 0 -> 603 bytes .../Content/Admin/images/online.gif | Bin 0 -> 1024 bytes .../Content/Admin/images/published.gif | Bin 0 -> 379 bytes .../Content/Admin/images/scheduled.gif | Bin 0 -> 642 bytes .../Items/Blogs.Blog.DetailAdmin.ascx | 6 +++-- .../Items/Blogs.BlogPost.SummaryAdmin.ascx | 14 +++++----- .../Themes/TheAdmin/Styles/site.css | 24 ++++++++---------- 8 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Content/Admin/images/draft.gif create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Content/Admin/images/offline.gif create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Content/Admin/images/online.gif create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Content/Admin/images/published.gif create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Content/Admin/images/scheduled.gif diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Content/Admin/images/draft.gif b/src/Orchard.Web/Modules/Orchard.Blogs/Content/Admin/images/draft.gif new file mode 100644 index 0000000000000000000000000000000000000000..a572f4589cee4941173e80c4481dd436e8def9de GIT binary patch literal 379 zcmV->0fhcXNk%w1VGsZi0M$AG`uh6y_4VK1-^ z!t?X<#>U3T$jIvI>hbaMz`($?w6waqy7ct)#l^+!?Cj>|=I7_At?c*4Eb3)6?7A+tt<8+1c6e@9(Ors->l+?d|QX ztgP49*SNU2l%_~BZ?;Kb`$&m$ z7lc)J%N1&c!s6q|9VQgPvRs2mA{*68n!C+&P=GW64;2m;eSbL`3L`HO7%?p@iDZ0H zHZ%tdA(dr09Ucq_5F8*92cDOhH8nJHK_vq%`cyqs8K=tS1-fL>aWK8#we)x=b?URneXH4U6WAmq@ z@MKo~+}O-gJmywR?#aXSj)Bc!QT42$#85Q(>ge`_Z01%_=2}wVWnAuNQq5>s;(K-D zczO4ee&T<9)Ny6pYiRk?%=hT!+g3~NYF^f0RO_>^`lFHIsh-DcRQSWbz*#@yd3oWh zpxkb0__nC%dUe4~Gxn>Z?u>!$$;0@DaQw%*^`oESaAyDi{{R30A^8LW004dfEC2ui z01yBW000NLfPR95goT9z4r54V2x~Nkeg<(&Z)Q3{owSQ{bi@JcHQ2(@BY>)C;GQP+)#8n)N_NnX1VIi?@!m>pMCK0wyd22fB*fx z_U_W^%d^vtdfLylsXLe%w7}`vm&c_iG79&_H=HW2JeczMwH&1tr^~qxP9Eyf$_Ir3v=k*6Xe>%-tStT5mY*bX(50 zu-ZLoF$b(?oN3>FbL-phucw{u*mhxS!H&qXlbN%w^gev^uz6puT8nbY;gp#dyZvT6 z&N$t+`R3BRqsf&gvroT0kaN^~;(`9z*C%G4@S1hJebem~_N~_SJ2H!pr){~rYTL!F z`G*tpjwI$EO6)vRRj_2=xyu)ds zamk^`#n-0+BbQ+m;0*!ApDc_F4D%UuK&n7_f`Q{MgFUB=$A$z)m)5kBnTHkzu{Y0u zaN*?>O$P=o%LNZKZX~rbvaqmlC=@VoDoZfuelaLeXzXU{ZP}Cgp?$Joqq%{iM}R}~ zY?m&H3@Jy=wgVO#&n8%2YVV(~!qBwB@QL$-cE?GdPTaVdBHX~(UKiu2JfW@0)g_35 z;j<~v63#$1&X`9le580<7+zdxIvUhz6~+?QxM2AS0YUYUoP`V;ho$(L9CZv5)t#0Y z^6PnIHmi5fY}99(8~CV|o70R>C*@Y~hi+j7(TbLeLoQ7c9n+t1RE0b~$0jDwEY8Eh GU=0BKCVeOX literal 0 HcmV?d00001 diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Content/Admin/images/published.gif b/src/Orchard.Web/Modules/Orchard.Blogs/Content/Admin/images/published.gif new file mode 100644 index 0000000000000000000000000000000000000000..b24b9c73158bfd58208063458829a56fd06da7fe GIT binary patch literal 379 zcmV->0fhcXNk%w1VGsZi0M$AG{QUgM$;tcs`}p|y`T6a?`9^z`()y1K~7$il+H;^N}*@$tsS#`E*@!^6YCz`)kl)~c$i zv9Yney}hrmudc4H&d$!}=H}Ja)#vBu+1c6C)6=D;rQ6%v?d|Qy$H(&W^5f&FNLf{{R300000000000 z00000A^8LW0024wEC2ui01yBW000Jo21g>I=c3+A9C+0*aezrTF>a_zcRetw>N_wBB&t0*eY`}pzW*RNk5 zJa~|vk$m^=oz~XIuV22LKY#YzxwCig+*!MJ)yfsiGP6=noH%;=%*jiaE?l~JVe8h7 zGiFW=4ECw6EsKZ@-o9;%e}HF9Z0M?0D-Isq7Z~V$@W6q>qTJ~-CeNNTg!i*l}By%ZAacjnB=$jFeK-1JMAF0EL(bmq)yXHTC>NllnI zsrTZ=^D9>^wX(9>yJt^HNx|K_cduNz^ykl?kkEjSA3of>cklD(&u7n`s;sQMapT70 z$B&;pdE(*W@$~7_hYuenBqaR){rks{?|=XP{r2tauV256jg9|<0mDE5#h)yU3=9zr zIv~qIal*iUzagS2A~-ZCBqS&_xVblwQG(4}THV$rus0%<*H~Ff%UV{?lqIw|kk>;@ zoH2yUkX>IgbFrSgAK&ynZcsO%-fM2*7r<#mL8=Dm4Zf9TbP$q48 z6^?dutq`AZCOdz3eoaYTlMZQXu6;~l-@{Zb734bAWev+h4TW4zGH{A;9SFE`_-Lc1 z8H <%--
-
+
+
"/>
+
--%> -
<%=_Encoded("New Post")%>
+
<%=_Encoded("New Post")%>
<% Html.Zone("primary"); Html.ZonesAny(); %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx index 6aa30c2e1..173c79d2c 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx +++ b/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"%> -
    -
  • +
    +

    <%=Html.Link(Html.Encode(Model.Item.Title), Url.BlogPostEdit(Model.Item.Blog.Slug, Model.Item.Id))%>

      @@ -45,9 +45,9 @@ <%=_Encoded("By {0}", Model.Item.Creator.UserName)%>
    -
    • + -
  • +
    <%if (Model.IsPublished){ %> "><%=_Encoded("View")%><%=_Encoded(" | ")%> @@ -68,7 +68,7 @@ } %>
    <%Html.Zone("meta");%> -
    • + -
  • -
\ No newline at end of file +
+ \ No newline at end of file diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index fdb082c11..1827302cb 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -464,7 +464,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 +619,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; } @@ -731,6 +730,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 +743,24 @@ table.items, textarea, input.text, input.text-box, .contentItems { padding:0; } -.contentItems li ul li { - border:0; - background:inherit; -} -li.properties { +.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 +768,6 @@ li.properties ul li{ background:inherit; } .icon { - margin:0 0 -2px 4px; margin:0 .2em -.2em .2em; } .linkButton { From 5cb9a78cebc9c4afddbd296c3c8ea126e88dfc60 Mon Sep 17 00:00:00 2001 From: jowall Date: Fri, 19 Feb 2010 17:22:33 -0800 Subject: [PATCH 03/11] Updated the CSS for tables and fixed a font size issue on manage menu page. --HG-- branch : dev --- src/Orchard.Web/Core/Navigation/AdminMenu.cs | 2 +- .../Core/Navigation/Views/Admin/Index.ascx | 6 ++--- .../Orchard.Blogs/Orchard.Blogs.csproj | 4 +-- .../Modules/Orchard.Media/AdminMenu.cs | 2 +- .../Themes/TheAdmin/Styles/site.css | 25 ++++++++++--------- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/Orchard.Web/Core/Navigation/AdminMenu.cs b/src/Orchard.Web/Core/Navigation/AdminMenu.cs index b06b2056b..0b46da08e 100644 --- a/src/Orchard.Web/Core/Navigation/AdminMenu.cs +++ b/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))); } } } diff --git a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx index d0df20472..32ccebc10 100644 --- a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx +++ b/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; %> - - - <% if (!menuPartEntry.IsMenuItem) { %><% } else { %><% } %> + + + <% if (!menuPartEntry.IsMenuItem) { %><% } else { %><% } %> " class="remove button">delete <% ++menuPartEntryIndex; diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj index 951e45ce8..3f361a599 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -2,7 +2,7 @@ Debug AnyCPU - 9.0.30729 + 9.0.21022 2.0 {63FBD4D9-E1DA-4A7B-AA6A-D6074FE50867} {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} @@ -201,8 +201,6 @@ False - True - http://orchard.codeplex.com/ False diff --git a/src/Orchard.Web/Modules/Orchard.Media/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Media/AdminMenu.cs index 4a46c35af..8bc691067 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/AdminMenu.cs +++ b/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)) ); } } diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index 1827302cb..e7d6fc22f 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -148,14 +148,12 @@ 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 */ p .button { font-size:inherit; } .meta, .hint { font-size:1.2em; } /* 12px */ - - /* Links ----------------------------------------------------------*/ a, a:link, a:visited { @@ -327,13 +325,8 @@ span.message { color:#fff; } .info.message { - background:#e4ebef; /* blue */ - border:1px solid #4687AD; - color:#062232; -} -.info.message { - background:#e6e7ef; /* blue */ - border:1px solid #b5b9c4; + background:#e6f1c9; /* green*/ + border:1px solid #d4deb9; color:#062232; } .debug.message { @@ -632,7 +625,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%; @@ -667,12 +661,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. From b7723c5a624ef1b826b1a3bba28f479291bc7812 Mon Sep 17 00:00:00 2001 From: Louis DeJardin Date: Sat, 20 Feb 2010 00:35:17 -0800 Subject: [PATCH 04/11] Fixing unit test Compile error introduced when model was removed from setup/index action --- src/Orchard.Tests.Modules/Setup/SetupControllerTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Tests.Modules/Setup/SetupControllerTests.cs b/src/Orchard.Tests.Modules/Setup/SetupControllerTests.cs index e72a06851..1a2cab841 100644 --- a/src/Orchard.Tests.Modules/Setup/SetupControllerTests.cs +++ b/src/Orchard.Tests.Modules/Setup/SetupControllerTests.cs @@ -69,7 +69,7 @@ namespace Orchard.Tests.Modules.Setup { [Test] public void IndexNormallyReturnsWithDefaultAdminUsername() { var controller = _container.Resolve(); - var result = controller.Index(null); + var result = controller.Index(); Assert.That(result, Is.Not.Null); Assert.That(result, Is.TypeOf()); From fa90119e70712a9d271a88aaf9617e88fce81865 Mon Sep 17 00:00:00 2001 From: Louis DeJardin Date: Mon, 22 Feb 2010 11:32:24 -0800 Subject: [PATCH 05/11] Removing references to file that do not exist Was causing failures in the automated build script --- src/Orchard.Web/Orchard.Web.csproj | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index d576a0298..13078ca91 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -217,12 +217,6 @@ - - - - - - @@ -251,6 +245,7 @@ + From 5ea1126bcc523dbeceec986e077ffbc0da1a69a7 Mon Sep 17 00:00:00 2001 From: Louis DeJardin Date: Mon, 22 Feb 2010 11:36:05 -0800 Subject: [PATCH 06/11] Removing another reference to a file that doesn't exist Again, causing problems with the automated build --- src/Orchard.Web/Orchard.Web.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index 13078ca91..7a7090c24 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -228,7 +228,6 @@ - From f3afcc93d92ab9bbc88e208579ae160b3bd1e136 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Mon, 22 Feb 2010 11:37:43 -0800 Subject: [PATCH 07/11] Updating SafeMode CSS images being included in the csproj --- src/Orchard.Web/Orchard.Web.csproj | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index d576a0298..798a310a1 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -217,12 +217,9 @@ - - - - - - + + + From b588e6e91b8a6241fe52ca96bd25eb37acbc0fba Mon Sep 17 00:00:00 2001 From: Louis DeJardin Date: Mon, 22 Feb 2010 12:06:41 -0800 Subject: [PATCH 08/11] Changing default home url to ~ It's a slightly clearer indicator of what the url textbox refers to --- .../Modules/Orchard.Setup/Controllers/SetupController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs index c4eaa120b..e2ea22e49 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs @@ -112,7 +112,7 @@ namespace Orchard.Setup.Controllers { menuItem.As().MenuPosition = "1"; menuItem.As().MenuText = T("Home").ToString(); menuItem.As().OnMainMenu = true; - menuItem.As().Url = ""; + menuItem.As().Url = "~"; var authenticationService = finiteEnvironment.Resolve(); authenticationService.SignIn(user, true); From c555f05404b19fb610a241ca9a8f2208d73cc4c6 Mon Sep 17 00:00:00 2001 From: Louis DeJardin Date: Mon, 22 Feb 2010 13:11:23 -0800 Subject: [PATCH 09/11] Improving error messages in setup failure scenario Inner exceptions are looped and output to provide richer error context Error message text is not localized --- .../Modules/Orchard.Setup/Controllers/SetupController.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs index e2ea22e49..caea6a76d 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs @@ -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); } } From c7e95e31eae20148592f7891c58bc1092774087e Mon Sep 17 00:00:00 2001 From: Louis DeJardin Date: Mon, 22 Feb 2010 13:17:11 -0800 Subject: [PATCH 10/11] Correcting text field lengths in sql server Convention adds support for StringLengthAttribute Adds StringLengthMax attribute to hide arbitrarily large number Increate Routable.Title length to nvarchar(1024) and Body.Text length to nvarchar(max) --- .../Core/Common/Records/BodyRecord.cs | 3 +++ .../Core/Common/Records/RoutableRecord.cs | 5 ++++- .../Data/Conventions/StringLengthConvention.cs | 17 +++++++++++++++++ src/Orchard/Orchard.csproj | 1 + 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 src/Orchard/Data/Conventions/StringLengthConvention.cs diff --git a/src/Orchard.Web/Core/Common/Records/BodyRecord.cs b/src/Orchard.Web/Core/Common/Records/BodyRecord.cs index e16c556b7..adb0655bf 100644 --- a/src/Orchard.Web/Core/Common/Records/BodyRecord.cs +++ b/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; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/Records/RoutableRecord.cs b/src/Orchard.Web/Core/Common/Records/RoutableRecord.cs index 100f29f62..a87035000 100644 --- a/src/Orchard.Web/Core/Common/Records/RoutableRecord.cs +++ b/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; } } } diff --git a/src/Orchard/Data/Conventions/StringLengthConvention.cs b/src/Orchard/Data/Conventions/StringLengthConvention.cs new file mode 100644 index 000000000..996205c18 --- /dev/null +++ b/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 arbetrary number large enough to be in the nvarchar(max) range + } + } + + public class StringLengthConvention : AttributePropertyConvention { + protected override void Apply(StringLengthAttribute attribute, IPropertyInstance instance) { + instance.Length(attribute.MaximumLength); + } + } +} diff --git a/src/Orchard/Orchard.csproj b/src/Orchard/Orchard.csproj index 6e54f2d57..d3c70e247 100644 --- a/src/Orchard/Orchard.csproj +++ b/src/Orchard/Orchard.csproj @@ -138,6 +138,7 @@ + From 57a4b2ad247ec0752201e1afb43ee7c33b167f37 Mon Sep 17 00:00:00 2001 From: Louis DeJardin Date: Mon, 22 Feb 2010 13:26:28 -0800 Subject: [PATCH 11/11] Fixing arbitrary spelling of the word arbetrary Oddly, this is far from the first time a person whose native language is not english has corrected my spelling. --- src/Orchard/Data/Conventions/StringLengthConvention.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard/Data/Conventions/StringLengthConvention.cs b/src/Orchard/Data/Conventions/StringLengthConvention.cs index 996205c18..2fb7eaa23 100644 --- a/src/Orchard/Data/Conventions/StringLengthConvention.cs +++ b/src/Orchard/Data/Conventions/StringLengthConvention.cs @@ -5,7 +5,7 @@ using FluentNHibernate.Conventions.Instances; namespace Orchard.Data.Conventions { public class StringLengthMaxAttribute : StringLengthAttribute { public StringLengthMaxAttribute() : base(10000) { - // 10000 is an arbetrary number large enough to be in the nvarchar(max) range + // 10000 is an arbitrary number large enough to be in the nvarchar(max) range } }