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

Merge branch '1.9-int' into 1.x

Browse Source
This commit is contained in:
Sipke Schoorstra
2015-04-21 15:00:42 +02:00
parent 7c0f4500eb 5d7988650e
commit 5dabbf7aec
14 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Checkbox.cshtml
View File

@@ -1,8 +1,9 @@
@using Orchard.DynamicForms.Elements
@using Orchard.DisplayManagement.Shapes
@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
var element = (CheckBox)Model.Element;
var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "input");
var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.CreateElementTagBuilder(Model, "input");
tagBuilder.Attributes["type"] = "checkbox";
tagBuilder.Attributes["name"] = element.Name;

7
src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/EmailField.cshtml
View File

@@ -1,14 +1,15 @@
@using Orchard.DynamicForms.Elements
@using Orchard.DisplayManagement.Shapes
@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
var element = (EmailField)Model.Element;
var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "input");
var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.CreateElementTagBuilder(Model, "input");
tagBuilder.AddCssClass("text");
tagBuilder.Attributes["type"] = "email";
tagBuilder.Attributes["value"] = Model.TokenizedValue;
tagBuilder.Attributes["name"] = element.Name;
tagBuilder.AddClientValidationAttributes(Model.ClientValidationAttributes);
tagBuilder.AddClientValidationAttributes((IDictionary<string, string>)Model.ClientValidationAttributes);
if (!ViewData.ModelState.IsValidField(element.Name)) {
tagBuilder.AddCssClass("input-validation-error");

2
src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Enumeration-CheckList.cshtml
View File

@@ -3,7 +3,7 @@
@using Orchard.Layouts.Helpers
@{
var element = (Enumeration)Model.Element;
var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
var index = 0;
}
@if (element.ShowLabel) {

2
src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Enumeration-RadioList.cshtml
View File

@@ -3,7 +3,7 @@
@using Orchard.Layouts.Helpers
@{
var element = (Enumeration)Model.Element;
var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
var index = 0;
}
@if (element.ShowLabel) {

5
src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/PasswordField.cshtml
View File

@@ -1,8 +1,9 @@
@using Orchard.DynamicForms.Elements
@using Orchard.DisplayManagement.Shapes
@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
var element = (PasswordField)Model.Element;
var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "input");
var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.CreateElementTagBuilder(Model, "input");
tagBuilder.AddCssClass("text");
tagBuilder.Attributes["type"] = "password";

2
src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Query-CheckList.cshtml
View File

@@ -3,7 +3,7 @@
@using Orchard.Layouts.Helpers
@{
var element = (Query)Model.Element;
var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
var index = 0;
}
@if (element.ShowLabel) {

2
src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Query-RadioList.cshtml
View File

@@ -3,7 +3,7 @@
@using Orchard.Layouts.Helpers
@{
var element = (Query)Model.Element;
var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
var index = 0;
}
@if (element.ShowLabel) {

2
src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Taxonomy-CheckList.cshtml
View File

@@ -3,7 +3,7 @@
@using Orchard.Layouts.Helpers
@{
var element = (Taxonomy)Model.Element;
var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
var index = 0;
}
@if (element.ShowLabel) {

2
src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Taxonomy-RadioList.cshtml
View File

@@ -3,7 +3,7 @@
@using Orchard.Layouts.Helpers
@{
var element = (Taxonomy)Model.Element;
var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
var index = 0;
}
@if (element.ShowLabel) {

5
src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/TextArea.cshtml
View File

@@ -1,8 +1,9 @@
@using Orchard.DynamicForms.Elements
@using Orchard.DisplayManagement.Shapes
@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
var element = (TextArea)Model.Element;
var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "textarea");
var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.CreateElementTagBuilder(Model, "textarea");
tagBuilder.AddCssClass("text");
tagBuilder.Attributes["name"] = element.Name;

5
src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/TextField.cshtml
View File

@@ -1,8 +1,9 @@
@using Orchard.DynamicForms.Elements
@using Orchard.DisplayManagement.Shapes
@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
var element = (TextField)Model.Element;
var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "input");
var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.CreateElementTagBuilder(Model, "input");
tagBuilder.AddCssClass("text");
tagBuilder.Attributes["type"] = "text";

1
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
View File

@@ -929,6 +929,7 @@ var LayoutEditor;
this.contentTypeClass = contentTypeClass;
this.html = html;
this.hasEditor = hasEditor;
this.isContainable = true;
this.getInnerText = function () {
return $($.parseHTML("<div>" + this.html + "</div>")).text();

2
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models/Html.js
View File

@@ -9,6 +9,7 @@
this.contentTypeClass = contentTypeClass;
this.html = html;
this.hasEditor = hasEditor;
this.isContainable = true;
this.getInnerText = function () {
return $($.parseHTML("<div>" + this.html + "</div>")).text();