From c525bda3887cef0b5e2fe69488a2212895e67df7 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipke@ideliverable.com>
Date: Sun, 19 Apr 2015 11:40:13 +0200
Subject: [PATCH] Added rule editor to other element types.

---
 .../Views/LayoutEditor.Template.Form.cshtml                   | 1 +
 .../Orchard.Layouts/Framework/Display/ElementDisplay.cs       | 1 +
 .../Orchard.Layouts/Views/LayoutEditor.Template.Canvas.cshtml | 1 +
 .../Orchard.Layouts/Views/LayoutEditor.Template.Column.cshtml | 1 +
 .../Views/LayoutEditor.Template.Content.cshtml                | 1 +
 .../Orchard.Layouts/Views/LayoutEditor.Template.Grid.cshtml   | 4 ++--
 .../Orchard.Layouts/Views/LayoutEditor.Template.Row.cshtml    | 1 +
 7 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/LayoutEditor.Template.Form.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/LayoutEditor.Template.Form.cshtml
index e584d1b84..fcc54c245 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/LayoutEditor.Template.Form.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/LayoutEditor.Template.Form.cshtml
@@ -12,6 +12,7 @@
             };
         }
         @Display(New.LayoutEditor_Template_Properties(ElementTypeName: "form", Items: additionalItems))
+        @Display(New.LayoutEditor_Template_Rule(ElementTypeName: "form"))
         <li class="layout-panel-item layout-panel-action" title="@T("Delete form (Del)")" ng-click="delete(element)"><i class="fa fa-remove"></i></li>
     </ul>
     <div class="layout-container-children-placeholder">
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Framework/Display/ElementDisplay.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Framework/Display/ElementDisplay.cs
index 313adff92..2b5c34ecb 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Framework/Display/ElementDisplay.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Framework/Display/ElementDisplay.cs
@@ -72,6 +72,7 @@ namespace Orchard.Layouts.Framework.Display {
                     var childIndex = 0;
                     foreach (var child in container.Elements) {
                         var childShape = DisplayElement(child, content, displayType: displayType, updater: updater);
+
                         if (childShape != null) {
                             childShape.Parent = elementShape;
                             elementShape.Add(childShape, childIndex++.ToString());
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Canvas.cshtml b/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Canvas.cshtml
index a19fc4c97..0bd6a3737 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Canvas.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Canvas.cshtml
@@ -3,6 +3,7 @@
         <li class="layout-panel-item layout-panel-label">Canvas</li>
         @Display()
         @Display(New.LayoutEditor_Template_Properties(ElementTypeName: "canvas"))
+        @Display(New.LayoutEditor_Template_Rule(ElementTypeName: "canvas"))
     </ul>
     <div class="layout-container-children-placeholder">
         @T("This layout canvas is empty. To get started, drag a grid element from the toolbox and drop it here.")
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Column.cshtml b/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Column.cshtml
index 3cc131e01..0e8d7a831 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Column.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Column.cshtml
@@ -16,6 +16,7 @@
     <ul class="layout-panel layout-panel-main">
         <li class="layout-panel-item layout-panel-label">Column ({{element.width}})</li>
         @Display(New.LayoutEditor_Template_Properties(ElementTypeName: "column", Items: additionalItems))
+        @Display(New.LayoutEditor_Template_Rule(ElementTypeName: "column"))
         <li class="layout-panel-item layout-panel-action" title="@T("Delete column (Del)")" ng-click="delete(element)"><i class="fa fa-remove"></i></li>
         <li class="layout-panel-item layout-panel-action" title="@T("Move column left (Ctrl+Left)")" ng-click="element.moveUp()" ng-class="{disabled: !element.canMoveUp()}"><i class="fa fa-chevron-left"></i></li>
         <li class="layout-panel-item layout-panel-action" title="@T("Move column right (Ctrl+Right)")" ng-click="element.moveDown()" ng-class="{disabled: !element.canMoveDown()}"><i class="fa fa-chevron-right"></i></li>
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Content.cshtml b/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Content.cshtml
index c5599aa98..bf2506068 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Content.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Content.cshtml
@@ -3,6 +3,7 @@
         <li class="layout-panel-item layout-panel-label">{{::element.contentTypeLabel}}</li>
         <li class="layout-panel-item layout-panel-action layout-panel-action-edit" ng-show="{{element.hasEditor}}" title="Edit {{element.contentTypeLabel.toLowerCase()}} content (Enter)" ng-click="edit()"><i class="fa fa-code"></i></li>
         @Display(New.LayoutEditor_Template_Properties(ElementTypeName: "{{element.contentTypeLabel.toLowerCase()}}"))
+        @Display(New.LayoutEditor_Template_Rule(ElementTypeName: "{{element.contentTypeLabel.toLowerCase()}}"))
         <li class="layout-panel-item layout-panel-action" title="@T("Delete {{element.contentTypeLabel.toLowerCase()}} (Del)")" ng-click="delete(element)"><i class="fa fa-remove"></i></li>
         <li class="layout-panel-item layout-panel-action" title="@T("Move {{element.contentTypeLabel.toLowerCase()}} up (Ctrl+Up)")" ng-click="element.moveUp()" ng-class="{disabled: !element.canMoveUp()}"><i class="fa fa-chevron-up"></i></li>
         <li class="layout-panel-item layout-panel-action" title="@T("Move {{element.contentTypeLabel.toLowerCase()}} down (Ctrl+Down)")" ng-click="element.moveDown()" ng-class="{disabled: !element.canMoveDown()}"><i class="fa fa-chevron-down"></i></li>
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Grid.cshtml b/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Grid.cshtml
index d0c16611a..2a7e7c960 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Grid.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Grid.cshtml
@@ -1,8 +1,8 @@
-@using Orchard.Layouts.ViewModels;
-<div class="layout-element-wrapper" ng-class="{'layout-container-empty': getShowChildrenPlaceholder()}">
+<div class="layout-element-wrapper" ng-class="{'layout-container-empty': getShowChildrenPlaceholder()}">
     <ul class="layout-panel layout-panel-main">
         <li class="layout-panel-item layout-panel-label">Grid</li>
         @Display(New.LayoutEditor_Template_Properties(ElementTypeName: "grid"))
+        @Display(New.LayoutEditor_Template_Rule(ElementTypeName: "grid"))
         <li class="layout-panel-item layout-panel-action" title="@T("Delete grid (Del)")" ng-click="delete(element)"><i class="fa fa-remove"></i></li>
         <li class="layout-panel-item layout-panel-action" title="@T("Move grid up (Ctrl+Up)")" ng-click="element.moveUp()" ng-class="{disabled: !element.canMoveUp()}"><i class="fa fa-chevron-up"></i></li>
         <li class="layout-panel-item layout-panel-action" title="@T("Move grid down (Ctrl+Down)")" ng-click="element.moveDown()" ng-class="{disabled: !element.canMoveDown()}"><i class="fa fa-chevron-down"></i></li>
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Row.cshtml b/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Row.cshtml
index 07393b8c0..d69dfc186 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Row.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Row.cshtml
@@ -2,6 +2,7 @@
     <ul class="layout-panel layout-panel-main">
         <li class="layout-panel-item layout-panel-label">Row</li>
         @Display(New.LayoutEditor_Template_Properties(ElementTypeName: "row"))
+        @Display(New.LayoutEditor_Template_Rule(ElementTypeName: "row"))
         <li class="layout-panel-item layout-panel-action" title="@T("Delete row (Del)")" ng-click="delete(element)">
             <i class="fa fa-remove"></i>
         </li>