lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11,164 Commits 94 Branches 33 Tags
b854839a28925da1ce3fccc8aeb1a2dae7a00938
Commit Graph

31 Commits

Author SHA1 Message Date
Daniel Stolt
03bac9222b Fixed Enter keyboard shortcut for layout elements that are not of type "Content". Fixes #5749. 2016-06-05 18:58:17 +02:00
Sipke Schoorstra
54c8c8417e Fixed LayoutEditor JS bugs. 
Fixes #6546
 2016-04-02 02:15:48 +02:00
Daniel Stolt
202234bf0b Refreshed all Gulp-compiled resource files. 2016-02-09 23:47:56 +01:00
Sipke Schoorstra
a492f89ea0 Further Layouts client-side scripting improvements. 
- Pushed the editElement function further down from Content to Element, which means even less code for custom container elements.
- Fixed a bug where client-side element editor state would not be applied after editing that element.
- Pushed down the toObject function from Content to Element, which means less code is necessary for custom container elements.
-
 2015-12-21 20:59:47 +01:00
Sipke Schoorstra
d1c0f98010 Updated Layouts to simplify custom container elements. 
These changes simplifies the requirements for implementing custom container elements by minimizing the amount of code necessary to tie things together.
 2015-12-21 19:48:59 +01:00
Daniel Stolt
f8409d5ce5 Updated the Gulp pipeline. 
NOTE: You need to run "npm update" from the solution folder to download the updated version of the dependencies for the updated Gulpfile to work properly.
 2015-10-09 22:41:21 +02:00
Daniel Stolt
df216b6a18 Merge from Orchard/dev. 2015-10-04 01:57:19 +02:00
Sebastien Ros
80c600fa02 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml
	src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Element.js
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Toolbox.cshtml
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/ClientStorageController.cs
	src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchSettingsIndexViewModel.cs
	src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml
	src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
	src/Orchard/Orchard.Framework.csproj
 2015-09-21 16:15:40 -07:00
Sebastien Ros
12a51ea7af [Fixes #5751, #5794] Removing Edit inline 2015-09-21 12:08:19 -07:00
Daniel Stolt
f023f66d63 Merged branch '1.9.x' into dev. 2015-07-26 01:28:38 +01:00
Sipke Schoorstra
b37951e205 Merge branch '1.9.x' into dev 
Conflicts:
 src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
 src/Orchard.Web/Modules/Orchard.Autoroute/Views/EditorTemplates/Parts.Autoroute.Edit.cshtml
 src/Orchard.Web/Modules/Orchard.DynamicForms/Migrations.cs
 src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/ValidationMessage.Design.cshtml
 src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/ValidationSummary.Design.cshtml
 src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
 src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
 src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
 src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js
 src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
 src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
 src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
 src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.css
 src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.min.css
 src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Shape.Design.cshtml
 src/Orchard.Web/Modules/Orchard.Layouts/Web.config
 2015-07-04 14:27:04 +02:00
Sipke Schoorstra
b18f153e6a #5445: Fixed form field binding issues. 
This fixes two issues:
1. Adding a Form element (and selecting the content type to create using the submitted values) and then adding a form element would not cause the Bindings tab to appear.
2. Adding nested containers (such as Grid, Row and Column) to a Form element would prevent the Bindings tab from appearing when adding a form field element such as TextField to a nested container.

Work Item: #5445
 2015-07-04 00:37:14 +02:00
Daniel Stolt
45aeb7b467 Merged 1.9.x into dev. 2015-06-20 23:30:49 +03:00
Daniel Stolt
b06a4ecb73 #5403 Improved native clipboard support in layout editor. 2015-06-20 19:35:11 +03:00
Daniel Stolt
764db254da Made layout editor toolbox separately scrollable while in sticky mode. 2015-06-20 16:42:53 +03:00
Sipke Schoorstra
20fe55a458 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Forms.js
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Forms.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.css.bundle
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.min.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Editor.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Editor.min.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Popup.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Popup.min.css
	src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Toolbox.cshtml
	src/Orchard/Tasks/BackgroundService.cs
 2015-06-10 23:58:18 +03:00
Daniel Stolt
452b8cfeac Added sticky positioning to layout editor toolbox. 2015-06-09 19:38:44 +03:00
Daniel Stolt
d86a5ec8c5 Replaced Web Essentials with Gulp for Orchard.Layouts. 
Starting with VS2015, Web Essentials will no longer perform tasks such as bundling, minification and LESS compilation. Developers are expected to use either Grunt or Gulp for front-end build automation. In order to enable working with the codebase in VS2015 going forward, this change is therefore necessary.
 2015-06-09 14:09:03 +03:00
Daniel Stolt
d9208bcc14 #5295: Fixed clipboard operations in layout element property popups. 2015-06-09 02:08:58 +03:00
Sipke Schoorstra
dacdbdffb2 Canvas everywhere. 2015-04-19 22:13:09 +02:00
Sipke Schoorstra
dea42e518b Cleaned up element views. 2015-04-17 14:34:00 +02:00
Sipke Schoorstra
05faccd722 Fixed that element editor dialog is not launched for Html and Form elements. 2015-04-03 17:42:11 +02:00
Sipke Schoorstra
eb61269d85 #21304: Fixed Text Element HTML filter issues. 
- Implemented HTML filters for Html, Text and Paragraph elements
- Tokens are only processed on the front-end, not in the editor page itself. This also prevents an exception when the {Shape.Execute} token is used with a theme specific shape.

Work Item: 21304
 2015-04-03 01:46:57 +02:00
Sipke Schoorstra
f02e147eaf Fixed url encoding / decoding issues. 
This change consistifies when and where data and html properties are being URL decoded.
 2015-03-12 00:23:05 +01:00
Kegan Maher
21c9ef2d9f #21240: Controllers defined in directives also should use inline-array DI syntax. 
This is an additional changeset added later to the same PR.
 2015-03-10 22:06:48 +01:00
Kegan Maher
6e7d82bd29 #21240: Layouts/DynamicForms: switch to Angular "inline array" DI annotation 
Work Item: 21240
 2015-03-06 09:03:04 +01:00
Sipke Schoorstra
27a01fb11e Fixed an HTML encoding issue. 
See: https://orchard.codeplex.com/discussions/582038
 2015-02-28 23:50:40 +01:00
Sipke Schoorstra
e26d70f3a5 #21226: Fixed that the Bindings tab doesn't appear for newly added form fields. 
Work Item: 21226
 2015-02-27 10:31:50 +01:00
Daniel Stolt
d32accb089 #21213: Improved layout popup keyboard handling. 
Work Item: 21213

Fixed space key issue when popup input field has focus. Also added ESC as a keyboard shortcut to close the popup. Also set focus to the first input when popup is opened.
 2015-02-24 12:47:57 +01:00
Sipke Schoorstra
bcfdd0120c Fixed a client side HTML decoding issue. 2015-02-23 16:01:54 +01:00
Daniel Stolt
4b11d08ccd Merged 'feature/layouteditor' into 1.x. 2015-02-19 22:14:55 +01:00