mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
Updating to MVC RTM.
--HG-- branch : 1.x
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1363
-286
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -114,6 +114,10 @@
|
|||||||
<Reference Include="System.Web.WebPages">
|
<Reference Include="System.Web.WebPages">
|
||||||
<HintPath>..\..\..\lib\aspnetmvc\System.Web.WebPages.dll</HintPath>
|
<HintPath>..\..\..\lib\aspnetmvc\System.Web.WebPages.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
<Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<HintPath>..\..\..\lib\aspnetmvc\System.Web.WebPages.Deployment.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System.Web.WebPages.Razor">
|
<Reference Include="System.Web.WebPages.Razor">
|
||||||
<HintPath>..\..\..\lib\aspnetmvc\System.Web.WebPages.Razor.dll</HintPath>
|
<HintPath>..\..\..\lib\aspnetmvc\System.Web.WebPages.Razor.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
|||||||
@@ -84,25 +84,25 @@ namespace Orchard.Experimental.Controllers {
|
|||||||
|
|
||||||
public ActionResult UsingShapes() {
|
public ActionResult UsingShapes() {
|
||||||
|
|
||||||
ViewModel.Page = Shape.Page()
|
ViewBag.Page = Shape.Page()
|
||||||
.Main(Shape.Zone(typeof (Array), Name: "Main"))
|
.Main(Shape.Zone(typeof (Array), Name: "Main"))
|
||||||
.Messages(Shape.Zone(typeof (Array), Name: "Messages"))
|
.Messages(Shape.Zone(typeof (Array), Name: "Messages"))
|
||||||
.Sidebar(Shape.Zone(typeof (Array), Name: "Sidebar"));
|
.Sidebar(Shape.Zone(typeof (Array), Name: "Sidebar"));
|
||||||
|
|
||||||
//ViewModel.Page.Add("Messages:5", New.Message(Content: T("This is a test"), Severity: "Really bad!!!"));
|
//ViewModel.Page.Add("Messages:5", New.Message(Content: T("This is a test"), Severity: "Really bad!!!"));
|
||||||
|
|
||||||
ViewModel.Page.Messages.Add(
|
ViewBag.Page.Messages.Add(
|
||||||
Shape.Message(Content: T("This is a test"), Severity: "Really bad!!!"));
|
Shape.Message(Content: T("This is a test"), Severity: "Really bad!!!"));
|
||||||
|
|
||||||
ViewModel.Page.Sidebar.Add(
|
ViewBag.Page.Sidebar.Add(
|
||||||
Shape.Link(Url: "http://orchard.codeplex.com", Content: Shape.Image(Url: "http://orchardproject.net/Content/images/orchardLogo.jpg").Attributes(new { @class = "bigredborderfromabadclassname" })));
|
Shape.Link(Url: "http://orchard.codeplex.com", Content: Shape.Image(Url: "http://orchardproject.net/Content/images/orchardLogo.jpg").Attributes(new { @class = "bigredborderfromabadclassname" })));
|
||||||
|
|
||||||
var model = Shape.Message(
|
var model = Shape.Message(
|
||||||
Content: Shape.Explosion(Height: 100, Width: 200),
|
Content: Shape.Explosion(Height: 100, Width: 200),
|
||||||
Severity: "Meh");
|
Severity: "Meh");
|
||||||
|
|
||||||
ViewModel.Page.Messages.Add(new HtmlString("<hr/>abuse<hr/>"));
|
ViewBag.Page.Messages.Add(new HtmlString("<hr/>abuse<hr/>"));
|
||||||
ViewModel.Page.Messages.Add("<hr/>encoded<hr/>");
|
ViewBag.Page.Messages.Add("<hr/>encoded<hr/>");
|
||||||
|
|
||||||
return View(model);
|
return View(model);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -100,6 +100,10 @@
|
|||||||
<HintPath>..\..\lib\aspnetmvc\System.Web.WebPages.dll</HintPath>
|
<HintPath>..\..\lib\aspnetmvc\System.Web.WebPages.dll</HintPath>
|
||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
<Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<HintPath>..\..\lib\aspnetmvc\System.Web.WebPages.Deployment.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
<Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\..\lib\aspnetmvc\System.Web.WebPages.Razor.dll</HintPath>
|
<HintPath>..\..\lib\aspnetmvc\System.Web.WebPages.Razor.dll</HintPath>
|
||||||
|
|||||||
@@ -139,6 +139,10 @@
|
|||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\..\lib\aspnetmvc\System.Web.WebPages.dll</HintPath>
|
<HintPath>..\..\lib\aspnetmvc\System.Web.WebPages.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
<Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<HintPath>..\..\lib\aspnetmvc\System.Web.WebPages.Deployment.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System.Web.WebPages.Razor">
|
<Reference Include="System.Web.WebPages.Razor">
|
||||||
<HintPath>..\..\lib\aspnetmvc\System.Web.WebPages.Razor.dll</HintPath>
|
<HintPath>..\..\lib\aspnetmvc\System.Web.WebPages.Razor.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
|||||||
Reference in New Issue
Block a user