Cleaned up element views.

2026-02-09 09:16:41 +08:00 · 2015-04-17 14:34:00 +02:00
parent 66248a7005
commit dea42e518b
52 changed files with 142 additions and 171 deletions
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/forms-admin.css
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/forms-admin.css
@@ -11,4 +11,8 @@
 .layout-editor .layout-content > .layout-element-wrapper .layout-content-markup > .form-field-element input[type="tel"],
 .layout-editor .layout-content > .layout-element-wrapper .layout-content-markup > .form-field-element textarea {
    width: 100%;
+}
+
+.layout-editor .layout-content > .layout-element-wrapper .layout-content-markup > .form-field-element .form-field-element-enumeration ol {
+    list-style: none;
 }
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Button.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Button.cshtml
@@ -1,12 +1,11 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (Button)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("button"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "button");

    tagBuilder.Attributes["type"] = "submit";
    tagBuilder.Attributes["name"] = element.Name;
    tagBuilder.SetInnerText(element.Text);
 }
-@Html.Raw(tagBuilder.ToString(TagRenderMode.Normal))
+@tagBuilder.ToHtmlString()
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Checkbox.Design.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Checkbox.Design.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (CheckBox)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "input");
    
    tagBuilder.Attributes["type"] = "checkbox";
    tagBuilder.Attributes["name"] = element.Name;
@@ -11,10 +10,10 @@
 }
@if (element.ShowLabel) {
    <label>
-        @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+        @tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
        @Html.Raw(element.Label)
    </label>
 }
 else {
-    @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+    @tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
 }
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Checkbox.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Checkbox.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (CheckBox)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "input");

    tagBuilder.Attributes["type"] = "checkbox";
    tagBuilder.Attributes["name"] = element.Name;
@@ -16,12 +15,12 @@
 }
@if (element.ShowLabel) {
    <label>
-        @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+        @tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
        @Html.Raw(element.Label)
    </label>
 }
 else {
-    @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+    @tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
 }
@if (element.ValidationSettings.ShowValidationMessage == true) {
    @Html.ValidationMessage(element.Name)
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/EmailField.Design.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/EmailField.Design.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (EmailField)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "input");

    tagBuilder.AddCssClass("text design");
    tagBuilder.Attributes["type"] = "email";
@@ -14,9 +13,9 @@
@if (element.ShowLabel) {
    <div>
        <label for="@element.HtmlId">@element.Label</label>
-        @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+        @tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
    </div>
 }
 else {
-    @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+    @tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
 }
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/EmailField.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/EmailField.cshtml
@@ -1,15 +1,14 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (EmailField)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "input");

    tagBuilder.AddCssClass("text");
    tagBuilder.Attributes["type"] = "email";
    tagBuilder.Attributes["value"] = Model.TokenizedValue;
    tagBuilder.Attributes["name"] = element.Name;
-    tagBuilder.AddClientValidationAttributes((IDictionary<string, string>)Model.ClientValidationAttributes);
+    tagBuilder.AddClientValidationAttributes(Model.ClientValidationAttributes);

    if (!ViewData.ModelState.IsValidField(element.Name)) {
        tagBuilder.AddCssClass("input-validation-error");
@@ -19,7 +18,7 @@
@if (element.ShowLabel) {
    <label for="@element.HtmlId">@element.Label</label>
 }
-@Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+@tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
@if (element.ValidationSettings.ShowValidationMessage == true) {
    @Html.ValidationMessage(element.Name)
 }
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Enumeration-CheckList.Design.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Enumeration-CheckList.Design.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (Enumeration)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("ol"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
 }
@if (element.ShowLabel) {
    <label>@Html.Raw(element.Label)</label>
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Enumeration-CheckList.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Enumeration-CheckList.cshtml
@@ -3,7 +3,7 @@
@using Orchard.Layouts.Helpers
@{
    var element = (Enumeration)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("ol"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
    var index = 0;
 }
@if (element.ShowLabel) {
@@ -20,7 +20,7 @@
    }
    <li>
        <label>
-            @Html.Raw(inputTagBuilder.ToString(TagRenderMode.SelfClosing))
+            @inputTagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
            @option.Text
        </label>
    </li>
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Enumeration-RadioList.Design.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Enumeration-RadioList.Design.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (Enumeration)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("ol"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
 }
@if (element.ShowLabel) {
    <label>@Html.Raw(element.Label)</label>
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Enumeration-RadioList.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Enumeration-RadioList.cshtml
@@ -3,7 +3,7 @@
@using Orchard.Layouts.Helpers
@{
    var element = (Enumeration)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("ol"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
    var index = 0;
 }
@if (element.ShowLabel) {
@@ -20,7 +20,7 @@
    }
    <li>   
        <label>
-            @Html.Raw(inputTagBuilder.ToString(TagRenderMode.SelfClosing))
+            @inputTagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
            @option.Text
        </label>
    </li>
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Form.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Form.cshtml
@@ -1,5 +1,4 @@
@using Orchard.ContentManagement
-@using Orchard.DisplayManagement.Shapes
@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
@@ -8,7 +7,7 @@
@{
    var contentItem = (ContentItem) Model.ContentItem;
    var element = (Form) Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("div"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model);
    var formName = element.Name;
    var formAction = String.IsNullOrWhiteSpace(element.Action) ? Url.Action("Submit", "Form", new { area = "Orchard.DynamicForms"}) : element.Action;
    var formMethod = !String.IsNullOrWhiteSpace(element.Method) ? element.Method : "POST";
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/HiddenField.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/HiddenField.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (HiddenField) Model.Element;
-    var tagBuilder = TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "input");

    tagBuilder.AddCssClass("text");
    tagBuilder.Attributes["type"] = "hidden";
@@ -11,4 +10,4 @@
    tagBuilder.Attributes["name"] = element.Name;
 }

-@Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+@tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Label.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Label.cshtml
@@ -1,12 +1,11 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("label"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "label");
    var label = (Label) Model.Element;
    
    tagBuilder.Attributes["for"] = label.For;
    tagBuilder.InnerHtml = label.Text;
 }

-@Html.Raw(tagBuilder.ToString(TagRenderMode.Normal))
+@tagBuilder.ToHtmlString(TagRenderMode.Normal)
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/PasswordField.Design.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/PasswordField.Design.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (PasswordField)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "input");

    tagBuilder.AddCssClass("text design");
    tagBuilder.Attributes["type"] = "password";
@@ -14,9 +13,9 @@
@if (element.ShowLabel) {
    <div>
        <label for="@element.HtmlId">@element.Label</label>
-        @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+        @tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
    </div>
 }
 else {
-    @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+    @tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
 }
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/PasswordField.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/PasswordField.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (PasswordField)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "input");

    tagBuilder.AddCssClass("text");
    tagBuilder.Attributes["type"] = "password";
@@ -18,7 +17,7 @@
@if (element.ShowLabel) {
    <label for="@element.HtmlId">@element.Label</label>
 }
-@Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+@tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
@if (element.ValidationSettings.ShowValidationMessage == true) {
    @Html.ValidationMessage(element.Name)
 }
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Query-CheckList.Design.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Query-CheckList.Design.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (Query)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("ol"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
 }
@if (element.ShowLabel) {
    <label>@Html.Raw(element.Label)</label>
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Query-CheckList.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Query-CheckList.cshtml
@@ -3,7 +3,7 @@
@using Orchard.Layouts.Helpers
@{
    var element = (Query)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("ol"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
    var index = 0;
 }
@if (element.ShowLabel) {
@@ -20,7 +20,7 @@
    }
    <li>
        <label>
-            @Html.Raw(inputTagBuilder.ToString(TagRenderMode.SelfClosing))
+            @inputTagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
            @option.Text
        </label>
    </li>
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Query-RadioList.Design.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Query-RadioList.Design.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (Query)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("ol"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
 }
@if (element.ShowLabel) {
    <label>@Html.Raw(element.Label)</label>
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Query-RadioList.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Query-RadioList.cshtml
@@ -3,7 +3,7 @@
@using Orchard.Layouts.Helpers
@{
    var element = (Query)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("ol"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
    var index = 0;
 }
@if (element.ShowLabel) {
@@ -20,7 +20,7 @@
    }
    <li>
        <label>
-            @Html.Raw(inputTagBuilder.ToString(TagRenderMode.SelfClosing))
+            @inputTagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
            @option.Text
        </label>
    </li>
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/RadioButton.Design.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/RadioButton.Design.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (RadioButton)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "input");

    tagBuilder.Attributes["type"] = "radio";
    tagBuilder.Attributes["name"] = element.Name;
@@ -11,10 +10,10 @@
 }
@if (element.ShowLabel) {
    <label>
-        @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+        @tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
        @Html.Raw(element.Label)
    </label>
 }
 else {
-    @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+    @tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
 }
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/RadioButton.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/RadioButton.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (RadioButton)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "input");

    tagBuilder.Attributes["type"] = "radio";
    tagBuilder.Attributes["name"] = element.Name;
@@ -11,10 +10,10 @@
 }
@if (element.ShowLabel) {
    <label>
-        @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+        @tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
        @Html.Raw(element.Label)
    </label>
 }
 else {
-    @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+    @tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
 }
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/ReCaptcha.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/ReCaptcha.cshtml
@@ -1,8 +1,7 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("div"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model);
    var element = (ReCaptcha)Model.Element;
    var publicKey = (string)Model.PublicKey;
 }
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Taxonomy-CheckList.Design.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Taxonomy-CheckList.Design.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (Taxonomy)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("ol"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
 }
@if (element.ShowLabel) {
    <label>@Html.Raw(element.Label)</label>
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Taxonomy-CheckList.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Taxonomy-CheckList.cshtml
@@ -3,7 +3,7 @@
@using Orchard.Layouts.Helpers
@{
    var element = (Taxonomy)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("ol"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
    var index = 0;
 }
@if (element.ShowLabel) {
@@ -20,7 +20,7 @@
    }
    <li>
        <label>
-            @Html.Raw(inputTagBuilder.ToString(TagRenderMode.SelfClosing))
+            @inputTagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
            @option.Text
        </label>
    </li>
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Taxonomy-RadioList.Design.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Taxonomy-RadioList.Design.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (Taxonomy)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("ol"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
 }
@if (element.ShowLabel) {
    <label>@Html.Raw(element.Label)</label>
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Taxonomy-RadioList.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/Taxonomy-RadioList.cshtml
@@ -3,7 +3,7 @@
@using Orchard.Layouts.Helpers
@{
    var element = (Taxonomy)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("ol"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "ol");
    var index = 0;
 }
@if (element.ShowLabel) {
@@ -20,7 +20,7 @@
    }
    <li>
        <label>
-            @Html.Raw(inputTagBuilder.ToString(TagRenderMode.SelfClosing))
+            @inputTagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
            @option.Text
        </label>
    </li>
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/TextArea.Design.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/TextArea.Design.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (TextArea)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("textarea"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "textarea");

    tagBuilder.AddCssClass("text design");
    tagBuilder.Attributes["name"] = element.Name;
@@ -22,9 +21,9 @@
@if (element.ShowLabel) {
    <div>
        <label for="@element.HtmlId">@element.Label</label>
-        @Html.Raw(tagBuilder.ToString(TagRenderMode.Normal))
+        @tagBuilder.ToHtmlString(TagRenderMode.Normal)
    </div>
 }
 else {
-    @Html.Raw(tagBuilder.ToString(TagRenderMode.Normal))
+    @tagBuilder.ToHtmlString(TagRenderMode.Normal)
 }
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/TextArea.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/TextArea.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (TextArea)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("textarea"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "textarea");

    tagBuilder.AddCssClass("text");
    tagBuilder.Attributes["name"] = element.Name;
@@ -27,7 +26,7 @@
    <label for="@element.HtmlId">@element.Label</label>
 }

-@Html.Raw(tagBuilder.ToString(TagRenderMode.Normal))
+@tagBuilder.ToHtmlString(TagRenderMode.Normal)
@if (element.ValidationSettings.ShowValidationMessage == true) {
    @Html.ValidationMessage(element.Name)
 }
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/TextField.Design.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/TextField.Design.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (TextField)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "input");

    tagBuilder.AddCssClass("text design");
    tagBuilder.Attributes["type"] = "text";
@@ -14,9 +13,9 @@
@if (element.ShowLabel) {
    <div>
        <label for="@element.HtmlId">@element.Label</label>
-        @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+        @tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
    </div>
 }
 else {
-    @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+    @tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
 }
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/TextField.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/TextField.cshtml
@@ -1,9 +1,8 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.DynamicForms.Elements
+@using Orchard.DynamicForms.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (TextField)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "input");

    tagBuilder.AddCssClass("text");
    tagBuilder.Attributes["type"] = "text";
@@ -19,7 +18,7 @@
@if (element.ShowLabel) {
    <label for="@element.HtmlId">@element.Label</label>
 }
-@Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+@tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
@if (element.ValidationSettings.ShowValidationMessage == true) {
    @Html.ValidationMessage(element.Name)
 }
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Helpers/TagBuilderExtensions.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Helpers/TagBuilderExtensions.cs
@@ -6,6 +6,13 @@ using Orchard.Layouts.Framework.Elements;

 namespace Orchard.Layouts.Helpers {
    public static class TagBuilderExtensions {
+
+        /// <summary>
+        /// Creates an <see cref="OrchardTagBuilder"/> and adds the ID, Class and Style attributes from the shape.Element property.
+        /// </summary>
+        public static OrchardTagBuilder CreateElementTagBuilder(dynamic shape, string tag = "div") {
+            return AddCommonElementAttributes(new OrchardTagBuilder(tag), shape);
+        }
        
        public static OrchardTagBuilder AddCommonElementAttributes(this OrchardTagBuilder tagBuilder, dynamic shape) {
            var attributes = GetCommonElementAttributes(shape);
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js
@@ -274,7 +274,9 @@ angular
                                            $scope.$root.editElement(receivedElement).then(function (args) {
                                                if (!args.cancel) {
                                                    receivedElement.data = args.element.data;
-                                                    receivedElement.setHtml(args.element.html);
+
+                                                    if (receivedElement.setHtml)
+                                                        receivedElement.setHtml(args.element.html);
                                                }
                                                $timeout(function () {
                                                    if (!!args.cancel)
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor/Services/ScopeConfigurator.js
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor/Services/ScopeConfigurator.js
@@ -241,7 +241,9 @@
                                            $scope.$root.editElement(receivedElement).then(function (args) {
                                                if (!args.cancel) {
                                                    receivedElement.data = args.element.data;
-                                                    receivedElement.setHtml(args.element.html);
+
+                                                    if (receivedElement.setHtml)
+                                                        receivedElement.setHtml(args.element.html);
                                                }
                                                $timeout(function () {
                                                    if (!!args.cancel)
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Canvas.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Canvas.cshtml
@@ -1,6 +1,7 @@
@using Orchard.DisplayManagement.Shapes
@using Orchard.Layouts.Helpers
@{
+    // Only render the surrounding div if there are any attributes to be rendered.
    var commonAttributes = (IDictionary<string, object>)TagBuilderExtensions.GetCommonElementAttributes(Model);
    var tagBuilder = commonAttributes.Any() ? new OrchardTagBuilder("div") : default(OrchardTagBuilder);

--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Column.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Column.cshtml
@@ -1,12 +1,11 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.Layouts.Elements
+@using Orchard.Layouts.Elements
@using Orchard.Layouts.Helpers
@{
    var element = (Column) Model.Element;
    var columnSpan = element.Width;
    var columnOffset = element.Offset;
    var columnOffsetCss = columnOffset > 0 ? "offset-" + columnOffset : default(string);
-    var tagBuilder = TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("div"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model);
    
    tagBuilder.AddCssClass("cell");
    tagBuilder.AddCssClass(String.Concat("span-", columnSpan));
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/ContentField.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/ContentField.cshtml
@@ -1,7 +1,6 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Helpers
@{
-    var tagBuilder = TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("div"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model);
 }
@tagBuilder.StartElement
@Display(Model.ContentField)
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/ContentItem.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/ContentItem.cshtml
@@ -1,7 +1,6 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Helpers
@{
-    var tagBuilder = TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("div"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model);
 }
@tagBuilder.StartElement
@foreach (var contentItem in Model.ContentItems) {
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/ContentPart.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/ContentPart.cshtml
@@ -1,9 +1,6 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.Layouts.Helpers
-@{
-    var tagBuilder = TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("div"), Model);
-}
+@using Orchard.Layouts.Helpers
@if (Model.Content != null) {
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model);
    @tagBuilder.StartElement
    @Display(Model.Content)
    @tagBuilder.EndElement
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Grid.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Grid.cshtml
@@ -1,7 +1,6 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Helpers
@{
-    var tagBuilder = TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("div"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model);
    tagBuilder.AddCssClass("table");
 }
@tagBuilder.StartElement
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Html.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Html.cshtml
@@ -1,8 +1,6 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Helpers
@{
-    var tagBuilder = TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("div"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model);
+    tagBuilder.InnerHtml = Model.ProcessedText;
 }
-@tagBuilder.StartElement
-@Html.Raw(Model.ProcessedText)
-@tagBuilder.EndElement
+@tagBuilder.ToHtmlString()
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Image.Design.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Image.Design.cshtml
@@ -15,4 +15,4 @@
        tagBuilder.Attributes["alt"] = T("Image not found").Text;
    }
 }
-@Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+@tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Image.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Image.cshtml
@@ -1,9 +1,8 @@
@using Orchard.ContentManagement
-@using Orchard.DisplayManagement.Shapes
@using Orchard.Layouts.Helpers
@using Orchard.MediaLibrary.Models
@{
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("img"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "img");
    var imagePart = (ImagePart)Model.ImagePart;
    var mediaPart = imagePart != null ? imagePart.As<MediaPart>() : default(MediaPart);

@@ -17,4 +16,4 @@
    
    tagBuilder.AddCssClass("layout-content-image");
 }
-@Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+@tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Markdown.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Markdown.cshtml
@@ -1,9 +1,6 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Helpers
@{
-    var tagBuilder = TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("div"), Model);
-    var text = (string)Model.ProcessedContent;
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model);
+    tagBuilder.InnerHtml = Model.ProcessedContent;
 }
-@tagBuilder.StartElement
-@Html.Raw(text)
-@tagBuilder.EndElement
+@tagBuilder.ToHtmlString()
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/MediaItem.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/MediaItem.cshtml
@@ -1,7 +1,6 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Helpers
@{
-    var tagBuilder = TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("div"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model);
 }
@tagBuilder.StartElement
@foreach (var contentItem in Model.ContentItems) {
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Paragraph.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Paragraph.cshtml
@@ -1,8 +1,6 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Helpers
@{
-    var tagBuilder = TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("p"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "p");
+    tagBuilder.InnerHtml = Model.ProcessedText;
 }
-@tagBuilder.StartElement
-@Html.Raw(Model.ProcessedText)
-@tagBuilder.EndElement
+@tagBuilder.ToHtmlString()
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Row.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Row.cshtml
@@ -1,7 +1,6 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Helpers
@{
-    var tagBuilder = TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("div"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model);
    tagBuilder.AddCssClass("row");
 }
@tagBuilder.StartElement
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Shape.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Shape.cshtml
@@ -1,9 +1,6 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.Layouts.Helpers
-@{
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("div"), Model);
-}
+@using Orchard.Layouts.Helpers
@if (Model.Shape != null) {
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model);
    @tagBuilder.StartElement
    @Display(Model.Shape)
    @tagBuilder.EndElement
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Text.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Text.cshtml
@@ -1,9 +1,6 @@
-@using Orchard.DisplayManagement.Shapes
-@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Helpers
@{
-    var tagBuilder = TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("div"), Model);
-    var text = (string) Model.ProcessedText;
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model);
+    tagBuilder.InnerHtml = Model.ProcessedText;
 }
-@tagBuilder.StartElement
-@Html.Raw(text)
-@tagBuilder.EndElement
+@tagBuilder.ToHtmlString()
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/VectorImage.Design.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/VectorImage.Design.cshtml
@@ -1,11 +1,10 @@
@using Orchard.ContentManagement
@using Orchard.DisplayManagement.Shapes
@using Orchard.Layouts.Elements
-@using Orchard.Layouts.Helpers
@using Orchard.MediaLibrary.Models
@{
+    var tagBuilder = new OrchardTagBuilder("img");
    var element = (VectorImage)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("img"), Model);
    var vectorImagePart = (VectorImagePart)Model.VectorImagePart;
    var mediaPart = vectorImagePart != null ? vectorImagePart.As<MediaPart>() : default(MediaPart);

@@ -25,4 +24,4 @@
        tagBuilder.Attributes["height"] = element.Height.ToString();
    }
 }
-@Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+@tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/VectorImage.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/VectorImage.cshtml
@@ -1,11 +1,10 @@
@using Orchard.ContentManagement
-@using Orchard.DisplayManagement.Shapes
@using Orchard.Layouts.Elements
@using Orchard.Layouts.Helpers
@using Orchard.MediaLibrary.Models
@{
    var element = (VectorImage)Model.Element;
-    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("img"), Model);
+    var tagBuilder = TagBuilderExtensions.CreateElementTagBuilder(Model, "img");
    var vectorImagePart = (VectorImagePart)Model.VectorImagePart;
    var mediaPart = vectorImagePart != null ? vectorImagePart.As<MediaPart>() : default(MediaPart);

@@ -27,4 +26,4 @@

    tagBuilder.AddCssClass("layout-content-vector");
 }
-@Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+@tagBuilder.ToHtmlString(TagRenderMode.SelfClosing)
--- a/src/Orchard/DisplayManagement/Shapes/ITagBuilderFactory.cs
+++ b/src/Orchard/DisplayManagement/Shapes/ITagBuilderFactory.cs
@@ -12,6 +12,9 @@ namespace Orchard.DisplayManagement.Shapes {

        public IHtmlString StartElement { get { return new HtmlString(ToString(TagRenderMode.StartTag)); } }
        public IHtmlString EndElement { get { return new HtmlString(ToString(TagRenderMode.EndTag)); } }
+        public IHtmlString ToHtmlString(TagRenderMode renderMode = TagRenderMode.Normal) {
+            return new HtmlString(ToString(renderMode));
+        }
    }

    public class TagBuilderFactory : ITagBuilderFactory {