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

Layout Canvas reusability improvements.

Browse Source 
This enables child canvas elements to be moved around and removed.
This commit is contained in:
Sipke Schoorstra
2015-04-30 17:35:03 +02:00
parent ff461b3945
commit a919aab936
5 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,6 +193,10 @@ var LayoutEditor;
this.editor.dropTargetElement = null;
};
this.canDelete = function () {
return !!this.parent;
};
this.delete = function () {
if (!!this.parent)
this.parent.deleteChild(this);
@@ -396,7 +400,9 @@ var LayoutEditor;
LayoutEditor.Canvas = function (data, htmlId, htmlClass, htmlStyle, isTemplated, rule, children) {
LayoutEditor.Element.call(this, "Canvas", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);
LayoutEditor.Container.call(this, ["Grid", "Content"], children);
LayoutEditor.Container.call(this, ["Canvas", "Grid", "Content"], children);
this.isContainable = true;
this.toObject = function () {
var result = this.elementToObject();

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

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

@@ -3,7 +3,9 @@
LayoutEditor.Canvas = function (data, htmlId, htmlClass, htmlStyle, isTemplated, rule, children) {
LayoutEditor.Element.call(this, "Canvas", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);
LayoutEditor.Container.call(this, ["Grid", "Content"], children);
LayoutEditor.Container.call(this, ["Canvas", "Grid", "Content"], children);
this.isContainable = true;
this.toObject = function () {
var result = this.elementToObject();

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

@@ -117,6 +117,10 @@
this.editor.dropTargetElement = null;
};
this.canDelete = function () {
return !!this.parent;
};
this.delete = function () {
if (!!this.parent)
this.parent.deleteChild(this);

5
src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Canvas.cshtml
View File

@@ -1,8 +1,11 @@
<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">Canvas</li>
<li class="layout-panel-item layout-panel-label">@T("Canvas")</li>
@Display()
@Display(New.LayoutEditor_Template_Properties(ElementTypeName: "canvas"))
<li class="layout-panel-item layout-panel-action" title="@T("Delete canvas (Del)")" ng-click="delete(element)" ng-show="element.canDelete()"><i class="fa fa-remove"></i></li>
<li class="layout-panel-item layout-panel-action" title="@T("Move canvas up (Ctrl+Up)")" ng-click="element.moveUp()" ng-show="element.canMoveUp()"><i class="fa fa-chevron-up"></i></li>
<li class="layout-panel-item layout-panel-action" title="@T("Move canvas down (Ctrl+Down)")" ng-click="element.moveDown()" ng-show="element.canMoveDown()"><i class="fa fa-chevron-down"></i></li>
</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.")