lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Some more experimentation with form-like shapes. Putting the "speculation" in speculation.

Browse Source 
--HG--
branch : mvc3p1
This commit is contained in:
Nathan Heskew
2010-08-30 14:57:28 -07:00
parent f6d2c77855
commit 3136c10652
3 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Orchard.Web/Modules/Orchard.DevTools/Controllers/HomeController.cs
View File

@@ -70,11 +70,18 @@ namespace Orchard.DevTools.Controllers {
);
// get at the first input?
//model.Fieldsets[0].Attributes(new {autofocus = "autofocus"}); // <-- could be applied by some other behavior - need to be able to modify attributes instead of clobbering them like this
model.Fieldsets[0][0].Attributes(new {autofocus = "autofocus"}); // <-- could be applied by some other behavior - need to be able to modify attributes instead of clobbering them like this
return View(model);
}
[HttpPost, ActionName("FormShapes")]
public ActionResult FormShapesPOST() {
//all reqs are fail
ModelState.AddModelError("AdminUsername", "The admin username is wrong.");
return FormShapes();
}
public ActionResult UsingShapes() {
ViewModel.Page = Shape.Page()

18
src/Orchard/DisplayManagement/Speculation/DefaultShapeTableFactory.cs
View File

@@ -4,8 +4,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Web;
using System.Web.Mvc;
using System.Web.Routing;
using ClaySharp.Implementation;
using Microsoft.CSharp.RuntimeBinder;
@@ -15,9 +14,11 @@ using Binder = Microsoft.CSharp.RuntimeBinder.Binder;
namespace Orchard.DisplayManagement {
public class DefaultShapeTableFactory : IShapeTableFactory {
private readonly IEnumerable<IShapeDriver> _shapeProviders;
private readonly RouteCollection _routeCollection;
public DefaultShapeTableFactory(IEnumerable<IShapeDriver> shapeProviders) {
public DefaultShapeTableFactory(IEnumerable<IShapeDriver> shapeProviders, RouteCollection routeCollection) {
_shapeProviders = shapeProviders;
_routeCollection = routeCollection;
}
public ShapeTable CreateShapeTable() {
@@ -59,6 +60,13 @@ namespace Orchard.DisplayManagement {
return Arguments.From(attributes.Values, attributes.Keys);
}
if (parameter.Name == "Html") {
return new HtmlHelper(
displayContext.ViewContext,
new ViewDataContainer { ViewData = displayContext.ViewContext.ViewData },
_routeCollection);
}
var result = ((dynamic)(displayContext.Value))[parameter.Name];
var converter = _converters.GetOrAdd(
parameter.ParameterType,
@@ -66,6 +74,10 @@ namespace Orchard.DisplayManagement {
return converter(result);
}
class ViewDataContainer : IViewDataContainer {
public ViewDataDictionary ViewData { get; set; }
}
static Func<object, object> CompileConverter(Type targetType) {
var valueParameter = Expression.Parameter(typeof (object), "value");

46
src/Orchard/Mvc/Html/Shapes.cs
View File

@@ -3,6 +3,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Mvc;
using System.Web.Mvc.Html;
using System.Web.Routing;
using ClaySharp;
using Orchard.DisplayManagement;
using Orchard.Localization;
@@ -20,14 +22,14 @@ namespace Orchard.Mvc.Html {
InnerHtml = Display(Content).ToString()
};
a.MergeAttributes(Attributes.Named);
a.MergeAttribute("href", Url);
a.MergeAttribute("href", Url, true);
return Display(new HtmlString(a.ToString()));
}
public IHtmlString Image(dynamic Display, string Url, INamedEnumerable<object> Attributes) {
var img = new TagBuilder("img");
img.MergeAttributes(Attributes.Named);
img.MergeAttribute("src", Url);
img.MergeAttribute("src", Url, true);
return Display(new HtmlString(img.ToString(TagRenderMode.SelfClosing)));
}
@@ -45,17 +47,22 @@ namespace Orchard.Mvc.Html {
};
li.MergeAttributes(Attributes.Named);
if (!string.IsNullOrWhiteSpace(Shape.Content.Name as string))
li.MergeAttribute("class", Shape.Content.Name);
li.MergeAttribute("class", Shape.Content.Name); //, true); //need a merge value...
return Display(new HtmlString(li.ToString()));
}
#region form and company
public IHtmlString Form(dynamic Display, dynamic Shape, object Submit, INamedEnumerable<object> Attributes) {
public IHtmlString Form(dynamic Display, dynamic Shape, object Submit, INamedEnumerable<object> Attributes, HtmlHelper Html) {
var form = new TagBuilder("form") {
InnerHtml = Display(Shape.Fieldsets).ToString()
};
form.MergeAttributes(Attributes.Named);
form.MergeAttribute("method", "POST");
if (string.Equals(form.Attributes["method"], "POST", StringComparison.OrdinalIgnoreCase))
form.InnerHtml += Html.AntiForgeryTokenOrchard();
return Display(new HtmlString(form.ToString()));
}
@@ -94,13 +101,18 @@ namespace Orchard.Mvc.Html {
return Display(Shape);
}
public IHtmlString Input(dynamic Display, dynamic Shape, INamedEnumerable<object> Attributes) {
public IHtmlString Input(dynamic Display, dynamic Shape, INamedEnumerable<object> Attributes, HtmlHelper Html) {
var input = new TagBuilder("input");
input.MergeAttributes(Attributes.Named);
input.MergeAttribute("name", Shape.Name);
input.MergeAttribute("name", Shape.Name, true);
if (!string.IsNullOrWhiteSpace(Shape.Value as string))
input.MergeAttribute("value", Shape.Value);
return Display(new HtmlString(input.ToString(TagRenderMode.SelfClosing)));
input.MergeAttribute("value", Shape.Value, true);
return Display(
new HtmlString(input.ToString(TagRenderMode.SelfClosing)),
New.ValidationMessage().For(Shape));
}
public IHtmlString ValidationMessage(dynamic Display, dynamic For, HtmlHelper Html) {
return Display(Html.ValidationMessage(For.Name as string));
}
public IHtmlString Label(dynamic Display, dynamic Shape, INamedEnumerable<object> Attributes) {
@@ -115,20 +127,26 @@ namespace Orchard.Mvc.Html {
return new HtmlString(Shape.ToString());
}
public IHtmlString InputPassword(dynamic Display, dynamic Shape) {
public IHtmlString InputPassword(dynamic Display, dynamic Shape, INamedEnumerable<object> Attributes) {
Shape.ShapeMetadata.Type = "Input";
Shape.Attributes(new { type = "password" });
var attributes = new RouteValueDictionary(Attributes.Named);
attributes["type"] = "password";
Shape.Attributes(attributes);
return Display(
New.Label().Text(Shape.Text),
Shape); //need validation shape
Shape);
}
public IHtmlString InputText(dynamic Display, dynamic Shape) {
public IHtmlString InputText(dynamic Display, dynamic Shape, INamedEnumerable<object> Attributes) {
Shape.ShapeMetadata.Type = "Input";
Shape.Attributes(new { type = "text" });
//could use a mergeattributes equiv if we go down this route
// also, Attributes.Named["type"] and equiv are NYI (INamedEnumerable is awesome but currently R/O)
var attributes = new RouteValueDictionary(Attributes.Named);
attributes["type"] = "text";
Shape.Attributes(attributes);
return Display(
New.Label().Text(Shape.Text),
Shape); //need validation shape
Shape);
}
#endregion