diff --git a/Orchard.proj b/Orchard.proj
index 5f1ae878d..f84846d28 100644
--- a/Orchard.proj
+++ b/Orchard.proj
@@ -8,6 +8,7 @@
$(MSBuildProjectDirectory)\src$(MSBuildProjectDirectory)\build$(MSBuildProjectDirectory)\buildtasks
+ $(LibFolder)\msbuild$(MSBuildProjectDirectory)\artifacts$(MSBuildProjectDirectory)\lib\sqlce$(ArtifactsFolder)\Source
@@ -33,7 +34,7 @@
$(BUILD_NUMBER)
-
+
@@ -156,7 +157,7 @@
-
+
@@ -338,6 +339,7 @@
$(MSBuildProjectDirectory)\src\**\bin\**\*;
$(MSBuildProjectDirectory)\src\**\obj\**\*;
$(MSBuildProjectDirectory)\**\App_Data\**\*;
+ $(MSBuildProjectDirectory)\**\node_modules\**\*;
$(MSBuildProjectDirectory)\**\_ReSharper*\**\*;
$(MSBuildProjectDirectory)\**\*.sln.cache;
$(MSBuildProjectDirectory)\**\*.suo;
@@ -369,8 +371,8 @@
-
-
+
+
diff --git a/lib/msbuild/ICSharpCode.SharpZipLib.dll b/lib/msbuild/ICSharpCode.SharpZipLib.dll
deleted file mode 100644
index bcdb00ea3..000000000
Binary files a/lib/msbuild/ICSharpCode.SharpZipLib.dll and /dev/null differ
diff --git a/lib/msbuild/Ionic.Zip.Reduced.dll b/lib/msbuild/Ionic.Zip.Reduced.dll
new file mode 100644
index 000000000..9622cc53e
Binary files /dev/null and b/lib/msbuild/Ionic.Zip.Reduced.dll differ
diff --git a/lib/msbuild/MSBuild.Community.Tasks.Targets b/lib/msbuild/MSBuild.Community.Tasks.Targets
index a04f036a0..b7ad52d62 100644
--- a/lib/msbuild/MSBuild.Community.Tasks.Targets
+++ b/lib/msbuild/MSBuild.Community.Tasks.Targets
@@ -1,116 +1,158 @@
-
+
-
-
- .
- $(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.dll
-
+
+ $(MSBuildThisFileDirectory)
+ $([MSBUILD]::Unescape($(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.dll))
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
-
-
+
+
+
+
+
+
-
-
-
-
+
+
-
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/msbuild/MSBuild.Community.Tasks.dll b/lib/msbuild/MSBuild.Community.Tasks.dll
index ee8046a1d..1288d54c1 100644
Binary files a/lib/msbuild/MSBuild.Community.Tasks.dll and b/lib/msbuild/MSBuild.Community.Tasks.dll differ
diff --git a/lib/msdeploy/createlogin.sql b/lib/msdeploy/createlogin.sql
new file mode 100644
index 000000000..f9679c4e8
--- /dev/null
+++ b/lib/msdeploy/createlogin.sql
@@ -0,0 +1,9 @@
+/**********************************************************************/
+/* Install.SQL */
+/* Creates a login and makes the user a member of db roles */
+/* */
+/* Modifications for SQL AZURE - ON MASTER */
+/**********************************************************************/
+
+
+CREATE LOGIN PlaceHolderForUser WITH PASSWORD = 'PlaceHolderForPassword'
\ No newline at end of file
diff --git a/lib/msdeploy/createuser.sql b/lib/msdeploy/createuser.sql
new file mode 100644
index 000000000..1db827770
--- /dev/null
+++ b/lib/msdeploy/createuser.sql
@@ -0,0 +1,15 @@
+/**********************************************************************/
+/* CreateUser.SQL */
+/* Creates a user and makes the user a member of db roles */
+/* This script runs against the User database and requires connection string */
+/* Supports SQL Server and SQL AZURE */
+/**********************************************************************/
+
+-- Create database user and map to login
+-- and add user to the datareader, datawriter, ddladmin and securityadmin roles
+--
+
+CREATE USER PlaceHolderForUser FOR LOGIN PlaceHolderForUser;
+GO
+EXEC sp_addrolemember 'db_owner', PlaceHolderForUser;
+GO
diff --git a/lib/msdeploy/install.sql b/lib/msdeploy/install.sql
deleted file mode 100644
index c998bcbfc..000000000
--- a/lib/msdeploy/install.sql
+++ /dev/null
@@ -1,45 +0,0 @@
-/**********************************************************************/
-/* Install.SQL */
-/* Creates a login and makes the user a member of db roles */
-/* */
-/**********************************************************************/
-
--- Declare variables for database name, username and password
-DECLARE @dbName sysname,
- @dbUser sysname,
- @dbPwd nvarchar(max);
-
--- Set variables for database name, username and password
-SET @dbName = 'PlaceHolderForDb';
-SET @dbUser = 'PlaceHolderForUser';
-SET @dbPwd = 'PlaceHolderForPassword';
-
-DECLARE @cmd nvarchar(max)
-
--- Create login
-IF( SUSER_SID(@dbUser) is null )
-BEGIN
- print '-- Creating login '
- SET @cmd = N'CREATE LOGIN ' + quotename(@dbUser) + N' WITH PASSWORD ='''+ replace(@dbPwd, '''', '''''') + N''''
- EXEC(@cmd)
-END
-
--- Create database user and map to login
--- and add user to the datareader, datawriter, ddladmin and securityadmin roles
---
-SET @cmd = N'USE ' + quotename(@DBName) + N';
-IF( NOT EXISTS (SELECT * FROM sys.database_principals WHERE name = ''' + replace(@dbUser, '''', '''''') + N'''))
-BEGIN
- print ''-- Creating user'';
- CREATE USER ' + quotename(@dbUser) + N' FOR LOGIN ' + quotename(@dbUser) + N';
- print ''-- Adding user'';
- EXEC sp_addrolemember ''db_ddladmin'', ''' + replace(@dbUser, '''', '''''') + N''';
- print ''-- Adding user'';
- EXEC sp_addrolemember ''db_securityadmin'', ''' + replace(@dbUser, '''', '''''') + N''';
- print ''-- Adding user'';
- EXEC sp_addrolemember ''db_datareader'', ''' + replace(@dbUser, '''', '''''') + N''';
- print ''-- Adding user'';
- EXEC sp_addrolemember ''db_datawriter'', ''' + replace(@dbUser, '''', '''''') + N''';
-END'
-EXEC(@cmd)
-GO
\ No newline at end of file
diff --git a/lib/msdeploy/manifest.xml b/lib/msdeploy/manifest.xml
index 8c0bcb819..670d2c3e3 100644
--- a/lib/msdeploy/manifest.xml
+++ b/lib/msdeploy/manifest.xml
@@ -1,7 +1,13 @@
-
+
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/lib/msdeploy/parameters.xml b/lib/msdeploy/parameters.xml
index 3a2e494c9..db78a9991 100644
--- a/lib/msdeploy/parameters.xml
+++ b/lib/msdeploy/parameters.xml
@@ -47,19 +47,17 @@
-
+
-
-
+
+
-
+
+
+
diff --git a/src/Gulpfile.js b/src/Gulpfile.js
index fce38f9fe..b602f5ca4 100644
--- a/src/Gulpfile.js
+++ b/src/Gulpfile.js
@@ -1,4 +1,5 @@
-var glob = require("glob"),
+var fs = require("fs"),
+ glob = require("glob"),
path = require("path-posix"),
merge = require("merge-stream"),
gulpif = require("gulp-if"),
@@ -42,14 +43,24 @@ gulp.task("watch", function () {
var pathWin32 = require("path");
getAssetGroups().forEach(function (assetGroup) {
var watchPaths = assetGroup.inputPaths.concat(assetGroup.watchPaths);
- gulp.watch(watchPaths, function (event) {
- var isConcat = path.basename(assetGroup.outputFileName, path.extname(assetGroup.outputFileName)) !== "@";
- if (isConcat)
- console.log("Asset file '" + event.path + "' was " + event.type + ", rebuilding asset group with output '" + assetGroup.outputPath + "'.");
- else
- console.log("Asset file '" + event.path + "' was " + event.type + ", rebuilding asset group.");
- var doRebuild = true;
- var task = createAssetGroupTask(assetGroup, doRebuild);
+ var inputWatcher;
+ function createWatcher() {
+ inputWatcher = gulp.watch(watchPaths, function (event) {
+ var isConcat = path.basename(assetGroup.outputFileName, path.extname(assetGroup.outputFileName)) !== "@";
+ if (isConcat)
+ console.log("Asset file '" + event.path + "' was " + event.type + ", rebuilding asset group with output '" + assetGroup.outputPath + "'.");
+ else
+ console.log("Asset file '" + event.path + "' was " + event.type + ", rebuilding asset group.");
+ var doRebuild = true;
+ var task = createAssetGroupTask(assetGroup, doRebuild);
+ });
+ }
+ createWatcher();
+ gulp.watch(assetGroup.manifestPath, function (event) {
+ console.log("Asset manifest file '" + event.path + "' was " + event.type + ", restarting watcher.");
+ inputWatcher.remove();
+ inputWatcher.end();
+ createWatcher();
});
});
});
@@ -72,6 +83,7 @@ function getAssetGroups() {
}
function resolveAssetGroupPaths(assetGroup, assetManifestPath) {
+ assetGroup.manifestPath = assetManifestPath;
assetGroup.basePath = path.dirname(assetManifestPath);
assetGroup.inputPaths = assetGroup.inputs.map(function (inputPath) {
return path.resolve(path.join(assetGroup.basePath, inputPath));
@@ -89,11 +101,18 @@ function resolveAssetGroupPaths(assetGroup, assetManifestPath) {
function createAssetGroupTask(assetGroup, doRebuild) {
var outputExt = path.extname(assetGroup.output).toLowerCase();
+ var doConcat = path.basename(assetGroup.outputFileName, outputExt) !== "@";
+ if (doConcat && !doRebuild) {
+ // Force a rebuild of this asset group is the asset manifest file itself is newer than the output.
+ var assetManifestStats = fs.statSync(assetGroup.manifestPath);
+ var outputStats = fs.existsSync(assetGroup.outputPath) ? fs.statSync(assetGroup.outputPath) : null;
+ doRebuild = !outputStats || assetManifestStats.mtime > outputStats.mtime;
+ }
switch (outputExt) {
case ".css":
- return buildCssPipeline(assetGroup, doRebuild);
+ return buildCssPipeline(assetGroup, doConcat, doRebuild);
case ".js":
- return buildJsPipeline(assetGroup, doRebuild);
+ return buildJsPipeline(assetGroup, doConcat, doRebuild);
}
}
@@ -101,13 +120,12 @@ function createAssetGroupTask(assetGroup, doRebuild) {
** PROCESSING PIPELINES
*/
-function buildCssPipeline(assetGroup, doRebuild) {
+function buildCssPipeline(assetGroup, doConcat, doRebuild) {
assetGroup.inputPaths.forEach(function (inputPath) {
var ext = path.extname(inputPath).toLowerCase();
if (ext !== ".less" && ext !== ".css")
throw "Input file '" + inputPath + "' is not of a valid type for output file '" + assetGroup.outputPath + "'.";
});
- var doConcat = path.basename(assetGroup.outputFileName, ".css") !== "@";
var generateSourceMaps = assetGroup.hasOwnProperty("generateSourceMaps") ? assetGroup.generateSourceMaps : true;
return gulp.src(assetGroup.inputPaths)
.pipe(gulpif(!doRebuild,
@@ -138,13 +156,12 @@ function buildCssPipeline(assetGroup, doRebuild) {
.pipe(gulp.dest(assetGroup.outputDir));
}
-function buildJsPipeline(assetGroup, doRebuild) {
+function buildJsPipeline(assetGroup, doConcat, doRebuild) {
assetGroup.inputPaths.forEach(function (inputPath) {
var ext = path.extname(inputPath).toLowerCase();
if (ext !== ".ts" && ext !== ".js")
throw "Input file '" + inputPath + "' is not of a valid type for output file '" + assetGroup.outputPath + "'.";
});
- var doConcat = path.basename(assetGroup.outputFileName, ".js") !== "@";
var generateSourceMaps = assetGroup.hasOwnProperty("generateSourceMaps") ? assetGroup.generateSourceMaps : true;
return gulp.src(assetGroup.inputPaths)
.pipe(gulpif(!doRebuild,
diff --git a/src/Orchard.Azure/.vs/config/applicationhost.config b/src/Orchard.Azure/.vs/config/applicationhost.config
new file mode 100644
index 000000000..c5660c9a1
--- /dev/null
+++ b/src/Orchard.Azure/.vs/config/applicationhost.config
@@ -0,0 +1,1038 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Orchard.Azure/Orchard.Azure.CloudService/Orchard.Azure.CloudService.ccproj b/src/Orchard.Azure/Orchard.Azure.CloudService/Orchard.Azure.CloudService.ccproj
index 66bb61da8..0008ce829 100644
--- a/src/Orchard.Azure/Orchard.Azure.CloudService/Orchard.Azure.CloudService.ccproj
+++ b/src/Orchard.Azure/Orchard.Azure.CloudService/Orchard.Azure.CloudService.ccproj
@@ -35,8 +35,9 @@
+
-
+
diff --git a/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.cscfg b/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Cloud.cscfg
similarity index 99%
rename from src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.cscfg
rename to src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Cloud.cscfg
index f61f4bfc9..be5261216 100644
--- a/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.cscfg
+++ b/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Cloud.cscfg
@@ -1,21 +1,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Local.cscfg b/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Local.cscfg
new file mode 100644
index 000000000..be5261216
--- /dev/null
+++ b/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Local.cscfg
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Orchard.Azure/Orchard.Azure.CloudService/ecf/Orchard.Azure.WebContent/diagnostics.wadcfgx b/src/Orchard.Azure/Orchard.Azure.CloudService/ecf/Orchard.Azure.WebContent/diagnostics.wadcfgx
new file mode 100644
index 000000000..99fad34fd
--- /dev/null
+++ b/src/Orchard.Azure/Orchard.Azure.CloudService/ecf/Orchard.Azure.WebContent/diagnostics.wadcfgx
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ devstoreaccount1
+
+
+
+
+ true
+
\ No newline at end of file
diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config b/src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config
index 1593a1e2c..827c5a9ab 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config
@@ -15,7 +15,7 @@
-
+
diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Config/HostComponents.config b/src/Orchard.Azure/Orchard.Azure.Web/Config/HostComponents.config
index 2da96521c..91ea6a690 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Config/HostComponents.config
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Config/HostComponents.config
@@ -1,98 +1,110 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Config/Sites.config b/src/Orchard.Azure/Orchard.Azure.Web/Config/Sites.config
index a9b061b5c..52ff25006 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Config/Sites.config
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Config/Sites.config
@@ -1,31 +1,50 @@
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
+ Uncomment to use ReadUncommitted as the default isolation level. Please not that
+ Sql Server Ce doesn't support ReadUncommitted.
-
\ No newline at end of file
+ Isolation level for all database transaction.
+ See http://msdn.microsoft.com/en-us/library/system.transactions.isolationlevel.aspx
+ -->
+
+
+
+
+
+
+
diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
index cff6ebb0b..aceb7edb8 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
@@ -20,7 +20,7 @@
- true
+ true
@@ -91,11 +91,11 @@
False..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Configuration.dll
-
+ ..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Diagnostics.dllTrue
-
+ ..\..\..\lib\windowsazure\Microsoft.WindowsAzure.ServiceRuntime.dllFalse
diff --git a/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs b/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs
index b36a0684f..eb3081530 100644
--- a/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Profile/Properties/AssemblyInfo.cs b/src/Orchard.Profile/Properties/AssemblyInfo.cs
index c23f2ddb7..c26e4ba29 100644
--- a/src/Orchard.Profile/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Profile/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Specs/Autoroute.feature b/src/Orchard.Specs/Autoroute.feature
index 605d324ec..35311ab19 100644
--- a/src/Orchard.Specs/Autoroute.feature
+++ b/src/Orchard.Specs/Autoroute.feature
@@ -19,7 +19,7 @@ Scenario: I can create and publish a new Home Page
And I fill in
| name | value |
| Title.Title | Foo |
- | Autoroute.PromoteToHomePage | True |
+ | AutoroutePart.PromoteToHomePage | True |
And I hit "Publish Now"
And I go to "/"
Then I should see "]*>.*?Foo.*?"
diff --git a/src/Orchard.Specs/Autoroute.feature.cs b/src/Orchard.Specs/Autoroute.feature.cs
index 9acc565f4..c21be5298 100644
--- a/src/Orchard.Specs/Autoroute.feature.cs
+++ b/src/Orchard.Specs/Autoroute.feature.cs
@@ -3,7 +3,7 @@
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.9.0.77
// SpecFlow Generator Version:1.9.0.0
-// Runtime Version:4.0.30319.34014
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -114,7 +114,7 @@ this.ScenarioSetup(scenarioInfo);
"Title.Title",
"Foo"});
table2.AddRow(new string[] {
- "Autoroute.PromoteToHomePage",
+ "AutoroutePart.PromoteToHomePage",
"True"});
#line 19
testRunner.And("I fill in", ((string)(null)), table2, "And ");
diff --git a/src/Orchard.Specs/Blogs.feature b/src/Orchard.Specs/Blogs.feature
index c3e87d12f..237384d14 100644
--- a/src/Orchard.Specs/Blogs.feature
+++ b/src/Orchard.Specs/Blogs.feature
@@ -67,7 +67,7 @@ Scenario: I can create a new blog with multiple blog posts each with the same ti
And I fill in
| name | value |
| Title.Title | My Post |
- | Autoroute.CurrentUrl | my-blog/my-post |
+ | AutoroutePart.CurrentUrl | my-blog/my-post |
| Body.Text | Are you still there? |
And I hit "Publish Now"
And I go to "my-blog/my-post-3"
@@ -141,7 +141,7 @@ Scenario: I set my blog to be the content for the home page and the posts for th
And I fill in
| name | value |
| Title.Title | My Blog |
- | Autoroute.PromoteToHomePage | true |
+ | AutoroutePart.PromoteToHomePage | true |
And I hit "Save"
And I go to "admin/blogs"
And I follow "My Blog"
@@ -275,20 +275,20 @@ Scenario: I can create browse blog posts on several pages
And I should not see "]*>.*?My Post 3.*?"
Scenario: I can create a new blog with a percent sign in the title and it gets stripped out of the slug
- Given I have installed Orchard
- When I go to "admin/blogs/create"
- And I fill in
- | name | value |
- | Title.Title | My Blog |
- And I hit "Save"
- And I go to "admin/blogs"
- And I follow "My Blog"
- And I follow "New Post" where class name has "primaryAction"
- And I fill in
- | name | value |
- | Title.Title | My Post with a % Sign |
- | Body.Text | Hi there. |
- And I hit "Publish Now"
- And I go to "my-blog/my-post-with-a-sign"
- Then I should see "]*>.*?My Post with a % Sign.*?"
- And I should see "Hi there."
\ No newline at end of file
+ Given I have installed Orchard
+ When I go to "admin/blogs/create"
+ And I fill in
+ | name | value |
+ | Title.Title | My Blog |
+ And I hit "Save"
+ And I go to "admin/blogs"
+ And I follow "My Blog"
+ And I follow "New Post" where class name has "primaryAction"
+ And I fill in
+ | name | value |
+ | Title.Title | My Post with a % Sign |
+ | Body.Text | Hi there. |
+ And I hit "Publish Now"
+ And I go to "my-blog/my-post-with-a-sign"
+ Then I should see "]*>.*?My Post with a % Sign.*?"
+ And I should see "Hi there."
\ No newline at end of file
diff --git a/src/Orchard.Specs/Blogs.feature.cs b/src/Orchard.Specs/Blogs.feature.cs
index f420e7133..74fabba3f 100644
--- a/src/Orchard.Specs/Blogs.feature.cs
+++ b/src/Orchard.Specs/Blogs.feature.cs
@@ -3,7 +3,7 @@
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.9.0.77
// SpecFlow Generator Version:1.9.0.0
-// Runtime Version:4.0.30319.34014
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -234,7 +234,7 @@ this.ScenarioSetup(scenarioInfo);
"Title.Title",
"My Post"});
table6.AddRow(new string[] {
- "Autoroute.CurrentUrl",
+ "AutoroutePart.CurrentUrl",
"my-blog/my-post"});
table6.AddRow(new string[] {
"Body.Text",
@@ -449,7 +449,7 @@ this.ScenarioSetup(scenarioInfo);
"Title.Title",
"My Blog"});
table12.AddRow(new string[] {
- "Autoroute.PromoteToHomePage",
+ "AutoroutePart.PromoteToHomePage",
"true"});
#line 141
testRunner.And("I fill in", ((string)(null)), table12, "And ");
@@ -779,9 +779,9 @@ this.ScenarioSetup(scenarioInfo);
#line 277
this.ScenarioSetup(scenarioInfo);
#line 278
- testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
+ testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
#line 279
- testRunner.When("I go to \"admin/blogs/create\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"admin/blogs/create\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table27 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -790,15 +790,15 @@ this.ScenarioSetup(scenarioInfo);
"Title.Title",
"My Blog"});
#line 280
- testRunner.And("I fill in", ((string)(null)), table27, "And ");
+ testRunner.And("I fill in", ((string)(null)), table27, "And ");
#line 283
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 284
- testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 285
- testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 286
- testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table28 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -810,15 +810,15 @@ this.ScenarioSetup(scenarioInfo);
"Body.Text",
"Hi there."});
#line 287
- testRunner.And("I fill in", ((string)(null)), table28, "And ");
+ testRunner.And("I fill in", ((string)(null)), table28, "And ");
#line 291
- testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 292
- testRunner.And("I go to \"my-blog/my-post-with-a-sign\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"my-blog/my-post-with-a-sign\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 293
- testRunner.Then("I should see \"]*>.*?My Post with a % Sign.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"]*>.*?My Post with a % Sign.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 294
- testRunner.And("I should see \"Hi there.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I should see \"Hi there.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
this.ScenarioCleanup();
}
diff --git a/src/Orchard.Specs/Boolean.feature b/src/Orchard.Specs/Boolean.feature
index 25c5a21e8..c36d964ba 100644
--- a/src/Orchard.Specs/Boolean.feature
+++ b/src/Orchard.Specs/Boolean.feature
@@ -1,13 +1,13 @@
Feature: Boolean Field
In order to add boolean content to my types
- As an administrator
+ As an administrator
I want to create, edit and publish boolean fields
Scenario: Creating and using Boolean fields
-
- # Creating an Event content type
+
+ # Creating an Event content type
Given I have installed Orchard
- And I have installed "Orchard.Fields"
+ And I have installed "Orchard.Fields"
When I go to "Admin/ContentTypes"
Then I should see "]*>.*?Create new type"
When I go to "Admin/ContentTypes/Create"
@@ -18,65 +18,65 @@ Scenario: Creating and using Boolean fields
And I hit "Create"
And I go to "Admin/ContentTypes/"
Then I should see "Event"
-
- # Adding a Boolean field
- When I go to "Admin/ContentTypes/Edit/Event"
- And I follow "Add Field"
- And I fill in
+
+ # Adding a Boolean field
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I follow "Add Field"
+ And I fill in
| name | value |
| DisplayName | Active |
| Name | Active |
| FieldTypeName | BooleanField |
- And I hit "Save"
- And I am redirected
- Then I should see "The \"Active\" field has been added."
+ And I hit "Save"
+ And I am redirected
+ Then I should see "The \"Active\" field has been added."
- # Creating an Event content item
- When I go to "Admin/Contents/Create/Event"
- Then I should see "Active"
- When I fill in
- | name | value |
- | Event.Active.Value | true |
- And I hit "Save"
- And I am redirected
- Then I should see "Your Event has been created."
- When I go to "Admin/Contents/List"
- Then I should see "Active:"
- And I should see "Yes"
+ # Creating an Event content item
+ When I go to "Admin/Contents/Create/Event"
+ Then I should see "Active"
+ When I fill in
+ | name | value |
+ | Event.Active.Value | true |
+ And I hit "Save"
+ And I am redirected
+ Then I should see "Your Event has been created."
+ When I go to "Admin/Contents/List"
+ Then I should see "Active:"
+ And I should see "Yes"
- # The hint should be displayed
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].BooleanFieldSettings.Hint | Check if the event is active |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "Check if the event is active"
-
- # The default value should be selected
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].BooleanFieldSettings.DefaultValue | True |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "checked=\"checked\""
+ # The hint should be displayed
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].BooleanFieldSettings.Hint | Check if the event is active |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "Check if the event is active"
+
+ # The default value should be selected
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].BooleanFieldSettings.DefaultValue | True |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "checked=\"checked\""
- # The value should be required
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].BooleanFieldSettings.Optional | false |
- And I fill in
- | name | value |
- | Fields[0].BooleanFieldSettings.NotSetLabel | May be |
- And I fill in
- | name | value |
- | Fields[0].BooleanFieldSettings.SelectionMode | Radiobutton |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- And I fill in
- | name | value |
- | Event.Active.Value | |
- And I hit "Save"
- Then I should see "The field Active is mandatory."
\ No newline at end of file
+ # The value should be required
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].BooleanFieldSettings.Optional | false |
+ And I fill in
+ | name | value |
+ | Fields[0].BooleanFieldSettings.NotSetLabel | May be |
+ And I fill in
+ | name | value |
+ | Fields[0].BooleanFieldSettings.SelectionMode | Radiobutton |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ And I fill in
+ | name | value |
+ | Event.Active.Value | |
+ And I hit "Save"
+ Then I should see "The field Active is mandatory."
\ No newline at end of file
diff --git a/src/Orchard.Specs/Boolean.feature.cs b/src/Orchard.Specs/Boolean.feature.cs
index 6d95a877a..f074e5cb2 100644
--- a/src/Orchard.Specs/Boolean.feature.cs
+++ b/src/Orchard.Specs/Boolean.feature.cs
@@ -3,7 +3,7 @@
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.9.0.77
// SpecFlow Generator Version:1.9.0.0
-// Runtime Version:4.0.30319.34014
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -32,8 +32,8 @@ namespace Orchard.Specs
public virtual void FeatureSetup()
{
testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
- TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Boolean Field", " In order to add boolean content to my types\r\nAs an administrator\r\n I want to c" +
- "reate, edit and publish boolean fields", ProgrammingLanguage.CSharp, ((string[])(null)));
+ TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Boolean Field", " In order to add boolean content to my types\r\n As an administrator\r\n I want to" +
+ " create, edit and publish boolean fields", ProgrammingLanguage.CSharp, ((string[])(null)));
testRunner.OnFeatureStart(featureInfo);
}
@@ -75,7 +75,7 @@ this.ScenarioSetup(scenarioInfo);
#line 9
testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
#line 10
- testRunner.And("I have installed \"Orchard.Fields\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I have installed \"Orchard.Fields\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 11
testRunner.When("I go to \"Admin/ContentTypes\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 12
@@ -101,9 +101,9 @@ this.ScenarioSetup(scenarioInfo);
#line 20
testRunner.Then("I should see \"Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 23
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 24
- testRunner.And("I follow \"Add Field\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I follow \"Add Field\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table2 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -118,17 +118,17 @@ this.ScenarioSetup(scenarioInfo);
"FieldTypeName",
"BooleanField"});
#line 25
- testRunner.And("I fill in", ((string)(null)), table2, "And ");
+ testRunner.And("I fill in", ((string)(null)), table2, "And ");
#line 30
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 31
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 32
- testRunner.Then("I should see \"The \\\"Active\\\" field has been added.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"The \\\"Active\\\" field has been added.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 35
- testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 36
- testRunner.Then("I should see \"Active\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Active\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
TechTalk.SpecFlow.Table table3 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -137,21 +137,21 @@ this.ScenarioSetup(scenarioInfo);
"Event.Active.Value",
"true"});
#line 37
- testRunner.When("I fill in", ((string)(null)), table3, "When ");
+ testRunner.When("I fill in", ((string)(null)), table3, "When ");
#line 40
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 41
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 42
- testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 43
- testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 44
- testRunner.Then("I should see \"Active:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Active:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 45
- testRunner.And("I should see \"Yes\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I should see \"Yes\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 48
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table4 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -160,15 +160,15 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].BooleanFieldSettings.Hint",
"Check if the event is active"});
#line 49
- testRunner.And("I fill in", ((string)(null)), table4, "And ");
+ testRunner.And("I fill in", ((string)(null)), table4, "And ");
#line 52
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 53
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 54
- testRunner.Then("I should see \"Check if the event is active\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Check if the event is active\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 57
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table5 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -177,15 +177,15 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].BooleanFieldSettings.DefaultValue",
"True"});
#line 58
- testRunner.And("I fill in", ((string)(null)), table5, "And ");
+ testRunner.And("I fill in", ((string)(null)), table5, "And ");
#line 61
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 62
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 63
- testRunner.Then("I should see \"checked=\\\"checked\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"checked=\\\"checked\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 66
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table6 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -194,7 +194,7 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].BooleanFieldSettings.Optional",
"false"});
#line 67
- testRunner.And("I fill in", ((string)(null)), table6, "And ");
+ testRunner.And("I fill in", ((string)(null)), table6, "And ");
#line hidden
TechTalk.SpecFlow.Table table7 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -203,7 +203,7 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].BooleanFieldSettings.NotSetLabel",
"May be"});
#line 70
- testRunner.And("I fill in", ((string)(null)), table7, "And ");
+ testRunner.And("I fill in", ((string)(null)), table7, "And ");
#line hidden
TechTalk.SpecFlow.Table table8 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -212,11 +212,11 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].BooleanFieldSettings.SelectionMode",
"Radiobutton"});
#line 73
- testRunner.And("I fill in", ((string)(null)), table8, "And ");
+ testRunner.And("I fill in", ((string)(null)), table8, "And ");
#line 76
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 77
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table9 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -225,11 +225,11 @@ this.ScenarioSetup(scenarioInfo);
"Event.Active.Value",
""});
#line 78
- testRunner.And("I fill in", ((string)(null)), table9, "And ");
+ testRunner.And("I fill in", ((string)(null)), table9, "And ");
#line 81
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 82
- testRunner.Then("I should see \"The field Active is mandatory.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"The field Active is mandatory.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
this.ScenarioCleanup();
}
diff --git a/src/Orchard.Specs/Comments.feature b/src/Orchard.Specs/Comments.feature
index 22ca0eb1b..16072c89f 100644
--- a/src/Orchard.Specs/Comments.feature
+++ b/src/Orchard.Specs/Comments.feature
@@ -39,12 +39,12 @@ Scenario: HTML markup in any given comment is encoded
And I hit "Submit Comment"
And I am redirected
# because the ToUrlString extension method breaks in this specific (test) environment, the returnUrl is broken...
- And I go to "my-blog/my-post"
+ And I go to "my-blog/my-post"
# And I go to "my-blog/my-post"
Then I should see "This is<br id="bad-anon-br" />a <a href"
And I should not see " "
- # Moderated comments are not displayed
+ # Moderated comments are not displayed
When I go to "users/account/logon"
And I fill in
| name | value |
@@ -52,15 +52,15 @@ Scenario: HTML markup in any given comment is encoded
| password | 6655321 |
And I hit "Sign In"
And I am redirected
- And I go to "admin/settings/comments"
- And I fill in
+ And I go to "admin/settings/comments"
+ And I fill in
| name | value |
| CommentSettings.ModerateComments | true |
- And I hit "Save"
- And I am redirected
- Then I should see "Settings updated"
- When I go to "users/account/logoff"
- And I go to "my-blog/my-post"
+ And I hit "Save"
+ And I am redirected
+ Then I should see "Settings updated"
+ When I go to "users/account/logoff"
+ And I go to "my-blog/my-post"
And I fill in
| name | value |
| Comments.Author | Bill |
diff --git a/src/Orchard.Specs/Comments.feature.cs b/src/Orchard.Specs/Comments.feature.cs
index 4c48a16bb..d7c9de2d7 100644
--- a/src/Orchard.Specs/Comments.feature.cs
+++ b/src/Orchard.Specs/Comments.feature.cs
@@ -3,7 +3,7 @@
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.9.0.77
// SpecFlow Generator Version:1.9.0.0
-// Runtime Version:4.0.30319.0
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -151,7 +151,7 @@ this.ScenarioSetup(scenarioInfo);
#line 40
testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 42
- testRunner.And("I go to \"my-blog/my-post\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"my-blog/my-post\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 44
testRunner.Then("I should see \"This is<br id="bad-anon-br" />a <a href\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 45
@@ -175,7 +175,7 @@ this.ScenarioSetup(scenarioInfo);
#line 54
testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 55
- testRunner.And("I go to \"admin/settings/comments\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"admin/settings/comments\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table6 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -184,17 +184,17 @@ this.ScenarioSetup(scenarioInfo);
"CommentSettings.ModerateComments",
"true"});
#line 56
- testRunner.And("I fill in", ((string)(null)), table6, "And ");
+ testRunner.And("I fill in", ((string)(null)), table6, "And ");
#line 59
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 60
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 61
- testRunner.Then("I should see \"Settings updated\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Settings updated\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 62
- testRunner.When("I go to \"users/account/logoff\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"users/account/logoff\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 63
- testRunner.And("I go to \"my-blog/my-post\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"my-blog/my-post\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table7 = new TechTalk.SpecFlow.Table(new string[] {
"name",
diff --git a/src/Orchard.Specs/DateTime.feature b/src/Orchard.Specs/DateTime.feature
index de1f61881..ac4c8d2d8 100644
--- a/src/Orchard.Specs/DateTime.feature
+++ b/src/Orchard.Specs/DateTime.feature
@@ -1,13 +1,13 @@
Feature: DateTime Field
In order to add Date content to my types
- As an administrator
+ As an administrator
I want to create, edit and publish DateTime fields
Scenario: Creating and using Date fields
-
- # Creating an Event content type
+
+ # Creating an Event content type
Given I have installed Orchard
- And I have installed "Orchard.Fields"
+ And I have installed "Orchard.Fields"
When I go to "Admin/ContentTypes"
Then I should see "]*>.*?Create new type"
When I go to "Admin/ContentTypes/Create"
@@ -18,133 +18,133 @@ Scenario: Creating and using Date fields
And I hit "Create"
And I go to "Admin/ContentTypes/"
Then I should see "Event"
-
- # Adding a Date field
- When I go to "Admin/ContentTypes/Edit/Event"
- And I follow "Add Field"
- And I fill in
+
+ # Adding a Date field
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I follow "Add Field"
+ And I fill in
| name | value |
| DisplayName | Date of the event |
| Name | EventDate |
| FieldTypeName | DateTimeField |
- And I hit "Save"
- And I am redirected
- Then I should see "The \"Date of the event\" field has been added."
+ And I hit "Save"
+ And I am redirected
+ Then I should see "The \"Date of the event\" field has been added."
- # Invalid Date
- When I go to "Admin/Contents/Create/Event"
- Then I should see "Date of the event"
- When I fill in
- | name | value |
- | Event.EventDate.Editor.Date | 31/01/2012 |
- | Event.EventDate.Editor.Time | 12:00 AM |
- And I hit "Save"
- Then I should see "Date of the event could not be parsed as a valid date and time"
+ # Invalid Date
+ When I go to "Admin/Contents/Create/Event"
+ Then I should see "Date of the event"
+ When I fill in
+ | name | value |
+ | Event.EventDate.Editor.Date | 31/01/2012 |
+ | Event.EventDate.Editor.Time | 12:00 AM |
+ And I hit "Save"
+ Then I should see "Date of the event could not be parsed as a valid date and time"
- # Creating an Event content item
- When I go to "Admin/Contents/Create/Event"
- Then I should see "Date of the event"
- When I fill in
- | name | value |
- | Event.EventDate.Editor.Date | 01/31/2012 |
- And I fill in
- | name | value |
- | Event.EventDate.Editor.Time | 12:00 AM |
- And I hit "Save"
- And I am redirected
- Then I should see "Your Event has been created."
- When I go to "Admin/Contents/List"
- Then I should see "Date of the event"
- And I should see "1/31/2012 12:00"
+ # Creating an Event content item
+ When I go to "Admin/Contents/Create/Event"
+ Then I should see "Date of the event"
+ When I fill in
+ | name | value |
+ | Event.EventDate.Editor.Date | 01/31/2012 |
+ And I fill in
+ | name | value |
+ | Event.EventDate.Editor.Time | 12:00 AM |
+ And I hit "Save"
+ And I am redirected
+ Then I should see "Your Event has been created."
+ When I go to "Admin/Contents/List"
+ Then I should see "Date of the event"
+ And I should see "1/31/2012 12:00"
- # The hint should be displayed
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].DateTimeFieldSettings.Hint | Enter the date of the event |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "Enter the date of the event"
-
- # Display = DateOnly
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].DateTimeFieldSettings.Display | DateOnly |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "Event.EventDate.Editor.Date"
- And I should not see "Event.EventDate.Editor.Time"
-
- # Display = TimeOnly
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].DateTimeFieldSettings.Display | TimeOnly |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "Event.EventDate.Editor.Time"
- And I should not see "Event.EventDate.Editor.Date"
+ # The hint should be displayed
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].DateTimeFieldSettings.Hint | Enter the date of the event |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "Enter the date of the event"
+
+ # Display = DateOnly
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].DateTimeFieldSettings.Display | DateOnly |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "Event.EventDate.Editor.Date"
+ And I should not see "Event.EventDate.Editor.Time"
+
+ # Display = TimeOnly
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].DateTimeFieldSettings.Display | TimeOnly |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "Event.EventDate.Editor.Time"
+ And I should not see "Event.EventDate.Editor.Date"
- # Required & Date and Time
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].DateTimeFieldSettings.Display | DateAndTime |
- | Fields[0].DateTimeFieldSettings.Required | true |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "Event.EventDate.Editor.Date"
- When I fill in
- | name | value |
- | Event.EventDate.Editor.Date | 01/31/2012 |
- | Event.EventDate.Editor.Time | 12:00 AM |
- And I hit "Save"
- And I am redirected
- Then I should see "Your Event has been created."
- When I go to "Admin/Contents/Create/Event"
- And I fill in
- | name | value |
- | Event.EventDate.Editor.Date | 01/31/2012 |
- And I hit "Save"
- Then I should see "Date of the event is required."
- When I go to "Admin/Contents/Create/Event"
- And I fill in
- | name | value |
- | Event.EventDate.Editor.Time | 12:00 AM |
- And I hit "Save"
- Then I should see "Date of the event is required."
+ # Required & Date and Time
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].DateTimeFieldSettings.Display | DateAndTime |
+ | Fields[0].DateTimeFieldSettings.Required | true |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "Event.EventDate.Editor.Date"
+ When I fill in
+ | name | value |
+ | Event.EventDate.Editor.Date | 01/31/2012 |
+ | Event.EventDate.Editor.Time | 12:00 AM |
+ And I hit "Save"
+ And I am redirected
+ Then I should see "Your Event has been created."
+ When I go to "Admin/Contents/Create/Event"
+ And I fill in
+ | name | value |
+ | Event.EventDate.Editor.Date | 01/31/2012 |
+ And I hit "Save"
+ Then I should see "Date of the event is required."
+ When I go to "Admin/Contents/Create/Event"
+ And I fill in
+ | name | value |
+ | Event.EventDate.Editor.Time | 12:00 AM |
+ And I hit "Save"
+ Then I should see "Date of the event is required."
- # Required & Date only
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].DateTimeFieldSettings.Display | DateOnly |
- | Fields[0].DateTimeFieldSettings.Required | true |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "Event.EventDate.Editor.Date"
- When I hit "Save"
- Then I should see "Date of the event is required."
+ # Required & Date only
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].DateTimeFieldSettings.Display | DateOnly |
+ | Fields[0].DateTimeFieldSettings.Required | true |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "Event.EventDate.Editor.Date"
+ When I hit "Save"
+ Then I should see "Date of the event is required."
- # Required & Time only
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].DateTimeFieldSettings.Display | TimeOnly |
- | Fields[0].DateTimeFieldSettings.Required | true |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "Event.EventDate.Editor.Date"
- When I hit "Save"
- Then I should see "Date of the event is required."
+ # Required & Time only
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].DateTimeFieldSettings.Display | TimeOnly |
+ | Fields[0].DateTimeFieldSettings.Required | true |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "Event.EventDate.Editor.Date"
+ When I hit "Save"
+ Then I should see "Date of the event is required."
Scenario: Creating and using date time fields in another culture
- # Creating an Event content type
+ # Creating an Event content type
Given I have installed Orchard
- And I have installed "Orchard.Fields"
- And I have the file "Content\orchard.core.po" in "Core\App_Data\Localization\fr-FR\orchard.core.po"
+ And I have installed "Orchard.Fields"
+ And I have the file "Content\orchard.core.po" in "Core\App_Data\Localization\fr-FR\orchard.core.po"
When I go to "Admin/ContentTypes"
Then I should see "]*>.*?Create new type"
When I go to "Admin/ContentTypes/Create"
@@ -155,39 +155,39 @@ Scenario: Creating and using date time fields in another culture
And I hit "Create"
And I go to "Admin/ContentTypes/"
Then I should see "Event"
-
- # Adding a Date field
- When I go to "Admin/ContentTypes/Edit/Event"
- And I follow "Add Field"
- And I fill in
+
+ # Adding a Date field
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I follow "Add Field"
+ And I fill in
| name | value |
| DisplayName | Date of the event |
| Name | EventDate |
| FieldTypeName | DateTimeField |
- And I hit "Save"
- And I am redirected
- Then I should see "The \"Date of the event\" field has been added."
+ And I hit "Save"
+ And I am redirected
+ Then I should see "The \"Date of the event\" field has been added."
- # Date & Time are inputted based on current culture
- When I have "fr-FR" as the default culture
- And I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].DateTimeFieldSettings.Display | DateAndTime |
- | Fields[0].DateTimeFieldSettings.Required | true |
- And I hit "Save"
- When I go to "Admin/Contents/Create/Event"
- And I fill in
- | name | value |
- | Event.EventDate.Editor.Date | 01/31/2012 |
- | Event.EventDate.Editor.Time | 12:00 AM |
- And I hit "Save"
- Then I should see "Date of the event could not be parsed as a valid date and time"
- When I go to "Admin/Contents/Create/Event"
- And I fill in
- | name | value |
- | Event.EventDate.Editor.Date | 31/01/2012 |
- | Event.EventDate.Editor.Time | 18:00 |
- And I hit "Save"
- And I am redirected
- Then I should see "Your Event has been created."
+ # Date & Time are inputted based on current culture
+ When I have "fr-FR" as the default culture
+ And I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].DateTimeFieldSettings.Display | DateAndTime |
+ | Fields[0].DateTimeFieldSettings.Required | true |
+ And I hit "Save"
+ When I go to "Admin/Contents/Create/Event"
+ And I fill in
+ | name | value |
+ | Event.EventDate.Editor.Date | 01/31/2012 |
+ | Event.EventDate.Editor.Time | 12:00 AM |
+ And I hit "Save"
+ Then I should see "Date of the event could not be parsed as a valid date and time"
+ When I go to "Admin/Contents/Create/Event"
+ And I fill in
+ | name | value |
+ | Event.EventDate.Editor.Date | 31/01/2012 |
+ | Event.EventDate.Editor.Time | 18:00 |
+ And I hit "Save"
+ And I am redirected
+ Then I should see "Your Event has been created."
diff --git a/src/Orchard.Specs/DateTime.feature.cs b/src/Orchard.Specs/DateTime.feature.cs
index 635470931..8439bf756 100644
--- a/src/Orchard.Specs/DateTime.feature.cs
+++ b/src/Orchard.Specs/DateTime.feature.cs
@@ -3,7 +3,7 @@
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.9.0.77
// SpecFlow Generator Version:1.9.0.0
-// Runtime Version:4.0.30319.34014
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -32,8 +32,8 @@ namespace Orchard.Specs
public virtual void FeatureSetup()
{
testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
- TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "DateTime Field", " In order to add Date content to my types\r\nAs an administrator\r\n I want to crea" +
- "te, edit and publish DateTime fields", ProgrammingLanguage.CSharp, ((string[])(null)));
+ TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "DateTime Field", " In order to add Date content to my types\r\n As an administrator\r\n I want to cr" +
+ "eate, edit and publish DateTime fields", ProgrammingLanguage.CSharp, ((string[])(null)));
testRunner.OnFeatureStart(featureInfo);
}
@@ -75,7 +75,7 @@ this.ScenarioSetup(scenarioInfo);
#line 9
testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
#line 10
- testRunner.And("I have installed \"Orchard.Fields\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I have installed \"Orchard.Fields\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 11
testRunner.When("I go to \"Admin/ContentTypes\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 12
@@ -101,9 +101,9 @@ this.ScenarioSetup(scenarioInfo);
#line 20
testRunner.Then("I should see \"Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 23
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 24
- testRunner.And("I follow \"Add Field\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I follow \"Add Field\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table2 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -118,17 +118,17 @@ this.ScenarioSetup(scenarioInfo);
"FieldTypeName",
"DateTimeField"});
#line 25
- testRunner.And("I fill in", ((string)(null)), table2, "And ");
+ testRunner.And("I fill in", ((string)(null)), table2, "And ");
#line 30
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 31
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 32
- testRunner.Then("I should see \"The \\\"Date of the event\\\" field has been added.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"The \\\"Date of the event\\\" field has been added.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 35
- testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 36
- testRunner.Then("I should see \"Date of the event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Date of the event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
TechTalk.SpecFlow.Table table3 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -140,15 +140,15 @@ this.ScenarioSetup(scenarioInfo);
"Event.EventDate.Editor.Time",
"12:00 AM"});
#line 37
- testRunner.When("I fill in", ((string)(null)), table3, "When ");
+ testRunner.When("I fill in", ((string)(null)), table3, "When ");
#line 41
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 42
- testRunner.Then("I should see \"Date of the event could not be parsed as a valid date and time\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Date of the event could not be parsed as a valid date and time\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 45
- testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 46
- testRunner.Then("I should see \"Date of the event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Date of the event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
TechTalk.SpecFlow.Table table4 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -157,7 +157,7 @@ this.ScenarioSetup(scenarioInfo);
"Event.EventDate.Editor.Date",
"01/31/2012"});
#line 47
- testRunner.When("I fill in", ((string)(null)), table4, "When ");
+ testRunner.When("I fill in", ((string)(null)), table4, "When ");
#line hidden
TechTalk.SpecFlow.Table table5 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -166,21 +166,21 @@ this.ScenarioSetup(scenarioInfo);
"Event.EventDate.Editor.Time",
"12:00 AM"});
#line 50
- testRunner.And("I fill in", ((string)(null)), table5, "And ");
+ testRunner.And("I fill in", ((string)(null)), table5, "And ");
#line 53
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 54
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 55
- testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 56
- testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 57
- testRunner.Then("I should see \"Date of the event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Date of the event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 58
- testRunner.And("I should see \"1/31/2012 12:00\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I should see \"1/31/2012 12:00\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 61
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table6 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -189,15 +189,15 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].DateTimeFieldSettings.Hint",
"Enter the date of the event"});
#line 62
- testRunner.And("I fill in", ((string)(null)), table6, "And ");
+ testRunner.And("I fill in", ((string)(null)), table6, "And ");
#line 65
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 66
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 67
- testRunner.Then("I should see \"Enter the date of the event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Enter the date of the event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 70
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table7 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -206,17 +206,17 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].DateTimeFieldSettings.Display",
"DateOnly"});
#line 71
- testRunner.And("I fill in", ((string)(null)), table7, "And ");
+ testRunner.And("I fill in", ((string)(null)), table7, "And ");
#line 74
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 75
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 76
- testRunner.Then("I should see \"Event.EventDate.Editor.Date\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Event.EventDate.Editor.Date\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 77
- testRunner.And("I should not see \"Event.EventDate.Editor.Time\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I should not see \"Event.EventDate.Editor.Time\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 80
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table8 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -225,17 +225,17 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].DateTimeFieldSettings.Display",
"TimeOnly"});
#line 81
- testRunner.And("I fill in", ((string)(null)), table8, "And ");
+ testRunner.And("I fill in", ((string)(null)), table8, "And ");
#line 84
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 85
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 86
- testRunner.Then("I should see \"Event.EventDate.Editor.Time\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Event.EventDate.Editor.Time\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 87
- testRunner.And("I should not see \"Event.EventDate.Editor.Date\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I should not see \"Event.EventDate.Editor.Date\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 90
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table9 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -247,13 +247,13 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].DateTimeFieldSettings.Required",
"true"});
#line 91
- testRunner.And("I fill in", ((string)(null)), table9, "And ");
+ testRunner.And("I fill in", ((string)(null)), table9, "And ");
#line 95
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 96
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 97
- testRunner.Then("I should see \"Event.EventDate.Editor.Date\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Event.EventDate.Editor.Date\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
TechTalk.SpecFlow.Table table10 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -265,15 +265,15 @@ this.ScenarioSetup(scenarioInfo);
"Event.EventDate.Editor.Time",
"12:00 AM"});
#line 98
- testRunner.When("I fill in", ((string)(null)), table10, "When ");
+ testRunner.When("I fill in", ((string)(null)), table10, "When ");
#line 102
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 103
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 104
- testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 105
- testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table11 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -282,13 +282,13 @@ this.ScenarioSetup(scenarioInfo);
"Event.EventDate.Editor.Date",
"01/31/2012"});
#line 106
- testRunner.And("I fill in", ((string)(null)), table11, "And ");
+ testRunner.And("I fill in", ((string)(null)), table11, "And ");
#line 109
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 110
- testRunner.Then("I should see \"Date of the event is required.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Date of the event is required.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 111
- testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table12 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -297,13 +297,13 @@ this.ScenarioSetup(scenarioInfo);
"Event.EventDate.Editor.Time",
"12:00 AM"});
#line 112
- testRunner.And("I fill in", ((string)(null)), table12, "And ");
+ testRunner.And("I fill in", ((string)(null)), table12, "And ");
#line 115
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 116
- testRunner.Then("I should see \"Date of the event is required.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Date of the event is required.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 119
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table13 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -315,19 +315,19 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].DateTimeFieldSettings.Required",
"true"});
#line 120
- testRunner.And("I fill in", ((string)(null)), table13, "And ");
+ testRunner.And("I fill in", ((string)(null)), table13, "And ");
#line 124
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 125
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 126
- testRunner.Then("I should see \"Event.EventDate.Editor.Date\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Event.EventDate.Editor.Date\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 127
- testRunner.When("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 128
- testRunner.Then("I should see \"Date of the event is required.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Date of the event is required.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 131
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table14 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -339,17 +339,17 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].DateTimeFieldSettings.Required",
"true"});
#line 132
- testRunner.And("I fill in", ((string)(null)), table14, "And ");
+ testRunner.And("I fill in", ((string)(null)), table14, "And ");
#line 136
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 137
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 138
- testRunner.Then("I should see \"Event.EventDate.Editor.Date\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Event.EventDate.Editor.Date\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 139
- testRunner.When("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 140
- testRunner.Then("I should see \"Date of the event is required.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Date of the event is required.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
this.ScenarioCleanup();
}
@@ -364,9 +364,9 @@ this.ScenarioSetup(scenarioInfo);
#line 145
testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
#line 146
- testRunner.And("I have installed \"Orchard.Fields\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I have installed \"Orchard.Fields\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 147
- testRunner.And("I have the file \"Content\\orchard.core.po\" in \"Core\\App_Data\\Localization\\fr-FR\\or" +
+ testRunner.And("I have the file \"Content\\orchard.core.po\" in \"Core\\App_Data\\Localization\\fr-FR\\or" +
"chard.core.po\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 148
testRunner.When("I go to \"Admin/ContentTypes\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
@@ -393,9 +393,9 @@ this.ScenarioSetup(scenarioInfo);
#line 157
testRunner.Then("I should see \"Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 160
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 161
- testRunner.And("I follow \"Add Field\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I follow \"Add Field\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table16 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -410,17 +410,17 @@ this.ScenarioSetup(scenarioInfo);
"FieldTypeName",
"DateTimeField"});
#line 162
- testRunner.And("I fill in", ((string)(null)), table16, "And ");
+ testRunner.And("I fill in", ((string)(null)), table16, "And ");
#line 167
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 168
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 169
- testRunner.Then("I should see \"The \\\"Date of the event\\\" field has been added.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"The \\\"Date of the event\\\" field has been added.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 172
- testRunner.When("I have \"fr-FR\" as the default culture", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I have \"fr-FR\" as the default culture", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 173
- testRunner.And("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table17 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -432,11 +432,11 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].DateTimeFieldSettings.Required",
"true"});
#line 174
- testRunner.And("I fill in", ((string)(null)), table17, "And ");
+ testRunner.And("I fill in", ((string)(null)), table17, "And ");
#line 178
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 179
- testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table18 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -448,13 +448,13 @@ this.ScenarioSetup(scenarioInfo);
"Event.EventDate.Editor.Time",
"12:00 AM"});
#line 180
- testRunner.And("I fill in", ((string)(null)), table18, "And ");
+ testRunner.And("I fill in", ((string)(null)), table18, "And ");
#line 184
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 185
- testRunner.Then("I should see \"Date of the event could not be parsed as a valid date and time\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Date of the event could not be parsed as a valid date and time\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 186
- testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table19 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -466,13 +466,13 @@ this.ScenarioSetup(scenarioInfo);
"Event.EventDate.Editor.Time",
"18:00"});
#line 187
- testRunner.And("I fill in", ((string)(null)), table19, "And ");
+ testRunner.And("I fill in", ((string)(null)), table19, "And ");
#line 191
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 192
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 193
- testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
this.ScenarioCleanup();
}
diff --git a/src/Orchard.Specs/Enumeration.feature b/src/Orchard.Specs/Enumeration.feature
index 9201b36c4..6864b9a83 100644
--- a/src/Orchard.Specs/Enumeration.feature
+++ b/src/Orchard.Specs/Enumeration.feature
@@ -1,13 +1,13 @@
Feature: Enumeration Field
In order to add a list of elements to my types
- As an administrator
+ As an administrator
I want to create, edit and publish Enumeration fields
Scenario: Creating and using Enumeration fields
-
- # Creating an Event content type
+
+ # Creating an Event content type
Given I have installed Orchard
- And I have installed "Orchard.Fields"
+ And I have installed "Orchard.Fields"
When I go to "Admin/ContentTypes"
Then I should see "]*>.*?Create new type"
When I go to "Admin/ContentTypes/Create"
@@ -18,92 +18,92 @@ Scenario: Creating and using Enumeration fields
And I hit "Create"
And I go to "Admin/ContentTypes/"
Then I should see "Event"
-
- # Adding a Enumeration field
- When I go to "Admin/ContentTypes/Edit/Event"
- And I follow "Add Field"
- And I fill in
+
+ # Adding a Enumeration field
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I follow "Add Field"
+ And I fill in
| name | value |
| DisplayName | Location |
| Name | Location |
| FieldTypeName | EnumerationField |
- And I hit "Save"
- And I am redirected
- Then I should see "The \"Location\" field has been added."
+ And I hit "Save"
+ And I am redirected
+ Then I should see "The \"Location\" field has been added."
- # Specifying Options
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].EnumerationFieldSettings.Options | Seattle |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see ""
+ # Specifying Options
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].EnumerationFieldSettings.Options | Seattle |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see ""
- # Creating an Event content item
- When I go to "Admin/Contents/Create/Event"
- Then I should see "Location"
- When I fill in
- | name | value |
- | Event.Location.Value | Seattle |
- And I hit "Save"
- And I am redirected
- Then I should see "Your Event has been created."
- When I go to "Admin/Contents/List"
- Then I should see "Location:"
- And I should see "Seattle"
+ # Creating an Event content item
+ When I go to "Admin/Contents/Create/Event"
+ Then I should see "Location"
+ When I fill in
+ | name | value |
+ | Event.Location.Value | Seattle |
+ And I hit "Save"
+ And I am redirected
+ Then I should see "Your Event has been created."
+ When I go to "Admin/Contents/List"
+ Then I should see "Location:"
+ And I should see "Seattle"
- # The hint should be displayed
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].EnumerationFieldSettings.Hint | Please select a location |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "Please select a location"
+ # The hint should be displayed
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].EnumerationFieldSettings.Hint | Please select a location |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "Please select a location"
- # The List Mode Dropdown
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].EnumerationFieldSettings.ListMode | Dropdown |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "select id=\"Event_Location_Value\" name=\"Event.Location.Value\""
-
- # The List Mode Radiobutton
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].EnumerationFieldSettings.ListMode | Radiobutton |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "input id=\"Event_Location_Value\" name=\"Event.Location.Value\" type=\"radio\""
-
- # The List Mode Listbox
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].EnumerationFieldSettings.ListMode | Listbox |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "select id=\"Event_Location_SelectedValues\" multiple=\"multiple\" name=\"Event.Location.SelectedValues\""
-
- # The List Mode Checkbox
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].EnumerationFieldSettings.ListMode | Checkbox |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "input type=\"checkbox\" name=\"Event.Location.SelectedValues\""
-
- # The value should be required
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].EnumerationFieldSettings.Required | true |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- And I hit "Save"
- Then I should see "The field Location is mandatory."
+ # The List Mode Dropdown
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].EnumerationFieldSettings.ListMode | Dropdown |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "select id=\"Event_Location_Value\" name=\"Event.Location.Value\""
+
+ # The List Mode Radiobutton
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].EnumerationFieldSettings.ListMode | Radiobutton |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "input id=\"Event_Location_Value\" name=\"Event.Location.Value\" type=\"radio\""
+
+ # The List Mode Listbox
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].EnumerationFieldSettings.ListMode | Listbox |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "select id=\"Event_Location_SelectedValues\" multiple=\"multiple\" name=\"Event.Location.SelectedValues\""
+
+ # The List Mode Checkbox
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].EnumerationFieldSettings.ListMode | Checkbox |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "input type=\"checkbox\" name=\"Event.Location.SelectedValues\""
+
+ # The value should be required
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].EnumerationFieldSettings.Required | true |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ And I hit "Save"
+ Then I should see "The field Location is mandatory."
diff --git a/src/Orchard.Specs/Enumeration.feature.cs b/src/Orchard.Specs/Enumeration.feature.cs
index 2241d667c..88a011d4f 100644
--- a/src/Orchard.Specs/Enumeration.feature.cs
+++ b/src/Orchard.Specs/Enumeration.feature.cs
@@ -3,7 +3,7 @@
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.9.0.77
// SpecFlow Generator Version:1.9.0.0
-// Runtime Version:4.0.30319.34014
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -32,8 +32,8 @@ namespace Orchard.Specs
public virtual void FeatureSetup()
{
testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
- TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Enumeration Field", " In order to add a list of elements to my types\r\nAs an administrator\r\n I want t" +
- "o create, edit and publish Enumeration fields", ProgrammingLanguage.CSharp, ((string[])(null)));
+ TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Enumeration Field", " In order to add a list of elements to my types\r\n As an administrator\r\n I want" +
+ " to create, edit and publish Enumeration fields", ProgrammingLanguage.CSharp, ((string[])(null)));
testRunner.OnFeatureStart(featureInfo);
}
@@ -75,7 +75,7 @@ this.ScenarioSetup(scenarioInfo);
#line 9
testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
#line 10
- testRunner.And("I have installed \"Orchard.Fields\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I have installed \"Orchard.Fields\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 11
testRunner.When("I go to \"Admin/ContentTypes\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 12
@@ -101,9 +101,9 @@ this.ScenarioSetup(scenarioInfo);
#line 20
testRunner.Then("I should see \"Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 23
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 24
- testRunner.And("I follow \"Add Field\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I follow \"Add Field\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table2 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -118,15 +118,15 @@ this.ScenarioSetup(scenarioInfo);
"FieldTypeName",
"EnumerationField"});
#line 25
- testRunner.And("I fill in", ((string)(null)), table2, "And ");
+ testRunner.And("I fill in", ((string)(null)), table2, "And ");
#line 30
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 31
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 32
- testRunner.Then("I should see \"The \\\"Location\\\" field has been added.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"The \\\"Location\\\" field has been added.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 35
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table3 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -135,17 +135,17 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].EnumerationFieldSettings.Options",
"Seattle"});
#line 36
- testRunner.And("I fill in", ((string)(null)), table3, "And ");
+ testRunner.And("I fill in", ((string)(null)), table3, "And ");
#line 39
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 40
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 41
- testRunner.Then("I should see \"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 44
- testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 45
- testRunner.Then("I should see \"Location\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Location\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
TechTalk.SpecFlow.Table table4 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -154,21 +154,21 @@ this.ScenarioSetup(scenarioInfo);
"Event.Location.Value",
"Seattle"});
#line 46
- testRunner.When("I fill in", ((string)(null)), table4, "When ");
+ testRunner.When("I fill in", ((string)(null)), table4, "When ");
#line 49
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 50
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 51
- testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 52
- testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 53
- testRunner.Then("I should see \"Location:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Location:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 54
- testRunner.And("I should see \"Seattle\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I should see \"Seattle\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 57
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table5 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -177,15 +177,15 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].EnumerationFieldSettings.Hint",
"Please select a location"});
#line 58
- testRunner.And("I fill in", ((string)(null)), table5, "And ");
+ testRunner.And("I fill in", ((string)(null)), table5, "And ");
#line 61
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 62
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 63
- testRunner.Then("I should see \"Please select a location\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Please select a location\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 66
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table6 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -194,15 +194,15 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].EnumerationFieldSettings.ListMode",
"Dropdown"});
#line 67
- testRunner.And("I fill in", ((string)(null)), table6, "And ");
+ testRunner.And("I fill in", ((string)(null)), table6, "And ");
#line 70
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 71
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 72
- testRunner.Then("I should see \"select id=\\\"Event_Location_Value\\\" name=\\\"Event.Location.Value\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"select id=\\\"Event_Location_Value\\\" name=\\\"Event.Location.Value\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 75
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table7 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -211,16 +211,16 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].EnumerationFieldSettings.ListMode",
"Radiobutton"});
#line 76
- testRunner.And("I fill in", ((string)(null)), table7, "And ");
+ testRunner.And("I fill in", ((string)(null)), table7, "And ");
#line 79
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 80
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 81
- testRunner.Then("I should see \"input id=\\\"Event_Location_Value\\\" name=\\\"Event.Location.Value\\\" typ" +
+ testRunner.Then("I should see \"input id=\\\"Event_Location_Value\\\" name=\\\"Event.Location.Value\\\" typ" +
"e=\\\"radio\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 84
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table8 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -229,16 +229,16 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].EnumerationFieldSettings.ListMode",
"Listbox"});
#line 85
- testRunner.And("I fill in", ((string)(null)), table8, "And ");
+ testRunner.And("I fill in", ((string)(null)), table8, "And ");
#line 88
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 89
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 90
- testRunner.Then("I should see \"select id=\\\"Event_Location_SelectedValues\\\" multiple=\\\"multiple\\\" n" +
+ testRunner.Then("I should see \"select id=\\\"Event_Location_SelectedValues\\\" multiple=\\\"multiple\\\" n" +
"ame=\\\"Event.Location.SelectedValues\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 93
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table9 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -247,15 +247,15 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].EnumerationFieldSettings.ListMode",
"Checkbox"});
#line 94
- testRunner.And("I fill in", ((string)(null)), table9, "And ");
+ testRunner.And("I fill in", ((string)(null)), table9, "And ");
#line 97
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 98
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 99
- testRunner.Then("I should see \"input type=\\\"checkbox\\\" name=\\\"Event.Location.SelectedValues\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"input type=\\\"checkbox\\\" name=\\\"Event.Location.SelectedValues\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 102
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table10 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -264,15 +264,15 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].EnumerationFieldSettings.Required",
"true"});
#line 103
- testRunner.And("I fill in", ((string)(null)), table10, "And ");
+ testRunner.And("I fill in", ((string)(null)), table10, "And ");
#line 106
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 107
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 108
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 109
- testRunner.Then("I should see \"The field Location is mandatory.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"The field Location is mandatory.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
this.ScenarioCleanup();
}
diff --git a/src/Orchard.Specs/Hosting/Orchard.Web/Config/Host.config b/src/Orchard.Specs/Hosting/Orchard.Web/Config/Host.config
index 27f896868..89797fb2d 100644
--- a/src/Orchard.Specs/Hosting/Orchard.Web/Config/Host.config
+++ b/src/Orchard.Specs/Hosting/Orchard.Web/Config/Host.config
@@ -7,7 +7,7 @@
-
+
@@ -190,6 +191,7 @@
+
@@ -198,24 +200,34 @@
-
-
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Orchard.Specs/Hosting/Simple.Web/Web.config b/src/Orchard.Specs/Hosting/Simple.Web/Web.config
index 99931ccb3..1042a64d6 100644
--- a/src/Orchard.Specs/Hosting/Simple.Web/Web.config
+++ b/src/Orchard.Specs/Hosting/Simple.Web/Web.config
@@ -195,7 +195,7 @@
-
+
diff --git a/src/Orchard.Specs/Input.feature b/src/Orchard.Specs/Input.feature
index e7e37fd2e..35a8e761c 100644
--- a/src/Orchard.Specs/Input.feature
+++ b/src/Orchard.Specs/Input.feature
@@ -1,13 +1,13 @@
Feature: Input Field
In order to add an input to my types
- As an administrator
+ As an administrator
I want to create, edit and publish input fields
Scenario: Creating and using Input fields
-
- # Creating an Event content type
+
+ # Creating an Event content type
Given I have installed Orchard
- And I have installed "Orchard.Fields"
+ And I have installed "Orchard.Fields"
When I go to "Admin/ContentTypes"
Then I should see "]*>.*?Create new type"
When I go to "Admin/ContentTypes/Create"
@@ -18,113 +18,113 @@ Scenario: Creating and using Input fields
And I hit "Create"
And I go to "Admin/ContentTypes/"
Then I should see "Event"
-
- # Adding a Input field
- When I go to "Admin/ContentTypes/Edit/Event"
- And I follow "Add Field"
- And I fill in
+
+ # Adding a Input field
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I follow "Add Field"
+ And I fill in
| name | value |
| DisplayName | Contact |
| Name | Contact |
| FieldTypeName | InputField |
- And I hit "Save"
- And I am redirected
- Then I should see "The \"Contact\" field has been added."
+ And I hit "Save"
+ And I am redirected
+ Then I should see "The \"Contact\" field has been added."
- # The hint should be displayed
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].InputFieldSettings.Hint | Enter the contact email address |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "Enter the contact email address"
-
- # The pattern should be effective
- #When I go to "Admin/ContentTypes/Edit/Event"
- # And I fill in
- # | name | value |
- # | Fields[0].InputFieldSettings.Pattern | [^@]*@[^@]* |
- # And I hit "Save"
- # And I go to "Admin/Contents/Create/Event"
- #Then I should see "pattern=\"[^@]*@[^@]*\""
-
- # The input type should be effective
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].InputFieldSettings.Type | Email |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "type=\"email\""
-
- # The title should be displayed
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].InputFieldSettings.Title | Enter an email address |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "title=\"Enter an email address\""
-
- # The auto focus should be effective
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].InputFieldSettings.AutoFocus | true |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "autofocus=\"autofocus\""
-
- # The auto complete should be effective
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].InputFieldSettings.AutoComplete | true |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "autocomplete=\"on\""
-
- # The watermark should be displayed
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].InputFieldSettings.Placeholder | email@domain.com |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "placeholder=\"email@domain.com\""
-
- # The maxlength should be effective
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].InputFieldSettings.MaxLength | 100 |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "maxlength=\"100\""
-
- # The value should be required
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].InputFieldSettings.Required | true |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- And I fill in
- | name | value |
- | Event.Contact.Value | |
- And I hit "Save"
- Then I should see "The field Contact is mandatory."
-
- # Creating an Event content item
- When I go to "Admin/Contents/Create/Event"
- Then I should see "Contact"
- When I fill in
- | name | value |
- | Event.Contact.Value | contact@orchardproject.net |
- And I hit "Save"
- And I am redirected
- Then I should see "Your Event has been created."
- When I go to "Admin/Contents/List"
- Then I should see "Contact:"
- And I should see "contact@orchardproject.net"
+ # The hint should be displayed
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].InputFieldSettings.Hint | Enter the contact email address |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "Enter the contact email address"
+
+ # The pattern should be effective
+ #When I go to "Admin/ContentTypes/Edit/Event"
+ # And I fill in
+ # | name | value |
+ # | Fields[0].InputFieldSettings.Pattern | [^@]*@[^@]* |
+ # And I hit "Save"
+ # And I go to "Admin/Contents/Create/Event"
+ #Then I should see "pattern=\"[^@]*@[^@]*\""
+
+ # The input type should be effective
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].InputFieldSettings.Type | Email |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "type=\"email\""
+
+ # The title should be displayed
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].InputFieldSettings.Title | Enter an email address |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "title=\"Enter an email address\""
+
+ # The auto focus should be effective
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].InputFieldSettings.AutoFocus | true |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "autofocus=\"autofocus\""
+
+ # The auto complete should be effective
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].InputFieldSettings.AutoComplete | true |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "autocomplete=\"on\""
+
+ # The watermark should be displayed
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].InputFieldSettings.Placeholder | email@domain.com |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "placeholder=\"email@domain.com\""
+
+ # The maxlength should be effective
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].InputFieldSettings.MaxLength | 100 |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "maxlength=\"100\""
+
+ # The value should be required
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].InputFieldSettings.Required | true |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ And I fill in
+ | name | value |
+ | Event.Contact.Value | |
+ And I hit "Save"
+ Then I should see "The field Contact is mandatory."
+
+ # Creating an Event content item
+ When I go to "Admin/Contents/Create/Event"
+ Then I should see "Contact"
+ When I fill in
+ | name | value |
+ | Event.Contact.Value | contact@orchardproject.net |
+ And I hit "Save"
+ And I am redirected
+ Then I should see "Your Event has been created."
+ When I go to "Admin/Contents/List"
+ Then I should see "Contact:"
+ And I should see "contact@orchardproject.net"
diff --git a/src/Orchard.Specs/Input.feature.cs b/src/Orchard.Specs/Input.feature.cs
index ade6902bf..2e9c54158 100644
--- a/src/Orchard.Specs/Input.feature.cs
+++ b/src/Orchard.Specs/Input.feature.cs
@@ -3,7 +3,7 @@
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.9.0.77
// SpecFlow Generator Version:1.9.0.0
-// Runtime Version:4.0.30319.34014
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -32,8 +32,8 @@ namespace Orchard.Specs
public virtual void FeatureSetup()
{
testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
- TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Input Field", " In order to add an input to my types\r\nAs an administrator\r\n I want to create, " +
- "edit and publish input fields", ProgrammingLanguage.CSharp, ((string[])(null)));
+ TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Input Field", " In order to add an input to my types\r\n As an administrator\r\n I want to create" +
+ ", edit and publish input fields", ProgrammingLanguage.CSharp, ((string[])(null)));
testRunner.OnFeatureStart(featureInfo);
}
@@ -75,7 +75,7 @@ this.ScenarioSetup(scenarioInfo);
#line 9
testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
#line 10
- testRunner.And("I have installed \"Orchard.Fields\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I have installed \"Orchard.Fields\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 11
testRunner.When("I go to \"Admin/ContentTypes\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 12
@@ -101,9 +101,9 @@ this.ScenarioSetup(scenarioInfo);
#line 20
testRunner.Then("I should see \"Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 23
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 24
- testRunner.And("I follow \"Add Field\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I follow \"Add Field\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table2 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -118,15 +118,15 @@ this.ScenarioSetup(scenarioInfo);
"FieldTypeName",
"InputField"});
#line 25
- testRunner.And("I fill in", ((string)(null)), table2, "And ");
+ testRunner.And("I fill in", ((string)(null)), table2, "And ");
#line 30
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 31
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 32
- testRunner.Then("I should see \"The \\\"Contact\\\" field has been added.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"The \\\"Contact\\\" field has been added.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 35
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table3 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -135,15 +135,15 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].InputFieldSettings.Hint",
"Enter the contact email address"});
#line 36
- testRunner.And("I fill in", ((string)(null)), table3, "And ");
+ testRunner.And("I fill in", ((string)(null)), table3, "And ");
#line 39
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 40
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 41
- testRunner.Then("I should see \"Enter the contact email address\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Enter the contact email address\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 53
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table4 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -152,15 +152,15 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].InputFieldSettings.Type",
"Email"});
#line 54
- testRunner.And("I fill in", ((string)(null)), table4, "And ");
+ testRunner.And("I fill in", ((string)(null)), table4, "And ");
#line 57
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 58
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 59
- testRunner.Then("I should see \"type=\\\"email\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"type=\\\"email\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 62
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table5 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -169,15 +169,15 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].InputFieldSettings.Title",
"Enter an email address"});
#line 63
- testRunner.And("I fill in", ((string)(null)), table5, "And ");
+ testRunner.And("I fill in", ((string)(null)), table5, "And ");
#line 66
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 67
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 68
- testRunner.Then("I should see \"title=\\\"Enter an email address\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"title=\\\"Enter an email address\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 71
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table6 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -186,15 +186,15 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].InputFieldSettings.AutoFocus",
"true"});
#line 72
- testRunner.And("I fill in", ((string)(null)), table6, "And ");
+ testRunner.And("I fill in", ((string)(null)), table6, "And ");
#line 75
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 76
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 77
- testRunner.Then("I should see \"autofocus=\\\"autofocus\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"autofocus=\\\"autofocus\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 80
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table7 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -203,15 +203,15 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].InputFieldSettings.AutoComplete",
"true"});
#line 81
- testRunner.And("I fill in", ((string)(null)), table7, "And ");
+ testRunner.And("I fill in", ((string)(null)), table7, "And ");
#line 84
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 85
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 86
- testRunner.Then("I should see \"autocomplete=\\\"on\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"autocomplete=\\\"on\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 89
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table8 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -220,15 +220,15 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].InputFieldSettings.Placeholder",
"email@domain.com"});
#line 90
- testRunner.And("I fill in", ((string)(null)), table8, "And ");
+ testRunner.And("I fill in", ((string)(null)), table8, "And ");
#line 93
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 94
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 95
- testRunner.Then("I should see \"placeholder=\\\"email@domain.com\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"placeholder=\\\"email@domain.com\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 98
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table9 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -237,15 +237,15 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].InputFieldSettings.MaxLength",
"100"});
#line 99
- testRunner.And("I fill in", ((string)(null)), table9, "And ");
+ testRunner.And("I fill in", ((string)(null)), table9, "And ");
#line 102
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 103
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 104
- testRunner.Then("I should see \"maxlength=\\\"100\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"maxlength=\\\"100\\\"\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 107
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table10 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -254,11 +254,11 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].InputFieldSettings.Required",
"true"});
#line 108
- testRunner.And("I fill in", ((string)(null)), table10, "And ");
+ testRunner.And("I fill in", ((string)(null)), table10, "And ");
#line 111
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 112
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table11 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -267,15 +267,15 @@ this.ScenarioSetup(scenarioInfo);
"Event.Contact.Value",
""});
#line 113
- testRunner.And("I fill in", ((string)(null)), table11, "And ");
+ testRunner.And("I fill in", ((string)(null)), table11, "And ");
#line 116
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 117
- testRunner.Then("I should see \"The field Contact is mandatory.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"The field Contact is mandatory.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 120
- testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 121
- testRunner.Then("I should see \"Contact\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Contact\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
TechTalk.SpecFlow.Table table12 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -284,19 +284,19 @@ this.ScenarioSetup(scenarioInfo);
"Event.Contact.Value",
"contact@orchardproject.net"});
#line 122
- testRunner.When("I fill in", ((string)(null)), table12, "When ");
+ testRunner.When("I fill in", ((string)(null)), table12, "When ");
#line 125
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 126
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 127
- testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 128
- testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 129
- testRunner.Then("I should see \"Contact:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Contact:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 130
- testRunner.And("I should see \"contact@orchardproject.net\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I should see \"contact@orchardproject.net\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
this.ScenarioCleanup();
}
diff --git a/src/Orchard.Specs/Link.feature b/src/Orchard.Specs/Link.feature
index cf7d8d04f..9ae1de538 100644
--- a/src/Orchard.Specs/Link.feature
+++ b/src/Orchard.Specs/Link.feature
@@ -1,13 +1,13 @@
Feature: Link Field
In order to add Link content to my types
- As an administrator
+ As an administrator
I want to create, edit and publish Link fields
Scenario: Creating and using Link fields
-
- # Creating an Event content type
+
+ # Creating an Event content type
Given I have installed Orchard
- And I have installed "Orchard.Fields"
+ And I have installed "Orchard.Fields"
When I go to "Admin/ContentTypes"
Then I should see "]*>.*?Create new type"
When I go to "Admin/ContentTypes/Create"
@@ -18,53 +18,53 @@ Scenario: Creating and using Link fields
And I hit "Create"
And I go to "Admin/ContentTypes/"
Then I should see "Event"
-
- # Adding a Link field
- When I go to "Admin/ContentTypes/Edit/Event"
- And I follow "Add Field"
- And I fill in
+
+ # Adding a Link field
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I follow "Add Field"
+ And I fill in
| name | value |
| DisplayName | Site Url |
| Name | SiteUrl |
| FieldTypeName | LinkField |
- And I hit "Save"
- And I am redirected
- Then I should see "The \"Site Url\" field has been added."
+ And I hit "Save"
+ And I am redirected
+ Then I should see "The \"Site Url\" field has been added."
- # Creating an Event content item
- When I go to "Admin/Contents/Create/Event"
- Then I should see "Site Url"
- When I fill in
- | name | value |
- | Event.SiteUrl.Value | http://www.orchardproject.net |
- And I fill in
- | name | value |
- | Event.SiteUrl.Text | Orchard |
- And I hit "Save"
- And I am redirected
- Then I should see "Your Event has been created."
- When I go to "Admin/Contents/List"
- Then I should see "Site Url:"
- And I should see "Orchard"
+ # Creating an Event content item
+ When I go to "Admin/Contents/Create/Event"
+ Then I should see "Site Url"
+ When I fill in
+ | name | value |
+ | Event.SiteUrl.Value | http://www.orchardproject.net |
+ And I fill in
+ | name | value |
+ | Event.SiteUrl.Text | Orchard |
+ And I hit "Save"
+ And I am redirected
+ Then I should see "Your Event has been created."
+ When I go to "Admin/Contents/List"
+ Then I should see "Site Url:"
+ And I should see "Orchard"
- # The hint should be displayed
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].LinkFieldSettings.Hint | Enter the url of the web site |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "Enter the url of the web site"
-
- # The value should be required
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].LinkFieldSettings.Required | true |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- And I fill in
- | name | value |
- | Event.SiteUrl.Value | |
- And I hit "Save"
- Then I should see "Url is required for Site Url."
\ No newline at end of file
+ # The hint should be displayed
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].LinkFieldSettings.Hint | Enter the url of the web site |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "Enter the url of the web site"
+
+ # The value should be required
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].LinkFieldSettings.Required | true |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ And I fill in
+ | name | value |
+ | Event.SiteUrl.Value | |
+ And I hit "Save"
+ Then I should see "Url is required for Site Url."
\ No newline at end of file
diff --git a/src/Orchard.Specs/Link.feature.cs b/src/Orchard.Specs/Link.feature.cs
index e226372db..84b100ed4 100644
--- a/src/Orchard.Specs/Link.feature.cs
+++ b/src/Orchard.Specs/Link.feature.cs
@@ -3,7 +3,7 @@
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.9.0.77
// SpecFlow Generator Version:1.9.0.0
-// Runtime Version:4.0.30319.34014
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -32,8 +32,8 @@ namespace Orchard.Specs
public virtual void FeatureSetup()
{
testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
- TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Link Field", " In order to add Link content to my types\r\nAs an administrator\r\n I want to crea" +
- "te, edit and publish Link fields", ProgrammingLanguage.CSharp, ((string[])(null)));
+ TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Link Field", " In order to add Link content to my types\r\n As an administrator\r\n I want to cr" +
+ "eate, edit and publish Link fields", ProgrammingLanguage.CSharp, ((string[])(null)));
testRunner.OnFeatureStart(featureInfo);
}
@@ -75,7 +75,7 @@ this.ScenarioSetup(scenarioInfo);
#line 9
testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
#line 10
- testRunner.And("I have installed \"Orchard.Fields\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I have installed \"Orchard.Fields\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 11
testRunner.When("I go to \"Admin/ContentTypes\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 12
@@ -101,9 +101,9 @@ this.ScenarioSetup(scenarioInfo);
#line 20
testRunner.Then("I should see \"Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 23
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 24
- testRunner.And("I follow \"Add Field\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I follow \"Add Field\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table2 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -118,17 +118,17 @@ this.ScenarioSetup(scenarioInfo);
"FieldTypeName",
"LinkField"});
#line 25
- testRunner.And("I fill in", ((string)(null)), table2, "And ");
+ testRunner.And("I fill in", ((string)(null)), table2, "And ");
#line 30
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 31
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 32
- testRunner.Then("I should see \"The \\\"Site Url\\\" field has been added.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"The \\\"Site Url\\\" field has been added.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 35
- testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 36
- testRunner.Then("I should see \"Site Url\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Site Url\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
TechTalk.SpecFlow.Table table3 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -137,7 +137,7 @@ this.ScenarioSetup(scenarioInfo);
"Event.SiteUrl.Value",
"http://www.orchardproject.net"});
#line 37
- testRunner.When("I fill in", ((string)(null)), table3, "When ");
+ testRunner.When("I fill in", ((string)(null)), table3, "When ");
#line hidden
TechTalk.SpecFlow.Table table4 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -146,21 +146,21 @@ this.ScenarioSetup(scenarioInfo);
"Event.SiteUrl.Text",
"Orchard"});
#line 40
- testRunner.And("I fill in", ((string)(null)), table4, "And ");
+ testRunner.And("I fill in", ((string)(null)), table4, "And ");
#line 43
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 44
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 45
- testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 46
- testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/Contents/List\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 47
- testRunner.Then("I should see \"Site Url:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Site Url:\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 48
- testRunner.And("I should see \"Orchard\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I should see \"Orchard\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 51
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table5 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -169,15 +169,15 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].LinkFieldSettings.Hint",
"Enter the url of the web site"});
#line 52
- testRunner.And("I fill in", ((string)(null)), table5, "And ");
+ testRunner.And("I fill in", ((string)(null)), table5, "And ");
#line 55
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 56
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 57
- testRunner.Then("I should see \"Enter the url of the web site\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Enter the url of the web site\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 60
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table6 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -186,11 +186,11 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].LinkFieldSettings.Required",
"true"});
#line 61
- testRunner.And("I fill in", ((string)(null)), table6, "And ");
+ testRunner.And("I fill in", ((string)(null)), table6, "And ");
#line 64
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 65
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table7 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -199,11 +199,11 @@ this.ScenarioSetup(scenarioInfo);
"Event.SiteUrl.Value",
""});
#line 66
- testRunner.And("I fill in", ((string)(null)), table7, "And ");
+ testRunner.And("I fill in", ((string)(null)), table7, "And ");
#line 69
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 70
- testRunner.Then("I should see \"Url is required for Site Url.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Url is required for Site Url.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
this.ScenarioCleanup();
}
diff --git a/src/Orchard.Specs/Lists.feature b/src/Orchard.Specs/Lists.feature
index 5074e822c..e68f3ccac 100644
--- a/src/Orchard.Specs/Lists.feature
+++ b/src/Orchard.Specs/Lists.feature
@@ -5,19 +5,19 @@
Scenario: I can create a new list
Given I have installed Orchard
- And I have installed "Orchard.Lists"
+ And I have installed "Orchard.Lists"
When I go to "Admin/ContentTypes"
- And I go to "Admin/ContentTypes/Create"
+ And I go to "Admin/ContentTypes/Create"
And I fill in
| name | value |
| DisplayName | Event |
| Name | Event |
And I hit "Create"
- And I am redirected
+ And I am redirected
And I fill in
| name | value |
| PartSelections[5].IsSelected | True |
- And I hit "Save"
+ And I hit "Save"
And I go to "Admin/ContentTypes/"
Then I should see "Event"
@@ -27,8 +27,8 @@ Scenario: I can create a new list
| Title.Title | MyList |
| Container.SelectedItemContentTypes | Event |
And I hit "Save"
- And I am redirected
- Then I should see "Your List has been created"
+ And I am redirected
+ Then I should see "Your List has been created"
When I go to "Admin/Lists"
Then I should see "MyList"
When I follow "Contained Items (0)"
diff --git a/src/Orchard.Specs/Lists.feature.cs b/src/Orchard.Specs/Lists.feature.cs
index a5bd6ef8b..ec41dafc7 100644
--- a/src/Orchard.Specs/Lists.feature.cs
+++ b/src/Orchard.Specs/Lists.feature.cs
@@ -3,7 +3,7 @@
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.9.0.77
// SpecFlow Generator Version:1.9.0.0
-// Runtime Version:4.0.30319.34014
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -75,11 +75,11 @@ this.ScenarioSetup(scenarioInfo);
#line 7
testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
#line 8
- testRunner.And("I have installed \"Orchard.Lists\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I have installed \"Orchard.Lists\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 9
testRunner.When("I go to \"Admin/ContentTypes\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 10
- testRunner.And("I go to \"Admin/ContentTypes/Create\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/ContentTypes/Create\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table1 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -95,7 +95,7 @@ this.ScenarioSetup(scenarioInfo);
#line 15
testRunner.And("I hit \"Create\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 16
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table2 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -106,7 +106,7 @@ this.ScenarioSetup(scenarioInfo);
#line 17
testRunner.And("I fill in", ((string)(null)), table2, "And ");
#line 20
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 21
testRunner.And("I go to \"Admin/ContentTypes/\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 22
@@ -128,9 +128,9 @@ this.ScenarioSetup(scenarioInfo);
#line 29
testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 30
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 31
- testRunner.Then("I should see \"Your List has been created\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Your List has been created\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 32
testRunner.When("I go to \"Admin/Lists\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 33
diff --git a/src/Orchard.Specs/Media.feature b/src/Orchard.Specs/Media.feature
index dd018ab39..5e1193fbf 100644
--- a/src/Orchard.Specs/Media.feature
+++ b/src/Orchard.Specs/Media.feature
@@ -5,14 +5,14 @@
Scenario: Media admin is available
Given I have installed Orchard
- And I have installed "Orchard.Media"
+ And I have installed "Orchard.Media"
- # Accessing the media page
+ # Accessing the media page
When I go to "admin/media"
Then I should see "Media"
And the status should be 200 "OK"
- # Creating a folder
+ # Creating a folder
When I go to "admin/media/create"
And I fill in
| name | value |
@@ -23,7 +23,7 @@ Scenario: Media admin is available
And I should see "Hello World"
And the status should be 200 "OK"
- # Editing a media with limited rights
+ # Editing a media with limited rights
When I go to "admin/media/edit?name=..\..\bin&mediaPath=..\..\bin"
And I am redirected
Then I should see "Media"
diff --git a/src/Orchard.Specs/Media.feature.cs b/src/Orchard.Specs/Media.feature.cs
index a9da6dd42..2c1d61c13 100644
--- a/src/Orchard.Specs/Media.feature.cs
+++ b/src/Orchard.Specs/Media.feature.cs
@@ -3,7 +3,7 @@
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.9.0.77
// SpecFlow Generator Version:1.9.0.0
-// Runtime Version:4.0.30319.34014
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -75,7 +75,7 @@ this.ScenarioSetup(scenarioInfo);
#line 7
testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
#line 8
- testRunner.And("I have installed \"Orchard.Media\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I have installed \"Orchard.Media\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 11
testRunner.When("I go to \"admin/media\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 12
diff --git a/src/Orchard.Specs/MediaPicker.feature b/src/Orchard.Specs/MediaPicker.feature
index 3c1008de6..eba7506a1 100644
--- a/src/Orchard.Specs/MediaPicker.feature
+++ b/src/Orchard.Specs/MediaPicker.feature
@@ -1,14 +1,14 @@
Feature: Media Picker Field
In order to add a media content to my types
- As an administrator
+ As an administrator
I want to create, edit and publish media fields
Scenario: Creating and using media fields
-
- # Creating an Event content type
+
+ # Creating an Event content type
Given I have installed Orchard
- And I have installed "Orchard.Media"
- And I have installed "Orchard.MediaPicker"
+ And I have installed "Orchard.Media"
+ And I have installed "Orchard.MediaPicker"
When I go to "Admin/ContentTypes"
Then I should see "]*>.*?Create new type"
@@ -20,61 +20,61 @@ Scenario: Creating and using media fields
And I hit "Create"
And I go to "Admin/ContentTypes/"
Then I should see "Event"
-
- # Adding a media field
- When I go to "Admin/ContentTypes/Edit/Event"
- And I follow "Add Field"
- And I fill in
+
+ # Adding a media field
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I follow "Add Field"
+ And I fill in
| name | value |
| DisplayName | File |
| Name | File |
| FieldTypeName | MediaPickerField |
- And I hit "Save"
- And I am redirected
- Then I should see "The \"File\" field has been added."
+ And I hit "Save"
+ And I am redirected
+ Then I should see "The \"File\" field has been added."
- # Creating an Event content item
- When I go to "Admin/Contents/Create/Event"
- Then I should see "File"
- When I fill in
- | name | value |
- | Event.File.Url | |
- And I hit "Save"
- And I am redirected
- Then I should see "Your Event has been created."
+ # Creating an Event content item
+ When I go to "Admin/Contents/Create/Event"
+ Then I should see "File"
+ When I fill in
+ | name | value |
+ | Event.File.Url | |
+ And I hit "Save"
+ And I am redirected
+ Then I should see "Your Event has been created."
- # The hint should be displayed
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].MediaPickerFieldSettings.Hint | Please select a file |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- Then I should see "Please select a file"
+ # The hint should be displayed
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].MediaPickerFieldSettings.Hint | Please select a file |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ Then I should see "Please select a file"
- # The value should be required
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | Fields[0].MediaPickerFieldSettings.Required | true |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- And I fill in
- | name | value |
- | Event.File.Url | |
- And I hit "Save"
- Then I should see "The field File is mandatory."
+ # The value should be required
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | Fields[0].MediaPickerFieldSettings.Required | true |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ And I fill in
+ | name | value |
+ | Event.File.Url | |
+ And I hit "Save"
+ Then I should see "The field File is mandatory."
- # The value should be bound
- When I go to "Admin/ContentTypes/Edit/Event"
- And I fill in
- | name | value |
- | ext-Fields[0].MediaPickerFieldSettings | true |
- | Fields[0].MediaPickerFieldSettings.AllowedExtensions | jpg |
- And I hit "Save"
- And I go to "Admin/Contents/Create/Event"
- And I fill in
- | name | value |
- | Event.File.Url | ~/Media/Default/images/Image.png |
- And I hit "Save"
- Then I should see "The field File must have one of these extensions: jpg"
\ No newline at end of file
+ # The value should be bound
+ When I go to "Admin/ContentTypes/Edit/Event"
+ And I fill in
+ | name | value |
+ | ext-Fields[0].MediaPickerFieldSettings | true |
+ | Fields[0].MediaPickerFieldSettings.AllowedExtensions | jpg |
+ And I hit "Save"
+ And I go to "Admin/Contents/Create/Event"
+ And I fill in
+ | name | value |
+ | Event.File.Url | ~/Media/Default/images/Image.png |
+ And I hit "Save"
+ Then I should see "The field File must have one of these extensions: jpg"
\ No newline at end of file
diff --git a/src/Orchard.Specs/MediaPicker.feature.cs b/src/Orchard.Specs/MediaPicker.feature.cs
index 9ff2adb90..3189f9308 100644
--- a/src/Orchard.Specs/MediaPicker.feature.cs
+++ b/src/Orchard.Specs/MediaPicker.feature.cs
@@ -3,7 +3,7 @@
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.9.0.77
// SpecFlow Generator Version:1.9.0.0
-// Runtime Version:4.0.30319.34014
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -32,8 +32,8 @@ namespace Orchard.Specs
public virtual void FeatureSetup()
{
testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
- TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Media Picker Field", " In order to add a media content to my types\r\nAs an administrator\r\n I want to c" +
- "reate, edit and publish media fields", ProgrammingLanguage.CSharp, ((string[])(null)));
+ TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Media Picker Field", " In order to add a media content to my types\r\n As an administrator\r\n I want to" +
+ " create, edit and publish media fields", ProgrammingLanguage.CSharp, ((string[])(null)));
testRunner.OnFeatureStart(featureInfo);
}
@@ -75,9 +75,9 @@ this.ScenarioSetup(scenarioInfo);
#line 9
testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
#line 10
- testRunner.And("I have installed \"Orchard.Media\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I have installed \"Orchard.Media\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 11
- testRunner.And("I have installed \"Orchard.MediaPicker\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I have installed \"Orchard.MediaPicker\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 13
testRunner.When("I go to \"Admin/ContentTypes\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 14
@@ -103,9 +103,9 @@ this.ScenarioSetup(scenarioInfo);
#line 22
testRunner.Then("I should see \"Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 25
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 26
- testRunner.And("I follow \"Add Field\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I follow \"Add Field\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table2 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -120,17 +120,17 @@ this.ScenarioSetup(scenarioInfo);
"FieldTypeName",
"MediaPickerField"});
#line 27
- testRunner.And("I fill in", ((string)(null)), table2, "And ");
+ testRunner.And("I fill in", ((string)(null)), table2, "And ");
#line 32
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 33
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 34
- testRunner.Then("I should see \"The \\\"File\\\" field has been added.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"The \\\"File\\\" field has been added.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 37
- testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 38
- testRunner.Then("I should see \"File\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"File\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
TechTalk.SpecFlow.Table table3 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -139,15 +139,15 @@ this.ScenarioSetup(scenarioInfo);
"Event.File.Url",
""});
#line 39
- testRunner.When("I fill in", ((string)(null)), table3, "When ");
+ testRunner.When("I fill in", ((string)(null)), table3, "When ");
#line 42
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 43
- testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 44
- testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Your Event has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 47
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table4 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -156,15 +156,15 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].MediaPickerFieldSettings.Hint",
"Please select a file"});
#line 48
- testRunner.And("I fill in", ((string)(null)), table4, "And ");
+ testRunner.And("I fill in", ((string)(null)), table4, "And ");
#line 51
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 52
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 53
- testRunner.Then("I should see \"Please select a file\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"Please select a file\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 56
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table5 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -173,11 +173,11 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].MediaPickerFieldSettings.Required",
"true"});
#line 57
- testRunner.And("I fill in", ((string)(null)), table5, "And ");
+ testRunner.And("I fill in", ((string)(null)), table5, "And ");
#line 60
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 61
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table6 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -186,13 +186,13 @@ this.ScenarioSetup(scenarioInfo);
"Event.File.Url",
""});
#line 62
- testRunner.And("I fill in", ((string)(null)), table6, "And ");
+ testRunner.And("I fill in", ((string)(null)), table6, "And ");
#line 65
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 66
- testRunner.Then("I should see \"The field File is mandatory.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"The field File is mandatory.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 69
- testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table7 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -204,11 +204,11 @@ this.ScenarioSetup(scenarioInfo);
"Fields[0].MediaPickerFieldSettings.AllowedExtensions",
"jpg"});
#line 70
- testRunner.And("I fill in", ((string)(null)), table7, "And ");
+ testRunner.And("I fill in", ((string)(null)), table7, "And ");
#line 74
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 75
- testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table8 = new TechTalk.SpecFlow.Table(new string[] {
"name",
@@ -217,11 +217,11 @@ this.ScenarioSetup(scenarioInfo);
"Event.File.Url",
"~/Media/Default/images/Image.png"});
#line 76
- testRunner.And("I fill in", ((string)(null)), table8, "And ");
+ testRunner.And("I fill in", ((string)(null)), table8, "And ");
#line 79
- testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 80
- testRunner.Then("I should see \"The field File must have one of these extensions: jpg\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.Then("I should see \"The field File must have one of these extensions: jpg\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
this.ScenarioCleanup();
}
diff --git a/src/Orchard.Specs/MultiTenancy.feature b/src/Orchard.Specs/MultiTenancy.feature
index ae586c309..909569d7f 100644
--- a/src/Orchard.Specs/MultiTenancy.feature
+++ b/src/Orchard.Specs/MultiTenancy.feature
@@ -168,7 +168,7 @@ Scenario: A running tenant can be disabled
And I go to "/Admin/MultiTenancy" on host localhost
And I hit "Suspend"
And I am redirected
- Then I should see "
-
+
diff --git a/src/Orchard.Tests.Modules/DesignerTools/Services/ObjectDumperTests.cs b/src/Orchard.Tests.Modules/DesignerTools/Services/ObjectDumperTests.cs
index d78cd52bb..22b162ac1 100644
--- a/src/Orchard.Tests.Modules/DesignerTools/Services/ObjectDumperTests.cs
+++ b/src/Orchard.Tests.Modules/DesignerTools/Services/ObjectDumperTests.cs
@@ -264,9 +264,6 @@ namespace Orchard.Tests.Modules.DesignerTools.Services
new JProperty("name", "TestingPart"),
new JProperty("value", "ContentPart"),
new JProperty("children", new JArray(
- new JObject(
- new JProperty("name", "Zones"),
- new JProperty("value", "ZoneCollection")),
new JObject(
new JProperty("name", "Id"),
new JProperty("value", "0")),
@@ -327,9 +324,6 @@ namespace Orchard.Tests.Modules.DesignerTools.Services
new JProperty("name", "TestingPart"),
new JProperty("value", "ContentPart"),
new JProperty("children", new JArray(
- new JObject(
- new JProperty("name", "Zones"),
- new JProperty("value", "ZoneCollection")),
new JObject(
new JProperty("name", "Id"),
new JProperty("value", "0")),
diff --git a/src/Orchard.Tests.Modules/Indexing/LuceneIndexProviderTests.cs b/src/Orchard.Tests.Modules/Indexing/LuceneIndexProviderTests.cs
index 41c6239fb..d7008dd6a 100644
--- a/src/Orchard.Tests.Modules/Indexing/LuceneIndexProviderTests.cs
+++ b/src/Orchard.Tests.Modules/Indexing/LuceneIndexProviderTests.cs
@@ -303,5 +303,24 @@ namespace Orchard.Tests.Modules.Indexing {
_provider.Store("default", _provider.New(1).Add("field", "value2"));
Assert.That(searchBuilder.WithField("id", "1").Count(), Is.EqualTo(1));
}
+
+ [Test]
+ public void IndexProviderShouldDeleteMoreThanMaxTermsCount() {
+ _provider.CreateIndex("default");
+
+ var documents = Enumerable.Range(1, 1025).Select(i => _provider.New(i).Add("field", "value1"));
+ _provider.Store("default", documents);
+
+ var searchBuilder = _provider.CreateSearchBuilder("default");
+
+ Assert.That(searchBuilder.Count(), Is.EqualTo(1025));
+ Assert.That(searchBuilder.Get(1).ContentItemId, Is.EqualTo(1));
+ Assert.That(searchBuilder.Get(1025).ContentItemId, Is.EqualTo(1025));
+
+ _provider.Delete("default", Enumerable.Range(1, 1025));
+
+
+ Assert.That(searchBuilder.Count(), Is.EqualTo(0));
+ }
}
}
diff --git a/src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs b/src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs
index 1ed9e5a14..569ed6ab3 100644
--- a/src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs b/src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs
index c522aae81..7844dc917 100644
--- a/src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs
+++ b/src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs
@@ -110,23 +110,23 @@ namespace Orchard.Tests.Modules.Recipes.Services {
[Test]
public void HarvestRecipesFailsToFindRecipesWhenCalledWithNotExistingExtension() {
- var recipes = (List)_recipeHarvester.HarvestRecipes("cantfindme");
+ var recipes = _recipeHarvester.HarvestRecipes("cantfindme");
- Assert.That(recipes.Count, Is.EqualTo(0));
+ Assert.That(recipes.Count(), Is.EqualTo(0));
}
[Test]
public void HarvestRecipesShouldHarvestRecipeXmlFiles() {
- var recipes = (List)_recipeHarvester.HarvestRecipes("Sample1");
- Assert.That(recipes.Count, Is.EqualTo(1));
+ var recipes = _recipeHarvester.HarvestRecipes("Sample1");
+ Assert.That(recipes.Count(), Is.EqualTo(1));
}
[Test]
public void ParseRecipeLoadsRecipeMetaDataIntoModel() {
- var recipes = (List)_recipeHarvester.HarvestRecipes("Sample1");
- Assert.That(recipes.Count, Is.EqualTo(1));
+ var recipes = _recipeHarvester.HarvestRecipes("Sample1");
+ Assert.That(recipes.Count(), Is.EqualTo(1));
- var sampleRecipe = recipes[0];
+ var sampleRecipe = recipes.First();
Assert.That(sampleRecipe.Name, Is.EqualTo("cms"));
Assert.That(sampleRecipe.Description, Is.EqualTo("a sample Orchard recipe describing a cms"));
Assert.That(sampleRecipe.Author, Is.EqualTo("orchard"));
diff --git a/src/Orchard.Tests/App.config b/src/Orchard.Tests/App.config
index c8a59d19c..bbab85258 100644
--- a/src/Orchard.Tests/App.config
+++ b/src/Orchard.Tests/App.config
@@ -24,7 +24,7 @@
-
+
diff --git a/src/Orchard.Tests/Caching/CacheTests.cs b/src/Orchard.Tests/Caching/CacheTests.cs
index 13af703fb..0201d3b26 100644
--- a/src/Orchard.Tests/Caching/CacheTests.cs
+++ b/src/Orchard.Tests/Caching/CacheTests.cs
@@ -1,4 +1,6 @@
using System;
+using System.Linq;
+using System.Threading;
using Autofac;
using NUnit.Framework;
using Orchard.Caching;
@@ -78,6 +80,42 @@ namespace Orchard.Tests.Caching {
Is.Not.SameAs(c2.CacheManager.GetCache()));
}
+ [Test]
+ public void CacheManagerIsNotBlocking() {
+ var hits = 0;
+ string result = "";
+
+ Enumerable.Range(0, 5).AsParallel().ForAll(x =>
+ result = _cacheManager.Get("testItem", ctx => {
+ // by waiting for 100ms we expect all the calls to Get
+ // to enter this lambda
+ Thread.Sleep(100);
+ hits++;
+ return "testResult";
+ })
+ );
+
+ Assert.That(result, Is.EqualTo("testResult"));
+ Assert.That(hits, Is.GreaterThan(1));
+ }
+
+ [Test]
+ public void CacheManagerIsBlocking() {
+ var hits = 0;
+ string result = "";
+
+ Enumerable.Range(0, 5).AsParallel().ForAll(x =>
+ result = _cacheManager.Get("testItem", true, ctx => {
+ Thread.Sleep(100);
+ hits++;
+ return "testResult";
+ })
+ );
+
+ Assert.That(result, Is.EqualTo("testResult"));
+ Assert.That(hits, Is.EqualTo(1));
+ }
+
class ComponentOne {
public ICacheManager CacheManager { get; set; }
diff --git a/src/Orchard.Tests/DatabaseEnabledTestsBase.cs b/src/Orchard.Tests/DatabaseEnabledTestsBase.cs
index e2f1fda3c..51e467618 100644
--- a/src/Orchard.Tests/DatabaseEnabledTestsBase.cs
+++ b/src/Orchard.Tests/DatabaseEnabledTestsBase.cs
@@ -24,7 +24,7 @@ namespace Orchard.Tests {
protected string _databaseFilePath;
protected ISessionFactory _sessionFactory;
protected StubClock _clock;
-
+ protected ShellSettings _shellSettings;
[TestFixtureSetUp]
public void InitFixture() {
@@ -48,7 +48,7 @@ namespace Orchard.Tests {
builder.RegisterInstance(new StubLocator(_session)).As();
builder.RegisterInstance(_clock).As();
builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>)).InstancePerLifetimeScope();
- builder.RegisterInstance(new ShellSettings { Name = ShellSettings.DefaultName, DataProvider = "SqlCe" });
+ builder.RegisterInstance(_shellSettings = new ShellSettings { Name = ShellSettings.DefaultName, DataProvider = "SqlCe" });
builder.RegisterType().As().InstancePerLifetimeScope();
builder.Register(context => _sessionFactory.OpenSession()).As().InstancePerLifetimeScope();
diff --git a/src/Orchard.Tests/DisplayManagement/DefaultDisplayManagerTests.cs b/src/Orchard.Tests/DisplayManagement/DefaultDisplayManagerTests.cs
index 82fb2f86c..c3e32d490 100644
--- a/src/Orchard.Tests/DisplayManagement/DefaultDisplayManagerTests.cs
+++ b/src/Orchard.Tests/DisplayManagement/DefaultDisplayManagerTests.cs
@@ -97,10 +97,18 @@ namespace Orchard.Tests.DisplayManagement {
throw new NotImplementedException();
}
+ public override object Resolve(Type serviceType) {
+ throw new NotImplementedException();
+ }
+
public override bool TryResolve(out T service) {
throw new NotImplementedException();
}
+ public override bool TryResolve(Type serviceType, out object service) {
+ throw new NotImplementedException();
+ }
+
public override T GetState(string name) {
object value;
return _state.TryGetValue(name, out value) ? (T)value : default(T);
diff --git a/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs b/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs
index 24594d570..8cfc8fbc5 100644
--- a/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs
+++ b/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs
@@ -95,6 +95,10 @@ namespace Orchard.Tests.Environment {
var ext = new ExtensionDescriptor { Id = "Orchard.Framework" };
ext.Features = new[] { new FeatureDescriptor { Extension = ext, Id = ext.Id } };
yield return ext;
+
+ var settings = new ExtensionDescriptor { Id = "Settings" };
+ settings.Features = new[] { new FeatureDescriptor { Extension = settings, Id = settings.Id } };
+ yield return settings;
}
public IEnumerable AvailableFeatures() {
@@ -177,6 +181,7 @@ namespace Orchard.Tests.Environment {
Assert.That(again2a, Is.SameAs(dep2a));
Assert.That(again2b, Is.SameAs(dep2b));
}
+
[Test]
public void SingletonDependenciesShouldBeUniquePerShell() {
var host = _lifetime.Resolve();
@@ -200,6 +205,7 @@ namespace Orchard.Tests.Environment {
Assert.That(dep2, Is.SameAs(dep2a));
Assert.That(dep2, Is.SameAs(dep2b));
}
+
[Test]
public void TransientDependenciesShouldBeUniquePerResolve() {
var host = _lifetime.Resolve();
diff --git a/src/Orchard.Tests/Environment/DefaultWorkContextAccessorTests.cs b/src/Orchard.Tests/Environment/DefaultWorkContextAccessorTests.cs
index 47f72ecb6..27ab4873b 100644
--- a/src/Orchard.Tests/Environment/DefaultWorkContextAccessorTests.cs
+++ b/src/Orchard.Tests/Environment/DefaultWorkContextAccessorTests.cs
@@ -28,13 +28,6 @@ namespace Orchard.Tests.Environment {
container.Mock()
.Setup(x => x.Current())
.Returns(() => _httpContextCurrent);
-
- container.Mock()
- .Setup(x => x.CreateContext(It.IsAny()))
- .Returns(() => new StubHttpContext());
-
- container.Mock()
- .Setup(x => x.Started());
}
[Test]
diff --git a/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs b/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs
index 75a1d8ece..22e96abf9 100644
--- a/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs
+++ b/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs
@@ -512,7 +512,7 @@ Features:
Dependencies: Beta
");
- moduleExtensionFolder.Manifests.Add("Classic", @"
+ themeExtensionFolder.Manifests.Add("Classic", @"
Name: Classic
Version: 1.0.3
OrchardVersion: 1
diff --git a/src/Orchard.Tests/Environment/ShellBuilders/CompositionStrategyTests.cs b/src/Orchard.Tests/Environment/ShellBuilders/CompositionStrategyTests.cs
index bb6780415..f36b467ae 100644
--- a/src/Orchard.Tests/Environment/ShellBuilders/CompositionStrategyTests.cs
+++ b/src/Orchard.Tests/Environment/ShellBuilders/CompositionStrategyTests.cs
@@ -9,6 +9,7 @@ using Orchard.Environment.Descriptor.Models;
using Orchard.Environment.Extensions;
using Orchard.Environment.Extensions.Models;
using Orchard.Environment.ShellBuilders;
+using Orchard.Logging;
using Orchard.Tests.Environment.TestDependencies;
using Orchard.Utility.Extensions;
@@ -17,16 +18,22 @@ namespace Orchard.Tests.Environment.ShellBuilders {
public class CompositionStrategyTests : ContainerTestBase {
private CompositionStrategy _compositionStrategy;
private Mock _extensionManager;
+ private IEnumerable _availableExtensions;
+ private IEnumerable _installedFeatures;
+ private Mock _loggerMock;
protected override void Register(ContainerBuilder builder) {
- _extensionManager = new Mock(MockBehavior.Loose);
+ _extensionManager = new Mock();
+ _loggerMock = new Mock();
builder.RegisterType().AsSelf();
builder.RegisterInstance(_extensionManager.Object);
+ builder.RegisterInstance(_loggerMock.Object);
}
protected override void Resolve(ILifetimeScope container) {
_compositionStrategy = container.Resolve();
+ _compositionStrategy.Logger = container.Resolve();
var alphaExtension = new ExtensionDescriptor {
Id = "Alpha",
@@ -54,7 +61,11 @@ namespace Orchard.Tests.Environment.ShellBuilders {
betaFeatureDescriptor
};
- var features = new List {
+ _availableExtensions = new[] {
+ alphaExtension
+ };
+
+ _installedFeatures = new List {
new Feature {
Descriptor = alphaFeatureDescriptor,
ExportedTypes = new List {
@@ -69,16 +80,16 @@ namespace Orchard.Tests.Environment.ShellBuilders {
}
};
- _extensionManager.Setup(x => x.AvailableExtensions()).Returns(new List {
- alphaExtension
- });
+ _loggerMock.Setup(x => x.IsEnabled(It.IsAny())).Returns(true);
- _extensionManager.Setup(x => x.AvailableFeatures()).Returns(
+ _extensionManager.Setup(x => x.AvailableExtensions()).Returns(() => _availableExtensions);
+
+ _extensionManager.Setup(x => x.AvailableFeatures()).Returns(() =>
_extensionManager.Object.AvailableExtensions()
.SelectMany(ext => ext.Features)
.ToReadOnlyCollection());
- _extensionManager.Setup(x => x.LoadFeatures(It.IsAny>())).Returns(features);
+ _extensionManager.Setup(x => x.LoadFeatures(It.IsAny>())).Returns(() => _installedFeatures);
}
[Test]
@@ -87,7 +98,7 @@ namespace Orchard.Tests.Environment.ShellBuilders {
var shellDescriptor = CreateShellDescriptor("Alpha", "Beta");
var shellBlueprint = _compositionStrategy.Compose(shellSettings, shellDescriptor);
- Assert.That(shellBlueprint.Dependencies.Count(x => x.Type == typeof (AlphaDependency)), Is.EqualTo(1));
+ Assert.That(shellBlueprint.Dependencies.Count(x => x.Type == typeof(AlphaDependency)), Is.EqualTo(1));
Assert.That(shellBlueprint.Dependencies.Count(x => x.Type == typeof(BetaDependency)), Is.EqualTo(1));
}
@@ -101,6 +112,34 @@ namespace Orchard.Tests.Environment.ShellBuilders {
Assert.That(shellDescriptor.Features.Count(x => x.Name == "Alpha"), Is.EqualTo(1));
}
+ [Test]
+ public void ComposeDoesNotThrowWhenFeatureStateRecordDoesNotExist() {
+ var shellSettings = CreateShell();
+ var shellDescriptor = CreateShellDescriptor("MyFeature");
+
+ Assert.DoesNotThrow(() => _compositionStrategy.Compose(shellSettings, shellDescriptor));
+ _loggerMock.Verify(x => x.Log(LogLevel.Warning, null, It.IsAny(), It.IsAny()));
+ }
+
+ [Test]
+ public void ComposeThrowsWhenAutoEnabledDependencyDoesNotExist() {
+ var myModule = _availableExtensions.First();
+
+ myModule.Features = myModule.Features.Concat(new[] {
+ new FeatureDescriptor {
+ Extension = myModule,
+ Name = "MyFeature",
+ Id = "MyFeature",
+ Dependencies = new[] { "NonExistingFeature" }
+ }
+ });
+
+ var shellSettings = CreateShell();
+ var shellDescriptor = CreateShellDescriptor("MyFeature");
+
+ Assert.Throws(() => _compositionStrategy.Compose(shellSettings, shellDescriptor));
+ }
+
private ShellSettings CreateShell() {
return new ShellSettings();
}
diff --git a/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs b/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs
index 7f3b1784e..dc0b13a26 100644
--- a/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs
+++ b/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs
@@ -56,11 +56,7 @@ namespace Orchard.Tests.Environment.ShellBuilders {
_container.Mock()
.Setup(x => x.Current())
- .Returns(httpContext);
-
- _container.Mock()
- .Setup(x => x.CreateContext(It.IsAny()))
- .Returns(httpContext);
+ .Returns(default(HttpContextBase));
var factory = _container.Resolve();
diff --git a/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs b/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs
index c788e4b21..fb50ba290 100644
--- a/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs
+++ b/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs
@@ -43,10 +43,6 @@ namespace Orchard.Tests.Environment.State {
_container.Mock()
.Setup(x=>x.Current())
.Returns(httpContext);
- _container.Mock()
- .Setup(x => x.CreateContext(It.IsAny()))
- .Returns(httpContext);
-
}
[TearDown]
diff --git a/src/Orchard.Tests/Localization/DateTimePartsTests.cs b/src/Orchard.Tests/Localization/DateTimePartsTests.cs
index 4532b0448..6a3ee09e4 100644
--- a/src/Orchard.Tests/Localization/DateTimePartsTests.cs
+++ b/src/Orchard.Tests/Localization/DateTimePartsTests.cs
@@ -4,7 +4,7 @@ using Orchard.Localization.Models;
namespace Orchard.Tests.Localization {
- [TestFixture]
+ [TestFixture()]
public class DateTimePartsTests {
[Test]
diff --git a/src/Orchard.Tests/Localization/DefaultDateFormatterTests.cs b/src/Orchard.Tests/Localization/DefaultDateFormatterTests.cs
index 8a4226c84..a2135f09c 100644
--- a/src/Orchard.Tests/Localization/DefaultDateFormatterTests.cs
+++ b/src/Orchard.Tests/Localization/DefaultDateFormatterTests.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Concurrent;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.Linq;
@@ -13,7 +12,8 @@ using Orchard.Localization.Services;
namespace Orchard.Tests.Localization {
- [TestFixture]
+ [TestFixture()]
+ [Category("longrunning")]
public class DefaultDateFormatterTests {
[SetUp]
diff --git a/src/Orchard.Tests/Localization/TestHelpers.cs b/src/Orchard.Tests/Localization/TestHelpers.cs
index d9d268762..34cebb5fd 100644
--- a/src/Orchard.Tests/Localization/TestHelpers.cs
+++ b/src/Orchard.Tests/Localization/TestHelpers.cs
@@ -42,10 +42,18 @@ namespace Orchard.Tests.Localization {
throw new NotImplementedException();
}
+ public override object Resolve(Type serviceType) {
+ throw new NotImplementedException();
+ }
+
public override bool TryResolve(out T service) {
throw new NotImplementedException();
}
+ public override bool TryResolve(Type serviceType, out object service) {
+ throw new NotImplementedException();
+ }
+
public override T GetState(string name) {
if (name == "CurrentCulture") return (T)((object)CultureName);
if (name == "CurrentCalendar") return (T)((object)CalendarName);
diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj
index 5dd02f1f0..924481c65 100644
--- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj
+++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj
@@ -272,8 +272,7 @@
-
-
+
@@ -295,7 +294,7 @@
-
+
diff --git a/src/Orchard.Tests/Properties/AssemblyInfo.cs b/src/Orchard.Tests/Properties/AssemblyInfo.cs
index 41f87fe43..c3bb0f4b3 100644
--- a/src/Orchard.Tests/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Tests/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Tests/Stubs/StubMachineNameProvider.cs b/src/Orchard.Tests/Stubs/StubApplicationEnvironment.cs
similarity index 56%
rename from src/Orchard.Tests/Stubs/StubMachineNameProvider.cs
rename to src/Orchard.Tests/Stubs/StubApplicationEnvironment.cs
index c453ac6f7..2849ef6af 100644
--- a/src/Orchard.Tests/Stubs/StubMachineNameProvider.cs
+++ b/src/Orchard.Tests/Stubs/StubApplicationEnvironment.cs
@@ -1,12 +1,12 @@
using Orchard.Environment;
namespace Orchard.Tests.Stubs {
- public class StubMachineNameProvider : IMachineNameProvider {
- public StubMachineNameProvider() {
+ public class StubApplicationEnvironment : IApplicationEnvironment {
+ public StubApplicationEnvironment() {
MachineName = "Orchard Machine";
}
public string MachineName { get; set; }
- public string GetMachineName() {
+ public string GetEnvironmentIdentifier() {
return MachineName;
}
}
diff --git a/src/Orchard.Tests/Stubs/StubHttpContextAccessor.cs b/src/Orchard.Tests/Stubs/StubHttpContextAccessor.cs
index b0368b6a7..892707b2f 100644
--- a/src/Orchard.Tests/Stubs/StubHttpContextAccessor.cs
+++ b/src/Orchard.Tests/Stubs/StubHttpContextAccessor.cs
@@ -1,5 +1,4 @@
using System.Web;
-using Autofac;
using Orchard.Mvc;
namespace Orchard.Tests.Stubs {
@@ -17,10 +16,6 @@ namespace Orchard.Tests.Stubs {
return _httpContext;
}
- public HttpContextBase CreateContext(ILifetimeScope lifetimeScope) {
- return _httpContext;
- }
-
public void Set(HttpContextBase httpContext) {
_httpContext = httpContext;
}
diff --git a/src/Orchard.Tests/Stubs/StubThreadProvider.cs b/src/Orchard.Tests/Stubs/StubThreadProvider.cs
deleted file mode 100644
index 73d6ebcaf..000000000
--- a/src/Orchard.Tests/Stubs/StubThreadProvider.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Orchard.Environment;
-
-namespace Orchard.Tests.Stubs {
- public class StubThreadProvider : IThreadProvider {
- public StubThreadProvider() {
- ManagedThreadId = 1;
- }
-
- public int ManagedThreadId { get; set; }
-
- public int GetCurrentThreadId() {
- return ManagedThreadId;
- }
- }
-}
diff --git a/src/Orchard.Tests/Stubs/StubWorkContextAccessor.cs b/src/Orchard.Tests/Stubs/StubWorkContextAccessor.cs
index b5fcdeeb6..76bbc5e22 100644
--- a/src/Orchard.Tests/Stubs/StubWorkContextAccessor.cs
+++ b/src/Orchard.Tests/Stubs/StubWorkContextAccessor.cs
@@ -13,7 +13,7 @@ namespace Orchard.Tests.Stubs {
public StubWorkContextAccessor(ILifetimeScope lifetimeScope) {
_lifetimeScope = lifetimeScope;
- _workContext = new WorkContextImpl(_lifetimeScope);
+ _workContext = new WorkContextImpl(lifetimeScope);
}
public class WorkContextImpl : WorkContext {
@@ -123,10 +123,18 @@ namespace Orchard.Tests.Stubs {
return _lifetimeScope.Resolve();
}
+ public override object Resolve(Type serviceType) {
+ return _lifetimeScope.Resolve(serviceType);
+ }
+
public override bool TryResolve(out T service) {
return _lifetimeScope.TryResolve(out service);
}
+ public override bool TryResolve(Type serviceType, out object service) {
+ return _lifetimeScope.TryResolve(serviceType, out service);
+ }
+
public override T GetState(string name) {
return (T) _contextDictonary[name];
}
@@ -149,7 +157,9 @@ namespace Orchard.Tests.Stubs {
}
public IWorkContextScope CreateWorkContextScope() {
- throw new NotSupportedException();
+ var workLifetime = _lifetimeScope.BeginLifetimeScope("work");
+ var workContext = new WorkContextImpl(workLifetime);
+ return new StubWorkContextScope(workContext, workLifetime);
}
}
}
diff --git a/src/Orchard.Tests/Stubs/StubWorkContextScope.cs b/src/Orchard.Tests/Stubs/StubWorkContextScope.cs
new file mode 100644
index 000000000..a63c75957
--- /dev/null
+++ b/src/Orchard.Tests/Stubs/StubWorkContextScope.cs
@@ -0,0 +1,26 @@
+using Autofac;
+
+namespace Orchard.Tests.Stubs {
+ public class StubWorkContextScope : IWorkContextScope {
+ private readonly ILifetimeScope _lifetimeScope;
+
+ public StubWorkContextScope(WorkContext workContext, ILifetimeScope lifetimeScope) {
+ _lifetimeScope = lifetimeScope;
+ WorkContext = workContext;
+ }
+
+ public WorkContext WorkContext { get; private set; }
+
+ public void Dispose() {
+ _lifetimeScope.Dispose();
+ }
+
+ public TService Resolve() {
+ return WorkContext.Resolve();
+ }
+
+ public bool TryResolve(out TService service) {
+ return WorkContext.TryResolve(out service);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Orchard.Tests/Tasks/DistributedLockServiceTests.cs b/src/Orchard.Tests/Tasks/DistributedLockServiceTests.cs
index 5b0074c27..a0664bd60 100644
--- a/src/Orchard.Tests/Tasks/DistributedLockServiceTests.cs
+++ b/src/Orchard.Tests/Tasks/DistributedLockServiceTests.cs
@@ -1,10 +1,12 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using System.Threading.Tasks;
using Autofac;
using NUnit.Framework;
using Orchard.Data;
using Orchard.Environment;
+using Orchard.Environment.Configuration;
using Orchard.Services;
using Orchard.Tasks.Locking.Records;
using Orchard.Tasks.Locking.Services;
@@ -15,11 +17,9 @@ namespace Orchard.Tests.Tasks {
public class DistributedLockServiceTests : DatabaseEnabledTestsBase {
private const string LockName = "Orchard Test Lock";
private DistributedLockService _distributedLockService;
- private StubMachineNameProvider _machineNameProvider;
- private StubThreadProvider _threadProvider;
+ private StubApplicationEnvironment _applicationEnvironment;
private IRepository _distributedLockRepository;
private ITransactionManager _transactionManager;
-
protected override IEnumerable DatabaseTypes {
get { yield return typeof(DistributedLockRecord); }
@@ -27,83 +27,71 @@ namespace Orchard.Tests.Tasks {
public override void Register(ContainerBuilder builder) {
builder.RegisterType().As();
- builder.RegisterType().As().SingleInstance();
- builder.RegisterType().As().SingleInstance();
+ builder.RegisterType().As().SingleInstance();
builder.RegisterType().AsSelf();
}
public override void Init() {
base.Init();
_distributedLockService = _container.Resolve();
- _machineNameProvider = (StubMachineNameProvider)_container.Resolve();
- _threadProvider = (StubThreadProvider)_container.Resolve();
+ _applicationEnvironment = (StubApplicationEnvironment)_container.Resolve();
_distributedLockRepository = _container.Resolve>();
_transactionManager = _container.Resolve();
}
- [Test]
- public void TryAcquiringLockSucceeds() {
- DistributedLock @lock;
- var lockAcquired = _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromSeconds(60), null, out @lock);
-
- Assert.That(lockAcquired, Is.True);
- }
-
[Test]
public void TryAcquiringLockTwiceOnSameMachineSucceeds() {
- DistributedLock @lock;
- var attempt1 = _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromSeconds(60), null, out @lock);
- var attempt2 = _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromSeconds(60), null, out @lock);
+ IDistributedLock @lock;
+ var attempt1 = _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromSeconds(60), out @lock);
+ var attempt2 = _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromSeconds(60), out @lock);
Assert.That(attempt1, Is.True);
Assert.That(attempt2, Is.True);
}
- [Test]
- public void TryAcquiringLockTwiceOnSameMachineIncreasesLockCountTwice() {
- DistributedLock @lock;
- _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromSeconds(60), null, out @lock);
- _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromSeconds(60), null, out @lock);
- var lockId = Int32.Parse(@lock.Id);
- var lockRecord = _distributedLockRepository.Get(lockId);
- Assert.That(lockRecord.Count, Is.EqualTo(2));
+ [Test]
+ public void AcquiringTheLockOnTheSameMachineReturnsTheSameLock() {
+ IDistributedLock lock1, lock2;
+ _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromSeconds(60), out lock1);
+ _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromSeconds(60), out lock2);
+
+ Assert.AreEqual(lock1, lock2);
}
[Test]
- public void ReleasingLockDecreasesLockCount() {
- DistributedLock @lock;
- _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromSeconds(60), null, out @lock);
- _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromSeconds(60), null, out @lock);
+ public void ReleasingSingleLockDeletesRecord() {
+ IDistributedLock lock1;
+ _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromSeconds(60), out lock1);
- var lockId = Int32.Parse(@lock.Id);
- var lockRecord = _distributedLockRepository.Get(lockId);
-
- _distributedLockService.ReleaseLock(@lock);
- _session.Refresh(lockRecord);
- Assert.That(lockRecord.Count, Is.EqualTo(1));
- }
-
- [Test]
- public void ReleasingLockAndCountReachesZeroDeletesLock()
- {
- DistributedLock @lock;
- _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromSeconds(60), null, out @lock);
-
- var lockId = Int32.Parse(@lock.Id);
- _distributedLockService.ReleaseLock(@lock);
- var lockRecord = _distributedLockRepository.Get(lockId);
+ lock1.Dispose();
+ var lockRecord = _distributedLockRepository.Table.FirstOrDefault();
Assert.That(lockRecord, Is.Null);
}
+ [Test]
+ public void ReleasingFirstLockDoesntDeleteRecord() {
+ IDistributedLock lock1, lock2;
+ _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromSeconds(60), out lock1);
+ _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromSeconds(60), out lock2);
+
+ lock1.Dispose();
+ var lockRecord = _distributedLockRepository.Table.FirstOrDefault();
+ Assert.That(lockRecord, Is.Not.Null);
+
+ lock2.Dispose();
+ lockRecord = _distributedLockRepository.Table.FirstOrDefault();
+ Assert.That(lockRecord, Is.Null);
+ }
+
[Test]
public void TryAcquiringLockTwiceFails() {
- DistributedLock @lock;
- _machineNameProvider.MachineName = "Orchard Test Machine 1";
- var attempt1 = _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromSeconds(60), null, out @lock);
- _machineNameProvider.MachineName = "Orchard Test Machine 2";
- var attempt2 = _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromSeconds(60), null, out @lock);
+ IDistributedLock @lock;
+ _applicationEnvironment.MachineName = "Orchard Test Machine 1";
+ var attempt1 = _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromSeconds(60), out @lock);
+ _applicationEnvironment.MachineName = "Orchard Test Machine 2";
+ var attempt2 = _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromSeconds(60), out @lock);
Assert.That(attempt1, Is.True);
Assert.That(attempt2, Is.False);
@@ -111,66 +99,88 @@ namespace Orchard.Tests.Tasks {
[Test]
public void TryAcquiringNonExpiredActiveLockFails() {
- DistributedLock @lock;
- CreateNonExpiredActiveLock("Other Machine", threadId: null);
- var success = _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromHours(1), null, out @lock);
+ IDistributedLock @lock;
+ CreateNonExpiredActiveLock("Other Machine");
+ var success = _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromHours(1), out @lock);
Assert.That(success, Is.False);
}
[Test]
- public void TryAcquiringNonExpiredButInactiveLockSucceeds() {
- DistributedLock @lock;
- CreateNonExpiredButInactiveLock("Other Machine", threadId: null);
- var success = _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromHours(1), null, out @lock);
+ public void TryAcquiringNonExpiredButInactiveLockFromOtherMachineFails() {
+ IDistributedLock @lock;
+ CreateNonExpiredActiveLock("Other Machine");
+ var success = _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromHours(1), out @lock);
+
+ Assert.That(success, Is.False);
+ }
+
+ [Test]
+ public void TryAcquiringNonExpiredButInactiveLockFromSameMachineSucceeds() {
+ IDistributedLock @lock;
+ CreateNonExpiredActiveLock("Orchard Machine");
+ var success = _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromHours(1), out @lock);
Assert.That(success, Is.True);
}
[Test]
public void TryAcquiringExpiredButActiveLockSucceeds() {
- DistributedLock @lock;
- CreateExpiredButActiveLock("Other Machine", threadId: null);
- var success = _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromHours(1), null, out @lock);
+ IDistributedLock @lock;
+ CreateExpiredButActiveLock("Other Machine");
+ var success = _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromHours(1), out @lock);
Assert.That(success, Is.True);
}
[Test]
public void TryAcquiringNonExpiredAndActiveLockFromCurrentOwnerSucceeds() {
- DistributedLock @lock;
- CreateNonExpiredActiveLock(GetMachineName(), threadId: null);
- var success = _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromHours(1), null, out @lock);
+ IDistributedLock @lock;
+ CreateNonExpiredActiveLock(GetMachineName());
+ var success = _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromHours(1), out @lock);
Assert.That(success, Is.True);
}
[Test]
public void AcquiringNonExpiredAndActiveLockFromDifferentOwnerThrowsTimeoutException() {
- CreateNonExpiredActiveLock("Other Machine", threadId: null);
- Assert.Throws(() => _distributedLockService.AcquireLockForMachine(LockName, TimeSpan.FromHours(1), TimeSpan.Zero));
+ CreateNonExpiredActiveLock("Other Machine");
+ Assert.Throws(() => _distributedLockService.AcquireLock(LockName, TimeSpan.FromHours(1), TimeSpan.Zero));
}
[Test]
public void MultipleAcquisitionsFromDifferentMachinesShouldFail() {
- DistributedLock @lock;
- _machineNameProvider.MachineName = "Orchard Test Machine 1";
- var attempt1 = _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromSeconds(60), null, out @lock);
- _machineNameProvider.MachineName = "Orchard Test Machine 2";
- var attempt2 = _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromSeconds(60), null, out @lock);
+ IDistributedLock @lock;
+ _applicationEnvironment.MachineName = "Orchard Test Machine 1";
+ var attempt1 = _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromMinutes(60), out @lock);
+ _applicationEnvironment.MachineName = "Orchard Test Machine 2";
+ var attempt2 = _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromMinutes(60), out @lock);
Assert.That(attempt1, Is.True);
Assert.That(attempt2, Is.False);
}
+ [Test]
+ public void MultipleAcquisitionsFromDifferentMachinesOnDifferentTenantShouldSucceed() {
+ IDistributedLock @lock;
+ _applicationEnvironment.MachineName = "Orchard Test Machine 1";
+ var attempt1 = _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromSeconds(60), out @lock);
+ _applicationEnvironment.MachineName = "Orchard Test Machine 2";
+ _shellSettings.Name = "Foo";
+ var attempt2 = _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromSeconds(60), out @lock);
+
+ Assert.That(attempt1, Is.True);
+ Assert.That(attempt2, Is.True);
+ }
+
[Test]
public void MultithreadedAcquisitionsShouldNotCauseTransactionErrors() {
var tasks = new List();
for (var i = 0; i < 10; i++) {
var task = Task.Factory.StartNew(() => {
- DistributedLock @lock;
- Assert.DoesNotThrow(() => _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromHours(1), null, out @lock));
+ IDistributedLock @lock;
+ Assert.DoesNotThrow(() => _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromHours(1), out @lock));
});
tasks.Add(task);
@@ -179,61 +189,53 @@ namespace Orchard.Tests.Tasks {
Task.WaitAll(tasks.ToArray());
}
- [Test]
- public void MixedScopeAcquisitionsShouldThrow() {
- DistributedLock @lock;
- Assert.DoesNotThrow(() => _distributedLockService.TryAcquireLockForMachine(LockName, TimeSpan.FromSeconds(60), null, out @lock));
- Assert.Throws(() => _distributedLockService.TryAcquireLockForThread(LockName, TimeSpan.FromSeconds(60), null, out @lock));
- }
-
[Test]
public void TryAcquireActiveLockWithNullTimeoutReturnsFalseImmediately() {
- CreateNonExpiredActiveLock("Other Machine", null);
+ CreateNonExpiredActiveLock("Other Machine");
- DistributedLock @lock;
- var acquired = _distributedLockService.TryAcquireLockForThread(LockName, TimeSpan.FromMinutes(1), null, out @lock);
+ IDistributedLock @lock;
+ var acquired = _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromMinutes(1), out @lock);
Assert.That(acquired, Is.False);
}
[Test]
public void ActiveLockWithUndefinedValidUntilNeverExpires() {
- CreateNonExpiredActiveLockThatNeverExpires("Other Machine", null);
+ CreateNonExpiredActiveLockThatNeverExpires("Other Machine");
+
_clock.Advance(DateTime.MaxValue - _clock.UtcNow); // Fast forward to the End of Time.
- DistributedLock @lock;
- var acquired = _distributedLockService.TryAcquireLockForThread(LockName, TimeSpan.FromMinutes(1), null, out @lock);
+ IDistributedLock @lock;
+ var acquired = _distributedLockService.TryAcquireLock(LockName, TimeSpan.FromMinutes(1), out @lock);
Assert.That(acquired, Is.False);
}
[Test]
public void ActiveLockWithUndefinedValidUntilNeverExpiresUntilReleased() {
- DistributedLock @lock;
+ IDistributedLock @lock;
// Create a never expiring lock.
- _machineNameProvider.MachineName = "Orchard Test Machine 1";
- var attempt1 = _distributedLockService.TryAcquireLockForThread(LockName, maxValidFor: null, timeout: null, @lock: out @lock);
-
+ _applicationEnvironment.MachineName = "Orchard Test Machine 1";
+ var attempt1 = _distributedLockService.TryAcquireLock(LockName, maxValidFor: null, timeout: null, dLock: out @lock);
+
// Release the lock.
- _distributedLockService.ReleaseLock(@lock);
+ @lock.Dispose();
// Acquire the lock from another machine.
- _machineNameProvider.MachineName = "Orchard Test Machine 2";
- var attempt2 = _distributedLockService.TryAcquireLockForThread(LockName, maxValidFor: null, timeout: null, @lock: out @lock);
+ _applicationEnvironment.MachineName = "Orchard Test Machine 2";
+ var attempt2 = _distributedLockService.TryAcquireLock(LockName, maxValidFor: null, timeout: null, dLock: out @lock);
// Validate the results.
Assert.That(attempt1, Is.True);
Assert.That(attempt2, Is.True);
}
- private DistributedLockRecord CreateLockRecord(int count, DateTime createdUtc, DateTime? validUntilUtc, string machineName, int? threadId) {
+ private DistributedLockRecord CreateLockRecord(DateTime createdUtc, DateTime? validUntilUtc, string machineName) {
var record = new DistributedLockRecord {
- Name = LockName,
- Count = count,
+ Name = String.Format("DistributedLock:{0}:{1}", ShellSettings.DefaultName, LockName),
CreatedUtc = createdUtc,
ValidUntilUtc = validUntilUtc,
MachineName = machineName,
- ThreadId = threadId
};
_distributedLockRepository.Create(record);
@@ -241,32 +243,23 @@ namespace Orchard.Tests.Tasks {
return record;
}
- private DistributedLockRecord CreateNonExpiredActiveLock(string machineName, int? threadId) {
+ private DistributedLockRecord CreateNonExpiredActiveLock(string machineName) {
var now = _clock.UtcNow;
- return CreateLockRecord(1, now, now + TimeSpan.FromHours(1), machineName, threadId);
+ return CreateLockRecord(now, now + TimeSpan.FromHours(1), machineName);
}
- private DistributedLockRecord CreateNonExpiredButInactiveLock(string machineName, int? threadId) {
+ private DistributedLockRecord CreateExpiredButActiveLock(string machineName) {
var now = _clock.UtcNow;
- return CreateLockRecord(0, now, now + TimeSpan.FromHours(1), machineName, threadId);
+ return CreateLockRecord(now, now - TimeSpan.FromHours(1), machineName);
}
- private DistributedLockRecord CreateExpiredButActiveLock(string machineName, int? threadId) {
+ private DistributedLockRecord CreateNonExpiredActiveLockThatNeverExpires(string machineName) {
var now = _clock.UtcNow;
- return CreateLockRecord(1, now, now - TimeSpan.FromHours(1), machineName, threadId);
- }
-
- private DistributedLockRecord CreateNonExpiredActiveLockThatNeverExpires(string machineName, int? threadId) {
- var now = _clock.UtcNow;
- return CreateLockRecord(1, now, null, machineName, threadId);
+ return CreateLockRecord(now, null, machineName);
}
private string GetMachineName() {
- return _machineNameProvider.GetMachineName();
- }
-
- private int GetThreadId() {
- return _threadProvider.GetCurrentThreadId();
+ return _applicationEnvironment.GetEnvironmentIdentifier();
}
}
}
diff --git a/src/Orchard.Tests/Tasks/LockTests.cs b/src/Orchard.Tests/Tasks/LockTests.cs
deleted file mode 100644
index d94218428..000000000
--- a/src/Orchard.Tests/Tasks/LockTests.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Autofac;
-using Moq;
-using NUnit.Framework;
-using Orchard.Tasks.Locking.Services;
-
-namespace Orchard.Tests.Tasks {
- [TestFixture]
- public class LockTests : ContainerTestBase {
- private const string LockName = "Orchard Test Lock";
- private const string LockId = "1";
- private Mock _distributedLockServiceMock;
- private DistributedLock _lock;
-
- protected override void Register(ContainerBuilder builder) {
- _distributedLockServiceMock = new Mock();
- builder.RegisterInstance(_distributedLockServiceMock.Object);
- }
-
- protected override void Resolve(ILifetimeScope container) {
- _lock = DistributedLock.ForMachine(_distributedLockServiceMock.Object, LockName, "Orchard Test Machine", LockId);
- }
-
- [Test]
- public void DisposeInvokesDistributedLockServiceDisposeLock() {
- _lock.Dispose();
-
- _distributedLockServiceMock.Verify(service => service.ReleaseLock(_lock), Times.Exactly(1));
- }
-
- [Test]
- public void DisposingMultipleTimesInvokesDistributedLockServiceDisposeLockOnce() {
- _lock.Dispose();
- _lock.Dispose();
- _lock.Dispose();
-
- _distributedLockServiceMock.Verify(service => service.ReleaseLock(_lock), Times.Exactly(1));
- }
- }
-}
\ No newline at end of file
diff --git a/src/Orchard.Tests/Tasks/SweepGeneratorTests.cs b/src/Orchard.Tests/Tasks/SweepGeneratorTests.cs
index e851df66c..8e468800a 100644
--- a/src/Orchard.Tests/Tasks/SweepGeneratorTests.cs
+++ b/src/Orchard.Tests/Tasks/SweepGeneratorTests.cs
@@ -23,10 +23,6 @@ namespace Orchard.Tests.Tasks {
.Setup(x => x.Current())
.Returns(() => null);
- container.Mock()
- .Setup(x => x.CreateContext(It.IsAny()))
- .Returns(() => new StubHttpContext());
-
container.Mock()
.Setup(x => x.Started());
}
diff --git a/src/Orchard.Tests/Time/TimeZoneSelectorTests.cs b/src/Orchard.Tests/Time/TimeZoneSelectorTests.cs
index b0cee916b..18b089be0 100644
--- a/src/Orchard.Tests/Time/TimeZoneSelectorTests.cs
+++ b/src/Orchard.Tests/Time/TimeZoneSelectorTests.cs
@@ -69,10 +69,18 @@ namespace Orchard.Tests.Time {
throw new NotImplementedException();
}
+ public override object Resolve(Type serviceType) {
+ throw new NotImplementedException();
+ }
+
public override bool TryResolve(out T service) {
throw new NotImplementedException();
}
+ public override bool TryResolve(Type serviceType, out object service) {
+ throw new NotImplementedException();
+ }
+
public override T GetState(string name) {
return default(T);
}
diff --git a/src/Orchard.WarmupStarter/Properties/AssemblyInfo.cs b/src/Orchard.WarmupStarter/Properties/AssemblyInfo.cs
index 4f4ee0785..3bf0779c8 100644
--- a/src/Orchard.WarmupStarter/Properties/AssemblyInfo.cs
+++ b/src/Orchard.WarmupStarter/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@ using System.Security;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
// Enable web application to call this assembly in Full Trust
[assembly: AllowPartiallyTrustedCallers]
diff --git a/src/Orchard.WarmupStarter/Starter.cs b/src/Orchard.WarmupStarter/Starter.cs
index ffa1f0763..b0b328da4 100644
--- a/src/Orchard.WarmupStarter/Starter.cs
+++ b/src/Orchard.WarmupStarter/Starter.cs
@@ -89,9 +89,9 @@ namespace Orchard.WarmupStarter {
var result = _initialization(application);
_initializationResult = result;
}
- catch (Exception e) {
+ catch (Exception ex) {
lock (_synLock) {
- _error = e;
+ _error = ex;
_previousError = null;
}
}
diff --git a/src/Orchard.Web.Tests/Properties/AssemblyInfo.cs b/src/Orchard.Web.Tests/Properties/AssemblyInfo.cs
index 788066b9f..0338f1a5b 100644
--- a/src/Orchard.Web.Tests/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web.Tests/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Config/Host.config b/src/Orchard.Web/Config/Host.config
index 9e6b2d119..94eefe177 100644
--- a/src/Orchard.Web/Config/Host.config
+++ b/src/Orchard.Web/Config/Host.config
@@ -8,7 +8,7 @@
-
+
diff --git a/src/Orchard.Web/Config/HostComponents.config b/src/Orchard.Web/Config/HostComponents.config
index dd1a321d6..f91398632 100644
--- a/src/Orchard.Web/Config/HostComponents.config
+++ b/src/Orchard.Web/Config/HostComponents.config
@@ -106,5 +106,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Orchard.Web/Config/Sites.config b/src/Orchard.Web/Config/Sites.config
index b64e22c3f..852db503e 100644
--- a/src/Orchard.Web/Config/Sites.config
+++ b/src/Orchard.Web/Config/Sites.config
@@ -8,7 +8,7 @@
/,o=/(^[\s]+|[\s]+$)/g,a=[];t=t.split(r),n=t.length;for(var s=0;n>s;s++){var u=t[s];if(u.length>0&&"WEBVTT"!==u&&u.match(i)){var l=u.split(i),d=t[s+1];a.push({start:e(l[0].replace(o,"")),end:e(l[1].replace(o,"")),data:d})}}return Q.when(a)}}},MediaPlayer.rules.BaseRulesCollection=function(){
+"use strict";var e=[];return{downloadRatioRule:void 0,insufficientBufferRule:void 0,getRules:function(){return Q.when(e)},setup:function(){var e=this;e.getRules().then(function(t){t.push(e.downloadRatioRule),t.push(e.insufficientBufferRule)})}}},MediaPlayer.rules.BaseRulesCollection.prototype={constructor:MediaPlayer.rules.BaseRulesCollection},MediaPlayer.rules.DownloadRatioRule=function(){"use strict";var e=function(e,t,n){var r=this,i=Q.defer();return r.manifestExt.getRepresentationFor(e,n).then(function(e){r.manifestExt.getBandwidth(e).then(function(e){i.resolve(e/t)})}),i.promise};return{debug:void 0,manifestExt:void 0,checkIndex:function(t,n,r){var i,o,a,s,u,l,d,c,f,g,h=this,p=n.HttpList,m=.75;return h.debug.log("Checking download ratio rule..."),n?null===p||void 0===p||0===p.length?(h.debug.log("No requests made for this stream yet, bailing."),Q.when(new MediaPlayer.rules.SwitchRequest)):(i=p[p.length-1],a=(i.tfinish.getTime()-i.trequest.getTime())/1e3,o=(i.tfinish.getTime()-i.tresponse.getTime())/1e3,0>=a?(h.debug.log("Don't know how long the download of the last fragment took, bailing."),Q.when(new MediaPlayer.rules.SwitchRequest)):null===i.mediaduration||void 0===i.mediaduration||i.mediaduration<=0?(h.debug.log("Don't know the duration of the last media fragment, bailing."),Q.when(new MediaPlayer.rules.SwitchRequest)):(d=Q.defer(),u=i.mediaduration/a,s=i.mediaduration/o*m,isNaN(s)||isNaN(u)?(h.debug.log("Total time: "+a+"s"),h.debug.log("Download time: "+o+"s"),h.debug.log("The ratios are NaN, bailing."),Q.when(new MediaPlayer.rules.SwitchRequest)):(h.debug.log("Total ratio: "+u),h.debug.log("Download ratio: "+s),h.debug.log("Download ratio: "+s),isNaN(s)?(h.debug.log("Invalid ratio, bailing."),d.resolve(new MediaPlayer.rules.SwitchRequest)):1>s?(h.debug.log("Download ratio is poor."),t>0?(h.debug.log("We are not at the lowest bitrate, so switch down."),h.manifestExt.getRepresentationFor(t-1,r).then(function(e){h.manifestExt.getBandwidth(e).then(function(e){h.manifestExt.getRepresentationFor(t,r).then(function(n){h.manifestExt.getBandwidth(n).then(function(n){l=e/n,h.debug.log("Switch ratio: "+l),l>s?(h.debug.log("Things must be going pretty bad, switch all the way down."),d.resolve(new MediaPlayer.rules.SwitchRequest(0))):(h.debug.log("Things could be better, so just switch down one index."),d.resolve(new MediaPlayer.rules.SwitchRequest(t-1)))})})})})):(h.debug.log("We are at the lowest bitrate and cannot switch down, use current."),d.resolve(new MediaPlayer.rules.SwitchRequest(t)))):(h.debug.log("Download ratio is good."),h.manifestExt.getRepresentationCount(r).then(function(n){n-=1,n>t?(h.debug.log("We are not at the highest bitrate, so switch up."),h.manifestExt.getRepresentationFor(t+1,r).then(function(i){h.manifestExt.getBandwidth(i).then(function(i){h.manifestExt.getRepresentationFor(t,r).then(function(o){h.manifestExt.getBandwidth(o).then(function(o){if(l=i/o,h.debug.log("Switch ratio: "+l),s>=l)if(s>1e3)h.debug.log("Tons of bandwidth available, go all the way up."),d.resolve(new MediaPlayer.rules.SwitchRequest(n-1));else if(s>100)h.debug.log("Just enough bandwidth available, switch up one."),d.resolve(new MediaPlayer.rules.SwitchRequest(t+1));else{for(h.debug.log("Not exactly sure where to go, so do some math."),f=-1,c=[];(f+=1)f&&!(st&&(u=MediaPlayer.rules.SwitchRequest.prototype.STRONG,a.debug.log("Apply STRONG to buffer rule.")),s?(a.debug.log("The buffer ran dry recently, switch down."),Q.when(new MediaPlayer.rules.SwitchRequest(n-1,u))):e>t?(a.debug.log("Too many dry buffer hits, quit switching bitrates."),Q.when(new MediaPlayer.rules.SwitchRequest(n,u))):Q.when(new MediaPlayer.rules.SwitchRequest(MediaPlayer.rules.SwitchRequest.prototype.NO_CHANGE,u)))))}}},MediaPlayer.rules.InsufficientBufferRule.prototype={constructor:MediaPlayer.rules.InsufficientBufferRule},MediaPlayer.rules.LimitSwitchesRule=function(){"use strict";var e=10,t=2e4,n=5,r=0;return{debug:void 0,checkIndex:function(i,o){if(r>0)return r-=1,Q.when(new MediaPlayer.rules.SwitchRequest(i,MediaPlayer.rules.SwitchRequest.prototype.STRONG));var a,s,u,l=this,d=!1,c=(new Date).getTime(),f=o.RepSwitchList.length;for(l.debug.log("Checking limit switches rule..."),u=f-1;u>=0;u-=1){if(a=o.RepSwitchList[u],s=c-a.t.getTime(),s>=t){l.debug.log("Reached time limit, bailing.");break}if(u>=e){l.debug.log("Found too many switches within validation time, force the stream to not change."),d=!0;break}}return d?(l.debug.log("Wait some time before allowing another switch."),r=n,Q.when(new MediaPlayer.rules.SwitchRequest(i,MediaPlayer.rules.SwitchRequest.prototype.STRONG))):Q.when(new MediaPlayer.rules.SwitchRequest(MediaPlayer.rules.SwitchRequest.prototype.NO_CHANGE,MediaPlayer.rules.SwitchRequest.prototype.STRONG))}}},MediaPlayer.rules.LimitSwitchesRule.prototype={constructor:MediaPlayer.rules.LimitSwitchesRule},MediaPlayer.rules.SwitchRequest=function(e,t){"use strict";this.quality=e,this.priority=t,void 0===this.quality&&(this.quality=999),void 0===this.priority&&(this.priority=.5)},MediaPlayer.rules.SwitchRequest.prototype={constructor:MediaPlayer.rules.SwitchRequest,NO_CHANGE:999,DEFAULT:.5,STRONG:1,WEAK:0},MediaPlayer.models.MetricsList=function(){"use strict";return{TcpList:[],HttpList:[],RepSwitchList:[],BufferLevel:[],PlayList:[],DroppedFrames:[]}},MediaPlayer.models.MetricsList.prototype={constructor:MediaPlayer.models.MetricsList},MediaPlayer.vo.SegmentRequest=function(){"use strict";this.action="download",this.startTime=0/0,this.streamType=null,this.type=null,this.duration=0/0,this.timescale=0/0,this.range=null,this.url=null,this.requestStartDate=null,this.firstByteDate=null,this.requestEndDate=null,this.deferred=null,this.quality=0/0,this.index=0/0},MediaPlayer.vo.SegmentRequest.prototype={constructor:MediaPlayer.vo.SegmentRequest,ACTION_DOWNLOAD:"download",ACTION_COMPLETE:"complete"},MediaPlayer.vo.metrics.BufferLevel=function(){"use strict";this.t=null,this.level=null},MediaPlayer.vo.metrics.BufferLevel.prototype={constructor:MediaPlayer.vo.metrics.BufferLevel},MediaPlayer.vo.metrics.DroppedFrames=function(){"use strict";this.time=null,this.droppedFrames=null},MediaPlayer.vo.metrics.DroppedFrames.prototype={constructor:MediaPlayer.vo.metrics.DroppedFrames},MediaPlayer.vo.metrics.HTTPRequest=function(){"use strict";this.tcpid=null,this.type=null,this.url=null,this.actualurl=null,this.range=null,this.trequest=null,this.tresponse=null,this.tfinish=null,this.responsecode=null,this.interval=null,this.mediaduration=null,this.trace=[]},MediaPlayer.vo.metrics.HTTPRequest.prototype={constructor:MediaPlayer.vo.metrics.HTTPRequest},MediaPlayer.vo.metrics.HTTPRequest.Trace=function(){"use strict";this.s=null,this.d=null,this.b=[]},MediaPlayer.vo.metrics.HTTPRequest.Trace.prototype={constructor:MediaPlayer.vo.metrics.HTTPRequest.Trace},MediaPlayer.vo.metrics.PlayList=function(){"use strict";this.start=null,this.mstart=null,this.starttype=null,this.trace=[]},MediaPlayer.vo.metrics.PlayList.Trace=function(){"use strict";this.representationid=null,this.subreplevel=null,this.start=null,this.mstart=null,this.duration=null,this.playbackspeed=null,this.stopreason=null},MediaPlayer.vo.metrics.PlayList.prototype={constructor:MediaPlayer.vo.metrics.PlayList},MediaPlayer.vo.metrics.PlayList.INITIAL_PLAY_START_REASON="initial_start",MediaPlayer.vo.metrics.PlayList.SEEK_START_REASON="seek",MediaPlayer.vo.metrics.PlayList.Trace.prototype={constructor:MediaPlayer.vo.metrics.PlayList.Trace()},MediaPlayer.vo.metrics.PlayList.Trace.USER_REQUEST_STOP_REASON="user_request",MediaPlayer.vo.metrics.PlayList.Trace.REPRESENTATION_SWITCH_STOP_REASON="representation_switch",MediaPlayer.vo.metrics.PlayList.Trace.END_OF_CONTENT_STOP_REASON="end_of_content",MediaPlayer.vo.metrics.PlayList.Trace.REBUFFERING_REASON="rebuffering",MediaPlayer.vo.metrics.RepresentationSwitch=function(){"use strict";this.t=null,this.mt=null,this.to=null,this.lto=null},MediaPlayer.vo.metrics.RepresentationSwitch.prototype={constructor:MediaPlayer.vo.metrics.RepresentationSwitch},MediaPlayer.vo.metrics.TCPConnection=function(){"use strict";this.tcpid=null,this.dest=null,this.topen=null,this.tclose=null,this.tconnect=null},MediaPlayer.vo.metrics.TCPConnection.prototype={constructor:MediaPlayer.vo.metrics.TCPConnection};
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Services/Jobs/JobProcessor.cs b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Services/Jobs/JobProcessor.cs
index 4a066e68a..4fd8487fe 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Services/Jobs/JobProcessor.cs
+++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Services/Jobs/JobProcessor.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
-using System.Threading;
using Microsoft.WindowsAzure.MediaServices.Client;
using Orchard.Azure.MediaServices.Helpers;
using Orchard.Azure.MediaServices.Models;
@@ -18,8 +17,6 @@ using Orchard.Tasks.Locking.Services;
namespace Orchard.Azure.MediaServices.Services.Jobs {
public class JobProcessor : Component, IBackgroundTask {
- private static readonly object _sweepLock = new object();
-
private readonly IWamsClient _wamsClient;
private readonly IAssetManager _assetManager;
private readonly IJobManager _jobManager;
@@ -41,126 +38,125 @@ namespace Orchard.Azure.MediaServices.Services.Jobs {
}
public void Sweep() {
- if (Monitor.TryEnter(_sweepLock)) {
- try {
- Logger.Debug("Beginning sweep.");
+ Logger.Debug("Beginning sweep.");
- if (!_orchardServices.WorkContext.CurrentSite.As().IsValid()) {
- Logger.Debug("Settings are invalid; going back to sleep.");
- return;
- }
+ try {
+ if (!_orchardServices.WorkContext.CurrentSite.As().IsValid()) {
+ Logger.Debug("Settings are invalid; going back to sleep.");
+ return;
+ }
- // Only allow this task to run on one farm node at a time.
- DistributedLock @lock;
- if (_distributedLockService.TryAcquireLockForMachine(GetType().FullName, TimeSpan.FromHours(1), out @lock)) {
- using (@lock) {
- var jobs = _jobManager.GetActiveJobs().ToDictionary(job => job.WamsJobId);
+ // Only allow this task to run on one farm node at a time.
+ IDistributedLock @lock;
+ if (_distributedLockService.TryAcquireLock(GetType().FullName, TimeSpan.FromHours(1), out @lock)) {
+ using (@lock) {
+ var jobs = _jobManager.GetActiveJobs().ToDictionary(job => job.WamsJobId);
- if (!jobs.Any()) {
- Logger.Debug("No open jobs were found; going back to sleep.");
- return;
+ if (!jobs.Any()) {
+ Logger.Debug("No open jobs were found; going back to sleep.");
+ return;
+ }
+
+ Logger.Information("Beginning processing of {0} open jobs.", jobs.Count());
+
+ var wamsJobs = _wamsClient.GetJobsById(jobs.Keys);
+
+ foreach (var wamsJob in wamsJobs) {
+ Logger.Information("Processing job '{0}'...", wamsJob.Name);
+
+ var job = jobs[wamsJob.Id];
+ var tasks = job.Tasks.ToDictionary(task => task.WamsTaskId);
+ var wamsTasks = wamsJob.Tasks.ToArray();
+
+ foreach (var wamsTask in wamsTasks) {
+ var task = tasks[wamsTask.Id];
+ task.Status = MapWamsJobState(wamsTask.State);
+ task.PercentComplete = (int)wamsTask.Progress;
}
- Logger.Information("Beginning processing of {0} open jobs.", jobs.Count());
+ var previousStatus = job.Status;
+ var wamsJobErrors = HarvestWamsJobErrors(wamsJob).ToArray();
- var wamsJobs = _wamsClient.GetJobsById(jobs.Keys);
+ job.CreatedUtc = wamsJob.Created;
+ job.StartedUtc = wamsJob.StartTime;
+ job.FinishedUtc = wamsJob.EndTime;
+ job.Status = MapWamsJobState(wamsJob.State);
+ job.ErrorMessage = GetAggregateErrorMessage(wamsJobErrors);
- foreach (var wamsJob in wamsJobs) {
- Logger.Information("Processing job '{0}'...", wamsJob.Name);
+ LogWamsJobErrors(wamsJobErrors);
- var job = jobs[wamsJob.Id];
- var tasks = job.Tasks.ToDictionary(task => task.WamsTaskId);
- var wamsTasks = wamsJob.Tasks.ToArray();
+ if (job.Status != previousStatus) {
+ if (job.Status == JobStatus.Finished) {
+ Logger.Information("Job '{0}' was finished in WAMS; creating locators.", wamsJob.Name);
- foreach (var wamsTask in wamsTasks) {
- var task = tasks[wamsTask.Id];
- task.Status = MapWamsJobState(wamsTask.State);
- task.PercentComplete = (int)wamsTask.Progress;
- }
+ var lastTask = job.Tasks.Last();
+ var lastWamsTask = wamsTasks.Single(task => task.Id == lastTask.WamsTaskId);
+ var outputAsset = lastWamsTask.OutputAssets.First();
+ var outputAssetName = !String.IsNullOrWhiteSpace(job.OutputAssetName) ? job.OutputAssetName : lastWamsTask.Name;
+ var outputAssetDescription = job.OutputAssetDescription.TrimSafe();
+ var encoderMetadataXml = _wamsClient.GetEncoderMetadataXml(outputAsset).Result;
+ var cloudVideoPart = job.CloudVideoPart;
+ var wamsLocators = _wamsClient.CreateLocatorsAsync(outputAsset, WamsLocatorCategory.Private).Result;
- var previousStatus = job.Status;
- var wamsJobErrors = HarvestWamsJobErrors(wamsJob).ToArray();
+ // HACK: Temporary workaround to disable dynamic packaging for VC1-based assets. In future versions
+ // this will be implemented more robustly by testing all the dynamic URLs to see which ones work
+ // and only store and use the working ones.
+ var forceNonDynamicAsset = lastWamsTask.Configuration.StartsWith("VC1");
- job.CreatedUtc = wamsJob.Created;
- job.StartedUtc = wamsJob.StartTime;
- job.FinishedUtc = wamsJob.EndTime;
- job.Status = MapWamsJobState(wamsJob.State);
- job.ErrorMessage = GetAggregateErrorMessage(wamsJobErrors);
+ if (wamsLocators.OnDemandLocator != null && !forceNonDynamicAsset) {
+ _assetManager.CreateAssetFor(cloudVideoPart, asset => {
+ asset.IncludeInPlayer = true;
+ asset.Name = outputAssetName;
+ asset.Description = outputAssetDescription;
+ asset.EncodingPreset = lastTask.HarvestAssetName;
+ asset.WamsPrivateLocatorId = wamsLocators.SasLocator.Id;
+ asset.WamsPrivateLocatorUrl = wamsLocators.SasLocator.Url;
+ asset.WamsPrivateOnDemandLocatorId = wamsLocators.OnDemandLocator.Id;
+ asset.WamsPrivateOnDemandLocatorUrl = wamsLocators.OnDemandLocator.Url;
+ asset.WamsManifestFilename = wamsLocators.OnDemandManifestFilename;
+ asset.WamsAssetId = outputAsset.Id;
+ asset.WamsEncoderMetadataXml = encoderMetadataXml;
+ asset.UploadState.Status = AssetUploadStatus.Uploaded;
+ asset.PublishState.Status = AssetPublishStatus.None;
+ });
+ }
+ else {
+ _assetManager.CreateAssetFor(cloudVideoPart, asset => {
+ asset.IncludeInPlayer = true;
+ asset.Name = outputAssetName;
+ asset.Description = outputAssetDescription;
+ asset.EncodingPreset = lastTask.HarvestAssetName;
+ asset.WamsPrivateLocatorId = wamsLocators.SasLocator.Id;
+ asset.WamsPrivateLocatorUrl = wamsLocators.SasLocator.Url;
+ asset.WamsAssetId = outputAsset.Id;
+ asset.WamsEncoderMetadataXml = encoderMetadataXml;
+ asset.UploadState.Status = AssetUploadStatus.Uploaded;
+ asset.PublishState.Status = AssetPublishStatus.None;
+ });
+ }
- LogWamsJobErrors(wamsJobErrors);
-
- if (job.Status != previousStatus) {
- if (job.Status == JobStatus.Finished) {
- Logger.Information("Job '{0}' was finished in WAMS; creating locators.", wamsJob.Name);
-
- var lastTask = job.Tasks.Last();
- var lastWamsTask = wamsTasks.Single(task => task.Id == lastTask.WamsTaskId);
- var outputAsset = lastWamsTask.OutputAssets.First();
- var outputAssetName = !String.IsNullOrWhiteSpace(job.OutputAssetName) ? job.OutputAssetName : lastWamsTask.Name;
- var outputAssetDescription = job.OutputAssetDescription.TrimSafe();
- var encoderMetadataXml = _wamsClient.GetEncoderMetadataXml(outputAsset).Result;
- var cloudVideoPart = job.CloudVideoPart;
- var wamsLocators = _wamsClient.CreateLocatorsAsync(outputAsset, WamsLocatorCategory.Private).Result;
-
- // HACK: Temporary workaround to disable dynamic packaging for VC1-based assets. In future versions
- // this will be implemented more robustly by testing all the dynamic URLs to see which ones work
- // and only store and use the working ones.
- var forceNonDynamicAsset = lastWamsTask.Configuration.StartsWith("VC1");
-
- if (wamsLocators.OnDemandLocator != null && !forceNonDynamicAsset) {
- _assetManager.CreateAssetFor(cloudVideoPart, asset => {
- asset.IncludeInPlayer = true;
- asset.Name = outputAssetName;
- asset.Description = outputAssetDescription;
- asset.EncodingPreset = lastTask.HarvestAssetName;
- asset.WamsPrivateLocatorId = wamsLocators.SasLocator.Id;
- asset.WamsPrivateLocatorUrl = wamsLocators.SasLocator.Url;
- asset.WamsPrivateOnDemandLocatorId = wamsLocators.OnDemandLocator.Id;
- asset.WamsPrivateOnDemandLocatorUrl = wamsLocators.OnDemandLocator.Url;
- asset.WamsManifestFilename = wamsLocators.OnDemandManifestFilename;
- asset.WamsAssetId = outputAsset.Id;
- asset.WamsEncoderMetadataXml = encoderMetadataXml;
- asset.UploadState.Status = AssetUploadStatus.Uploaded;
- asset.PublishState.Status = AssetPublishStatus.None;
- });
- }
- else {
- _assetManager.CreateAssetFor(cloudVideoPart, asset => {
- asset.IncludeInPlayer = true;
- asset.Name = outputAssetName;
- asset.Description = outputAssetDescription;
- asset.EncodingPreset = lastTask.HarvestAssetName;
- asset.WamsPrivateLocatorId = wamsLocators.SasLocator.Id;
- asset.WamsPrivateLocatorUrl = wamsLocators.SasLocator.Url;
- asset.WamsAssetId = outputAsset.Id;
- asset.WamsEncoderMetadataXml = encoderMetadataXml;
- asset.UploadState.Status = AssetUploadStatus.Uploaded;
- asset.PublishState.Status = AssetPublishStatus.None;
- });
- }
-
- try {
- if (cloudVideoPart.IsPublished())
- _assetManager.PublishAssetsFor(cloudVideoPart);
- }
- catch (Exception ex) {
- Logger.Warning(ex, "Processing of job '{0}' was completed but an error occurred while publishing the cloud video item with ID {1} after processing.", wamsJob.Name, cloudVideoPart.Id);
- }
+ try {
+ if (cloudVideoPart.IsPublished())
+ _assetManager.PublishAssetsFor(cloudVideoPart);
+ }
+ catch (Exception ex) {
+ Logger.Warning(ex, "Processing of job '{0}' was completed but an error occurred while publishing the cloud video item with ID {1} after processing.", wamsJob.Name, cloudVideoPart.Id);
}
}
-
- Logger.Information("Processing of job '{0}' was successfully completed.", wamsJob.Name);
}
+
+ Logger.Information("Processing of job '{0}' was successfully completed.", wamsJob.Name);
}
}
}
- catch (Exception ex) {
- Logger.Error(ex, "Error during sweep.");
- }
- finally {
- Monitor.Exit(_sweepLock);
- Logger.Debug("Ending sweep.");
- }
+ else
+ Logger.Debug("Distributed lock could not be acquired; going back to sleep.");
+ }
+ catch (Exception ex) {
+ Logger.Error(ex, "Error during sweep.");
+ }
+ finally {
+ Logger.Debug("Ending sweep.");
}
}
diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
index f585f8311..c3a205ab2 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
@@ -45,7 +45,7 @@
-
+
@@ -57,15 +57,15 @@
-
+
-
+
-
+
diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Module.txt b/src/Orchard.Web/Modules/Orchard.Azure/Module.txt
index 9c8eb1aac..c8016dd21 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: Provides a set of Orchard service implementations targeting Microsoft Azure services.
Category: Hosting
diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
index 8587c2796..12d87b822 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
@@ -107,7 +107,7 @@
-
+
diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Azure/Properties/AssemblyInfo.cs
index 5edcbfb73..39c27bbae 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/AzureApplicationEnvironment.cs b/src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/AzureApplicationEnvironment.cs
new file mode 100644
index 000000000..0b6c5bc0d
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/AzureApplicationEnvironment.cs
@@ -0,0 +1,10 @@
+using Microsoft.WindowsAzure.ServiceRuntime;
+using Orchard.Environment;
+
+namespace Orchard.Azure.Services.Environment {
+ public class AzureApplicationEnvironment : IApplicationEnvironment {
+ public string GetEnvironmentIdentifier() {
+ return RoleEnvironment.CurrentRoleInstance.Id;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs b/src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs
index 2e1ad499f..6e11a98d9 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs
@@ -2,11 +2,11 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using Microsoft.Azure;
using Orchard.Azure.Services.FileSystems;
using Orchard.Environment.Configuration;
using Orchard.FileSystems.Media;
using Orchard.Logging;
+using Microsoft.Azure;
namespace Orchard.Azure.Services.Environment.Configuration
{
diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/DefaultPlatformConfigurationAccessor.cs b/src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/DefaultPlatformConfigurationAccessor.cs
index ba596ce66..71639b174 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/DefaultPlatformConfigurationAccessor.cs
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/DefaultPlatformConfigurationAccessor.cs
@@ -1,6 +1,6 @@
-using Microsoft.Azure;
-using System.Configuration;
+using System.Configuration;
using System;
+using Microsoft.Azure;
namespace Orchard.Azure.Services.Environment.Configuration {
diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Services/TaskLease/AzureMachineNameProvider.cs b/src/Orchard.Web/Modules/Orchard.Azure/Services/TaskLease/AzureMachineNameProvider.cs
deleted file mode 100644
index 52a6dd2ab..000000000
--- a/src/Orchard.Web/Modules/Orchard.Azure/Services/TaskLease/AzureMachineNameProvider.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.WindowsAzure.ServiceRuntime;
-using Orchard.Environment;
-
-namespace Orchard.Azure.Services.TaskLease {
- public class AzureMachineNameProvider : IMachineNameProvider {
- public string GetMachineName() {
- return RoleEnvironment.CurrentRoleInstance.Id;
- }
- }
-}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Web.config b/src/Orchard.Web/Modules/Orchard.Azure/Web.config
index 15d8508e3..254f46733 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Web.config
@@ -41,7 +41,7 @@
-
+
@@ -53,15 +53,15 @@
-
+
-
+
-
+
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs
index 640c11181..f2783f000 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs
@@ -53,10 +53,14 @@ namespace Orchard.Blogs.Drivers {
}
protected override void Importing(BlogArchivesPart part, ImportContentContext context) {
- var blog = context.Attribute(part.PartDefinition.Name, "Blog");
- if (blog != null) {
- part.BlogId = context.GetItemFromSession(blog).Id;
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
}
+
+ context.ImportAttribute(part.PartDefinition.Name, "Blog", blog =>
+ part.BlogId = context.GetItemFromSession(blog).Id
+ );
}
protected override void Exporting(BlogArchivesPart part, ExportContentContext context) {
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs
index db0030450..2fdc29313 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs
@@ -43,20 +43,22 @@ namespace Orchard.Blogs.Drivers {
}
protected override void Importing(BlogPart part, ContentManagement.Handlers.ImportContentContext context) {
- var description = context.Attribute(part.PartDefinition.Name, "Description");
- if (description != null) {
- part.Description = description;
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
}
- var postCount = context.Attribute(part.PartDefinition.Name, "PostCount");
- if (postCount != null) {
- part.PostCount = Convert.ToInt32(postCount);
- }
+ context.ImportAttribute(part.PartDefinition.Name, "Description", description =>
+ part.Description = description
+ );
- var feedProxyUrl = context.Attribute(part.PartDefinition.Name, "FeedProxyUrl");
- if (feedProxyUrl != null) {
- part.FeedProxyUrl = feedProxyUrl;
- }
+ context.ImportAttribute(part.PartDefinition.Name, "PostCount", postCount =>
+ part.PostCount = Convert.ToInt32(postCount)
+ );
+
+ context.ImportAttribute(part.PartDefinition.Name, "FeedProxyUrl", feedProxyUrl =>
+ part.FeedProxyUrl = feedProxyUrl
+ );
}
protected override void Exporting(BlogPart part, ContentManagement.Handlers.ExportContentContext context) {
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs
index 8ab1b9268..e44f6fce6 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs
@@ -66,22 +66,25 @@ namespace Orchard.Blogs.Drivers {
}
protected override void Importing(RecentBlogPostsPart part, ImportContentContext context) {
- var blog = context.Attribute(part.PartDefinition.Name, "Blog");
- if (blog != null) {
- part.BlogId = context.GetItemFromSession(blog).Id;
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
}
- var count = context.Attribute(part.PartDefinition.Name, "Count");
- if (count != null) {
- part.Count = Convert.ToInt32(count);
- }
+ context.ImportAttribute(part.PartDefinition.Name, "Blog", blog =>
+ part.BlogId = context.GetItemFromSession(blog).Id
+ );
+
+ context.ImportAttribute(part.PartDefinition.Name, "Count", count =>
+ part.Count = Convert.ToInt32(count)
+ );
}
protected override void Exporting(RecentBlogPostsPart part, ExportContentContext context) {
var blog = _contentManager.Get(part.BlogId);
var blogIdentity = _contentManager.GetItemMetadata(blog).Identity;
- context.Element(part.PartDefinition.Name).SetAttributeValue("Blog", blogIdentity);
+ context.Element(part.PartDefinition.Name).SetAttributeValue("Blog", blogIdentity);
context.Element(part.PartDefinition.Name).SetAttributeValue("Count", part.Count);
}
}
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt b/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
index 37df5063f..c5d8c1e48 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: The Orchard Blogs module is implementing basic blogging features.
FeatureDescription: A simple web log.
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs
index 51684d725..669976e1b 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs
@@ -29,6 +29,6 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Caching/Module.txt b/src/Orchard.Web/Modules/Orchard.Caching/Module.txt
index d047dcf80..dd1e26e2b 100644
--- a/src/Orchard.Web/Modules/Orchard.Caching/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Caching/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: Sébastien Ros
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: Provides an API to cache business data.
Features:
diff --git a/src/Orchard.Web/Modules/Orchard.Caching/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Caching/Properties/AssemblyInfo.cs
index be2a0894d..94e0fe6a8 100644
--- a/src/Orchard.Web/Modules/Orchard.Caching/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Caching/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Module.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Module.txt
index 53f661672..b268ada56 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: Tools to create Orchard components.
FeatureDescription: Tools to create Orchard components.
diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Properties/AssemblyInfo.cs
index a21dc27e2..285c3afa6 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs
index a2488a61f..b27c3ced1 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs
@@ -117,7 +117,7 @@ namespace Orchard.Comments.Drivers {
// prevent users from commenting on a closed thread by hijacking the commentedOn property
var commentsPart = commentedOn.As();
- if (!commentsPart.CommentsActive) {
+ if (commentsPart == null || !commentsPart.CommentsActive) {
_orchardServices.TransactionManager.Cancel();
return Editor(part, shapeHelper);
}
@@ -132,71 +132,65 @@ namespace Orchard.Comments.Drivers {
}
protected override void Importing(CommentPart part, ContentManagement.Handlers.ImportContentContext context) {
- var author = context.Attribute(part.PartDefinition.Name, "Author");
- if (author != null) {
- part.Record.Author = author;
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
}
- var siteName = context.Attribute(part.PartDefinition.Name, "SiteName");
- if (siteName != null) {
- part.Record.SiteName = siteName;
- }
+ context.ImportAttribute(part.PartDefinition.Name, "Author", author =>
+ part.Record.Author = author
+ );
- var userName = context.Attribute(part.PartDefinition.Name, "UserName");
- if (userName != null) {
- part.Record.UserName = userName;
- }
+ context.ImportAttribute(part.PartDefinition.Name, "SiteName", siteName =>
+ part.Record.SiteName = siteName
+ );
- var email = context.Attribute(part.PartDefinition.Name, "Email");
- if (email != null) {
- part.Record.Email = email;
- }
+ context.ImportAttribute(part.PartDefinition.Name, "UserName", userName =>
+ part.Record.UserName = userName
+ );
- var position = context.Attribute(part.PartDefinition.Name, "Position");
- if (position != null) {
- part.Record.Position = decimal.Parse(position, CultureInfo.InvariantCulture);
- }
+ context.ImportAttribute(part.PartDefinition.Name, "Email", email =>
+ part.Record.Email = email
+ );
- var status = context.Attribute(part.PartDefinition.Name, "Status");
- if (status != null) {
- part.Record.Status = (CommentStatus)Enum.Parse(typeof(CommentStatus), status);
- }
+ context.ImportAttribute(part.PartDefinition.Name, "Position", position =>
+ part.Record.Position = decimal.Parse(position, CultureInfo.InvariantCulture)
+ );
- var commentDate = context.Attribute(part.PartDefinition.Name, "CommentDateUtc");
- if (commentDate != null) {
- part.Record.CommentDateUtc = XmlConvert.ToDateTime(commentDate, XmlDateTimeSerializationMode.Utc);
- }
+ context.ImportAttribute(part.PartDefinition.Name, "Status", status =>
+ part.Record.Status = (CommentStatus)Enum.Parse(typeof(CommentStatus), status)
+ );
- var text = context.Attribute(part.PartDefinition.Name, "CommentText");
- if (text != null) {
- part.Record.CommentText = text;
- }
+ context.ImportAttribute(part.PartDefinition.Name, "CommentDateUtc", commentDate =>
+ part.Record.CommentDateUtc = XmlConvert.ToDateTime(commentDate, XmlDateTimeSerializationMode.Utc)
+ );
- var commentedOn = context.Attribute(part.PartDefinition.Name, "CommentedOn");
- if (commentedOn != null) {
+ context.ImportAttribute(part.PartDefinition.Name, "CommentText", text =>
+ part.Record.CommentText = text
+ );
+
+ context.ImportAttribute(part.PartDefinition.Name, "CommentedOn", commentedOn => {
var contentItem = context.GetItemFromSession(commentedOn);
if (contentItem != null) {
part.Record.CommentedOn = contentItem.Id;
}
contentItem.As().Record.CommentPartRecords.Add(part.Record);
- }
+ });
- var repliedOn = context.Attribute(part.PartDefinition.Name, "RepliedOn");
- if (repliedOn != null) {
+ context.ImportAttribute(part.PartDefinition.Name, "RepliedOn", repliedOn => {
var contentItem = context.GetItemFromSession(repliedOn);
if (contentItem != null) {
part.Record.RepliedOn = contentItem.Id;
}
- }
+ });
- var commentedOnContainer = context.Attribute(part.PartDefinition.Name, "CommentedOnContainer");
- if (commentedOnContainer != null) {
+ context.ImportAttribute(part.PartDefinition.Name, "CommentedOnContainer", commentedOnContainer => {
var container = context.GetItemFromSession(commentedOnContainer);
if (container != null) {
part.Record.CommentedOnContainer = container.Id;
}
- }
+ });
}
protected override void Exporting(CommentPart part, ContentManagement.Handlers.ExportContentContext context) {
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs
index 97966f3f9..d7175898a 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs
@@ -111,20 +111,22 @@ namespace Orchard.Comments.Drivers {
}
protected override void Importing(CommentsPart part, ContentManagement.Handlers.ImportContentContext context) {
- var commentsShown = context.Attribute(part.PartDefinition.Name, "CommentsShown");
- if (commentsShown != null) {
- part.CommentsShown = Convert.ToBoolean(commentsShown);
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
}
- var commentsActive = context.Attribute(part.PartDefinition.Name, "CommentsActive");
- if (commentsActive != null) {
- part.CommentsActive = Convert.ToBoolean(commentsActive);
- }
+ context.ImportAttribute(part.PartDefinition.Name, "CommentsShown", commentsShown =>
+ part.CommentsShown = Convert.ToBoolean(commentsShown)
+ );
- var threadedComments = context.Attribute(part.PartDefinition.Name, "ThreadedComments");
- if (threadedComments != null) {
- part.ThreadedComments = Convert.ToBoolean(threadedComments);
- }
+ context.ImportAttribute(part.PartDefinition.Name, "CommentsActive", commentsActive =>
+ part.CommentsActive = Convert.ToBoolean(commentsActive)
+ );
+
+ context.ImportAttribute(part.PartDefinition.Name, "ThreadedComments", threadedComments =>
+ part.ThreadedComments = Convert.ToBoolean(threadedComments)
+ );
}
protected override void Exporting(CommentsPart part, ContentManagement.Handlers.ExportContentContext context) {
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Module.txt b/src/Orchard.Web/Modules/Orchard.Comments/Module.txt
index db08b140b..d474d622a 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: The comments system implemented by this module can be applied to arbitrary Orchard content types, such as blogs and pages. It includes comment validation and spam protection through the Akismet service.
Features:
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Comments/Properties/AssemblyInfo.cs
index decf91004..d7cd0582f 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs b/src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs
index 816f2720a..18d288fa1 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs
@@ -118,7 +118,8 @@ namespace Orchard.Comments.Services {
}
public void DeleteComment(int commentId) {
- _orchardServices.ContentManager.Remove(_orchardServices.ContentManager.Get(commentId).ContentItem);
+ // Get latest because the comment may be unpublished if the anti-spam module has caught it
+ _orchardServices.ContentManager.Remove(_orchardServices.ContentManager.Get(commentId, VersionOptions.Latest).ContentItem);
}
public bool CommentsDisabledForCommentedContent(int id) {
diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
index 444d72ac3..22e6f9998 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
@@ -162,6 +162,11 @@ namespace Orchard.ContentPermissions.Drivers {
}
protected override void Importing(ContentPermissionsPart part, ImportContentContext context) {
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
+ }
+
context.ImportAttribute(part.PartDefinition.Name, "Enabled", s => part.Enabled = XmlConvert.ToBoolean(s));
context.ImportAttribute(part.PartDefinition.Name, "ViewContent", s => part.ViewContent = s);
context.ImportAttribute(part.PartDefinition.Name, "EditContent", s => part.EditContent = s);
diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Module.txt b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Module.txt
index 7d895333c..ae22aa617 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Module.txt
@@ -2,7 +2,7 @@ Name: Orchard.ContentPermissions
AntiForgery: enabled
Author: Chris Pyle, Sbastien Ros
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: Allows item-level front end view permissions.
Features:
diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Properties/AssemblyInfo.cs
index 41952f985..9d53413a9 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentMenuItemPartDriver.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentMenuItemPartDriver.cs
index 4a6808484..ee75f144a 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentMenuItemPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentMenuItemPartDriver.cs
@@ -60,14 +60,18 @@ namespace Orchard.ContentPicker.Drivers {
}
protected override void Importing(ContentMenuItemPart part, ImportContentContext context) {
- var contentItemId = context.Attribute(part.PartDefinition.Name, "ContentItem");
- if (contentItemId != null) {
- var contentItem = context.GetItemFromSession(contentItemId);
- part.Content = contentItem;
- }
- else {
- part.Content = null;
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
}
+
+ context.ImportAttribute(part.PartDefinition.Name, "ContentItem",
+ contentItemId => {
+ var contentItem = context.GetItemFromSession(contentItemId);
+ part.Content = contentItem;
+ }, () =>
+ part.Content = null
+ );
}
protected override void Exporting(ContentMenuItemPart part, ExportContentContext context) {
diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs
index b08c95247..8b7c15194 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs
@@ -17,7 +17,7 @@ namespace Orchard.ContentPicker.Fields {
public IEnumerable ContentItems {
get {
- return _contentItems.Value;
+ return _contentItems.Value ?? Enumerable.Empty();
}
}
diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt b/src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
index 1feba3586..42a678254 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
@@ -2,7 +2,7 @@ Name: Orchard.ContentPicker
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardcontentpicker.codeplex.com
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: UI for selecting Content Items.
Features:
diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/Properties/AssemblyInfo.cs
index ca5eacf22..c9a2beb06 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt b/src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt
index c1db7247b..c7fb423a5 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: ContentTypes modules enables the creation and alteration of content types not based on code.
Dependencies: Contents
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Properties/AssemblyInfo.cs
index 904c28a48..06128c3bf 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/StereotypeService.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/StereotypeService.cs
index c00221328..4b4e8471a 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/StereotypeService.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/StereotypeService.cs
@@ -22,7 +22,7 @@ namespace Orchard.ContentTypes.Services {
}
public IEnumerable GetStereotypes() {
- return _cacheManager.Get("ContentType.Stereotypes", context => {
+ return _cacheManager.Get("ContentType.Stereotypes", true, context => {
// TODO: Implement a signal in ContentDefinitionManager that gets raised whenever a type definition is updated.
// For now, we'll just cache the stereotypes for 1 minute.
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml
index 4cd178cc0..e9b798834 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml
@@ -43,7 +43,7 @@
}
diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Drivers/CustomFormPartDriver.cs b/src/Orchard.Web/Modules/Orchard.CustomForms/Drivers/CustomFormPartDriver.cs
index ee942bd46..109675fb7 100644
--- a/src/Orchard.Web/Modules/Orchard.CustomForms/Drivers/CustomFormPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Drivers/CustomFormPartDriver.cs
@@ -59,21 +59,20 @@ namespace Orchard.CustomForms.Drivers {
}
protected override void Importing(CustomFormPart part, ImportContentContext context) {
- IfNotNull(context.Attribute(part.PartDefinition.Name, "ContentType"), x => part.Record.ContentType = x);
- IfNotNull(context.Attribute(part.PartDefinition.Name, "SaveContentItem"), x => part.Record.SaveContentItem = Boolean.Parse(x));
- IfNotNull(context.Attribute(part.PartDefinition.Name, "CustomMessage"), x => part.Record.CustomMessage = Boolean.Parse(x));
- IfNotNull(context.Attribute(part.PartDefinition.Name, "Message"), x => part.Record.Message = x);
- IfNotNull(context.Attribute(part.PartDefinition.Name, "Redirect"), x => part.Record.Redirect = Boolean.Parse(x));
- IfNotNull(context.Attribute(part.PartDefinition.Name, "RedirectUrl"), x => part.Record.RedirectUrl = x);
- IfNotNull(context.Attribute(part.PartDefinition.Name, "SubmitButtonText"), x => part.Record.SubmitButtonText = x);
- }
-
- private static void IfNotNull(T value, Action then) {
- if (value != null) {
- then(value);
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
}
- }
+ context.ImportAttribute(part.PartDefinition.Name, "ContentType", x => part.Record.ContentType = x);
+ context.ImportAttribute(part.PartDefinition.Name, "SaveContentItem", x => part.Record.SaveContentItem = Boolean.Parse(x));
+ context.ImportAttribute(part.PartDefinition.Name, "CustomMessage", x => part.Record.CustomMessage = Boolean.Parse(x));
+ context.ImportAttribute(part.PartDefinition.Name, "Message", x => part.Record.Message = x);
+ context.ImportAttribute(part.PartDefinition.Name, "Redirect", x => part.Record.Redirect = Boolean.Parse(x));
+ context.ImportAttribute(part.PartDefinition.Name, "RedirectUrl", x => part.Record.RedirectUrl = x);
+ context.ImportAttribute(part.PartDefinition.Name, "SubmitButtonText", x => part.Record.SubmitButtonText = x);
+ }
+
protected override void Exporting(CustomFormPart part, ExportContentContext context) {
context.Element(part.PartDefinition.Name).SetAttributeValue("ContentType", part.Record.ContentType);
context.Element(part.PartDefinition.Name).SetAttributeValue("SaveContentItem", part.Record.SaveContentItem);
diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt b/src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
index 3fff3687d..af58241ea 100644
--- a/src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
@@ -2,7 +2,7 @@ Name: Custom Forms
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardcustomforms.codeplex.com
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
LifecycleStatus: Deprecated
Description: Create custom forms like contact forms or content contributions.
diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.CustomForms/Properties/AssemblyInfo.cs
index 32c55e753..5095e0451 100644
--- a/src/Orchard.Web/Modules/Orchard.CustomForms/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj b/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj
index ec35906e7..2914e7645 100644
--- a/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj
@@ -72,7 +72,7 @@
-
+
diff --git a/src/Orchard.Web/Modules/Orchard.Dashboards/Services/DefaultDashboardSelector.cs b/src/Orchard.Web/Modules/Orchard.Dashboards/Services/DefaultDashboardSelector.cs
index 55b7ca415..f303de0ed 100644
--- a/src/Orchard.Web/Modules/Orchard.Dashboards/Services/DefaultDashboardSelector.cs
+++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Services/DefaultDashboardSelector.cs
@@ -6,7 +6,7 @@ using Orchard.Layouts.Models;
namespace Orchard.Dashboards.Services {
public class DefaultDashboardSelector : IDashboardSelector {
private readonly IOrchardServices _services;
- public const string DefaultLayout = "{\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Canvas\",\"data\":\"\",\"exportableData\":\"\",\"index\":0,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Grid\",\"data\":\"\",\"exportableData\":\"\",\"index\":0,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Row\",\"data\":\"\",\"exportableData\":\"\",\"index\":0,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Column\",\"data\":\"Width=2&Offset=0&Collapsible=null\",\"exportableData\":\"\",\"index\":0,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Html\",\"data\":\"TypeName=Orchard.Layouts.Elements.Html&Text=%3ch2%3e%3ci+class%3d%22fa+fa-cog%22%3e%3c%2fi%3e+Get+up+and+running%3c%2fh2%3e%0d%0a%3cp%3eStart+by+exploring+the+menu+on+the+left+and+familiarize+yourself+with+Orchard.+As+for+the+basics%2c+we+suggest+%3ca+href%3d%22%23%7bUrl.Action%3aIndex%2cAdmin%2carea%3dOrchard.Themes%7d%22%3echanging+the+theme%3c%2fa%3e%2c+%3ca+href%3d%22%23%7bUrl.Action%3aCreate%2cAdmin%2carea%3dContents%2cid%3dPage%7d%22%3eadding+some+pages%3c%2fa%3e%2c+%3ca+href%3d%22%23%7bUrl.Action%3aCreate%2cBlogAdmin%2carea%3dOrchard.Blogs%7d%22%3esetup+up+a+blog%3c%2fa%3e%2c+and+%3ca+href%3d%22%23%7bUrl.Action%3aIndex%2cAdmin%2carea%3dSettings%2cgroupInfoId%3dIndex%7d%22%3econfiguring+basic+settings%3c%2fa%3e.%3c%2fp%3e&Content=%3ch2%3e%3ci+class%3d%22fa+fa-cog%22%3e%3c%2fi%3e+Get+up+and+running%3c%2fh2%3e%0d%0a%3cp%3eStart+by+exploring+the+menu+on+the+left+and+familiarize+yourself+with+Orchard.+As+for+the+basics%2c+we+suggest+%3ca+href%3d%22%23%7bUrl.Action%3aIndex%2cAdmin%2carea%3dOrchard.Themes%7d%22%3echanging+the+theme%3c%2fa%3e%2c+%3ca+href%3d%22%23%7bUrl.Action%3aCreate%2cAdmin%2carea%3dContents%2cid%3dPage%7d%22%3eadding+some+pages%3c%2fa%3e%2c+%3ca+href%3d%22%23%7bUrl.Action%3aCreate%2cBlogAdmin%2carea%3dOrchard.Blogs%7d%22%3esetup+up+a+blog%3c%2fa%3e%2c+and+%3ca+href%3d%22%23%7bUrl.Action%3aIndex%2cAdmin%2carea%3dSettings%2cgroupInfoId%3dIndex%7d%22%3econfiguring+basic+settings%3c%2fa%3e.%3c%2fp%3e\",\"exportableData\":\"\",\"index\":0,\"elements\":[],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"},{\"typeName\":\"Orchard.Layouts.Elements.Column\",\"data\":\"Width=2&Offset=0&Collapsible=null\",\"exportableData\":\"\",\"index\":1,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Html\",\"data\":\"TypeName=Orchard.Layouts.Elements.Html&Text=%3ch2%3e%3ci+class%3d%22fa+fa-th-large%22%3e%3c%2fi%3eGet+more+goodies%3c%2fh2%3e%0d%0a%3cp%3eChange+the+way+your+site+works+and+looks+with+%3ca+href%3d%22%23%7bUrl.Action%3aThemes%2cGallery%2carea%3dOrchard.Packaging%7d%22%3ethemes%3c%2fa%3e+and+%3ca+href%3d%22%23%7bUrl.Action%3aModules%2cGallery%2carea%3dOrchard.Packaging%7d%22%3emodules%3c%2fa%3e.+There%26rsquo%3bs+plenty+to+choose+from+in+the+%3ca+href%3d%22http%3a%2f%2fgallery.orchardproject.net%22%3eOrchard+Gallery%3c%2fa%3e.+We%26rsquo%3bre+always+adding+things%2c+so+be+sure+to+check+back+often+to+see+what%26rsquo%3bs+new.%3c%2fp%3e&Content=%3ch2%3e%3ci+class%3d%22fa+fa-th-large%22%3e%3c%2fi%3eGet+more+goodies%3c%2fh2%3e%0d%0a%3cp%3eChange+the+way+your+site+works+and+looks+with+%3ca+href%3d%22%23%7bUrl.Action%3aThemes%2cGallery%2carea%3dOrchard.Packaging%7d%22%3ethemes%3c%2fa%3e+and+%3ca+href%3d%22%23%7bUrl.Action%3aModules%2cGallery%2carea%3dOrchard.Packaging%7d%22%3emodules%3c%2fa%3e.+There%26rsquo%3bs+plenty+to+choose+from+in+the+%3ca+href%3d%22http%3a%2f%2fgallery.orchardproject.net%22%3eOrchard+Gallery%3c%2fa%3e.+We%26rsquo%3bre+always+adding+things%2c+so+be+sure+to+check+back+often+to+see+what%26rsquo%3bs+new.%3c%2fp%3e\",\"exportableData\":\"\",\"index\":0,\"elements\":[],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"},{\"typeName\":\"Orchard.Layouts.Elements.Column\",\"data\":\"Width=2&Offset=0&Collapsible=null\",\"exportableData\":\"\",\"index\":2,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Html\",\"data\":\"TypeName=Orchard.Layouts.Elements.Html&Text=%3ch2%3e%3ci+class%3d%22fa+fa-book%22%3e%3c%2fi%3eRead+the+Docs%3c%2fh2%3e%0d%0a%3cp%3eAre+you+ready+to+go+deeper+and+become+an+Orchard+expert%3f+Take+a+look+at+the+%3ca+href%3d%22http%3a%2f%2fdocs.orchardproject.net%22%3eOrchard+Documentation%3c%2fa%3e+to+learn+about+how+everything+connects+together+and+what+makes+Orchard+tick.%3c%2fp%3e&Content=%3ch2%3e%3ci+class%3d%22fa+fa-book%22%3e%3c%2fi%3eRead+the+Docs%3c%2fh2%3e%0d%0a%3cp%3eAre+you+ready+to+go+deeper+and+become+an+Orchard+expert%3f+Take+a+look+at+the+%3ca+href%3d%22http%3a%2f%2fdocs.orchardproject.net%22%3eOrchard+Documentation%3c%2fa%3e+to+learn+about+how+everything+connects+together+and+what+makes+Orchard+tick.%3c%2fp%3e\",\"exportableData\":\"\",\"index\":0,\"elements\":[],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"},{\"typeName\":\"Orchard.Layouts.Elements.Column\",\"data\":\"Width=2&Offset=0&Collapsible=null\",\"exportableData\":\"\",\"index\":3,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Html\",\"data\":\"TypeName=Orchard.Layouts.Elements.Html&Text=%3ch2%3e%3ci+class%3d%22fa+fa-users%22%3e%3c%2fi%3eMake+friends%3c%2fh2%3e%0d%0a%3cp%3eFind+friends+that+share+your+interest+of+Orchard.+There+are+a+couple+ways+that+you+can%26nbsp%3b%3ca+href%3d%22http%3a%2f%2forchardproject.net%2fdiscussions%22%3ediscuss+and+get+connected%3c%2fa%3e+to+the+project+including+mailing+lists%2c+forums+and+IRC.%3c%2fp%3e&Content=%3ch2%3e%3ci+class%3d%22fa+fa-users%22%3e%3c%2fi%3eMake+friends%3c%2fh2%3e%0d%0a%3cp%3eFind+friends+that+share+your+interest+of+Orchard.+There+are+a+couple+ways+that+you+can%26nbsp%3b%3ca+href%3d%22http%3a%2f%2forchardproject.net%2fdiscussions%22%3ediscuss+and+get+connected%3c%2fa%3e+to+the+project+including+mailing+lists%2c+forums+and+IRC.%3c%2fp%3e\",\"exportableData\":\"\",\"index\":0,\"elements\":[],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"},{\"typeName\":\"Orchard.Layouts.Elements.Column\",\"data\":\"Width=2&Offset=0&Collapsible=null\",\"exportableData\":\"\",\"index\":4,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Html\",\"data\":\"TypeName=Orchard.Layouts.Elements.Html&Text=%3ch2%3e%3ci+class%3d%22fa+fa-pencil%22%3e%3c%2fi%3eContribute+back%3c%2fh2%3e%0d%0a%3cp%3eHelp+grow+Orchard.+We+encourage+contributions+of+all+sorts%2c+including+code+submissions%2c+documentation%2c+translations%2c+feature+recommendations%2c+and+more.Here+are+some+ways+to+%3ca+href%3d%22http%3a%2f%2forchardproject.net%2fcontribution%22%3egive+back+to+the+project%3c%2fa%3e.%3c%2fp%3e&Content=%3ch2%3e%3ci+class%3d%22fa+fa-pencil%22%3e%3c%2fi%3eContribute+back%3c%2fh2%3e%0d%0a%3cp%3eHelp+grow+Orchard.+We+encourage+contributions+of+all+sorts%2c+including+code+submissions%2c+documentation%2c+translations%2c+feature+recommendations%2c+and+more.Here+are+some+ways+to+%3ca+href%3d%22http%3a%2f%2forchardproject.net%2fcontribution%22%3egive+back+to+the+project%3c%2fa%3e.%3c%2fp%3e\",\"exportableData\":\"\",\"index\":0,\"elements\":[],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"},{\"typeName\":\"Orchard.Layouts.Elements.Column\",\"data\":\"Width=2&Offset=0&Collapsible=null\",\"exportableData\":\"\",\"index\":5,\"elements\":[],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"},{\"typeName\":\"Orchard.Layouts.Elements.Row\",\"data\":\"\",\"exportableData\":\"\",\"index\":1,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Column\",\"data\":\"Width=10&Offset=0&Collapsible=null\",\"exportableData\":\"\",\"index\":0,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Html\",\"data\":\"TypeName=Orchard.Layouts.Elements.Html&Text=%3ch2%3e%3ci+class%3d%22fa+fa-clock-o%22%3e%3c%2fi%3eStay+up+to+date%3c%2fh2%3e%0d%0a%3cp%3e%3ciframe+width%3d%22100%25%22+height%3d%22100%25%22+scrolling%3d%22no%22+frameborder%3d%220%22+src%3d%22http%3a%2f%2fwww.orchardproject.net%2fadvisory%22+id%3d%22advisory%22%3e%0d%0a+%26lt%3bp%26gt%3bYour+browser+does+not+support+iframes.+You+can%27t+see+advisory+messages.%26lt%3b%2fp%26gt%3b%3c%2fiframe%3e%3c%2fp%3e&Content=%3ch2%3e%3ci+class%3d%22fa+fa-clock-o%22%3e%3c%2fi%3eStay+up+to+date%3c%2fh2%3e%0d%0a%3cp%3e%3ciframe+width%3d%22100%25%22+height%3d%22100%25%22+scrolling%3d%22no%22+frameborder%3d%220%22+src%3d%22http%3a%2f%2fwww.orchardproject.net%2fadvisory%22+id%3d%22advisory%22%3e%0d%0a+%26lt%3bp%26gt%3bYour+browser+does+not+support+iframes.+You+can%27t+see+advisory+messages.%26lt%3b%2fp%26gt%3b%3c%2fiframe%3e%3c%2fp%3e\",\"exportableData\":\"\",\"index\":0,\"elements\":[],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"},{\"typeName\":\"Orchard.Layouts.Elements.Column\",\"data\":\"Width=2&Offset=0&Collapsible=null\",\"exportableData\":\"\",\"index\":1,\"elements\":[],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}]}";
+ public const string DefaultLayout = "{\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Canvas\",\"data\":\"\",\"exportableData\":\"\",\"index\":0,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Grid\",\"data\":\"\",\"exportableData\":\"\",\"index\":0,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Row\",\"data\":\"\",\"exportableData\":\"\",\"index\":0,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Column\",\"data\":\"Width=2&Offset=0&Collapsible=null\",\"exportableData\":\"\",\"index\":0,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Html\",\"data\":\"TypeName=Orchard.Layouts.Elements.Html&Text=%3ch2%3e%3ci+class%3d%22fa+fa-cog%22%3e%3c%2fi%3e+Get+up+and+running%3c%2fh2%3e%0d%0a%3cp%3eStart+by+exploring+the+menu+on+the+left+and+familiarize+yourself+with+Orchard.+As+for+the+basics%2c+we+suggest+%3ca+href%3d%22%23%7bUrl.Action%3aIndex%2cAdmin%2carea%3dOrchard.Themes%7d%22%3echanging+the+theme%3c%2fa%3e%2c+%3ca+href%3d%22%23%7bUrl.Action%3aCreate%2cAdmin%2carea%3dContents%2cid%3dPage%7d%22%3eadding+some+pages%3c%2fa%3e%2c+%3ca+href%3d%22%23%7bUrl.Action%3aCreate%2cBlogAdmin%2carea%3dOrchard.Blogs%7d%22%3esetup+up+a+blog%3c%2fa%3e%2c+and+%3ca+href%3d%22%23%7bUrl.Action%3aIndex%2cAdmin%2carea%3dSettings%2cgroupInfoId%3dIndex%7d%22%3econfiguring+basic+settings%3c%2fa%3e.%3c%2fp%3e&Content=%3ch2%3e%3ci+class%3d%22fa+fa-cog%22%3e%3c%2fi%3e+Get+up+and+running%3c%2fh2%3e%0d%0a%3cp%3eStart+by+exploring+the+menu+on+the+left+and+familiarize+yourself+with+Orchard.+As+for+the+basics%2c+we+suggest+%3ca+href%3d%22%23%7bUrl.Action%3aIndex%2cAdmin%2carea%3dOrchard.Themes%7d%22%3echanging+the+theme%3c%2fa%3e%2c+%3ca+href%3d%22%23%7bUrl.Action%3aCreate%2cAdmin%2carea%3dContents%2cid%3dPage%7d%22%3eadding+some+pages%3c%2fa%3e%2c+%3ca+href%3d%22%23%7bUrl.Action%3aCreate%2cBlogAdmin%2carea%3dOrchard.Blogs%7d%22%3esetup+up+a+blog%3c%2fa%3e%2c+and+%3ca+href%3d%22%23%7bUrl.Action%3aIndex%2cAdmin%2carea%3dSettings%2cgroupInfoId%3dIndex%7d%22%3econfiguring+basic+settings%3c%2fa%3e.%3c%2fp%3e\",\"exportableData\":\"\",\"index\":0,\"elements\":[],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"},{\"typeName\":\"Orchard.Layouts.Elements.Column\",\"data\":\"Width=2&Offset=0&Collapsible=null\",\"exportableData\":\"\",\"index\":1,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Html\",\"data\":\"TypeName=Orchard.Layouts.Elements.Html&Text=%3ch2%3e%3ci+class%3d%22fa+fa-th-large%22%3e%3c%2fi%3eGet+more+goodies%3c%2fh2%3e%0d%0a%3cp%3eChange+the+way+your+site+works+and+looks+with+%3ca+href%3d%22%23%7bUrl.Action%3aThemes%2cGallery%2carea%3dOrchard.Packaging%7d%22%3ethemes%3c%2fa%3e+and+%3ca+href%3d%22%23%7bUrl.Action%3aModules%2cGallery%2carea%3dOrchard.Packaging%7d%22%3emodules%3c%2fa%3e.+There%26rsquo%3bs+plenty+to+choose+from+in+the+%3ca+href%3d%22http%3a%2f%2fgallery.orchardproject.net%22%3eOrchard+Gallery%3c%2fa%3e.+We%26rsquo%3bre+always+adding+things%2c+so+be+sure+to+check+back+often+to+see+what%26rsquo%3bs+new.%3c%2fp%3e&Content=%3ch2%3e%3ci+class%3d%22fa+fa-th-large%22%3e%3c%2fi%3eGet+more+goodies%3c%2fh2%3e%0d%0a%3cp%3eChange+the+way+your+site+works+and+looks+with+%3ca+href%3d%22%23%7bUrl.Action%3aThemes%2cGallery%2carea%3dOrchard.Packaging%7d%22%3ethemes%3c%2fa%3e+and+%3ca+href%3d%22%23%7bUrl.Action%3aModules%2cGallery%2carea%3dOrchard.Packaging%7d%22%3emodules%3c%2fa%3e.+There%26rsquo%3bs+plenty+to+choose+from+in+the+%3ca+href%3d%22http%3a%2f%2fgallery.orchardproject.net%22%3eOrchard+Gallery%3c%2fa%3e.+We%26rsquo%3bre+always+adding+things%2c+so+be+sure+to+check+back+often+to+see+what%26rsquo%3bs+new.%3c%2fp%3e\",\"exportableData\":\"\",\"index\":0,\"elements\":[],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"},{\"typeName\":\"Orchard.Layouts.Elements.Column\",\"data\":\"Width=2&Offset=0&Collapsible=null\",\"exportableData\":\"\",\"index\":2,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Html\",\"data\":\"TypeName=Orchard.Layouts.Elements.Html&Text=%3ch2%3e%3ci+class%3d%22fa+fa-book%22%3e%3c%2fi%3eRead+the+Docs%3c%2fh2%3e%0d%0a%3cp%3eAre+you+ready+to+go+deeper+and+become+an+Orchard+expert%3f+Take+a+look+at+the+%3ca+href%3d%22http%3a%2f%2fdocs.orchardproject.net%22%3eOrchard+Documentation%3c%2fa%3e+to+learn+about+how+everything+connects+together+and+what+makes+Orchard+tick.%3c%2fp%3e&Content=%3ch2%3e%3ci+class%3d%22fa+fa-book%22%3e%3c%2fi%3eRead+the+Docs%3c%2fh2%3e%0d%0a%3cp%3eAre+you+ready+to+go+deeper+and+become+an+Orchard+expert%3f+Take+a+look+at+the+%3ca+href%3d%22http%3a%2f%2fdocs.orchardproject.net%22%3eOrchard+Documentation%3c%2fa%3e+to+learn+about+how+everything+connects+together+and+what+makes+Orchard+tick.%3c%2fp%3e\",\"exportableData\":\"\",\"index\":0,\"elements\":[],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"},{\"typeName\":\"Orchard.Layouts.Elements.Column\",\"data\":\"Width=2&Offset=0&Collapsible=null\",\"exportableData\":\"\",\"index\":3,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Html\",\"data\":\"TypeName=Orchard.Layouts.Elements.Html&Text=%3ch2%3e%3ci+class%3d%22fa+fa-users%22%3e%3c%2fi%3eMake+friends%3c%2fh2%3e%0d%0a%3cp%3eFind+friends+that+share+your+interest+of+Orchard.+There+are+a+couple+ways+that+you+can%26nbsp%3b%3ca+href%3d%22http%3a%2f%2forchardproject.net%2fdiscussions%22%3ediscuss+and+get+connected%3c%2fa%3e+to+the+project+including+mailing+lists%2c+forums+and+IRC.%3c%2fp%3e&Content=%3ch2%3e%3ci+class%3d%22fa+fa-users%22%3e%3c%2fi%3eMake+friends%3c%2fh2%3e%0d%0a%3cp%3eFind+friends+that+share+your+interest+of+Orchard.+There+are+a+couple+ways+that+you+can%26nbsp%3b%3ca+href%3d%22http%3a%2f%2forchardproject.net%2fdiscussions%22%3ediscuss+and+get+connected%3c%2fa%3e+to+the+project+including+mailing+lists%2c+forums+and+IRC.%3c%2fp%3e\",\"exportableData\":\"\",\"index\":0,\"elements\":[],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"},{\"typeName\":\"Orchard.Layouts.Elements.Column\",\"data\":\"Width=2&Offset=0&Collapsible=null\",\"exportableData\":\"\",\"index\":4,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Html\",\"data\":\"TypeName=Orchard.Layouts.Elements.Html&Text=%3ch2%3e%3ci+class%3d%22fa+fa-pencil%22%3e%3c%2fi%3eContribute+back%3c%2fh2%3e%0d%0a%3cp%3eHelp+grow+Orchard.+We+encourage+contributions+of+all+sorts%2c+including+code+submissions%2c+documentation%2c+translations%2c+feature+recommendations%2c+and+more.Here+are+some+ways+to+%3ca+href%3d%22http%3a%2f%2forchardproject.net%2fcontribution%22%3egive+back+to+the+project%3c%2fa%3e.%3c%2fp%3e&Content=%3ch2%3e%3ci+class%3d%22fa+fa-pencil%22%3e%3c%2fi%3eContribute+back%3c%2fh2%3e%0d%0a%3cp%3eHelp+grow+Orchard.+We+encourage+contributions+of+all+sorts%2c+including+code+submissions%2c+documentation%2c+translations%2c+feature+recommendations%2c+and+more.Here+are+some+ways+to+%3ca+href%3d%22http%3a%2f%2forchardproject.net%2fcontribution%22%3egive+back+to+the+project%3c%2fa%3e.%3c%2fp%3e\",\"exportableData\":\"\",\"index\":0,\"elements\":[],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"},{\"typeName\":\"Orchard.Layouts.Elements.Column\",\"data\":\"Width=2&Offset=0&Collapsible=null\",\"exportableData\":\"\",\"index\":5,\"elements\":[],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"},{\"typeName\":\"Orchard.Layouts.Elements.Row\",\"data\":\"\",\"exportableData\":\"\",\"index\":1,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Column\",\"data\":\"Width=10&Offset=0&Collapsible=null\",\"exportableData\":\"\",\"index\":0,\"elements\":[{\"typeName\":\"Orchard.Layouts.Elements.Html\",\"data\":\"TypeName=Orchard.Layouts.Elements.Html&Text=%3ch2%3e%3ci+class%3d%22fa+fa-clock-o%22%3e%3c%2fi%3eStay+up+to+date%3c%2fh2%3e%0d%0a%3cp%3e%3ciframe+width%3d%22100%25%22+height%3d%22100%25%22+scrolling%3d%22no%22+frameborder%3d%220%22+src%3d%22http%3a%2f%2fwww.orchardproject.net%2fadvisory%22+id%3d%22advisory%22%3e%0d%0a+%26lt%3bp%26gt%3bYour+browser+does+not+support+iframes.+You+can%27t+see+advisory+messages.%26lt%3b%2fp%26gt%3b%3c%2fiframe%3e%3c%2fp%3e&Content=%3ch2%3e%3ci+class%3d%22fa+fa-clock-o%22%3e%3c%2fi%3eStay+up+to+date%3c%2fh2%3e%0d%0a%3cp%3e%3ciframe+width%3d%22100%25%22+height%3d%22100%25%22+scrolling%3d%22no%22+frameborder%3d%220%22+src%3d%22http%3a%2f%2fwww.orchardproject.net%2fadvisory%22+id%3d%22advisory%22%3e%0d%0a+%26lt%3bp%26gt%3bYour+browser+does+not+support+iframes.+You+can%27t+see+advisory+messages.%26lt%3b%2fp%26gt%3b%3c%2fiframe%3e%3c%2fp%3e\",\"exportableData\":\"\",\"index\":0,\"elements\":[],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"},{\"typeName\":\"Orchard.Layouts.Elements.Column\",\"data\":\"Width=2&Offset=0&Collapsible=null\",\"exportableData\":\"\",\"index\":1,\"elements\":[],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}],\"isTemplated\":false,\"htmlId\":\"\",\"htmlClass\":\"\",\"htmlStyle\":\"\",\"rule\":\"\"}]}";
public DefaultDashboardSelector(IOrchardServices services) {
_services = services;
diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt b/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt
index 9cf6763e0..6cd2a40b2 100644
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: Contains designer tools to ease the Themes development process
FeatureName: Shape Tracing
diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.DesignerTools/Properties/AssemblyInfo.cs
index e7d9be4bd..c725f836f 100644
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs b/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs
index cec0f009a..ae80ad879 100644
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs
@@ -2,6 +2,7 @@
using System.Linq;
using System.Text;
using System.Web.Routing;
+using System.Xml.Linq;
using Orchard.DisplayManagement.Descriptors;
using Orchard.DisplayManagement.Implementation;
using Orchard.DisplayManagement.Shapes;
@@ -11,15 +12,16 @@ using Orchard.Security;
using Orchard.Themes;
using Orchard.UI;
using Orchard.UI.Admin;
+using System.Web;
namespace Orchard.DesignerTools.Services {
[OrchardFeature("Orchard.DesignerTools")]
public class ShapeTracingFactory : IShapeFactoryEvents, IShapeDisplayEvents {
+ private readonly WorkContext _workContext;
private readonly IShapeTableManager _shapeTableManager;
private readonly IThemeManager _themeManager;
private readonly IWebSiteFolder _webSiteFolder;
private readonly IAuthorizer _authorizer;
- private readonly IWorkContextAccessor _workContextAccessor;
private bool _processing;
private int _shapeId;
@@ -31,7 +33,7 @@ namespace Orchard.DesignerTools.Services {
IWebSiteFolder webSiteFolder,
IAuthorizer authorizer
) {
- _workContextAccessor = workContextAccessor;
+ _workContext = workContextAccessor.GetContext();
_shapeTableManager = shapeTableManager;
_themeManager = themeManager;
_webSiteFolder = webSiteFolder;
@@ -39,17 +41,13 @@ namespace Orchard.DesignerTools.Services {
}
private bool IsActivable() {
- var workContext = _workContextAccessor.GetContext();
-
// activate on front-end only
- if (AdminFilter.IsApplied(new RequestContext(workContext.HttpContext, new RouteData())))
+ if (AdminFilter.IsApplied(new RequestContext(_workContext.HttpContext, new RouteData())))
return false;
// if not logged as a site owner, still activate if it's a local request (development machine)
- if (!_authorizer.Authorize(StandardPermissions.SiteOwner)) {
-
- return workContext.HttpContext.Request.IsLocal;
- }
+ if (!_authorizer.Authorize(StandardPermissions.SiteOwner))
+ return _workContext.HttpContext.Request.IsLocal;
return true;
}
@@ -78,8 +76,7 @@ namespace Orchard.DesignerTools.Services {
&& context.ShapeType != "DateTimeRelative") {
var shapeMetadata = (ShapeMetadata)context.Shape.Metadata;
- var workContext = _workContextAccessor.GetContext();
- var currentTheme = workContext.CurrentTheme;
+ var currentTheme = _workContext.CurrentTheme;
var shapeTable = _shapeTableManager.GetShapeTable(currentTheme.Id);
if (!shapeTable.Descriptors.ContainsKey(shapeMetadata.Type)) {
@@ -102,8 +99,7 @@ namespace Orchard.DesignerTools.Services {
var shape = context.Shape;
var shapeMetadata = (ShapeMetadata) context.Shape.Metadata;
- var workContext = _workContextAccessor.GetContext();
- var currentTheme = _themeManager.GetRequestTheme(workContext.HttpContext.Request.RequestContext);
+ var currentTheme = _themeManager.GetRequestTheme(_workContext.HttpContext.Request.RequestContext);
var shapeTable = _shapeTableManager.GetShapeTable(currentTheme.Id);
if (!shapeMetadata.Wrappers.Contains("ShapeTracingWrapper")) {
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/QueryElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/QueryElementDriver.cs
index f5a492657..0b284e293 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/QueryElementDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/QueryElementDriver.cs
@@ -136,7 +136,7 @@ namespace Orchard.DynamicForms.Drivers {
var runtimeValues = GetRuntimeValues(element);
if (!String.IsNullOrWhiteSpace(optionLabel)) {
- yield return new SelectListItem { Text = displayType != "Design" ? _tokenizer.Replace(optionLabel, tokenData) : optionLabel };
+ yield return new SelectListItem { Text = displayType != "Design" ? _tokenizer.Replace(optionLabel, tokenData) : optionLabel, Value = string.Empty };
}
if (queryId == null)
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TaxonomyElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TaxonomyElementDriver.cs
index c398f5726..806e72c0a 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TaxonomyElementDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TaxonomyElementDriver.cs
@@ -138,7 +138,7 @@ namespace Orchard.DynamicForms.Drivers {
var runtimeValues = GetRuntimeValues(element);
if (!String.IsNullOrWhiteSpace(optionLabel)) {
- yield return new SelectListItem { Text = displayType != "Design" ? _tokenizer.Replace(optionLabel, tokenData) : optionLabel };
+ yield return new SelectListItem { Text = displayType != "Design" ? _tokenizer.Replace(optionLabel, tokenData) : optionLabel, Value = string.Empty };
}
if (taxonomyId == null)
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Migrations.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Migrations.cs
index e65035a55..16acf01e1 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Migrations.cs
@@ -1,10 +1,15 @@
using System;
+using System.Linq;
+using System.Security.Cryptography;
using Orchard.ContentManagement.MetaData;
using Orchard.Core.Contents.Extensions;
+using Orchard.Data;
using Orchard.Data.Migration;
namespace Orchard.DynamicForms {
public class Migrations : DataMigrationImpl {
+ private readonly byte[] _oldLayoutHash = new byte[] { 0x91, 0x10, 0x3b, 0x97, 0xce, 0x1e, 0x1e, 0xc7, 0x7a, 0x41, 0xf7, 0x82, 0xe8, 0x58, 0x85, 0x91 };
+
private const string DefaultFormLayoutData =
@"{
""elements"": [
@@ -59,7 +64,52 @@ namespace Orchard.DynamicForms {
.WithSetting("LayoutTypePartSettings.DefaultLayoutData", DefaultFormLayoutData))
.WithSetting("Stereotype", "Widget")
.DisplayedAs("Form Widget"));
- return 1;
+ return 2;
+ }
+
+ public int UpdateFrom1() {
+ // if the default layout data was unchanged, fix it with the new default
+
+ var formLayoutPart = ContentDefinitionManager
+ .GetTypeDefinition("Form")
+ .Parts
+ .FirstOrDefault(x => x.PartDefinition.Name == "LayoutPart");
+
+ if (formLayoutPart != null &&
+ formLayoutPart.Settings["LayoutTypePartSettings.DefaultLayoutData"] != null) {
+ var layout = formLayoutPart.Settings["LayoutTypePartSettings.DefaultLayoutData"];
+
+ if(GetMD5(layout) == _oldLayoutHash) {
+ ContentDefinitionManager.AlterTypeDefinition("Form", type => type
+ .WithPart("LayoutPart", p => p
+ .WithSetting("LayoutTypePartSettings.DefaultLayoutData", DefaultFormLayoutData))
+ );
+ }
+ }
+
+ var formWidgetLayoutPart = ContentDefinitionManager
+ .GetTypeDefinition("FormWidget")
+ .Parts
+ .FirstOrDefault(x => x.PartDefinition.Name == "LayoutPart");
+
+ if (formWidgetLayoutPart != null &&
+ formWidgetLayoutPart.Settings["LayoutTypePartSettings.DefaultLayoutData"] != null) {
+ var layout = formWidgetLayoutPart.Settings["LayoutTypePartSettings.DefaultLayoutData"];
+
+ if (GetMD5(layout) == _oldLayoutHash) {
+ ContentDefinitionManager.AlterTypeDefinition("FormWidget", type => type
+ .WithPart("LayoutPart", p => p
+ .WithSetting("LayoutTypePartSettings.DefaultLayoutData", DefaultFormLayoutData))
+ );
+ }
+ }
+
+ return 2;
+ }
+
+ private byte[] GetMD5(string text) {
+ byte[] encodedText = System.Text.Encoding.UTF8.GetBytes(text);
+ return ((HashAlgorithm)CryptoConfig.CreateFromName("MD5")).ComputeHash(encodedText);
}
}
}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt b/src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt
index 50a66b14d..130adc262 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt
@@ -1,8 +1,8 @@
-Name: Custom Forms
+Name: Dynamic Forms
AntiForgery: enabled
Author: The Orchard Team
-Website: http://orchardcustomforms.codeplex.com
-Version: 1.9.1
+Website: http://www.orchardproject.net/
+Version: 1.9.2
OrchardVersion: 1.9
Description: Create custom forms like contact forms using layouts.
Features:
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Tokens/FormTokens.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Tokens/FormTokens.cs
index e26cb2626..68fbdb5c4 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Tokens/FormTokens.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Tokens/FormTokens.cs
@@ -7,7 +7,7 @@ namespace Orchard.DynamicForms.Tokens {
public void Describe(DescribeContext context) {
context.For("FormSubmission", T("Dynamic Form submission"), T("Dynamic Form Submission tokens for use in workflows handling the Dynamic Form Submitted event."))
- .Token("Field:*", T("Field:"), T("The posted field value to access."))
+ .Token("Field:*", T("Field:"), T("The posted field value to access."), "Text")
.Token("IsValid:*", T("IsValid:"), T("The posted field validation status."))
;
}
@@ -15,10 +15,20 @@ namespace Orchard.DynamicForms.Tokens {
public void Evaluate(EvaluateContext context) {
context.For("FormSubmission")
.Token(token => token.StartsWith("Field:", StringComparison.OrdinalIgnoreCase) ? token.Substring("Field:".Length) : null, GetFieldValue)
+ .Chain(FilterChainParam, "Text", GetFieldValue)
.Token(token => token.StartsWith("IsValid:", StringComparison.OrdinalIgnoreCase) ? token.Substring("IsValid:".Length) : null, GetFieldValidationStatus);
}
- private object GetFieldValue(string fieldName, FormSubmissionTokenContext context) {
+ private static Tuple FilterChainParam(string token) {
+ int tokenLength = "Field:".Length;
+ int chainIndex = token.IndexOf('.');
+ if (token.StartsWith("Field:", StringComparison.OrdinalIgnoreCase) && chainIndex > tokenLength)
+ return new Tuple(token.Substring(tokenLength, chainIndex - tokenLength), token.Substring(chainIndex + 1));
+ else
+ return null;
+ }
+
+ private string GetFieldValue(string fieldName, FormSubmissionTokenContext context) {
return context.PostedValues[fieldName];
}
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Module.txt b/src/Orchard.Web/Modules/Orchard.Email/Module.txt
index 58fedf6d9..d81676eca 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Email/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: The Email Messaging module adds Email sending functionalities.
Features:
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Email/Properties/AssemblyInfo.cs
index 56a441495..165086d69 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Email/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs
index 4e0afb916..50d0b98af 100644
--- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs
@@ -61,7 +61,8 @@ namespace Orchard.Fields.Drivers {
}
protected override void Exporting(ContentPart part, BooleanField field, ExportContentContext context) {
- context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Value", field.Value);
+ if (field.Value.HasValue)
+ context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Value", field.Value);
}
protected override void Describe(DescribeMembersContext context) {
diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs
index 1cda2654a..85b59a5d1 100644
--- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs
@@ -167,7 +167,9 @@ namespace Orchard.Fields.Drivers {
}
protected override void Exporting(ContentPart part, DateTimeField field, ExportContentContext context) {
- context.Element(GetPrefix(field, part)).SetAttributeValue("Value", XmlConvert.ToString(field.Storage.Get(null), XmlDateTimeSerializationMode.Utc));
+ var value = field.Storage.Get(null);
+ if (value != DateTime.MinValue)
+ context.Element(GetPrefix(field, part)).SetAttributeValue("Value", XmlConvert.ToString(value, XmlDateTimeSerializationMode.Utc));
}
protected override void Describe(DescribeMembersContext context) {
diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/EnumerationFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/EnumerationFieldDriver.cs
index 3d1607f39..4ba91fbbe 100644
--- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/EnumerationFieldDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/EnumerationFieldDriver.cs
@@ -4,6 +4,7 @@ using Orchard.ContentManagement.Handlers;
using Orchard.Fields.Settings;
using Orchard.Fields.Fields;
using Orchard.Localization;
+using System;
namespace Orchard.Fields.Drivers {
public class EnumerationFieldDriver : ContentFieldDriver {
@@ -51,7 +52,8 @@ namespace Orchard.Fields.Drivers {
}
protected override void Exporting(ContentPart part, EnumerationField field, ExportContentContext context) {
- context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Value", field.Value);
+ if (!String.IsNullOrEmpty(field.Value))
+ context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Value", field.Value);
}
protected override void Describe(DescribeMembersContext context) {
diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/InputFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/InputFieldDriver.cs
index aefd92b55..8a85cf904 100644
--- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/InputFieldDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/InputFieldDriver.cs
@@ -56,7 +56,8 @@ namespace Orchard.Fields.Drivers {
}
protected override void Exporting(ContentPart part, InputField field, ExportContentContext context) {
- context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Value", field.Value);
+ if (!String.IsNullOrEmpty(field.Value))
+ context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Value", field.Value);
}
protected override void Describe(DescribeMembersContext context) {
diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/LinkFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/LinkFieldDriver.cs
index 24727c63f..ef92dd6e0 100644
--- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/LinkFieldDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/LinkFieldDriver.cs
@@ -62,9 +62,11 @@ namespace Orchard.Fields.Drivers {
}
protected override void Exporting(ContentPart part, LinkField field, ExportContentContext context) {
- context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Text", field.Text);
- context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Url", field.Value);
- context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Target", field.Target);
+ if (!String.IsNullOrEmpty(field.Text) || !String.IsNullOrEmpty(field.Value) || !String.IsNullOrEmpty(field.Target)) {
+ context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Text", field.Text);
+ context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Url", field.Value);
+ context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Target", field.Target);
+ }
}
protected override void Describe(DescribeMembersContext context) {
diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs
index 95114fe2b..326c25a97 100644
--- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs
@@ -104,7 +104,8 @@ namespace Orchard.Fields.Drivers {
}
protected override void Exporting(ContentPart part, NumericField field, ExportContentContext context) {
- context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Value", !field.Value.HasValue ? String.Empty : field.Value.Value.ToString(CultureInfo.InvariantCulture));
+ if (field.Value.HasValue)
+ context.Element(field.FieldDefinition.Name + "." + field.Name).SetAttributeValue("Value", field.Value.Value.ToString(CultureInfo.InvariantCulture));
}
protected override void Describe(DescribeMembersContext context) {
diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Module.txt b/src/Orchard.Web/Modules/Orchard.Fields/Module.txt
index 5e8bec54d..bda7b95f0 100644
--- a/src/Orchard.Web/Modules/Orchard.Fields/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Fields/Module.txt
@@ -2,7 +2,7 @@ Name: Fields
AntiForgery: enabled
Author: Antoine Griffard, Sbastien Ros
Website: http://orchardfields.codeplex.com
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: Some content fields
Features:
diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Fields/Properties/AssemblyInfo.cs
index 0243b4fab..4ed61055a 100644
--- a/src/Orchard.Web/Modules/Orchard.Fields/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Fields/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Enumeration.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Enumeration.Edit.cshtml
index b5fec779d..ca39d9ade 100644
--- a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Enumeration.Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Enumeration.Edit.cshtml
@@ -8,34 +8,34 @@
@switch (settings.ListMode) {
case ListMode.Dropdown:
- @Html.DropDownListFor(m => m.Value, new SelectList(options, Model.Value))
+ @Html.DropDownListFor(m => m.Value, new SelectList(options, Model.Value), settings.Required ? new {required = "required"} : null)
break;
case ListMode.Radiobutton:
foreach (var option in options) {
- if (string.IsNullOrWhiteSpace(option)) {
-
- }
+ if (string.IsNullOrWhiteSpace(option)) {
+
+ }
else {
-
- }
+
+ }
}
break;
case ListMode.Listbox:
- @Html.ListBoxFor(m => m.SelectedValues, new MultiSelectList(options, Model.SelectedValues))
- break;
+ @Html.ListBoxFor(m => m.SelectedValues, new MultiSelectList(options, Model.SelectedValues), settings.Required ? new {required = "required"} : null)
+ break;
case ListMode.Checkbox:
- int index = 0;
+ int index = 0;
foreach (var option in options) {
index++;
if (!string.IsNullOrWhiteSpace(option)) {
-
-
+ required="required" } />
+
}
}
diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Numeric.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Numeric.Edit.cshtml
index 369dd5658..9a7a400a9 100644
--- a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Numeric.Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Numeric.Edit.cshtml
@@ -4,7 +4,9 @@
diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.ImportExport/Properties/AssemblyInfo.cs
index 6f1259ddc..f0aa0453b 100644
--- a/src/Orchard.Web/Modules/Orchard.ImportExport/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Providers/ImportActions/ExecuteRecipeAction.cs b/src/Orchard.Web/Modules/Orchard.ImportExport/Providers/ImportActions/ExecuteRecipeAction.cs
index 9b52d8678..fa3cdb7cd 100644
--- a/src/Orchard.Web/Modules/Orchard.ImportExport/Providers/ImportActions/ExecuteRecipeAction.cs
+++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Providers/ImportActions/ExecuteRecipeAction.cs
@@ -12,6 +12,7 @@ using Orchard.ImportExport.ViewModels;
using Orchard.Mvc;
using Orchard.Recipes.Models;
using Orchard.Recipes.Services;
+using Orchard.Setup.Services;
using Orchard.Tasks;
using Orchard.UI.Notify;
@@ -50,13 +51,16 @@ namespace Orchard.ImportExport.Providers.ImportActions {
_sweepGenerator = sweepGenerator;
_recipeStepQueue = recipeStepQueue;
_recipeStepResultRepository = recipeStepResultRepository;
- }
+
+ RecipeExecutionTimeout = 600;
+ }
public override string Name { get { return "ExecuteRecipe"; } }
public XDocument RecipeDocument { get; set; }
public bool ResetSite { get; set; }
public string SuperUserPassword { get; set; }
+ public int RecipeExecutionTimeout { get; set; }
public override dynamic BuildEditor(dynamic shapeFactory) {
return UpdateEditor(shapeFactory, null);
@@ -148,8 +152,8 @@ namespace Orchard.ImportExport.Providers.ImportActions {
// Give each execution step a chance to augment the recipe step before it will be scheduled.
PrepareRecipe(recipeDocument);
- // Sets the request timeout to 10 minutes to give enough time to execute custom recipes.
- _orchardServices.WorkContext.HttpContext.Server.ScriptTimeout = 600;
+ // Sets the request timeout to a configurable amount of seconds to give enough time to execute custom recipes.
+ _orchardServices.WorkContext.HttpContext.Server.ScriptTimeout = RecipeExecutionTimeout;
// Suspend background task execution.
_sweepGenerator.Terminate();
@@ -181,7 +185,7 @@ namespace Orchard.ImportExport.Providers.ImportActions {
private string Setup(XDocument recipeDocument) {
// Prepare Setup.
var setupContext = new SetupContext {
- RecipeDocument = recipeDocument,
+ Recipe = _recipeParser.ParseRecipe(recipeDocument),
AdminPassword = SuperUserPassword,
AdminUsername = _orchardServices.WorkContext.CurrentSite.SuperUser,
DatabaseConnectionString = _shellSettings.DataConnectionString,
diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Services/ISetupService.cs b/src/Orchard.Web/Modules/Orchard.ImportExport/Services/ISetupService.cs
deleted file mode 100644
index 176bf128c..000000000
--- a/src/Orchard.Web/Modules/Orchard.ImportExport/Services/ISetupService.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Orchard.ImportExport.Models;
-
-namespace Orchard.ImportExport.Services {
- public interface ISetupService : IDependency {
- string Setup(SetupContext context);
- }
-}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.ImportExport/Services/SetupService.cs
deleted file mode 100644
index c125a21c9..000000000
--- a/src/Orchard.Web/Modules/Orchard.ImportExport/Services/SetupService.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-using System;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Web;
-using Orchard.ContentManagement;
-using Orchard.Core.Settings.Models;
-using Orchard.Data;
-using Orchard.Data.Migration;
-using Orchard.Data.Migration.Interpreters;
-using Orchard.Data.Migration.Schema;
-using Orchard.Environment;
-using Orchard.Environment.Configuration;
-using Orchard.Environment.Descriptor;
-using Orchard.Environment.Descriptor.Models;
-using Orchard.Environment.ShellBuilders;
-using Orchard.Environment.State;
-using Orchard.ImportExport.Models;
-using Orchard.Localization.Services;
-using Orchard.Logging;
-using Orchard.Recipes.Services;
-using Orchard.Security;
-using Orchard.Settings;
-using Orchard.Utility.Extensions;
-
-namespace Orchard.ImportExport.Services
-{
- public class SetupService : Component, ISetupService {
- private readonly ShellSettings _shellSettings;
- private readonly IOrchardHost _orchardHost;
- private readonly IShellSettingsManager _shellSettingsManager;
- private readonly IShellContainerFactory _shellContainerFactory;
- private readonly ICompositionStrategy _compositionStrategy;
- private readonly IProcessingEngine _processingEngine;
-
- public SetupService(
- ShellSettings shellSettings,
- IOrchardHost orchardHost,
- IShellSettingsManager shellSettingsManager,
- IShellContainerFactory shellContainerFactory,
- ICompositionStrategy compositionStrategy,
- IProcessingEngine processingEngine) {
-
- _shellSettings = shellSettings;
- _orchardHost = orchardHost;
- _shellSettingsManager = shellSettingsManager;
- _shellContainerFactory = shellContainerFactory;
- _compositionStrategy = compositionStrategy;
- _processingEngine = processingEngine;
- }
-
- public string Setup(SetupContext context) {
- string executionId;
-
- Logger.Information("Running setup for tenant '{0}'.", _shellSettings.Name);
-
- // The vanilla Orchard distibution has the following features enabled.
- string[] hardcoded = {
- // Framework
- "Orchard.Framework",
- // Core
- "Common", "Containers", "Contents", "Dashboard", "Feeds", "Navigation","Scheduling", "Settings", "Shapes", "Title",
- // Modules
- "Orchard.Pages", "Orchard.ContentPicker", "Orchard.Themes", "Orchard.Users", "Orchard.Roles", "Orchard.Modules",
- "PackagingServices", "Orchard.Packaging", "Gallery", "Orchard.Recipes"
- };
-
- context.EnabledFeatures = hardcoded.Union(context.EnabledFeatures ?? Enumerable.Empty()).Distinct().ToList();
-
- var shellSettings = new ShellSettings(_shellSettings);
-
- if (String.IsNullOrEmpty(shellSettings.DataProvider)) {
- shellSettings.DataProvider = context.DatabaseProvider;
- shellSettings.DataConnectionString = context.DatabaseConnectionString;
- shellSettings.DataTablePrefix = context.DatabaseTablePrefix;
- }
-
- shellSettings.EncryptionAlgorithm = "AES";
- shellSettings.EncryptionKey = SymmetricAlgorithm.Create(shellSettings.EncryptionAlgorithm).Key.ToHexString();
- shellSettings.HashAlgorithm = "HMACSHA256";
- shellSettings.HashKey = HMAC.Create(shellSettings.HashAlgorithm).Key.ToHexString();
-
- var shellDescriptor = new ShellDescriptor {
- Features = context.EnabledFeatures.Select(name => new ShellFeature { Name = name })
- };
-
- var shellBlueprint = _compositionStrategy.Compose(shellSettings, shellDescriptor);
-
- // Initialize database explicitly, and store shell descriptor.
- using (var bootstrapLifetimeScope = _shellContainerFactory.CreateContainer(shellSettings, shellBlueprint)) {
- using (var environment = bootstrapLifetimeScope.CreateWorkContextScope()) {
- // Workaround to avoid a Transaction issue with PostgreSQL.
- environment.Resolve().RequireNew();
-
- var schemaBuilder = new SchemaBuilder(environment.Resolve());
-
- schemaBuilder.CreateTable("Orchard_Framework_DataMigrationRecord", table => table
- .Column("Id", column => column.PrimaryKey().Identity())
- .Column("DataMigrationClass")
- .Column("Version"));
-
- schemaBuilder.AlterTable("Orchard_Framework_DataMigrationRecord",
- table => table.AddUniqueConstraint("UC_DMR_DataMigrationClass_Version", "DataMigrationClass", "Version"));
-
- var dataMigrationManager = environment.Resolve();
- dataMigrationManager.Update("Settings");
-
- foreach (var feature in context.EnabledFeatures) {
- dataMigrationManager.Update(feature);
- }
-
- var descriptorManager = environment.Resolve();
- descriptorManager.UpdateShellDescriptor(0, shellDescriptor.Features, shellDescriptor.Parameters);
- }
- }
-
- // In effect "pump messages" see PostMessage circa 1980.
- while ( _processingEngine.AreTasksPending() )
- _processingEngine.ExecuteNextTask();
-
- // Create a standalone environment.
- // Must mark state as Running - otherwise standalone environment is created "for setup".
- shellSettings.State = TenantState.Running;
- using (var environment = _orchardHost.CreateStandaloneEnvironment(shellSettings)) {
- try {
- executionId = CreateTenantData(context, environment);
- }
- catch {
- environment.Resolve().Cancel();
- throw;
- }
- }
-
- _shellSettingsManager.SaveSettings(shellSettings);
-
- return executionId;
- }
-
- private string CreateTenantData(SetupContext context, IWorkContextScope environment) {
- // Create superuser.
- var membershipService = environment.Resolve();
- var user = membershipService.CreateUser(
- new CreateUserParams(
- context.AdminUsername,
- context.AdminPassword,
- email: String.Empty,
- passwordQuestion: String.Empty,
- passwordAnswer: String.Empty,
- isApproved: true));
-
- // Set superuser as current user for request (it will be set as the owner of all content items).
- var authenticationService = environment.Resolve();
- authenticationService.SetAuthenticatedUserForRequest(user);
-
- // Set site name and settings.
- var siteService = environment.Resolve();
- var siteSettings = siteService.GetSiteSettings().As();
- siteSettings.SiteSalt = Guid.NewGuid().ToString("N");
- siteSettings.SiteName = context.SiteName;
- siteSettings.SuperUser = context.AdminUsername;
- siteSettings.SiteCulture = "en-US";
-
- // Add default culture.
- var cultureManager = environment.Resolve();
- cultureManager.AddCulture("en-US");
-
- // Execute recipe
- var recipeParser = environment.Resolve();
- var recipe = recipeParser.ParseRecipe(context.RecipeDocument);
- var recipeManager = environment.Resolve();
- var executionId = recipeManager.Execute(recipe);
-
- // Null check: temporary fix for running setup in command line.
- if (HttpContext.Current != null) {
- authenticationService.SignIn(user, true);
- }
-
- return executionId;
- }
- }
-}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Module.txt b/src/Orchard.Web/Modules/Orchard.Indexing/Module.txt
index 99ab8cfca..122669177 100644
--- a/src/Orchard.Web/Modules/Orchard.Indexing/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: The Indexing module enables the site to be indexed. The index generated by this module can then be used by the search module to provide an integrated full-text search experience to a web site.
FeatureDescription: Indexing infrastructure. Requires an index implementation like the Lucene module.
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Properties/AssemblyInfo.cs
index 999336b2c..eefbb569d 100644
--- a/src/Orchard.Web/Modules/Orchard.Indexing/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Module.txt b/src/Orchard.Web/Modules/Orchard.JobsQueue/Module.txt
index 05186f82d..48b0c9042 100644
--- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: This module provides a jobs queue to process jobs asynchronously.
Features:
diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.JobsQueue/Properties/AssemblyInfo.cs
index 43830bba5..fa1bc9edb 100644
--- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Security;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Services/JobsQueueProcessor.cs b/src/Orchard.Web/Modules/Orchard.JobsQueue/Services/JobsQueueProcessor.cs
index 039bfbc75..74bec9bb6 100644
--- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Services/JobsQueueProcessor.cs
+++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Services/JobsQueueProcessor.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Threading;
using Newtonsoft.Json.Linq;
using Orchard.Environment;
using Orchard.Events;
@@ -13,12 +12,11 @@ namespace Orchard.JobsQueue.Services {
public class JobsQueueProcessor : IJobsQueueProcessor {
private readonly Work _jobsQueueManager;
private readonly Work _eventBus;
- private readonly ReaderWriterLockSlim _rwl = new ReaderWriterLockSlim();
private readonly IDistributedLockService _distributedLockService;
public JobsQueueProcessor(
Work jobsQueueManager,
- Work eventBus,
+ Work eventBus,
IDistributedLockService distributedLockService) {
_jobsQueueManager = jobsQueueManager;
@@ -28,26 +26,19 @@ namespace Orchard.JobsQueue.Services {
}
public ILogger Logger { get; set; }
- public void ProcessQueue() {
- // prevent two threads on the same machine to process the message queue
- if (_rwl.TryEnterWriteLock(0)) {
- try {
- DistributedLock @lock;
- if(_distributedLockService.TryAcquireLockForMachine(GetType().FullName, TimeSpan.FromMinutes(5), out @lock)){
- using (@lock) {
- IEnumerable messages;
- while ((messages = _jobsQueueManager.Value.GetJobs(0, 10).ToArray()).Any()) {
- foreach (var message in messages) {
- ProcessMessage(message);
- }
- }
+ public void ProcessQueue() {
+ IDistributedLock @lock;
+ if (_distributedLockService.TryAcquireLock(GetType().FullName, TimeSpan.FromMinutes(5), out @lock)) {
+ using (@lock) {
+ IEnumerable messages;
+
+ while ((messages = _jobsQueueManager.Value.GetJobs(0, 10).ToArray()).Any()) {
+ foreach (var message in messages) {
+ ProcessMessage(message);
}
}
}
- finally {
- _rwl.ExitWriteLock();
- }
}
}
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Layouts/AdminMenu.cs
index 35db9afee..0a675af3d 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/AdminMenu.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/AdminMenu.cs
@@ -11,9 +11,9 @@ namespace Orchard.Layouts {
builder
.AddImageSet("layouts")
.Add(T("Layouts"), "8.5", layouts => layouts
- .Action("List", "Admin", new {id = "Layout", area = "Contents"})
+ .Action("List", "Admin", new {id = "Layout", area = "Contents"}).Permission(Permissions.ManageLayouts)
.LinkToFirstChild(false)
- .Add(T("Elements"), "1", elements => elements.Action("Index", "BlueprintAdmin", new {area = "Orchard.Layouts"})));
+ .Add(T("Elements"), "1", elements => elements.Action("Index", "BlueprintAdmin", new {area = "Orchard.Layouts"}).Permission(Permissions.ManageLayouts)));
}
}
}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/LayoutEditor/Directives/Editor.js b/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/LayoutEditor/Directives/Editor.js
index 8595615e8..b7dcde8aa 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/LayoutEditor/Directives/Editor.js
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/LayoutEditor/Directives/Editor.js
@@ -74,45 +74,6 @@
return host.addElement(contentType);
};
- $scope.toggleInlineEditing = function () {
- if (!$scope.element.inlineEditingIsActive) {
- $scope.element.inlineEditingIsActive = true;
- $element.find(".layout-toolbar-container").show();
- var selector = "#layout-editor-" + $scope.$id + " .layout-html .layout-content-markup[data-templated=false]";
- var firstContentEditorId = $(selector).first().attr("id");
- tinymce.init({
- selector: selector,
- theme: "modern",
- schema: "html5",
- plugins: [
- "advlist autolink lists link image charmap print preview hr anchor pagebreak",
- "searchreplace wordcount visualblocks visualchars code fullscreen",
- "insertdatetime media nonbreaking table contextmenu directionality",
- "emoticons template paste textcolor colorpicker textpattern",
- "fullscreen autoresize"
- ],
- toolbar: "undo redo cut copy paste | bold italic | bullist numlist outdent indent formatselect | alignleft aligncenter alignright alignjustify ltr rtl | link unlink charmap | code fullscreen close",
- convert_urls: false,
- valid_elements: "*[*]",
- // Shouldn't be needed due to the valid_elements setting, but TinyMCE would strip script.src without it.
- extended_valid_elements: "script[type|defer|src|language]",
- statusbar: false,
- skin: "orchardlightgray",
- inline: true,
- fixed_toolbar_container: "#layout-editor-" + $scope.$id + " .layout-toolbar-container",
- init_instance_callback: function (editor) {
- if (editor.id == firstContentEditorId)
- tinymce.execCommand("mceFocus", false, editor.id);
- }
- });
- }
- else {
- tinymce.remove("#layout-editor-" + $scope.$id + " .layout-content-markup");
- $element.find(".layout-toolbar-container").hide();
- $scope.element.inlineEditingIsActive = false;
- }
- };
-
$(document).on("cut copy paste", function (e) {
// If the pseudo clipboard was already invoked (which happens on the first clipboard
// operation after page load even if native clipboard support exists) then sit this
@@ -164,23 +125,12 @@
element.find(".layout-toolbar-container").click(function (e) {
e.stopPropagation();
});
- // Intercept mousedown on editor while in inline editing mode to
- // prevent current editor from losing focus.
- element.mousedown(function (e) {
- if (scope.element.inlineEditingIsActive) {
- e.preventDefault();
- e.stopPropagation();
- }
- })
// Unfocus and unselect everything on click outside of canvas.
$(window).click(function (e) {
- // Except when in inline editing mode.
- if (!scope.element.inlineEditingIsActive) {
- scope.$apply(function () {
- scope.element.activeElement = null;
- scope.element.focusedElement = null;
- });
- }
+ scope.$apply(function () {
+ scope.element.activeElement = null;
+ scope.element.focusedElement = null;
+ });
});
}
};
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/LayoutEditor/Directives/Html.js b/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/LayoutEditor/Directives/Html.js
index 4dc6a4f1e..94890f1d6 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/LayoutEditor/Directives/Html.js
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/LayoutEditor/Directives/Html.js
@@ -35,13 +35,6 @@
templateUrl: environment.templateUrl("Html"),
replace: true,
link: function (scope, element) {
- // Mouse down events must not be intercepted by drag and drop while inline editing is active,
- // otherwise clicks in inline editors will have no effect.
- element.find(".layout-content-markup").mousedown(function (e) {
- if (scope.element.editor.inlineEditingIsActive) {
- e.stopPropagation();
- }
- });
}
};
}
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/LayoutEditor/Services/ScopeConfigurator.js b/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/LayoutEditor/Services/ScopeConfigurator.js
index 988fdde43..a2ce3a6ba 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/LayoutEditor/Services/ScopeConfigurator.js
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/LayoutEditor/Services/ScopeConfigurator.js
@@ -15,7 +15,7 @@
var resetFocus = false;
var element = $scope.element;
- if (element.editor.isDragging || element.editor.inlineEditingIsActive)
+ if (element.editor.isDragging)
return;
// If native clipboard support exists, the pseudo-clipboard will have been disabled.
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Editor.js b/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Editor.js
index a93081991..86b664804 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Editor.js
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Editor.js
@@ -9,7 +9,6 @@
this.focusedElement = null;
this.dropTargetElement = null;
this.isDragging = false;
- this.inlineEditingIsActive = false;
this.isResizing = false;
this.resetToolboxElements = function () {
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Element.js b/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Element.js
index 6f30d5508..6a983cf25 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Element.js
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Element.js
@@ -57,7 +57,7 @@
this.setIsActive = function (value) {
if (!this.editor)
return;
- if (this.editor.isDragging || this.editor.inlineEditingIsActive || this.editor.isResizing)
+ if (this.editor.isDragging || this.editor.isResizing)
return;
if (value)
@@ -77,7 +77,7 @@
return;
if (!this.children && this.isTemplated)
return;
- if (this.editor.isDragging || this.editor.inlineEditingIsActive || this.editor.isResizing)
+ if (this.editor.isDragging || this.editor.isResizing)
return;
this.editor.focusedElement = this;
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Assets/Less/LayoutEditor/Canvas.less b/src/Orchard.Web/Modules/Orchard.Layouts/Assets/Less/LayoutEditor/Canvas.less
index aab898205..ec7aba16f 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Assets/Less/LayoutEditor/Canvas.less
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Assets/Less/LayoutEditor/Canvas.less
@@ -6,4 +6,4 @@
display: none;
}
}
-}
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Controllers/BlueprintAdminController.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Controllers/BlueprintAdminController.cs
index 1dcac2e31..6c5b8ae36 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Controllers/BlueprintAdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Controllers/BlueprintAdminController.cs
@@ -34,7 +34,8 @@ namespace Orchard.Layouts.Controllers {
ICultureAccessor cultureAccessor,
IShapeFactory shapeFactory,
ITransactionManager transactionManager,
- ISignals signals) {
+ ISignals signals,
+ IOrchardServices orchardServices) {
_elementBlueprintService = elementBlueprintService;
_notifier = notifier;
@@ -43,12 +44,19 @@ namespace Orchard.Layouts.Controllers {
_shapeFactory = shapeFactory;
_transactionManager = transactionManager;
_signals = signals;
+ Services = orchardServices;
+
T = NullLocalizer.Instance;
}
+ public IOrchardServices Services { get; set; }
public Localizer T { get; set; }
public ActionResult Index() {
+ if (!Services.Authorizer.Authorize(Permissions.ManageLayouts, T("Not authorized to manage layouts."))) {
+ return new HttpUnauthorizedResult();
+ }
+
var blueprints = _elementBlueprintService.GetBlueprints().ToArray();
var viewModel = new BlueprintsIndexViewModel {
Blueprints = blueprints
@@ -57,6 +65,10 @@ namespace Orchard.Layouts.Controllers {
}
public ActionResult Browse() {
+ if (!Services.Authorizer.Authorize(Permissions.ManageLayouts, T("Not authorized to manage layouts."))) {
+ return new HttpUnauthorizedResult();
+ }
+
var categories = RemoveBlueprints(_elementManager.GetCategories(DescribeElementsContext.Empty)).ToArray();
var viewModel = new BrowseElementsViewModel {
Categories = categories
@@ -65,6 +77,10 @@ namespace Orchard.Layouts.Controllers {
}
public ActionResult Create(string id) {
+ if (!Services.Authorizer.Authorize(Permissions.ManageLayouts, T("Not authorized to manage layouts."))) {
+ return new HttpUnauthorizedResult();
+ }
+
if (String.IsNullOrWhiteSpace(id))
return RedirectToAction("Browse");
@@ -80,6 +96,10 @@ namespace Orchard.Layouts.Controllers {
[HttpPost]
public ActionResult Create(string id, CreateElementBlueprintViewModel model) {
+ if (!Services.Authorizer.Authorize(Permissions.ManageLayouts, T("Not authorized to manage layouts."))) {
+ return new HttpUnauthorizedResult();
+ }
+
var describeContext = DescribeElementsContext.Empty;
var descriptor = _elementManager.GetElementDescriptorByTypeName(describeContext, id);
var baseElement = _elementManager.ActivateElement(descriptor);
@@ -100,7 +120,11 @@ namespace Orchard.Layouts.Controllers {
return RedirectToAction("Edit", new { id = blueprint.Id });
}
- public ViewResult Edit(int id) {
+ public ActionResult Edit(int id) {
+ if (!Services.Authorizer.Authorize(Permissions.ManageLayouts, T("Not authorized to manage layouts."))) {
+ return new HttpUnauthorizedResult();
+ }
+
var blueprint = _elementBlueprintService.GetBlueprint(id);
var describeContext = DescribeElementsContext.Empty;
var descriptor = _elementManager.GetElementDescriptorByTypeName(describeContext, blueprint.BaseElementTypeName);
@@ -125,6 +149,10 @@ namespace Orchard.Layouts.Controllers {
[HttpPost]
[ValidateInput(false)]
public ActionResult Edit(int id, ElementDataViewModel model) {
+ if (!Services.Authorizer.Authorize(Permissions.ManageLayouts, T("Not authorized to manage layouts."))) {
+ return new HttpUnauthorizedResult();
+ }
+
var blueprint = _elementBlueprintService.GetBlueprint(id);
var describeContext = DescribeElementsContext.Empty;
var descriptor = _elementManager.GetElementDescriptorByTypeName(describeContext, blueprint.BaseElementTypeName);
@@ -154,6 +182,10 @@ namespace Orchard.Layouts.Controllers {
}
public ActionResult Properties(int id) {
+ if (!Services.Authorizer.Authorize(Permissions.ManageLayouts, T("Not authorized to manage layouts."))) {
+ return new HttpUnauthorizedResult();
+ }
+
var blueprint = _elementBlueprintService.GetBlueprint(id);
var describeContext = DescribeElementsContext.Empty;
var descriptor = _elementManager.GetElementDescriptorByTypeName(describeContext, blueprint.BaseElementTypeName);
@@ -171,6 +203,10 @@ namespace Orchard.Layouts.Controllers {
[HttpPost]
public ActionResult Properties(int id, ElementBlueprintPropertiesViewModel model) {
+ if (!Services.Authorizer.Authorize(Permissions.ManageLayouts, T("Not authorized to manage layouts."))) {
+ return new HttpUnauthorizedResult();
+ }
+
var blueprint = _elementBlueprintService.GetBlueprint(id);
var describeContext = DescribeElementsContext.Empty;
var descriptor = _elementManager.GetElementDescriptorByTypeName(describeContext, blueprint.BaseElementTypeName);
@@ -191,7 +227,12 @@ namespace Orchard.Layouts.Controllers {
return RedirectToAction("Index");
}
+ [HttpPost]
public ActionResult Delete(int id) {
+ if (!Services.Authorizer.Authorize(Permissions.ManageLayouts, T("Not authorized to manage layouts."))) {
+ return new HttpUnauthorizedResult();
+ }
+
var blueprint = _elementBlueprintService.GetBlueprint(id);
if (blueprint == null)
@@ -204,7 +245,12 @@ namespace Orchard.Layouts.Controllers {
[FormValueRequired("submit.BulkEdit")]
[ActionName("Index")]
+ [HttpPost]
public ActionResult BulkDelete(IEnumerable blueprintIds) {
+ if (!Services.Authorizer.Authorize(Permissions.ManageLayouts, T("Not authorized to manage layouts."))) {
+ return new HttpUnauthorizedResult();
+ }
+
if (blueprintIds == null || !blueprintIds.Any()) {
_notifier.Error(T("Please select the blueprints to delete."));
}
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Controllers/ElementController.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Controllers/ElementController.cs
index 170bdfb19..38dffa4ce 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Controllers/ElementController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Controllers/ElementController.cs
@@ -142,18 +142,7 @@ namespace Orchard.Layouts.Controllers {
_objectStore.Set(session, state);
return RedirectToAction("Edit", new {session = session});
}
-
- public RedirectToRouteResult Add(string session, string typeName, int? contentId = null, string contentType = null) {
- var state = new ElementSessionState {
- TypeName = typeName,
- ContentId = contentId,
- ContentType = contentType
- };
-
- _objectStore.Set(session, state);
- return RedirectToAction("Edit", new { session = session });
- }
-
+
public ViewResult Edit(string session) {
var sessionState = _objectStore.Get(session);
var contentId = sessionState.ContentId;
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Controllers/LayoutController.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Controllers/LayoutController.cs
index 753bd9aa8..a72f1783b 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Controllers/LayoutController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Controllers/LayoutController.cs
@@ -6,6 +6,7 @@ using Orchard.ContentManagement;
using Orchard.Layouts.Elements;
using Orchard.Layouts.Framework.Elements;
using Orchard.Layouts.Services;
+using Orchard.Localization;
using Orchard.UI.Admin;
namespace Orchard.Layouts.Controllers {
@@ -15,15 +16,25 @@ namespace Orchard.Layouts.Controllers {
private readonly ILayoutManager _layoutManager;
private readonly ILayoutModelMapper _mapper;
- public LayoutController(IContentManager contentManager, ILayoutManager layoutManager, ILayoutModelMapper mapper) {
+ public LayoutController(
+ IContentManager contentManager,
+ ILayoutManager layoutManager,
+ ILayoutModelMapper mapper,
+ IOrchardServices orchardServices) {
_contentManager = contentManager;
_layoutManager = layoutManager;
_mapper = mapper;
+ Services = orchardServices;
+
+ T = NullLocalizer.Instance;
}
+ public IOrchardServices Services { get; set; }
+ public Localizer T { get; set; }
+
[HttpPost, ValidateInput(enableValidation: false)]
- public ContentResult ApplyTemplate(int? templateId = null, string layoutData = null, int? contentId = null, string contentType = null) {
+ public ActionResult ApplyTemplate(int? templateId = null, string layoutData = null, int? contentId = null, string contentType = null) {
var template = templateId != null ? _layoutManager.GetLayout(templateId.Value) : null;
var templateElements = template != null ? _layoutManager.LoadElements(template).ToList() : default(IEnumerable);
var describeContext = CreateDescribeElementsContext(contentId, contentType);
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
index 116ab44bc..ace0e73fa 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
@@ -90,9 +90,18 @@ namespace Orchard.Layouts.Drivers {
protected override DriverResult Editor(LayoutPart part, IUpdateModel updater, dynamic shapeHelper) {
return ContentShape("Parts_Layout_Edit", () => {
-
if (part.Id == 0 && String.IsNullOrWhiteSpace(part.LayoutData)) {
- part.LayoutData = part.TypePartDefinition.Settings.GetModel().DefaultLayoutData;
+
+ var settings = part.TypePartDefinition.Settings.GetModel();
+
+ // If the default layout setting is left empty, use the one from the service
+ if (String.IsNullOrWhiteSpace(settings.DefaultLayoutData)) {
+ var defaultData = _serializer.Serialize(_layoutManager.CreateDefaultLayout());
+ part.LayoutData = defaultData;
+ }
+ else {
+ part.LayoutData = settings.DefaultLayoutData;
+ }
}
var viewModel = new LayoutPartViewModel {
@@ -140,6 +149,11 @@ namespace Orchard.Layouts.Drivers {
}
protected override void Importing(LayoutPart part, ImportContentContext context) {
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
+ }
+
context.ImportChildEl(part.PartDefinition.Name, "LayoutData", s => {
part.LayoutData = s;
_layoutManager.Importing(new ImportLayoutContext {
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/ProjectionElementDriver.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/ProjectionElementDriver.cs
index d42f56128..ec8f4631c 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/ProjectionElementDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/ProjectionElementDriver.cs
@@ -290,11 +290,11 @@ namespace Orchard.Layouts.Drivers {
var query = element.QueryId != null ? _contentManager.Get(element.QueryId.Value) : default(QueryPart);
var layout = query != null && element.LayoutId != null ? _layoutRepository.Get(element.LayoutId.Value) : default(LayoutRecord);
var queryIdentity = query != null ? _contentManager.GetItemMetadata(query).Identity.ToString() : default(string);
- var layoutIndex = layout != null ? query.Layouts.IndexOf(layout) : default(int?);
+ var layoutIndex = layout != null ? query.Layouts.IndexOf(layout) : -1; // -1 is the Default Layout.
- if (queryIdentity != null && layoutIndex != null) {
+ if (queryIdentity != null) {
context.ExportableData["QueryId"] = queryIdentity;
- context.ExportableData["LayoutIndex"] = layoutIndex.Value.ToString();
+ context.ExportableData["LayoutIndex"] = layoutIndex.ToString();
}
}
@@ -307,10 +307,9 @@ namespace Orchard.Layouts.Drivers {
var queryPart = query.As();
var layoutIndex = XmlHelper.Parse(context.ExportableData.Get("LayoutIndex"));
- var layout = queryPart.Layouts[layoutIndex];
element.QueryId = queryPart.Id;
- element.LayoutId = layout.Id;
+ element.LayoutId = layoutIndex != -1 ? queryPart.Layouts[layoutIndex].Id : -1;
}
private static string GetLayoutDescription(IEnumerable layouts, LayoutRecord l) {
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Elements/Column.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Elements/Column.cs
index 7f87b3e0d..f0b8d3e0a 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Elements/Column.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Elements/Column.cs
@@ -21,7 +21,7 @@ namespace Orchard.Layouts.Elements {
}
public int? Width {
- get { return this.Retrieve("Width") ?? this.Retrieve("ColumnSpan") ?? 0; } // Falling back on "ColumnSpan" for backward compatibility.
+ get { return this.Retrieve("Width") ?? this.Retrieve("ColumnSpan") ?? 12; } // Falling back on "ColumnSpan" for backward compatibility.
set { this.Store(x => x.Width, value); }
}
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Framework/Elements/Element.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Framework/Elements/Element.cs
index 87959efaf..16aa590e6 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Framework/Elements/Element.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Framework/Elements/Element.cs
@@ -3,7 +3,7 @@ using Orchard.Localization;
using Orchard.Utility.Extensions;
namespace Orchard.Layouts.Framework.Elements {
- public abstract class Element {
+ public abstract class Element : IElement {
protected Element() {
T = NullLocalizer.Instance;
Data = new ElementDataDictionary();
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Framework/Elements/IElement.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Framework/Elements/IElement.cs
new file mode 100644
index 000000000..0cf0c8f1f
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Framework/Elements/IElement.cs
@@ -0,0 +1,3 @@
+namespace Orchard.Layouts.Framework.Elements {
+ public interface IElement : ITransientDependency {}
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Handlers/LayoutPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Handlers/LayoutPartHandler.cs
index 78f9a595b..0e2c3b37a 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Handlers/LayoutPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Handlers/LayoutPartHandler.cs
@@ -16,7 +16,6 @@ namespace Orchard.Layouts.Handlers {
private readonly IContentPartDisplay _contentPartDisplay;
private readonly IShapeDisplay _shapeDisplay;
private readonly ILayoutSerializer _serializer;
- private readonly IStaticHttpContextScopeFactory _staticHttpContextScopeFactory;
private readonly IAliasService _aliasService;
public LayoutPartHandler(
@@ -26,7 +25,6 @@ namespace Orchard.Layouts.Handlers {
IContentPartDisplay contentPartDisplay,
IShapeDisplay shapeDisplay,
ILayoutSerializer serializer,
- IStaticHttpContextScopeFactory staticHttpContextScopeFactory,
IAliasService aliasService) {
_layoutManager = layoutManager;
@@ -34,7 +32,6 @@ namespace Orchard.Layouts.Handlers {
_contentPartDisplay = contentPartDisplay;
_shapeDisplay = shapeDisplay;
_serializer = serializer;
- _staticHttpContextScopeFactory = staticHttpContextScopeFactory;
_aliasService = aliasService;
Filters.Add(StorageFilter.For(repository));
@@ -44,22 +41,13 @@ namespace Orchard.Layouts.Handlers {
private void IndexLayout(IndexContentContext context, LayoutPart part) {
var layoutShape = _contentPartDisplay.BuildDisplay(part);
- var layoutHtml = RenderShape(layoutShape);
+ var layoutHtml = _shapeDisplay.Display(layoutShape);
context.DocumentIndex
.Add("body", layoutHtml).RemoveTags().Analyze()
.Add("format", "html").Store();
}
- ///
- /// This method of rendering is safe even in background tasks.
- ///
- private string RenderShape(dynamic shape) {
- using (_staticHttpContextScopeFactory.CreateStaticScope()) {
- return _shapeDisplay.Display(shape);
- }
- }
-
private void UpdateTemplateClients(PublishContentContext context, LayoutPart part) {
UpdateTemplateClients(part);
}
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Migrations.cs
index c87ade13c..746120763 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Migrations.cs
@@ -33,7 +33,6 @@ namespace Orchard.Layouts {
.WithPart("LayoutPart", p => p
.WithSetting("LayoutTypePartSettings.IsTemplate", "True"))
.DisplayedAs("Layout")
- .Listable()
.Draftable());
ContentDefinitionManager.AlterTypeDefinition("LayoutWidget", type => type
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Models/ElementSessionState.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Models/ElementSessionState.cs
index 26859a51f..6fcff6c7f 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Models/ElementSessionState.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Models/ElementSessionState.cs
@@ -1,9 +1,12 @@
+using System;
+
namespace Orchard.Layouts.Models {
- public class ElementSessionState {
+ [Serializable]
+ public class ElementSessionState {
public string TypeName { get; set; }
public string ElementData { get; set; }
public string ElementEditorData { get; set; }
public int? ContentId { get; set; }
public string ContentType { get; set; }
}
-}
\ No newline at end of file
+}
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Module.txt b/src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
index 6e61893e6..4f21508df 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
@@ -10,7 +10,7 @@ Features:
Orchard.Layouts:
Name: Layouts
Description: Provides tools to create layouts.
- Dependencies: Common, Orchard.jQuery, Orchard.Forms, Orchard.Tokens, Orchard.MediaLibrary, TinyMce, Orchard.Widgets
+ Dependencies: Common, Orchard.jQuery, Orchard.Forms, Orchard.Tokens, Orchard.MediaLibrary, Orchard.Widgets
Category: Layout
Orchard.Layouts.Snippets:
Name: Layout Snippets
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
index 39ace50e4..c25bf3fb8 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
@@ -358,6 +358,7 @@
+
@@ -367,6 +368,7 @@
+
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Permissions.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Permissions.cs
new file mode 100644
index 000000000..a7905be9b
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Permissions.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using Orchard.Environment.Extensions.Models;
+using Orchard.Security.Permissions;
+
+namespace Orchard.Layouts {
+ public class Permissions : IPermissionProvider {
+ public static readonly Permission ManageLayouts = new Permission { Description = "Managing Layouts", Name = "ManageLayouts" };
+
+ public virtual Feature Feature { get; set; }
+
+ public IEnumerable GetPermissions() {
+ return new[] {
+ ManageLayouts,
+ };
+ }
+
+ public IEnumerable GetDefaultStereotypes() {
+ return new[] {
+ new PermissionStereotype {
+ Name = "Administrator",
+ Permissions = new[] { ManageLayouts }
+ },
+ new PermissionStereotype {
+ Name = "Editor",
+ Permissions = new[] { ManageLayouts }
+ },
+ new PermissionStereotype {
+ Name = "Moderator",
+ },
+ new PermissionStereotype {
+ Name = "Author"
+ },
+ new PermissionStereotype {
+ Name = "Contributor",
+ },
+ };
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js b/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js
index 405a8f9e7..2be99a094 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js
@@ -62,7 +62,7 @@ angular
var resetFocus = false;
var element = $scope.element;
- if (element.editor.isDragging || element.editor.inlineEditingIsActive)
+ if (element.editor.isDragging)
return;
// If native clipboard support exists, the pseudo-clipboard will have been disabled.
@@ -443,45 +443,6 @@ angular
return host.addElement(contentType);
};
- $scope.toggleInlineEditing = function () {
- if (!$scope.element.inlineEditingIsActive) {
- $scope.element.inlineEditingIsActive = true;
- $element.find(".layout-toolbar-container").show();
- var selector = "#layout-editor-" + $scope.$id + " .layout-html .layout-content-markup[data-templated=false]";
- var firstContentEditorId = $(selector).first().attr("id");
- tinymce.init({
- selector: selector,
- theme: "modern",
- schema: "html5",
- plugins: [
- "advlist autolink lists link image charmap print preview hr anchor pagebreak",
- "searchreplace wordcount visualblocks visualchars code fullscreen",
- "insertdatetime media nonbreaking table contextmenu directionality",
- "emoticons template paste textcolor colorpicker textpattern",
- "fullscreen autoresize"
- ],
- toolbar: "undo redo cut copy paste | bold italic | bullist numlist outdent indent formatselect | alignleft aligncenter alignright alignjustify ltr rtl | link unlink charmap | code fullscreen close",
- convert_urls: false,
- valid_elements: "*[*]",
- // Shouldn't be needed due to the valid_elements setting, but TinyMCE would strip script.src without it.
- extended_valid_elements: "script[type|defer|src|language]",
- statusbar: false,
- skin: "orchardlightgray",
- inline: true,
- fixed_toolbar_container: "#layout-editor-" + $scope.$id + " .layout-toolbar-container",
- init_instance_callback: function (editor) {
- if (editor.id == firstContentEditorId)
- tinymce.execCommand("mceFocus", false, editor.id);
- }
- });
- }
- else {
- tinymce.remove("#layout-editor-" + $scope.$id + " .layout-content-markup");
- $element.find(".layout-toolbar-container").hide();
- $scope.element.inlineEditingIsActive = false;
- }
- };
-
$(document).on("cut copy paste", function (e) {
// If the pseudo clipboard was already invoked (which happens on the first clipboard
// operation after page load even if native clipboard support exists) then sit this
@@ -533,23 +494,12 @@ angular
element.find(".layout-toolbar-container").click(function (e) {
e.stopPropagation();
});
- // Intercept mousedown on editor while in inline editing mode to
- // prevent current editor from losing focus.
- element.mousedown(function (e) {
- if (scope.element.inlineEditingIsActive) {
- e.preventDefault();
- e.stopPropagation();
- }
- })
// Unfocus and unselect everything on click outside of canvas.
$(window).click(function (e) {
- // Except when in inline editing mode.
- if (!scope.element.inlineEditingIsActive) {
- scope.$apply(function () {
- scope.element.activeElement = null;
- scope.element.focusedElement = null;
- });
- }
+ scope.$apply(function () {
+ scope.element.activeElement = null;
+ scope.element.focusedElement = null;
+ });
});
}
};
@@ -730,13 +680,6 @@ angular
templateUrl: environment.templateUrl("Html"),
replace: true,
link: function (scope, element) {
- // Mouse down events must not be intercepted by drag and drop while inline editing is active,
- // otherwise clicks in inline editors will have no effect.
- element.find(".layout-content-markup").mousedown(function (e) {
- if (scope.element.editor.inlineEditingIsActive) {
- e.stopPropagation();
- }
- });
}
};
}
@@ -1051,4 +994,4 @@ angular
};
}
]);
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["Module.js","Clipboard.js","ScopeConfigurator.js","Editor.js","Canvas.js","Child.js","Column.js","Content.js","Html.js","Grid.js","Row.js","Popup.js","Toolbox.js","ToolboxGroup.js"],"names":[],"mappings":"AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC7CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACjUA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC3LA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AClBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACdA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACnEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACnCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC/CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AClBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACvCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC9MA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"LayoutEditor.js","sourcesContent":["angular.module(\"LayoutEditor\", [\"ngSanitize\", \"ngResource\", \"ui.sortable\"]);","var LayoutEditor;\r\n(function(LayoutEditor) {\r\n\r\n    var Clipboard = function () {\r\n        var self = this;\r\n        this._clipboardData = {};\r\n        this._isDisabled = false;\r\n        this._wasInvoked = false;\r\n\r\n        this.setData = function(contentType, data) {\r\n            self._clipboardData[contentType] = data;\r\n            self._wasInvoked = true;\r\n        };\r\n        this.getData = function (contentType) {\r\n            return self._clipboardData[contentType];\r\n            self._wasInvoked = true;\r\n        };\r\n        this.disable = function() {\r\n            self._isDisabled = true;\r\n            self._wasInvoked = false;\r\n            self._clipboardData = {};\r\n        };\r\n        this.isDisabled = function () {\r\n            return self._isDisabled;\r\n        }\r\n        this.wasInvoked = function () {\r\n            return self._wasInvoked;\r\n        }\r\n    }\r\n\r\n    LayoutEditor.Clipboard = new Clipboard();\r\n\r\n    angular\r\n        .module(\"LayoutEditor\")\r\n        .factory(\"clipboard\", [\r\n            function() {\r\n                return {\r\n                    setData: LayoutEditor.Clipboard.setData,\r\n                    getData: LayoutEditor.Clipboard.getData,\r\n                    disable: LayoutEditor.Clipboard.disable,\r\n                    isDisabled: LayoutEditor.Clipboard.isDisabled,\r\n                    wasInvoked: LayoutEditor.Clipboard.wasInvoked\r\n                };\r\n            }\r\n        ]);\r\n})(LayoutEditor || (LayoutEditor = {}));","angular\r\n    .module(\"LayoutEditor\")\r\n    .factory(\"scopeConfigurator\", [\"$timeout\", \"clipboard\",\r\n        function ($timeout, clipboard) {\r\n            return {\r\n\r\n                configureForElement: function ($scope, $element) {\r\n                \r\n                    $element.find(\".layout-panel\").click(function (e) {\r\n                        e.stopPropagation();\r\n                    });\r\n\r\n                    $element.parent().keydown(function (e) {\r\n                        var handled = false;\r\n                        var resetFocus = false;\r\n                        var element = $scope.element;\r\n                    \r\n                        if (element.editor.isDragging || element.editor.inlineEditingIsActive)\r\n                            return;\r\n\r\n                        // If native clipboard support exists, the pseudo-clipboard will have been disabled.\r\n                        if (!clipboard.isDisabled()) {\r\n                            var focusedElement = element.editor.focusedElement;\r\n                            if (!!focusedElement) {\r\n                                // Pseudo clipboard handling for browsers not allowing real clipboard operations.\r\n                                if (e.ctrlKey) {\r\n                                    switch (e.which) {\r\n                                    case 67: // C\r\n                                        focusedElement.copy(clipboard);\r\n                                        break;\r\n                                    case 88: // X\r\n                                        focusedElement.cut(clipboard);\r\n                                        break;\r\n                                    case 86: // V\r\n                                        focusedElement.paste(clipboard);\r\n                                        break;\r\n                                    }\r\n                                }\r\n                            }\r\n                        }\r\n\r\n                        if (!e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 46) { // Del\r\n                            $scope.delete(element);\r\n                            handled = true;\r\n                        } else if (!e.ctrlKey && !e.shiftKey && !e.altKey && (e.which == 32 || e.which == 27)) { // Space or Esc\r\n                            $element.find(\".layout-panel-action-properties\").first().click();\r\n                            handled = true;\r\n                        }\r\n\r\n                        if (element.type == \"Content\") { // This is a content element.\r\n                            if (!e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 13) { // Enter\r\n                                $element.find(\".layout-panel-action-edit\").first().click();\r\n                                handled = true;\r\n                            }\r\n                        }\r\n\r\n                        if (!!element.children) { // This is a container.\r\n                            if (!e.ctrlKey && !e.shiftKey && e.altKey && e.which == 40) { // Alt+Down\r\n                                if (element.children.length > 0)\r\n                                    element.children[0].setIsFocused();\r\n                                handled = true;\r\n                            }\r\n\r\n                            if (element.type == \"Column\") { // This is a column.\r\n                                var connectAdjacent = !e.ctrlKey;\r\n                                if (e.which == 37) { // Left\r\n                                    if (e.altKey)\r\n                                        element.expandLeft(connectAdjacent);\r\n                                    if (e.shiftKey)\r\n                                        element.contractRight(connectAdjacent);\r\n                                    handled = true;\r\n                                } else if (e.which == 39) { // Right\r\n                                    if (e.altKey)\r\n                                        element.contractLeft(connectAdjacent);\r\n                                    if (e.shiftKey)\r\n                                        element.expandRight(connectAdjacent);\r\n                                    handled = true;\r\n                                }\r\n                            }\r\n                        }\r\n\r\n                        if (!!element.parent) { // This is a child.\r\n                            if (e.altKey && e.which == 38) { // Alt+Up\r\n                                element.parent.setIsFocused();\r\n                                handled = true;\r\n                            }\r\n\r\n                            if (element.parent.type == \"Row\") { // Parent is a horizontal container.\r\n                                if (!e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 37) { // Left\r\n                                    element.parent.moveFocusPrevChild(element);\r\n                                    handled = true;\r\n                                }\r\n                                else if (!e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 39) { // Right\r\n                                    element.parent.moveFocusNextChild(element);\r\n                                    handled = true;\r\n                                }\r\n                                else if (e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 37) { // Ctrl+Left\r\n                                    element.moveUp();\r\n                                    resetFocus = true;\r\n                                    handled = true;\r\n                                }\r\n                                else if (e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 39) { // Ctrl+Right\r\n                                    element.moveDown();\r\n                                    handled = true;\r\n                                }\r\n                            }\r\n                            else { // Parent is a vertical container.\r\n                                if (!e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 38) { // Up\r\n                                    element.parent.moveFocusPrevChild(element);\r\n                                    handled = true;\r\n                                }\r\n                                else if (!e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 40) { // Down\r\n                                    element.parent.moveFocusNextChild(element);\r\n                                    handled = true;\r\n                                }\r\n                                else if (e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 38) { // Ctrl+Up\r\n                                    element.moveUp();\r\n                                    resetFocus = true;\r\n                                    handled = true;\r\n                                }\r\n                                else if (e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 40) { // Ctrl+Down\r\n                                    element.moveDown();\r\n                                    handled = true;\r\n                                }\r\n                            }\r\n                        }\r\n\r\n                        if (handled) {\r\n                            e.preventDefault();\r\n                        }\r\n\r\n                        e.stopPropagation();\r\n\r\n                        $scope.$apply(); // Event is not triggered by Angular directive but raw event handler on element.\r\n\r\n                        // HACK: Workaround because of how Angular treats the DOM when elements are shifted around - input focus is sometimes lost.\r\n                        if (resetFocus) {\r\n                            window.setTimeout(function () {\r\n                                $scope.$apply(function () {\r\n                                    element.editor.focusedElement.setIsFocused();\r\n                                });\r\n                            }, 100);\r\n                        }\r\n                    });\r\n\r\n                    $scope.element.setIsFocusedEventHandlers.push(function () {\r\n                        $element.parent().focus();\r\n                    });\r\n\r\n                    $scope.delete = function (element) {\r\n                        element.delete();\r\n                    }\r\n                },\r\n\r\n                configureForContainer: function ($scope, $element) {\r\n                    var element = $scope.element;\r\n\r\n                    //$scope.isReceiving = false; // True when container is receiving an external element via drag/drop.\r\n                    $scope.getShowChildrenPlaceholder = function () {\r\n                        return $scope.element.children.length === 0 && !$scope.element.getIsDropTarget();\r\n                    };\r\n\r\n                    $scope.sortableOptions = {\r\n                        cursor: \"move\",\r\n                        delay: 150,\r\n                        disabled: element.getIsSealed(),\r\n                        distance: 5,\r\n                        //handle: element.children.length < 2 ? \".imaginary-class\" : false, // For some reason doesn't get re-evaluated after adding more children.\r\n                        start: function (e, ui) {\r\n                            $scope.$apply(function () {\r\n                                element.setIsDropTarget(true);\r\n                                element.editor.isDragging = true;\r\n                            });\r\n                            // Make the drop target placeholder as high as the item being dragged.\r\n                            ui.placeholder.height(ui.item.height() - 4);\r\n                            ui.placeholder.css(\"min-height\", 0);\r\n                        },\r\n                        stop: function (e, ui) {\r\n                            $scope.$apply(function () {\r\n                                element.editor.isDragging = false;\r\n                                element.setIsDropTarget(false);\r\n                            });\r\n                        },\r\n                        over: function (e, ui) {\r\n                            if (!!ui.sender && !!ui.sender[0].isToolbox) {\r\n                                if (!!ui.sender[0].dropTargetTimeout) {\r\n                                    $timeout.cancel(ui.sender[0].dropTargetTimeout);\r\n                                    ui.sender[0].dropTargetTimeout = null;\r\n                                }\r\n                                $timeout(function () {\r\n                                    if (element.type == \"Row\") {\r\n                                        // If there was a previous drop target and it was a row, roll back any pending column adds to it.\r\n                                        var previousDropTarget = element.editor.dropTargetElement;\r\n                                        if (!!previousDropTarget && previousDropTarget.type == \"Row\")\r\n                                            previousDropTarget.rollbackAddColumn();\r\n                                    }\r\n                                    element.setIsDropTarget(false);\r\n                                });\r\n                                ui.sender[0].dropTargetTimeout = $timeout(function () {\r\n                                    if (element.type == \"Row\") {\r\n                                        var receivedColumn = ui.item.sortable.model;\r\n                                        var receivedColumnWidth = Math.floor(12 / (element.children.length + 1));\r\n                                        receivedColumn.width = receivedColumnWidth;\r\n                                        receivedColumn.offset = 0;\r\n                                        element.beginAddColumn(receivedColumnWidth);\r\n                                        // Make the drop target placeholder the correct width and as high as the highest existing column in the row.\r\n                                        var maxHeight = _.max(_($element.find(\"> .layout-children > .layout-column:not(.ui-sortable-placeholder)\")).map(function (e) {\r\n                                            return $(e).height();\r\n                                        }));\r\n                                        for (i = 1; i <= 12; i++)\r\n                                            ui.placeholder.removeClass(\"col-xs-\" + i);\r\n                                        ui.placeholder.addClass(\"col-xs-\" + receivedColumn.width);\r\n                                        if (maxHeight > 0) {\r\n                                            ui.placeholder.height(maxHeight);\r\n                                            ui.placeholder.css(\"min-height\", 0);\r\n                                        }\r\n                                        else {\r\n                                            ui.placeholder.height(0);\r\n                                            ui.placeholder.css(\"min-height\", \"\");\r\n                                        }\r\n                                    }\r\n                                    element.setIsDropTarget(true);\r\n                                }, 150);\r\n                            }\r\n                        },\r\n                        receive: function (e, ui) {\r\n                            if (!!ui.sender && !!ui.sender[0].isToolbox) {\r\n                                $scope.$apply(function () {\r\n                                    var receivedElement = ui.item.sortable.model;\r\n                                    if (!!receivedElement) {\r\n                                        if (element.type == \"Row\")\r\n                                            element.commitAddColumn();\r\n                                        // Should ideally call LayoutEditor.Container.addChild() instead, but since this handler\r\n                                        // is run *before* the ui-sortable directive's handler, if we try to add the child to the\r\n                                        // array that handler will get an exception when trying to do the same.\r\n                                        // Because of this, we need to invoke \"setParent\" so that specific container types can perform element speficic initialization.\r\n                                        receivedElement.setEditor(element.editor);\r\n                                        receivedElement.setParent(element);\r\n\r\n                                        if (!!receivedElement.hasEditor) {\r\n                                            $scope.$root.editElement(receivedElement).then(function (args) {\r\n                                                if (!args.cancel) {\r\n                                                    receivedElement.data = args.element.data;\r\n                                                    receivedElement.applyElementEditorModel(args.elementEditorModel);\r\n\r\n                                                    if (!!receivedElement.setHtml)\r\n                                                        receivedElement.setHtml(args.element.html);\r\n                                                }\r\n                                                $timeout(function () {\r\n                                                    if (!!args.cancel)\r\n                                                        receivedElement.delete();\r\n                                                    else\r\n                                                        receivedElement.setIsFocused();\r\n                                                    //$scope.isReceiving = false;\r\n                                                    element.setIsDropTarget(false);\r\n\r\n                                                });\r\n                                                return;\r\n                                            });\r\n                                        }\r\n                                    }\r\n                                    $timeout(function () {\r\n                                        //$scope.isReceiving = false;\r\n                                        element.setIsDropTarget(false);\r\n                                        if (!!receivedElement)\r\n                                            receivedElement.setIsFocused();\r\n                                    });\r\n                                });\r\n                            }\r\n                        }\r\n                    };\r\n\r\n                    $scope.click = function (child, e) {\r\n                        if (!child.editor.isDragging)\r\n                            child.setIsFocused();\r\n                        e.stopPropagation();\r\n                    };\r\n\r\n                    $scope.getClasses = function (child) {\r\n                        var result = [\"layout-element\"];\r\n\r\n                        if (!!child.children) {\r\n                            result.push(\"layout-container\");\r\n                            if (child.getIsSealed())\r\n                                result.push(\"layout-container-sealed\");\r\n                        }\r\n\r\n                        result.push(\"layout-\" + child.type.toLowerCase());\r\n\r\n                        if (!!child.dropTargetClass)\r\n                            result.push(child.dropTargetClass);\r\n\r\n                        // TODO: Move these to either the Column directive or the Column model class.\r\n                        if (child.type == \"Row\") {\r\n                            result.push(\"row\");\r\n                            if (!child.canAddColumn())\r\n                                result.push(\"layout-row-full\");\r\n                        }\r\n                        if (child.type == \"Column\") {\r\n                            result.push(\"col-xs-\" + child.width);\r\n                            result.push(\"col-xs-offset-\" + child.offset);\r\n                        }\r\n                        if (child.type == \"Content\")\r\n                            result.push(\"layout-content-\" + child.contentTypeClass);\r\n\r\n                        if (child.getIsActive())\r\n                            result.push(\"layout-element-active\");\r\n                        if (child.getIsFocused())\r\n                            result.push(\"layout-element-focused\");\r\n                        if (child.getIsSelected())\r\n                            result.push(\"layout-element-selected\");\r\n                        if (child.getIsDropTarget())\r\n                            result.push(\"layout-element-droptarget\");\r\n                        if (child.isTemplated)\r\n                            result.push(\"layout-element-templated\");\r\n\r\n                        return result;\r\n                    };\r\n                }\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutEditor\", [\"environment\",\r\n        function (environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: {},\r\n                controller: [\"$scope\", \"$element\", \"$attrs\", \"$compile\", \"clipboard\",\r\n                    function ($scope, $element, $attrs, $compile, clipboard) {\r\n                        if (!!$attrs.model)\r\n                            $scope.element = eval($attrs.model);\r\n                        else\r\n                            throw new Error(\"The 'model' attribute must evaluate to a LayoutEditor.Editor object.\");\r\n\r\n                        $scope.click = function (canvas, e) {\r\n                            if (!canvas.editor.isDragging)\r\n                                canvas.setIsFocused();\r\n                            e.stopPropagation();\r\n                        };\r\n\r\n                        $scope.getClasses = function (canvas) {\r\n                            var result = [\"layout-element\", \"layout-container\", \"layout-canvas\"];\r\n\r\n                            if (canvas.getIsActive())\r\n                                result.push(\"layout-element-active\");\r\n                            if (canvas.getIsFocused())\r\n                                result.push(\"layout-element-focused\");\r\n                            if (canvas.getIsSelected())\r\n                                result.push(\"layout-element-selected\");\r\n                            if (canvas.getIsDropTarget())\r\n                                result.push(\"layout-element-droptarget\");\r\n                            if (canvas.isTemplated)\r\n                                result.push(\"layout-element-templated\");\r\n\r\n                            return result;\r\n                        };\r\n\r\n                        // An unfortunate side-effect of the next hack on line 54 is that the created elements aren't added to the DOM yet, so we can't use it to get to the parent \".layout-desiger\" element.\r\n                        // Work around: access that element directly (which efectively turns multiple layout editors on a single page impossible). \r\n                        // //var layoutDesignerHost = $element.closest(\".layout-designer\").data(\"layout-designer-host\");\r\n                        var layoutDesignerHost = $(\".layout-designer\").data(\"layout-designer-host\");\r\n\r\n                        $scope.$root.layoutDesignerHost = layoutDesignerHost;\r\n\r\n                        layoutDesignerHost.element.on(\"replacecanvas\", function (e, args) {\r\n                            var editor = $scope.element;\r\n                            var canvasData = {\r\n                                data: args.canvas.data,\r\n                                htmlId: args.canvas.htmlId,\r\n                                htmlClass: args.canvas.htmlClass,\r\n                                htmlStyle: args.canvas.htmlStyle,\r\n                                isTemplated: args.canvas.isTemplated,\r\n                                children: args.canvas.children\r\n                            };\r\n\r\n                            // HACK: Instead of simply updating the $scope.element with a new instance, we need to replace the entire orc-layout-editor markup\r\n                            // in order for angular to rebind starting with the Canvas element. Otherwise, for some reason, it will rebind starting with the first child of Canvas.\r\n                            // You can see this happening when setting a breakpoint in ScopeConfigurator where containers are initialized with drag & drop: on page load, the first element\r\n                            // is a Canvas (good), but after having selected another template, the first element is (typically) a Grid (bad).\r\n                            // Simply recompiling the orc-layout-editor directive will cause the entire thing to be generated, which works just fine as well (even though not is nice as simply leveraging model binding).\r\n                            layoutDesignerHost.editor = window.layoutEditor = new LayoutEditor.Editor(editor.config, canvasData);\r\n                            var template = \"<orc-layout-editor\" + \" model='window.layoutEditor' />\";\r\n                            var html = $compile(template)($scope);\r\n                            $(\".layout-editor-holder\").html(html);\r\n                        });\r\n\r\n                        $scope.$root.editElement = function (element) {\r\n                            var host = $scope.$root.layoutDesignerHost;\r\n                            return host.editElement(element);\r\n                        };\r\n\r\n                        $scope.$root.addElement = function (contentType) {\r\n                            var host = $scope.$root.layoutDesignerHost;\r\n                            return host.addElement(contentType);\r\n                        };\r\n\r\n                        $scope.toggleInlineEditing = function () {\r\n                            if (!$scope.element.inlineEditingIsActive) {\r\n                                $scope.element.inlineEditingIsActive = true;\r\n                                $element.find(\".layout-toolbar-container\").show();\r\n                                var selector = \"#layout-editor-\" + $scope.$id + \" .layout-html .layout-content-markup[data-templated=false]\";\r\n                                var firstContentEditorId = $(selector).first().attr(\"id\");\r\n                                tinymce.init({\r\n                                    selector: selector,\r\n                                    theme: \"modern\",\r\n                                    schema: \"html5\",\r\n                                    plugins: [\r\n                                        \"advlist autolink lists link image charmap print preview hr anchor pagebreak\",\r\n                                        \"searchreplace wordcount visualblocks visualchars code fullscreen\",\r\n                                        \"insertdatetime media nonbreaking table contextmenu directionality\",\r\n                                        \"emoticons template paste textcolor colorpicker textpattern\",\r\n                                        \"fullscreen autoresize\"\r\n                                    ],\r\n                                    toolbar: \"undo redo cut copy paste | bold italic | bullist numlist outdent indent formatselect | alignleft aligncenter alignright alignjustify ltr rtl | link unlink charmap | code fullscreen close\",\r\n                                    convert_urls: false,\r\n                                    valid_elements: \"*[*]\",\r\n                                    // Shouldn't be needed due to the valid_elements setting, but TinyMCE would strip script.src without it.\r\n                                    extended_valid_elements: \"script[type|defer|src|language]\",\r\n                                    statusbar: false,\r\n                                    skin: \"orchardlightgray\",\r\n                                    inline: true,\r\n                                    fixed_toolbar_container: \"#layout-editor-\" + $scope.$id + \" .layout-toolbar-container\",\r\n                                    init_instance_callback: function (editor) {\r\n                                        if (editor.id == firstContentEditorId)\r\n                                            tinymce.execCommand(\"mceFocus\", false, editor.id);\r\n                                    }\r\n                                });\r\n                            }\r\n                            else {\r\n                                tinymce.remove(\"#layout-editor-\" + $scope.$id + \" .layout-content-markup\");\r\n                                $element.find(\".layout-toolbar-container\").hide();\r\n                                $scope.element.inlineEditingIsActive = false;\r\n                            }\r\n                        };\r\n\r\n                        $(document).on(\"cut copy paste\", function (e) {\r\n                            // If the pseudo clipboard was already invoked (which happens on the first clipboard\r\n                            // operation after page load even if native clipboard support exists) then sit this\r\n                            // one operation out, but make sure whatever is on the pseudo clipboard gets migrated\r\n                            // to the native clipboard for subsequent operations.\r\n                            if (clipboard.wasInvoked()) {\r\n                                e.originalEvent.clipboardData.setData(\"text/plain\", clipboard.getData(\"text/plain\"));\r\n                                e.originalEvent.clipboardData.setData(\"text/json\", clipboard.getData(\"text/json\"));\r\n                                e.preventDefault();\r\n                            }\r\n                            else {\r\n                                var focusedElement = $scope.element.focusedElement;\r\n                                if (!!focusedElement) {\r\n                                    $scope.$apply(function () {\r\n                                        switch (e.type) {\r\n                                            case \"copy\":\r\n                                                focusedElement.copy(e.originalEvent.clipboardData);\r\n                                                break;\r\n                                            case \"cut\":\r\n                                                focusedElement.cut(e.originalEvent.clipboardData);\r\n                                                break;\r\n                                            case \"paste\":\r\n                                                focusedElement.paste(e.originalEvent.clipboardData);\r\n                                                break;\r\n                                        }\r\n                                    });\r\n\r\n                                    // HACK: Workaround because of how Angular treats the DOM when elements are shifted around - input focus is sometimes lost.\r\n                                    window.setTimeout(function () {\r\n                                        $scope.$apply(function () {\r\n                                            if (!!$scope.element.focusedElement)\r\n                                                $scope.element.focusedElement.setIsFocused();\r\n                                        });\r\n                                    }, 100);\r\n\r\n                                    e.preventDefault();\r\n                                }\r\n                            }\r\n\r\n                            // Native clipboard support obviously exists, so disable the peudo clipboard from now on.\r\n                            clipboard.disable();\r\n                        });\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"Editor\"),\r\n                replace: true,\r\n                link: function (scope, element) {\r\n                    // No clicks should propagate from the TinyMCE toolbars.\r\n                    element.find(\".layout-toolbar-container\").click(function (e) {\r\n                        e.stopPropagation();\r\n                    });\r\n                    // Intercept mousedown on editor while in inline editing mode to \r\n                    // prevent current editor from losing focus.\r\n                    element.mousedown(function (e) {\r\n                        if (scope.element.inlineEditingIsActive) {\r\n                            e.preventDefault();\r\n                            e.stopPropagation();\r\n                        }\r\n                    })\r\n                    // Unfocus and unselect everything on click outside of canvas.\r\n                    $(window).click(function (e) {\r\n                        // Except when in inline editing mode.\r\n                        if (!scope.element.inlineEditingIsActive) {\r\n                            scope.$apply(function () {\r\n                                scope.element.activeElement = null;\r\n                                scope.element.focusedElement = null;\r\n                            });\r\n                        }\r\n                    });\r\n                }\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutCanvas\", [\"scopeConfigurator\", \"environment\",\r\n        function (scopeConfigurator, environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: { element: \"=\" },\r\n                controller: [\"$scope\", \"$element\", \"$attrs\",\r\n                    function ($scope, $element, $attrs) {\r\n                        scopeConfigurator.configureForElement($scope, $element);\r\n                        scopeConfigurator.configureForContainer($scope, $element);\r\n                        $scope.sortableOptions[\"axis\"] = \"y\";\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"Canvas\"),\r\n                replace: true\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutChild\", [\"$compile\",\r\n        function ($compile) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: { element: \"=\" },\r\n                link: function (scope, element) {\r\n                    var template = \"<orc-layout-\" + scope.element.type.toLowerCase() + \" element='element' />\";\r\n                    var html = $compile(template)(scope);\r\n                    $(element).replaceWith(html);\r\n                }\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutColumn\", [\"$compile\", \"scopeConfigurator\", \"environment\",\r\n        function ($compile, scopeConfigurator, environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: { element: \"=\" },\r\n                controller: [\"$scope\", \"$element\",\r\n                    function ($scope, $element) {\r\n                        scopeConfigurator.configureForElement($scope, $element);\r\n                        scopeConfigurator.configureForContainer($scope, $element);\r\n                        $scope.sortableOptions[\"axis\"] = \"y\";\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"Column\"),\r\n                replace: true,\r\n                link: function (scope, element, attrs) {\r\n                    element.find(\".layout-column-resize-bar\").draggable({\r\n                        axis: \"x\",\r\n                        helper: \"clone\",\r\n                        revert: true,\r\n                        start: function (e, ui) {\r\n                            scope.$apply(function () {\r\n                                scope.element.editor.isResizing = true;\r\n                            });\r\n                        },\r\n                        drag: function (e, ui) {\r\n                            var columnElement = element.parent();\r\n                            var columnSize = columnElement.width() / scope.element.width;\r\n                            var connectAdjacent = !e.ctrlKey;\r\n                            if ($(e.target).hasClass(\"layout-column-resize-bar-left\")) {\r\n                                var delta = ui.offset.left - columnElement.offset().left;\r\n                                if (delta < -columnSize && scope.element.canExpandLeft(connectAdjacent)) {\r\n                                    scope.$apply(function () {\r\n                                        scope.element.expandLeft(connectAdjacent);\r\n                                    });\r\n                                }\r\n                                else if (delta > columnSize && scope.element.canContractLeft(connectAdjacent)) {\r\n                                    scope.$apply(function () {\r\n                                        scope.element.contractLeft(connectAdjacent);\r\n                                    });\r\n                                }\r\n                            }\r\n                            else if ($(e.target).hasClass(\"layout-column-resize-bar-right\")) {\r\n                                var delta = ui.offset.left - columnElement.width() - columnElement.offset().left;\r\n                                if (delta > columnSize && scope.element.canExpandRight(connectAdjacent)) {\r\n                                    scope.$apply(function () {\r\n                                        scope.element.expandRight(connectAdjacent);\r\n                                    });\r\n                                }\r\n                                else if (delta < -columnSize && scope.element.canContractRight(connectAdjacent)) {\r\n                                    scope.$apply(function () {\r\n                                        scope.element.contractRight(connectAdjacent);\r\n                                    });\r\n                                }\r\n                            }\r\n\r\n                        },\r\n                        stop: function (e, ui) {\r\n                            scope.$apply(function () {\r\n                              scope.element.editor.isResizing = false;\r\n                            });\r\n                        }\r\n                    });\r\n                }\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutContent\", [\"$sce\", \"scopeConfigurator\", \"environment\",\r\n        function ($sce, scopeConfigurator, environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: { element: \"=\" },\r\n                controller: [\"$scope\", \"$element\",\r\n                    function ($scope, $element) {\r\n                        scopeConfigurator.configureForElement($scope, $element);\r\n                        $scope.edit = function () {\r\n                            $scope.$root.editElement($scope.element).then(function (args) {\r\n                                $scope.$apply(function () {\r\n                                    if (args.cancel)\r\n                                        return;\r\n\r\n                                    $scope.element.data = args.element.data;\r\n                                    $scope.element.setHtml(args.element.html);\r\n                                });\r\n                            });\r\n                        };\r\n\r\n                        // Overwrite the setHtml function so that we can use the $sce service to trust the html (and not have the html binding strip certain tags).\r\n                        $scope.element.setHtml = function (html) {\r\n                            $scope.element.html = html;\r\n                            $scope.element.htmlUnsafe = $sce.trustAsHtml(html);\r\n                        };\r\n\r\n                        $scope.element.setHtml($scope.element.html);\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"Content\"),\r\n                replace: true\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutHtml\", [\"$sce\", \"scopeConfigurator\", \"environment\",\r\n        function ($sce, scopeConfigurator, environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: { element: \"=\" },\r\n                controller: [\"$scope\", \"$element\",\r\n                    function ($scope, $element) {\r\n                        scopeConfigurator.configureForElement($scope, $element);\r\n                        $scope.edit = function () {\r\n                            $scope.$root.editElement($scope.element).then(function (args) {\r\n                                $scope.$apply(function () {\r\n                                    if (args.cancel)\r\n                                        return;\r\n\r\n                                    $scope.element.data = args.element.data;\r\n                                    $scope.element.setHtml(args.element.html);\r\n                                });\r\n                            });\r\n                        };\r\n                        $scope.updateContent = function (e) {\r\n                            $scope.element.setHtml(e.target.innerHTML);\r\n                        };\r\n\r\n                        // Overwrite the setHtml function so that we can use the $sce service to trust the html (and not have the html binding strip certain tags).\r\n                        $scope.element.setHtml = function (html) {\r\n                            $scope.element.html = html;\r\n                            $scope.element.htmlUnsafe = $sce.trustAsHtml(html);\r\n                        };\r\n\r\n                        $scope.element.setHtml($scope.element.html);\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"Html\"),\r\n                replace: true,\r\n                link: function (scope, element) {\r\n                    // Mouse down events must not be intercepted by drag and drop while inline editing is active,\r\n                    // otherwise clicks in inline editors will have no effect.\r\n                    element.find(\".layout-content-markup\").mousedown(function (e) {\r\n                        if (scope.element.editor.inlineEditingIsActive) {\r\n                            e.stopPropagation();\r\n                        }\r\n                    });\r\n                }\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutGrid\", [\"$compile\", \"scopeConfigurator\", \"environment\",\r\n        function ($compile, scopeConfigurator, environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: { element: \"=\" },\r\n                controller: [\"$scope\", \"$element\",\r\n                    function ($scope, $element) {\r\n                        scopeConfigurator.configureForElement($scope, $element);\r\n                        scopeConfigurator.configureForContainer($scope, $element);\r\n                        $scope.sortableOptions[\"axis\"] = \"y\";\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"Grid\"),\r\n                replace: true\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutRow\", [\"$compile\", \"scopeConfigurator\", \"environment\",\r\n        function ($compile, scopeConfigurator, environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: { element: \"=\" },\r\n                controller: [\"$scope\", \"$element\",\r\n                    function ($scope, $element) {\r\n                        scopeConfigurator.configureForElement($scope, $element);\r\n                        scopeConfigurator.configureForContainer($scope, $element);\r\n                        $scope.sortableOptions[\"axis\"] = \"x\";\r\n                        $scope.sortableOptions[\"ui-floating\"] = true;\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"Row\"),\r\n                replace: true\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutPopup\", [\r\n        function () {\r\n            return {\r\n                restrict: \"A\",\r\n                link: function (scope, element, attrs) {\r\n                    var popup = $(element);\r\n                    var trigger = popup.closest(\".layout-popup-trigger\");\r\n                    var parentElement = popup.closest(\".layout-element\");\r\n                    trigger.click(function () {\r\n                        popup.toggle();\r\n                        if (popup.is(\":visible\")) {\r\n                            popup.position({\r\n                                my: attrs.orcLayoutPopupMy || \"left top\",\r\n                                at: attrs.orcLayoutPopupAt || \"left bottom+4px\",\r\n                                of: trigger\r\n                            });\r\n                            popup.find(\"input\").first().focus();\r\n                        }\r\n                    });\r\n                    popup.click(function (e) {\r\n                        e.stopPropagation();\r\n                    });\r\n                    parentElement.click(function (e) {\r\n                        popup.hide();\r\n                    });\r\n                    popup.keydown(function (e) {\r\n                        if (!e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 27) // Esc\r\n                            popup.hide();\r\n                        e.stopPropagation();\r\n                    });\r\n                    popup.on(\"cut copy paste\", function (e) {\r\n                        // Allow clipboard operations in popup without invoking clipboard event handlers on parent element.\r\n                        e.stopPropagation();\r\n                    });\r\n                }\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutToolbox\", [\"$compile\", \"environment\",\r\n        function ($compile, environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                controller: [\"$scope\", \"$element\",\r\n                    function ($scope, $element) {\r\n\r\n                        $scope.resetElements = function () {\r\n\r\n                            $scope.gridElements = [\r\n                                LayoutEditor.Grid.from({\r\n                                    toolboxIcon: \"\\uf00a\",\r\n                                    toolboxLabel: \"Grid\",\r\n                                    toolboxDescription: \"Empty grid.\",\r\n                                    children: []\r\n                                })\r\n                            ];\r\n\r\n                            $scope.rowElements = [\r\n                                LayoutEditor.Row.from({\r\n                                    toolboxIcon: \"\\uf0c9\",\r\n                                    toolboxLabel: \"Row (1 column)\",\r\n                                    toolboxDescription: \"Row with 1 column.\",\r\n                                    children: LayoutEditor.Column.times(1)\r\n                                }),\r\n                                LayoutEditor.Row.from({\r\n                                    toolboxIcon: \"\\uf0c9\",\r\n                                    toolboxLabel: \"Row (2 columns)\",\r\n                                    toolboxDescription: \"Row with 2 columns.\",\r\n                                    children: LayoutEditor.Column.times(2)\r\n                                }),\r\n                                LayoutEditor.Row.from({\r\n                                    toolboxIcon: \"\\uf0c9\",\r\n                                    toolboxLabel: \"Row (3 columns)\",\r\n                                    toolboxDescription: \"Row with 3 columns.\",\r\n                                    children: LayoutEditor.Column.times(3)\r\n                                }),\r\n                                LayoutEditor.Row.from({\r\n                                    toolboxIcon: \"\\uf0c9\",\r\n                                    toolboxLabel: \"Row (4 columns)\",\r\n                                    toolboxDescription: \"Row with 4 columns.\",\r\n                                    children: LayoutEditor.Column.times(4)\r\n                                }),\r\n                                LayoutEditor.Row.from({\r\n                                    toolboxIcon: \"\\uf0c9\",\r\n                                    toolboxLabel: \"Row (6 columns)\",\r\n                                    toolboxDescription: \"Row with 6 columns.\",\r\n                                    children: LayoutEditor.Column.times(6)\r\n                                }),\r\n                                LayoutEditor.Row.from({\r\n                                    toolboxIcon: \"\\uf0c9\",\r\n                                    toolboxLabel: \"Row (12 columns)\",\r\n                                    toolboxDescription: \"Row with 12 columns.\",\r\n                                    children: LayoutEditor.Column.times(12)\r\n                                }), LayoutEditor.Row.from({\r\n                                    toolboxIcon: \"\\uf0c9\",\r\n                                    toolboxLabel: \"Row (empty)\",\r\n                                    toolboxDescription: \"Empty row.\",\r\n                                    children: []\r\n                                })\r\n                            ];\r\n\r\n                            $scope.columnElements = [\r\n                                LayoutEditor.Column.from({\r\n                                    toolboxIcon: \"\\uf0db\",\r\n                                    toolboxLabel: \"Column\",\r\n                                    toolboxDescription: \"Empty column.\",\r\n                                    width: 1,\r\n                                    offset: 0,\r\n                                    children: []\r\n                                })\r\n                            ];\r\n\r\n                            $scope.canvasElements = [\r\n                                LayoutEditor.Canvas.from({\r\n                                    toolboxIcon: \"\\uf044\",\r\n                                    toolboxLabel: \"Canvas\",\r\n                                    toolboxDescription: \"Empty canvas.\",\r\n                                    children: []\r\n                                })\r\n                            ];\r\n\r\n                            $scope.contentElementCategories = _($scope.element.config.categories).map(function (category) {\r\n                                return {\r\n                                    name: category.name,\r\n                                    elements: _(category.contentTypes).map(function (contentType) {\r\n                                        var type = contentType.type;\r\n                                        var factory = LayoutEditor.factories[type] || LayoutEditor.factories[\"Content\"];\r\n                                        var item = {\r\n                                            isTemplated: false,\r\n                                            contentType: contentType.id,\r\n                                            contentTypeLabel: contentType.label,\r\n                                            contentTypeClass: contentType.typeClass,\r\n                                            data: null,\r\n                                            hasEditor: contentType.hasEditor,\r\n                                            html: contentType.html\r\n                                        };\r\n                                        var element = factory(item);\r\n                                        element.toolboxIcon = contentType.icon || \"\\uf1c9\";\r\n                                        element.toolboxLabel = contentType.label;\r\n                                        element.toolboxDescription = contentType.description;\r\n                                        return element;\r\n                                    })\r\n                                };\r\n                            });\r\n\r\n                        };\r\n\r\n                        $scope.resetElements();\r\n\r\n                        $scope.getSortableOptions = function (type) {\r\n                            var editorId = $element.closest(\".layout-editor\").attr(\"id\");\r\n                            var parentClasses;\r\n                            var placeholderClasses;\r\n                            var floating = false;\r\n\r\n                            switch (type) {\r\n                                case \"Grid\":\r\n                                    parentClasses = [\".layout-canvas\", \".layout-column\", \".layout-common-holder\"];\r\n                                    placeholderClasses = \"layout-element layout-container layout-grid ui-sortable-placeholder\";\r\n                                    break;\r\n                                case \"Row\":\r\n                                    parentClasses = [\".layout-grid\"];\r\n                                    placeholderClasses = \"layout-element layout-container layout-row row ui-sortable-placeholder\";\r\n                                    break;\r\n                                case \"Column\":\r\n                                    parentClasses = [\".layout-row:not(.layout-row-full)\"];\r\n                                    placeholderClasses = \"layout-element layout-container layout-column ui-sortable-placeholder\";\r\n                                    floating = true; // To ensure a smooth horizontal-list reordering. https://github.com/angular-ui/ui-sortable#floating\r\n                                    break;\r\n                                case \"Content\":\r\n                                    parentClasses = [\".layout-canvas\", \".layout-column\", \".layout-common-holder\"];\r\n                                    placeholderClasses = \"layout-element layout-content ui-sortable-placeholder\";\r\n                                    break;\r\n                                case \"Canvas\":\r\n                                    parentClasses = [\".layout-canvas\", \".layout-column\", \".layout-common-holder\"];\r\n                                    placeholderClasses = \"layout-element layout-container layout-grid ui-sortable-placeholder\";\r\n                                    break;\r\n                            }\r\n\r\n                            return {\r\n                                cursor: \"move\",\r\n                                connectWith: _(parentClasses).map(function (e) { return \"#\" + editorId + \" \" + e + \":not(.layout-container-sealed) > .layout-element-wrapper > .layout-children\"; }).join(\", \"),\r\n                                placeholder: placeholderClasses,\r\n                                \"ui-floating\": floating,\r\n                                create: function (e, ui) {\r\n                                    e.target.isToolbox = true; // Will indicate to connected sortables that dropped items were sent from toolbox.\r\n                                },\r\n                                start: function (e, ui) {\r\n                                    $scope.$apply(function () {\r\n                                        $scope.element.isDragging = true;\r\n                                    });\r\n                                },\r\n                                stop: function (e, ui) {\r\n                                    $scope.$apply(function () {\r\n                                        $scope.element.isDragging = false;\r\n                                        $scope.resetElements();\r\n                                    });\r\n                                },\r\n                                over: function (e, ui) {\r\n                                    $scope.$apply(function () {\r\n                                        $scope.element.canvas.setIsDropTarget(false);\r\n                                    });\r\n                                },\r\n                            }\r\n                        };\r\n\r\n                        var layoutIsCollapsedCookieName = \"layoutToolboxCategory_Layout_IsCollapsed\";\r\n                        $scope.layoutIsCollapsed = $.cookie(layoutIsCollapsedCookieName) === \"true\";\r\n\r\n                        $scope.toggleLayoutIsCollapsed = function (e) {\r\n                            $scope.layoutIsCollapsed = !$scope.layoutIsCollapsed;\r\n                            $.cookie(layoutIsCollapsedCookieName, $scope.layoutIsCollapsed, { expires: 365 }); // Remember collapsed state for a year.\r\n                            e.preventDefault();\r\n                            e.stopPropagation();\r\n                        };\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"Toolbox\"),\r\n                replace: true,\r\n                link: function (scope, element) {\r\n                    var toolbox = element.find(\".layout-toolbox\");\r\n                    $(window).on(\"resize scroll\", function (e) {\r\n                        var canvas = element.parent().find(\".layout-canvas\");\r\n                        // If the canvas is taller than the toolbox, make the toolbox sticky-positioned within the editor\r\n                        // to help the user avoid excessive vertical scrolling.\r\n                        var canvasIsTaller = !!canvas && canvas.height() > toolbox.height();\r\n                        var windowPos = $(window).scrollTop();\r\n                        if (canvasIsTaller && windowPos > element.offset().top + element.height() - toolbox.height()) {\r\n                            toolbox.addClass(\"sticky-bottom\");\r\n                            toolbox.removeClass(\"sticky-top\");\r\n                        }\r\n                        else if (canvasIsTaller && windowPos > element.offset().top) {\r\n                            toolbox.addClass(\"sticky-top\");\r\n                            toolbox.removeClass(\"sticky-bottom\");\r\n                        }\r\n                        else {\r\n                            toolbox.removeClass(\"sticky-top\");\r\n                            toolbox.removeClass(\"sticky-bottom\");\r\n                        }\r\n                    });\r\n                }\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutToolboxGroup\", [\"$compile\", \"environment\",\r\n        function ($compile, environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: { category: \"=\" },\r\n                controller: [\"$scope\", \"$element\",\r\n                    function ($scope, $element) {\r\n                        var isCollapsedCookieName = \"layoutToolboxCategory_\" + $scope.category.name + \"_IsCollapsed\";\r\n                        $scope.isCollapsed = $.cookie(isCollapsedCookieName) === \"true\";\r\n                        $scope.toggleIsCollapsed = function (e) {\r\n                            $scope.isCollapsed = !$scope.isCollapsed;\r\n                            $.cookie(isCollapsedCookieName, $scope.isCollapsed, { expires: 365 }); // Remember collapsed state for a year.\r\n                            e.preventDefault();\r\n                            e.stopPropagation();\r\n                        };\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"ToolboxGroup\"),\r\n                replace: true\r\n            };\r\n        }\r\n    ]);"],"sourceRoot":"/source/"}
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["Module.js","Clipboard.js","ScopeConfigurator.js","Editor.js","Canvas.js","Child.js","Column.js","Content.js","Html.js","Grid.js","Row.js","Popup.js","Toolbox.js","ToolboxGroup.js"],"names":[],"mappings":"AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC7CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACjUA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACzIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AClBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACdA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACnEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACnCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACxCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AClBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACvCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC9MA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"LayoutEditor.js","sourcesContent":["angular.module(\"LayoutEditor\", [\"ngSanitize\", \"ngResource\", \"ui.sortable\"]);","var LayoutEditor;\r\n(function(LayoutEditor) {\r\n\r\n    var Clipboard = function () {\r\n        var self = this;\r\n        this._clipboardData = {};\r\n        this._isDisabled = false;\r\n        this._wasInvoked = false;\r\n\r\n        this.setData = function(contentType, data) {\r\n            self._clipboardData[contentType] = data;\r\n            self._wasInvoked = true;\r\n        };\r\n        this.getData = function (contentType) {\r\n            return self._clipboardData[contentType];\r\n            self._wasInvoked = true;\r\n        };\r\n        this.disable = function() {\r\n            self._isDisabled = true;\r\n            self._wasInvoked = false;\r\n            self._clipboardData = {};\r\n        };\r\n        this.isDisabled = function () {\r\n            return self._isDisabled;\r\n        }\r\n        this.wasInvoked = function () {\r\n            return self._wasInvoked;\r\n        }\r\n    }\r\n\r\n    LayoutEditor.Clipboard = new Clipboard();\r\n\r\n    angular\r\n        .module(\"LayoutEditor\")\r\n        .factory(\"clipboard\", [\r\n            function() {\r\n                return {\r\n                    setData: LayoutEditor.Clipboard.setData,\r\n                    getData: LayoutEditor.Clipboard.getData,\r\n                    disable: LayoutEditor.Clipboard.disable,\r\n                    isDisabled: LayoutEditor.Clipboard.isDisabled,\r\n                    wasInvoked: LayoutEditor.Clipboard.wasInvoked\r\n                };\r\n            }\r\n        ]);\r\n})(LayoutEditor || (LayoutEditor = {}));","angular\r\n    .module(\"LayoutEditor\")\r\n    .factory(\"scopeConfigurator\", [\"$timeout\", \"clipboard\",\r\n        function ($timeout, clipboard) {\r\n            return {\r\n\r\n                configureForElement: function ($scope, $element) {\r\n                \r\n                    $element.find(\".layout-panel\").click(function (e) {\r\n                        e.stopPropagation();\r\n                    });\r\n\r\n                    $element.parent().keydown(function (e) {\r\n                        var handled = false;\r\n                        var resetFocus = false;\r\n                        var element = $scope.element;\r\n                    \r\n                        if (element.editor.isDragging)\r\n                            return;\r\n\r\n                        // If native clipboard support exists, the pseudo-clipboard will have been disabled.\r\n                        if (!clipboard.isDisabled()) {\r\n                            var focusedElement = element.editor.focusedElement;\r\n                            if (!!focusedElement) {\r\n                                // Pseudo clipboard handling for browsers not allowing real clipboard operations.\r\n                                if (e.ctrlKey) {\r\n                                    switch (e.which) {\r\n                                    case 67: // C\r\n                                        focusedElement.copy(clipboard);\r\n                                        break;\r\n                                    case 88: // X\r\n                                        focusedElement.cut(clipboard);\r\n                                        break;\r\n                                    case 86: // V\r\n                                        focusedElement.paste(clipboard);\r\n                                        break;\r\n                                    }\r\n                                }\r\n                            }\r\n                        }\r\n\r\n                        if (!e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 46) { // Del\r\n                            $scope.delete(element);\r\n                            handled = true;\r\n                        } else if (!e.ctrlKey && !e.shiftKey && !e.altKey && (e.which == 32 || e.which == 27)) { // Space or Esc\r\n                            $element.find(\".layout-panel-action-properties\").first().click();\r\n                            handled = true;\r\n                        }\r\n\r\n                        if (element.type == \"Content\") { // This is a content element.\r\n                            if (!e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 13) { // Enter\r\n                                $element.find(\".layout-panel-action-edit\").first().click();\r\n                                handled = true;\r\n                            }\r\n                        }\r\n\r\n                        if (!!element.children) { // This is a container.\r\n                            if (!e.ctrlKey && !e.shiftKey && e.altKey && e.which == 40) { // Alt+Down\r\n                                if (element.children.length > 0)\r\n                                    element.children[0].setIsFocused();\r\n                                handled = true;\r\n                            }\r\n\r\n                            if (element.type == \"Column\") { // This is a column.\r\n                                var connectAdjacent = !e.ctrlKey;\r\n                                if (e.which == 37) { // Left\r\n                                    if (e.altKey)\r\n                                        element.expandLeft(connectAdjacent);\r\n                                    if (e.shiftKey)\r\n                                        element.contractRight(connectAdjacent);\r\n                                    handled = true;\r\n                                } else if (e.which == 39) { // Right\r\n                                    if (e.altKey)\r\n                                        element.contractLeft(connectAdjacent);\r\n                                    if (e.shiftKey)\r\n                                        element.expandRight(connectAdjacent);\r\n                                    handled = true;\r\n                                }\r\n                            }\r\n                        }\r\n\r\n                        if (!!element.parent) { // This is a child.\r\n                            if (e.altKey && e.which == 38) { // Alt+Up\r\n                                element.parent.setIsFocused();\r\n                                handled = true;\r\n                            }\r\n\r\n                            if (element.parent.type == \"Row\") { // Parent is a horizontal container.\r\n                                if (!e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 37) { // Left\r\n                                    element.parent.moveFocusPrevChild(element);\r\n                                    handled = true;\r\n                                }\r\n                                else if (!e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 39) { // Right\r\n                                    element.parent.moveFocusNextChild(element);\r\n                                    handled = true;\r\n                                }\r\n                                else if (e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 37) { // Ctrl+Left\r\n                                    element.moveUp();\r\n                                    resetFocus = true;\r\n                                    handled = true;\r\n                                }\r\n                                else if (e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 39) { // Ctrl+Right\r\n                                    element.moveDown();\r\n                                    handled = true;\r\n                                }\r\n                            }\r\n                            else { // Parent is a vertical container.\r\n                                if (!e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 38) { // Up\r\n                                    element.parent.moveFocusPrevChild(element);\r\n                                    handled = true;\r\n                                }\r\n                                else if (!e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 40) { // Down\r\n                                    element.parent.moveFocusNextChild(element);\r\n                                    handled = true;\r\n                                }\r\n                                else if (e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 38) { // Ctrl+Up\r\n                                    element.moveUp();\r\n                                    resetFocus = true;\r\n                                    handled = true;\r\n                                }\r\n                                else if (e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 40) { // Ctrl+Down\r\n                                    element.moveDown();\r\n                                    handled = true;\r\n                                }\r\n                            }\r\n                        }\r\n\r\n                        if (handled) {\r\n                            e.preventDefault();\r\n                        }\r\n\r\n                        e.stopPropagation();\r\n\r\n                        $scope.$apply(); // Event is not triggered by Angular directive but raw event handler on element.\r\n\r\n                        // HACK: Workaround because of how Angular treats the DOM when elements are shifted around - input focus is sometimes lost.\r\n                        if (resetFocus) {\r\n                            window.setTimeout(function () {\r\n                                $scope.$apply(function () {\r\n                                    element.editor.focusedElement.setIsFocused();\r\n                                });\r\n                            }, 100);\r\n                        }\r\n                    });\r\n\r\n                    $scope.element.setIsFocusedEventHandlers.push(function () {\r\n                        $element.parent().focus();\r\n                    });\r\n\r\n                    $scope.delete = function (element) {\r\n                        element.delete();\r\n                    }\r\n                },\r\n\r\n                configureForContainer: function ($scope, $element) {\r\n                    var element = $scope.element;\r\n\r\n                    //$scope.isReceiving = false; // True when container is receiving an external element via drag/drop.\r\n                    $scope.getShowChildrenPlaceholder = function () {\r\n                        return $scope.element.children.length === 0 && !$scope.element.getIsDropTarget();\r\n                    };\r\n\r\n                    $scope.sortableOptions = {\r\n                        cursor: \"move\",\r\n                        delay: 150,\r\n                        disabled: element.getIsSealed(),\r\n                        distance: 5,\r\n                        //handle: element.children.length < 2 ? \".imaginary-class\" : false, // For some reason doesn't get re-evaluated after adding more children.\r\n                        start: function (e, ui) {\r\n                            $scope.$apply(function () {\r\n                                element.setIsDropTarget(true);\r\n                                element.editor.isDragging = true;\r\n                            });\r\n                            // Make the drop target placeholder as high as the item being dragged.\r\n                            ui.placeholder.height(ui.item.height() - 4);\r\n                            ui.placeholder.css(\"min-height\", 0);\r\n                        },\r\n                        stop: function (e, ui) {\r\n                            $scope.$apply(function () {\r\n                                element.editor.isDragging = false;\r\n                                element.setIsDropTarget(false);\r\n                            });\r\n                        },\r\n                        over: function (e, ui) {\r\n                            if (!!ui.sender && !!ui.sender[0].isToolbox) {\r\n                                if (!!ui.sender[0].dropTargetTimeout) {\r\n                                    $timeout.cancel(ui.sender[0].dropTargetTimeout);\r\n                                    ui.sender[0].dropTargetTimeout = null;\r\n                                }\r\n                                $timeout(function () {\r\n                                    if (element.type == \"Row\") {\r\n                                        // If there was a previous drop target and it was a row, roll back any pending column adds to it.\r\n                                        var previousDropTarget = element.editor.dropTargetElement;\r\n                                        if (!!previousDropTarget && previousDropTarget.type == \"Row\")\r\n                                            previousDropTarget.rollbackAddColumn();\r\n                                    }\r\n                                    element.setIsDropTarget(false);\r\n                                });\r\n                                ui.sender[0].dropTargetTimeout = $timeout(function () {\r\n                                    if (element.type == \"Row\") {\r\n                                        var receivedColumn = ui.item.sortable.model;\r\n                                        var receivedColumnWidth = Math.floor(12 / (element.children.length + 1));\r\n                                        receivedColumn.width = receivedColumnWidth;\r\n                                        receivedColumn.offset = 0;\r\n                                        element.beginAddColumn(receivedColumnWidth);\r\n                                        // Make the drop target placeholder the correct width and as high as the highest existing column in the row.\r\n                                        var maxHeight = _.max(_($element.find(\"> .layout-children > .layout-column:not(.ui-sortable-placeholder)\")).map(function (e) {\r\n                                            return $(e).height();\r\n                                        }));\r\n                                        for (i = 1; i <= 12; i++)\r\n                                            ui.placeholder.removeClass(\"col-xs-\" + i);\r\n                                        ui.placeholder.addClass(\"col-xs-\" + receivedColumn.width);\r\n                                        if (maxHeight > 0) {\r\n                                            ui.placeholder.height(maxHeight);\r\n                                            ui.placeholder.css(\"min-height\", 0);\r\n                                        }\r\n                                        else {\r\n                                            ui.placeholder.height(0);\r\n                                            ui.placeholder.css(\"min-height\", \"\");\r\n                                        }\r\n                                    }\r\n                                    element.setIsDropTarget(true);\r\n                                }, 150);\r\n                            }\r\n                        },\r\n                        receive: function (e, ui) {\r\n                            if (!!ui.sender && !!ui.sender[0].isToolbox) {\r\n                                $scope.$apply(function () {\r\n                                    var receivedElement = ui.item.sortable.model;\r\n                                    if (!!receivedElement) {\r\n                                        if (element.type == \"Row\")\r\n                                            element.commitAddColumn();\r\n                                        // Should ideally call LayoutEditor.Container.addChild() instead, but since this handler\r\n                                        // is run *before* the ui-sortable directive's handler, if we try to add the child to the\r\n                                        // array that handler will get an exception when trying to do the same.\r\n                                        // Because of this, we need to invoke \"setParent\" so that specific container types can perform element speficic initialization.\r\n                                        receivedElement.setEditor(element.editor);\r\n                                        receivedElement.setParent(element);\r\n\r\n                                        if (!!receivedElement.hasEditor) {\r\n                                            $scope.$root.editElement(receivedElement).then(function (args) {\r\n                                                if (!args.cancel) {\r\n                                                    receivedElement.data = args.element.data;\r\n                                                    receivedElement.applyElementEditorModel(args.elementEditorModel);\r\n\r\n                                                    if (!!receivedElement.setHtml)\r\n                                                        receivedElement.setHtml(args.element.html);\r\n                                                }\r\n                                                $timeout(function () {\r\n                                                    if (!!args.cancel)\r\n                                                        receivedElement.delete();\r\n                                                    else\r\n                                                        receivedElement.setIsFocused();\r\n                                                    //$scope.isReceiving = false;\r\n                                                    element.setIsDropTarget(false);\r\n\r\n                                                });\r\n                                                return;\r\n                                            });\r\n                                        }\r\n                                    }\r\n                                    $timeout(function () {\r\n                                        //$scope.isReceiving = false;\r\n                                        element.setIsDropTarget(false);\r\n                                        if (!!receivedElement)\r\n                                            receivedElement.setIsFocused();\r\n                                    });\r\n                                });\r\n                            }\r\n                        }\r\n                    };\r\n\r\n                    $scope.click = function (child, e) {\r\n                        if (!child.editor.isDragging)\r\n                            child.setIsFocused();\r\n                        e.stopPropagation();\r\n                    };\r\n\r\n                    $scope.getClasses = function (child) {\r\n                        var result = [\"layout-element\"];\r\n\r\n                        if (!!child.children) {\r\n                            result.push(\"layout-container\");\r\n                            if (child.getIsSealed())\r\n                                result.push(\"layout-container-sealed\");\r\n                        }\r\n\r\n                        result.push(\"layout-\" + child.type.toLowerCase());\r\n\r\n                        if (!!child.dropTargetClass)\r\n                            result.push(child.dropTargetClass);\r\n\r\n                        // TODO: Move these to either the Column directive or the Column model class.\r\n                        if (child.type == \"Row\") {\r\n                            result.push(\"row\");\r\n                            if (!child.canAddColumn())\r\n                                result.push(\"layout-row-full\");\r\n                        }\r\n                        if (child.type == \"Column\") {\r\n                            result.push(\"col-xs-\" + child.width);\r\n                            result.push(\"col-xs-offset-\" + child.offset);\r\n                        }\r\n                        if (child.type == \"Content\")\r\n                            result.push(\"layout-content-\" + child.contentTypeClass);\r\n\r\n                        if (child.getIsActive())\r\n                            result.push(\"layout-element-active\");\r\n                        if (child.getIsFocused())\r\n                            result.push(\"layout-element-focused\");\r\n                        if (child.getIsSelected())\r\n                            result.push(\"layout-element-selected\");\r\n                        if (child.getIsDropTarget())\r\n                            result.push(\"layout-element-droptarget\");\r\n                        if (child.isTemplated)\r\n                            result.push(\"layout-element-templated\");\r\n\r\n                        return result;\r\n                    };\r\n                }\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutEditor\", [\"environment\",\r\n        function (environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: {},\r\n                controller: [\"$scope\", \"$element\", \"$attrs\", \"$compile\", \"clipboard\",\r\n                    function ($scope, $element, $attrs, $compile, clipboard) {\r\n                        if (!!$attrs.model)\r\n                            $scope.element = eval($attrs.model);\r\n                        else\r\n                            throw new Error(\"The 'model' attribute must evaluate to a LayoutEditor.Editor object.\");\r\n\r\n                        $scope.click = function (canvas, e) {\r\n                            if (!canvas.editor.isDragging)\r\n                                canvas.setIsFocused();\r\n                            e.stopPropagation();\r\n                        };\r\n\r\n                        $scope.getClasses = function (canvas) {\r\n                            var result = [\"layout-element\", \"layout-container\", \"layout-canvas\"];\r\n\r\n                            if (canvas.getIsActive())\r\n                                result.push(\"layout-element-active\");\r\n                            if (canvas.getIsFocused())\r\n                                result.push(\"layout-element-focused\");\r\n                            if (canvas.getIsSelected())\r\n                                result.push(\"layout-element-selected\");\r\n                            if (canvas.getIsDropTarget())\r\n                                result.push(\"layout-element-droptarget\");\r\n                            if (canvas.isTemplated)\r\n                                result.push(\"layout-element-templated\");\r\n\r\n                            return result;\r\n                        };\r\n\r\n                        // An unfortunate side-effect of the next hack on line 54 is that the created elements aren't added to the DOM yet, so we can't use it to get to the parent \".layout-desiger\" element.\r\n                        // Work around: access that element directly (which efectively turns multiple layout editors on a single page impossible). \r\n                        // //var layoutDesignerHost = $element.closest(\".layout-designer\").data(\"layout-designer-host\");\r\n                        var layoutDesignerHost = $(\".layout-designer\").data(\"layout-designer-host\");\r\n\r\n                        $scope.$root.layoutDesignerHost = layoutDesignerHost;\r\n\r\n                        layoutDesignerHost.element.on(\"replacecanvas\", function (e, args) {\r\n                            var editor = $scope.element;\r\n                            var canvasData = {\r\n                                data: args.canvas.data,\r\n                                htmlId: args.canvas.htmlId,\r\n                                htmlClass: args.canvas.htmlClass,\r\n                                htmlStyle: args.canvas.htmlStyle,\r\n                                isTemplated: args.canvas.isTemplated,\r\n                                children: args.canvas.children\r\n                            };\r\n\r\n                            // HACK: Instead of simply updating the $scope.element with a new instance, we need to replace the entire orc-layout-editor markup\r\n                            // in order for angular to rebind starting with the Canvas element. Otherwise, for some reason, it will rebind starting with the first child of Canvas.\r\n                            // You can see this happening when setting a breakpoint in ScopeConfigurator where containers are initialized with drag & drop: on page load, the first element\r\n                            // is a Canvas (good), but after having selected another template, the first element is (typically) a Grid (bad).\r\n                            // Simply recompiling the orc-layout-editor directive will cause the entire thing to be generated, which works just fine as well (even though not is nice as simply leveraging model binding).\r\n                            layoutDesignerHost.editor = window.layoutEditor = new LayoutEditor.Editor(editor.config, canvasData);\r\n                            var template = \"<orc-layout-editor\" + \" model='window.layoutEditor' />\";\r\n                            var html = $compile(template)($scope);\r\n                            $(\".layout-editor-holder\").html(html);\r\n                        });\r\n\r\n                        $scope.$root.editElement = function (element) {\r\n                            var host = $scope.$root.layoutDesignerHost;\r\n                            return host.editElement(element);\r\n                        };\r\n\r\n                        $scope.$root.addElement = function (contentType) {\r\n                            var host = $scope.$root.layoutDesignerHost;\r\n                            return host.addElement(contentType);\r\n                        };\r\n\r\n                        $(document).on(\"cut copy paste\", function (e) {\r\n                            // If the pseudo clipboard was already invoked (which happens on the first clipboard\r\n                            // operation after page load even if native clipboard support exists) then sit this\r\n                            // one operation out, but make sure whatever is on the pseudo clipboard gets migrated\r\n                            // to the native clipboard for subsequent operations.\r\n                            if (clipboard.wasInvoked()) {\r\n                                e.originalEvent.clipboardData.setData(\"text/plain\", clipboard.getData(\"text/plain\"));\r\n                                e.originalEvent.clipboardData.setData(\"text/json\", clipboard.getData(\"text/json\"));\r\n                                e.preventDefault();\r\n                            }\r\n                            else {\r\n                                var focusedElement = $scope.element.focusedElement;\r\n                                if (!!focusedElement) {\r\n                                    $scope.$apply(function () {\r\n                                        switch (e.type) {\r\n                                            case \"copy\":\r\n                                                focusedElement.copy(e.originalEvent.clipboardData);\r\n                                                break;\r\n                                            case \"cut\":\r\n                                                focusedElement.cut(e.originalEvent.clipboardData);\r\n                                                break;\r\n                                            case \"paste\":\r\n                                                focusedElement.paste(e.originalEvent.clipboardData);\r\n                                                break;\r\n                                        }\r\n                                    });\r\n\r\n                                    // HACK: Workaround because of how Angular treats the DOM when elements are shifted around - input focus is sometimes lost.\r\n                                    window.setTimeout(function () {\r\n                                        $scope.$apply(function () {\r\n                                            if (!!$scope.element.focusedElement)\r\n                                                $scope.element.focusedElement.setIsFocused();\r\n                                        });\r\n                                    }, 100);\r\n\r\n                                    e.preventDefault();\r\n                                }\r\n                            }\r\n\r\n                            // Native clipboard support obviously exists, so disable the peudo clipboard from now on.\r\n                            clipboard.disable();\r\n                        });\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"Editor\"),\r\n                replace: true,\r\n                link: function (scope, element) {\r\n                    // No clicks should propagate from the TinyMCE toolbars.\r\n                    element.find(\".layout-toolbar-container\").click(function (e) {\r\n                        e.stopPropagation();\r\n                    });\r\n                    // Unfocus and unselect everything on click outside of canvas.\r\n                    $(window).click(function (e) {\r\n                        scope.$apply(function () {\r\n                            scope.element.activeElement = null;\r\n                            scope.element.focusedElement = null;\r\n                        });\r\n                    });\r\n                }\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutCanvas\", [\"scopeConfigurator\", \"environment\",\r\n        function (scopeConfigurator, environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: { element: \"=\" },\r\n                controller: [\"$scope\", \"$element\", \"$attrs\",\r\n                    function ($scope, $element, $attrs) {\r\n                        scopeConfigurator.configureForElement($scope, $element);\r\n                        scopeConfigurator.configureForContainer($scope, $element);\r\n                        $scope.sortableOptions[\"axis\"] = \"y\";\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"Canvas\"),\r\n                replace: true\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutChild\", [\"$compile\",\r\n        function ($compile) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: { element: \"=\" },\r\n                link: function (scope, element) {\r\n                    var template = \"<orc-layout-\" + scope.element.type.toLowerCase() + \" element='element' />\";\r\n                    var html = $compile(template)(scope);\r\n                    $(element).replaceWith(html);\r\n                }\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutColumn\", [\"$compile\", \"scopeConfigurator\", \"environment\",\r\n        function ($compile, scopeConfigurator, environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: { element: \"=\" },\r\n                controller: [\"$scope\", \"$element\",\r\n                    function ($scope, $element) {\r\n                        scopeConfigurator.configureForElement($scope, $element);\r\n                        scopeConfigurator.configureForContainer($scope, $element);\r\n                        $scope.sortableOptions[\"axis\"] = \"y\";\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"Column\"),\r\n                replace: true,\r\n                link: function (scope, element, attrs) {\r\n                    element.find(\".layout-column-resize-bar\").draggable({\r\n                        axis: \"x\",\r\n                        helper: \"clone\",\r\n                        revert: true,\r\n                        start: function (e, ui) {\r\n                            scope.$apply(function () {\r\n                                scope.element.editor.isResizing = true;\r\n                            });\r\n                        },\r\n                        drag: function (e, ui) {\r\n                            var columnElement = element.parent();\r\n                            var columnSize = columnElement.width() / scope.element.width;\r\n                            var connectAdjacent = !e.ctrlKey;\r\n                            if ($(e.target).hasClass(\"layout-column-resize-bar-left\")) {\r\n                                var delta = ui.offset.left - columnElement.offset().left;\r\n                                if (delta < -columnSize && scope.element.canExpandLeft(connectAdjacent)) {\r\n                                    scope.$apply(function () {\r\n                                        scope.element.expandLeft(connectAdjacent);\r\n                                    });\r\n                                }\r\n                                else if (delta > columnSize && scope.element.canContractLeft(connectAdjacent)) {\r\n                                    scope.$apply(function () {\r\n                                        scope.element.contractLeft(connectAdjacent);\r\n                                    });\r\n                                }\r\n                            }\r\n                            else if ($(e.target).hasClass(\"layout-column-resize-bar-right\")) {\r\n                                var delta = ui.offset.left - columnElement.width() - columnElement.offset().left;\r\n                                if (delta > columnSize && scope.element.canExpandRight(connectAdjacent)) {\r\n                                    scope.$apply(function () {\r\n                                        scope.element.expandRight(connectAdjacent);\r\n                                    });\r\n                                }\r\n                                else if (delta < -columnSize && scope.element.canContractRight(connectAdjacent)) {\r\n                                    scope.$apply(function () {\r\n                                        scope.element.contractRight(connectAdjacent);\r\n                                    });\r\n                                }\r\n                            }\r\n\r\n                        },\r\n                        stop: function (e, ui) {\r\n                            scope.$apply(function () {\r\n                              scope.element.editor.isResizing = false;\r\n                            });\r\n                        }\r\n                    });\r\n                }\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutContent\", [\"$sce\", \"scopeConfigurator\", \"environment\",\r\n        function ($sce, scopeConfigurator, environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: { element: \"=\" },\r\n                controller: [\"$scope\", \"$element\",\r\n                    function ($scope, $element) {\r\n                        scopeConfigurator.configureForElement($scope, $element);\r\n                        $scope.edit = function () {\r\n                            $scope.$root.editElement($scope.element).then(function (args) {\r\n                                $scope.$apply(function () {\r\n                                    if (args.cancel)\r\n                                        return;\r\n\r\n                                    $scope.element.data = args.element.data;\r\n                                    $scope.element.setHtml(args.element.html);\r\n                                });\r\n                            });\r\n                        };\r\n\r\n                        // Overwrite the setHtml function so that we can use the $sce service to trust the html (and not have the html binding strip certain tags).\r\n                        $scope.element.setHtml = function (html) {\r\n                            $scope.element.html = html;\r\n                            $scope.element.htmlUnsafe = $sce.trustAsHtml(html);\r\n                        };\r\n\r\n                        $scope.element.setHtml($scope.element.html);\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"Content\"),\r\n                replace: true\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutHtml\", [\"$sce\", \"scopeConfigurator\", \"environment\",\r\n        function ($sce, scopeConfigurator, environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: { element: \"=\" },\r\n                controller: [\"$scope\", \"$element\",\r\n                    function ($scope, $element) {\r\n                        scopeConfigurator.configureForElement($scope, $element);\r\n                        $scope.edit = function () {\r\n                            $scope.$root.editElement($scope.element).then(function (args) {\r\n                                $scope.$apply(function () {\r\n                                    if (args.cancel)\r\n                                        return;\r\n\r\n                                    $scope.element.data = args.element.data;\r\n                                    $scope.element.setHtml(args.element.html);\r\n                                });\r\n                            });\r\n                        };\r\n                        $scope.updateContent = function (e) {\r\n                            $scope.element.setHtml(e.target.innerHTML);\r\n                        };\r\n\r\n                        // Overwrite the setHtml function so that we can use the $sce service to trust the html (and not have the html binding strip certain tags).\r\n                        $scope.element.setHtml = function (html) {\r\n                            $scope.element.html = html;\r\n                            $scope.element.htmlUnsafe = $sce.trustAsHtml(html);\r\n                        };\r\n\r\n                        $scope.element.setHtml($scope.element.html);\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"Html\"),\r\n                replace: true,\r\n                link: function (scope, element) {\r\n                }\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutGrid\", [\"$compile\", \"scopeConfigurator\", \"environment\",\r\n        function ($compile, scopeConfigurator, environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: { element: \"=\" },\r\n                controller: [\"$scope\", \"$element\",\r\n                    function ($scope, $element) {\r\n                        scopeConfigurator.configureForElement($scope, $element);\r\n                        scopeConfigurator.configureForContainer($scope, $element);\r\n                        $scope.sortableOptions[\"axis\"] = \"y\";\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"Grid\"),\r\n                replace: true\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutRow\", [\"$compile\", \"scopeConfigurator\", \"environment\",\r\n        function ($compile, scopeConfigurator, environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: { element: \"=\" },\r\n                controller: [\"$scope\", \"$element\",\r\n                    function ($scope, $element) {\r\n                        scopeConfigurator.configureForElement($scope, $element);\r\n                        scopeConfigurator.configureForContainer($scope, $element);\r\n                        $scope.sortableOptions[\"axis\"] = \"x\";\r\n                        $scope.sortableOptions[\"ui-floating\"] = true;\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"Row\"),\r\n                replace: true\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutPopup\", [\r\n        function () {\r\n            return {\r\n                restrict: \"A\",\r\n                link: function (scope, element, attrs) {\r\n                    var popup = $(element);\r\n                    var trigger = popup.closest(\".layout-popup-trigger\");\r\n                    var parentElement = popup.closest(\".layout-element\");\r\n                    trigger.click(function () {\r\n                        popup.toggle();\r\n                        if (popup.is(\":visible\")) {\r\n                            popup.position({\r\n                                my: attrs.orcLayoutPopupMy || \"left top\",\r\n                                at: attrs.orcLayoutPopupAt || \"left bottom+4px\",\r\n                                of: trigger\r\n                            });\r\n                            popup.find(\"input\").first().focus();\r\n                        }\r\n                    });\r\n                    popup.click(function (e) {\r\n                        e.stopPropagation();\r\n                    });\r\n                    parentElement.click(function (e) {\r\n                        popup.hide();\r\n                    });\r\n                    popup.keydown(function (e) {\r\n                        if (!e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 27) // Esc\r\n                            popup.hide();\r\n                        e.stopPropagation();\r\n                    });\r\n                    popup.on(\"cut copy paste\", function (e) {\r\n                        // Allow clipboard operations in popup without invoking clipboard event handlers on parent element.\r\n                        e.stopPropagation();\r\n                    });\r\n                }\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutToolbox\", [\"$compile\", \"environment\",\r\n        function ($compile, environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                controller: [\"$scope\", \"$element\",\r\n                    function ($scope, $element) {\r\n\r\n                        $scope.resetElements = function () {\r\n\r\n                            $scope.gridElements = [\r\n                                LayoutEditor.Grid.from({\r\n                                    toolboxIcon: \"\\uf00a\",\r\n                                    toolboxLabel: \"Grid\",\r\n                                    toolboxDescription: \"Empty grid.\",\r\n                                    children: []\r\n                                })\r\n                            ];\r\n\r\n                            $scope.rowElements = [\r\n                                LayoutEditor.Row.from({\r\n                                    toolboxIcon: \"\\uf0c9\",\r\n                                    toolboxLabel: \"Row (1 column)\",\r\n                                    toolboxDescription: \"Row with 1 column.\",\r\n                                    children: LayoutEditor.Column.times(1)\r\n                                }),\r\n                                LayoutEditor.Row.from({\r\n                                    toolboxIcon: \"\\uf0c9\",\r\n                                    toolboxLabel: \"Row (2 columns)\",\r\n                                    toolboxDescription: \"Row with 2 columns.\",\r\n                                    children: LayoutEditor.Column.times(2)\r\n                                }),\r\n                                LayoutEditor.Row.from({\r\n                                    toolboxIcon: \"\\uf0c9\",\r\n                                    toolboxLabel: \"Row (3 columns)\",\r\n                                    toolboxDescription: \"Row with 3 columns.\",\r\n                                    children: LayoutEditor.Column.times(3)\r\n                                }),\r\n                                LayoutEditor.Row.from({\r\n                                    toolboxIcon: \"\\uf0c9\",\r\n                                    toolboxLabel: \"Row (4 columns)\",\r\n                                    toolboxDescription: \"Row with 4 columns.\",\r\n                                    children: LayoutEditor.Column.times(4)\r\n                                }),\r\n                                LayoutEditor.Row.from({\r\n                                    toolboxIcon: \"\\uf0c9\",\r\n                                    toolboxLabel: \"Row (6 columns)\",\r\n                                    toolboxDescription: \"Row with 6 columns.\",\r\n                                    children: LayoutEditor.Column.times(6)\r\n                                }),\r\n                                LayoutEditor.Row.from({\r\n                                    toolboxIcon: \"\\uf0c9\",\r\n                                    toolboxLabel: \"Row (12 columns)\",\r\n                                    toolboxDescription: \"Row with 12 columns.\",\r\n                                    children: LayoutEditor.Column.times(12)\r\n                                }), LayoutEditor.Row.from({\r\n                                    toolboxIcon: \"\\uf0c9\",\r\n                                    toolboxLabel: \"Row (empty)\",\r\n                                    toolboxDescription: \"Empty row.\",\r\n                                    children: []\r\n                                })\r\n                            ];\r\n\r\n                            $scope.columnElements = [\r\n                                LayoutEditor.Column.from({\r\n                                    toolboxIcon: \"\\uf0db\",\r\n                                    toolboxLabel: \"Column\",\r\n                                    toolboxDescription: \"Empty column.\",\r\n                                    width: 1,\r\n                                    offset: 0,\r\n                                    children: []\r\n                                })\r\n                            ];\r\n\r\n                            $scope.canvasElements = [\r\n                                LayoutEditor.Canvas.from({\r\n                                    toolboxIcon: \"\\uf044\",\r\n                                    toolboxLabel: \"Canvas\",\r\n                                    toolboxDescription: \"Empty canvas.\",\r\n                                    children: []\r\n                                })\r\n                            ];\r\n\r\n                            $scope.contentElementCategories = _($scope.element.config.categories).map(function (category) {\r\n                                return {\r\n                                    name: category.name,\r\n                                    elements: _(category.contentTypes).map(function (contentType) {\r\n                                        var type = contentType.type;\r\n                                        var factory = LayoutEditor.factories[type] || LayoutEditor.factories[\"Content\"];\r\n                                        var item = {\r\n                                            isTemplated: false,\r\n                                            contentType: contentType.id,\r\n                                            contentTypeLabel: contentType.label,\r\n                                            contentTypeClass: contentType.typeClass,\r\n                                            data: null,\r\n                                            hasEditor: contentType.hasEditor,\r\n                                            html: contentType.html\r\n                                        };\r\n                                        var element = factory(item);\r\n                                        element.toolboxIcon = contentType.icon || \"\\uf1c9\";\r\n                                        element.toolboxLabel = contentType.label;\r\n                                        element.toolboxDescription = contentType.description;\r\n                                        return element;\r\n                                    })\r\n                                };\r\n                            });\r\n\r\n                        };\r\n\r\n                        $scope.resetElements();\r\n\r\n                        $scope.getSortableOptions = function (type) {\r\n                            var editorId = $element.closest(\".layout-editor\").attr(\"id\");\r\n                            var parentClasses;\r\n                            var placeholderClasses;\r\n                            var floating = false;\r\n\r\n                            switch (type) {\r\n                                case \"Grid\":\r\n                                    parentClasses = [\".layout-canvas\", \".layout-column\", \".layout-common-holder\"];\r\n                                    placeholderClasses = \"layout-element layout-container layout-grid ui-sortable-placeholder\";\r\n                                    break;\r\n                                case \"Row\":\r\n                                    parentClasses = [\".layout-grid\"];\r\n                                    placeholderClasses = \"layout-element layout-container layout-row row ui-sortable-placeholder\";\r\n                                    break;\r\n                                case \"Column\":\r\n                                    parentClasses = [\".layout-row:not(.layout-row-full)\"];\r\n                                    placeholderClasses = \"layout-element layout-container layout-column ui-sortable-placeholder\";\r\n                                    floating = true; // To ensure a smooth horizontal-list reordering. https://github.com/angular-ui/ui-sortable#floating\r\n                                    break;\r\n                                case \"Content\":\r\n                                    parentClasses = [\".layout-canvas\", \".layout-column\", \".layout-common-holder\"];\r\n                                    placeholderClasses = \"layout-element layout-content ui-sortable-placeholder\";\r\n                                    break;\r\n                                case \"Canvas\":\r\n                                    parentClasses = [\".layout-canvas\", \".layout-column\", \".layout-common-holder\"];\r\n                                    placeholderClasses = \"layout-element layout-container layout-grid ui-sortable-placeholder\";\r\n                                    break;\r\n                            }\r\n\r\n                            return {\r\n                                cursor: \"move\",\r\n                                connectWith: _(parentClasses).map(function (e) { return \"#\" + editorId + \" \" + e + \":not(.layout-container-sealed) > .layout-element-wrapper > .layout-children\"; }).join(\", \"),\r\n                                placeholder: placeholderClasses,\r\n                                \"ui-floating\": floating,\r\n                                create: function (e, ui) {\r\n                                    e.target.isToolbox = true; // Will indicate to connected sortables that dropped items were sent from toolbox.\r\n                                },\r\n                                start: function (e, ui) {\r\n                                    $scope.$apply(function () {\r\n                                        $scope.element.isDragging = true;\r\n                                    });\r\n                                },\r\n                                stop: function (e, ui) {\r\n                                    $scope.$apply(function () {\r\n                                        $scope.element.isDragging = false;\r\n                                        $scope.resetElements();\r\n                                    });\r\n                                },\r\n                                over: function (e, ui) {\r\n                                    $scope.$apply(function () {\r\n                                        $scope.element.canvas.setIsDropTarget(false);\r\n                                    });\r\n                                },\r\n                            }\r\n                        };\r\n\r\n                        var layoutIsCollapsedCookieName = \"layoutToolboxCategory_Layout_IsCollapsed\";\r\n                        $scope.layoutIsCollapsed = $.cookie(layoutIsCollapsedCookieName) === \"true\";\r\n\r\n                        $scope.toggleLayoutIsCollapsed = function (e) {\r\n                            $scope.layoutIsCollapsed = !$scope.layoutIsCollapsed;\r\n                            $.cookie(layoutIsCollapsedCookieName, $scope.layoutIsCollapsed, { expires: 365 }); // Remember collapsed state for a year.\r\n                            e.preventDefault();\r\n                            e.stopPropagation();\r\n                        };\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"Toolbox\"),\r\n                replace: true,\r\n                link: function (scope, element) {\r\n                    var toolbox = element.find(\".layout-toolbox\");\r\n                    $(window).on(\"resize scroll\", function (e) {\r\n                        var canvas = element.parent().find(\".layout-canvas\");\r\n                        // If the canvas is taller than the toolbox, make the toolbox sticky-positioned within the editor\r\n                        // to help the user avoid excessive vertical scrolling.\r\n                        var canvasIsTaller = !!canvas && canvas.height() > toolbox.height();\r\n                        var windowPos = $(window).scrollTop();\r\n                        if (canvasIsTaller && windowPos > element.offset().top + element.height() - toolbox.height()) {\r\n                            toolbox.addClass(\"sticky-bottom\");\r\n                            toolbox.removeClass(\"sticky-top\");\r\n                        }\r\n                        else if (canvasIsTaller && windowPos > element.offset().top) {\r\n                            toolbox.addClass(\"sticky-top\");\r\n                            toolbox.removeClass(\"sticky-bottom\");\r\n                        }\r\n                        else {\r\n                            toolbox.removeClass(\"sticky-top\");\r\n                            toolbox.removeClass(\"sticky-bottom\");\r\n                        }\r\n                    });\r\n                }\r\n            };\r\n        }\r\n    ]);","angular\r\n    .module(\"LayoutEditor\")\r\n    .directive(\"orcLayoutToolboxGroup\", [\"$compile\", \"environment\",\r\n        function ($compile, environment) {\r\n            return {\r\n                restrict: \"E\",\r\n                scope: { category: \"=\" },\r\n                controller: [\"$scope\", \"$element\",\r\n                    function ($scope, $element) {\r\n                        var isCollapsedCookieName = \"layoutToolboxCategory_\" + $scope.category.name + \"_IsCollapsed\";\r\n                        $scope.isCollapsed = $.cookie(isCollapsedCookieName) === \"true\";\r\n                        $scope.toggleIsCollapsed = function (e) {\r\n                            $scope.isCollapsed = !$scope.isCollapsed;\r\n                            $.cookie(isCollapsedCookieName, $scope.isCollapsed, { expires: 365 }); // Remember collapsed state for a year.\r\n                            e.preventDefault();\r\n                            e.stopPropagation();\r\n                        };\r\n                    }\r\n                ],\r\n                templateUrl: environment.templateUrl(\"ToolboxGroup\"),\r\n                replace: true\r\n            };\r\n        }\r\n    ]);"],"sourceRoot":"/source/"}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js b/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
index d92fdf698..b31866784 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
@@ -1 +1 @@
-angular.module("LayoutEditor",["ngSanitize","ngResource","ui.sortable"]);var LayoutEditor;!function(e){var t=function(){var e=this;this._clipboardData={},this._isDisabled=!1,this._wasInvoked=!1,this.setData=function(t,o){e._clipboardData[t]=o,e._wasInvoked=!0},this.getData=function(t){return e._clipboardData[t]},this.disable=function(){e._isDisabled=!0,e._wasInvoked=!1,e._clipboardData={}},this.isDisabled=function(){return e._isDisabled},this.wasInvoked=function(){return e._wasInvoked}};e.Clipboard=new t,angular.module("LayoutEditor").factory("clipboard",[function(){return{setData:e.Clipboard.setData,getData:e.Clipboard.getData,disable:e.Clipboard.disable,isDisabled:e.Clipboard.isDisabled,wasInvoked:e.Clipboard.wasInvoked}}])}(LayoutEditor||(LayoutEditor={})),angular.module("LayoutEditor").factory("scopeConfigurator",["$timeout","clipboard",function(e,t){return{configureForElement:function(e,o){o.find(".layout-panel").click(function(e){e.stopPropagation()}),o.parent().keydown(function(n){var l=!1,a=!1,i=e.element;if(!i.editor.isDragging&&!i.editor.inlineEditingIsActive){if(!t.isDisabled()){var r=i.editor.focusedElement;if(r&&n.ctrlKey)switch(n.which){case 67:r.copy(t);break;case 88:r.cut(t);break;case 86:r.paste(t)}}if(n.ctrlKey||n.shiftKey||n.altKey||46!=n.which?n.ctrlKey||n.shiftKey||n.altKey||32!=n.which&&27!=n.which||(o.find(".layout-panel-action-properties").first().click(),l=!0):(e["delete"](i),l=!0),"Content"==i.type&&(n.ctrlKey||n.shiftKey||n.altKey||13!=n.which||(o.find(".layout-panel-action-edit").first().click(),l=!0)),i.children&&(n.ctrlKey||n.shiftKey||!n.altKey||40!=n.which||(i.children.length>0&&i.children[0].setIsFocused(),l=!0),"Column"==i.type)){var c=!n.ctrlKey;37==n.which?(n.altKey&&i.expandLeft(c),n.shiftKey&&i.contractRight(c),l=!0):39==n.which&&(n.altKey&&i.contractLeft(c),n.shiftKey&&i.expandRight(c),l=!0)}i.parent&&(n.altKey&&38==n.which&&(i.parent.setIsFocused(),l=!0),"Row"==i.parent.type?n.ctrlKey||n.shiftKey||n.altKey||37!=n.which?n.ctrlKey||n.shiftKey||n.altKey||39!=n.which?!n.ctrlKey||n.shiftKey||n.altKey||37!=n.which?!n.ctrlKey||n.shiftKey||n.altKey||39!=n.which||(i.moveDown(),l=!0):(i.moveUp(),a=!0,l=!0):(i.parent.moveFocusNextChild(i),l=!0):(i.parent.moveFocusPrevChild(i),l=!0):n.ctrlKey||n.shiftKey||n.altKey||38!=n.which?n.ctrlKey||n.shiftKey||n.altKey||40!=n.which?!n.ctrlKey||n.shiftKey||n.altKey||38!=n.which?!n.ctrlKey||n.shiftKey||n.altKey||40!=n.which||(i.moveDown(),l=!0):(i.moveUp(),a=!0,l=!0):(i.parent.moveFocusNextChild(i),l=!0):(i.parent.moveFocusPrevChild(i),l=!0)),l&&n.preventDefault(),n.stopPropagation(),e.$apply(),a&&window.setTimeout(function(){e.$apply(function(){i.editor.focusedElement.setIsFocused()})},100)}}),e.element.setIsFocusedEventHandlers.push(function(){o.parent().focus()}),e["delete"]=function(e){e["delete"]()}},configureForContainer:function(t,o){var n=t.element;t.getShowChildrenPlaceholder=function(){return 0===t.element.children.length&&!t.element.getIsDropTarget()},t.sortableOptions={cursor:"move",delay:150,disabled:n.getIsSealed(),distance:5,start:function(e,o){t.$apply(function(){n.setIsDropTarget(!0),n.editor.isDragging=!0}),o.placeholder.height(o.item.height()-4),o.placeholder.css("min-height",0)},stop:function(e,o){t.$apply(function(){n.editor.isDragging=!1,n.setIsDropTarget(!1)})},over:function(t,l){l.sender&&l.sender[0].isToolbox&&(l.sender[0].dropTargetTimeout&&(e.cancel(l.sender[0].dropTargetTimeout),l.sender[0].dropTargetTimeout=null),e(function(){if("Row"==n.type){var e=n.editor.dropTargetElement;e&&"Row"==e.type&&e.rollbackAddColumn()}n.setIsDropTarget(!1)}),l.sender[0].dropTargetTimeout=e(function(){if("Row"==n.type){var e=l.item.sortable.model,t=Math.floor(12/(n.children.length+1));e.width=t,e.offset=0,n.beginAddColumn(t);var a=_.max(_(o.find("> .layout-children > .layout-column:not(.ui-sortable-placeholder)")).map(function(e){return $(e).height()}));for(i=1;i<=12;i++)l.placeholder.removeClass("col-xs-"+i);l.placeholder.addClass("col-xs-"+e.width),a>0?(l.placeholder.height(a),l.placeholder.css("min-height",0)):(l.placeholder.height(0),l.placeholder.css("min-height",""))}n.setIsDropTarget(!0)},150))},receive:function(o,l){l.sender&&l.sender[0].isToolbox&&t.$apply(function(){var o=l.item.sortable.model;o&&("Row"==n.type&&n.commitAddColumn(),o.setEditor(n.editor),o.setParent(n),o.hasEditor&&t.$root.editElement(o).then(function(t){t.cancel||(o.data=t.element.data,o.applyElementEditorModel(t.elementEditorModel),o.setHtml&&o.setHtml(t.element.html)),e(function(){t.cancel?o["delete"]():o.setIsFocused(),n.setIsDropTarget(!1)})})),e(function(){n.setIsDropTarget(!1),o&&o.setIsFocused()})})}},t.click=function(e,t){e.editor.isDragging||e.setIsFocused(),t.stopPropagation()},t.getClasses=function(e){var t=["layout-element"];return e.children&&(t.push("layout-container"),e.getIsSealed()&&t.push("layout-container-sealed")),t.push("layout-"+e.type.toLowerCase()),e.dropTargetClass&&t.push(e.dropTargetClass),"Row"==e.type&&(t.push("row"),e.canAddColumn()||t.push("layout-row-full")),"Column"==e.type&&(t.push("col-xs-"+e.width),t.push("col-xs-offset-"+e.offset)),"Content"==e.type&&t.push("layout-content-"+e.contentTypeClass),e.getIsActive()&&t.push("layout-element-active"),e.getIsFocused()&&t.push("layout-element-focused"),e.getIsSelected()&&t.push("layout-element-selected"),e.getIsDropTarget()&&t.push("layout-element-droptarget"),e.isTemplated&&t.push("layout-element-templated"),t}}}}]),angular.module("LayoutEditor").directive("orcLayoutEditor",["environment",function(environment){return{restrict:"E",scope:{},controller:["$scope","$element","$attrs","$compile","clipboard",function($scope,$element,$attrs,$compile,clipboard){if(!$attrs.model)throw new Error("The 'model' attribute must evaluate to a LayoutEditor.Editor object.");$scope.element=eval($attrs.model),$scope.click=function(e,t){e.editor.isDragging||e.setIsFocused(),t.stopPropagation()},$scope.getClasses=function(e){var t=["layout-element","layout-container","layout-canvas"];return e.getIsActive()&&t.push("layout-element-active"),e.getIsFocused()&&t.push("layout-element-focused"),e.getIsSelected()&&t.push("layout-element-selected"),e.getIsDropTarget()&&t.push("layout-element-droptarget"),e.isTemplated&&t.push("layout-element-templated"),t};var layoutDesignerHost=$(".layout-designer").data("layout-designer-host");$scope.$root.layoutDesignerHost=layoutDesignerHost,layoutDesignerHost.element.on("replacecanvas",function(e,t){var o=$scope.element,n={data:t.canvas.data,htmlId:t.canvas.htmlId,htmlClass:t.canvas.htmlClass,htmlStyle:t.canvas.htmlStyle,isTemplated:t.canvas.isTemplated,children:t.canvas.children};layoutDesignerHost.editor=window.layoutEditor=new LayoutEditor.Editor(o.config,n);var l="",a=$compile(l)($scope);$(".layout-editor-holder").html(a)}),$scope.$root.editElement=function(e){var t=$scope.$root.layoutDesignerHost;return t.editElement(e)},$scope.$root.addElement=function(e){var t=$scope.$root.layoutDesignerHost;return t.addElement(e)},$scope.toggleInlineEditing=function(){if($scope.element.inlineEditingIsActive)tinymce.remove("#layout-editor-"+$scope.$id+" .layout-content-markup"),$element.find(".layout-toolbar-container").hide(),$scope.element.inlineEditingIsActive=!1;else{$scope.element.inlineEditingIsActive=!0,$element.find(".layout-toolbar-container").show();var e="#layout-editor-"+$scope.$id+" .layout-html .layout-content-markup[data-templated=false]",t=$(e).first().attr("id");tinymce.init({selector:e,theme:"modern",schema:"html5",plugins:["advlist autolink lists link image charmap print preview hr anchor pagebreak","searchreplace wordcount visualblocks visualchars code fullscreen","insertdatetime media nonbreaking table contextmenu directionality","emoticons template paste textcolor colorpicker textpattern","fullscreen autoresize"],toolbar:"undo redo cut copy paste | bold italic | bullist numlist outdent indent formatselect | alignleft aligncenter alignright alignjustify ltr rtl | link unlink charmap | code fullscreen close",convert_urls:!1,valid_elements:"*[*]",extended_valid_elements:"script[type|defer|src|language]",statusbar:!1,skin:"orchardlightgray",inline:!0,fixed_toolbar_container:"#layout-editor-"+$scope.$id+" .layout-toolbar-container",init_instance_callback:function(e){e.id==t&&tinymce.execCommand("mceFocus",!1,e.id)}})}},$(document).on("cut copy paste",function(e){if(clipboard.wasInvoked())e.originalEvent.clipboardData.setData("text/plain",clipboard.getData("text/plain")),e.originalEvent.clipboardData.setData("text/json",clipboard.getData("text/json")),e.preventDefault();else{var t=$scope.element.focusedElement;t&&($scope.$apply(function(){switch(e.type){case"copy":t.copy(e.originalEvent.clipboardData);break;case"cut":t.cut(e.originalEvent.clipboardData);break;case"paste":t.paste(e.originalEvent.clipboardData)}}),window.setTimeout(function(){$scope.$apply(function(){$scope.element.focusedElement&&$scope.element.focusedElement.setIsFocused()})},100),e.preventDefault())}clipboard.disable()})}],templateUrl:environment.templateUrl("Editor"),replace:!0,link:function(e,t){t.find(".layout-toolbar-container").click(function(e){e.stopPropagation()}),t.mousedown(function(t){e.element.inlineEditingIsActive&&(t.preventDefault(),t.stopPropagation())}),$(window).click(function(t){e.element.inlineEditingIsActive||e.$apply(function(){e.element.activeElement=null,e.element.focusedElement=null})})}}}]),angular.module("LayoutEditor").directive("orcLayoutCanvas",["scopeConfigurator","environment",function(e,t){return{restrict:"E",scope:{element:"="},controller:["$scope","$element","$attrs",function(t,o,n){e.configureForElement(t,o),e.configureForContainer(t,o),t.sortableOptions.axis="y"}],templateUrl:t.templateUrl("Canvas"),replace:!0}}]),angular.module("LayoutEditor").directive("orcLayoutChild",["$compile",function(e){return{restrict:"E",scope:{element:"="},link:function(t,o){var n="",l=e(n)(t);$(o).replaceWith(l)}}}]),angular.module("LayoutEditor").directive("orcLayoutColumn",["$compile","scopeConfigurator","environment",function(e,t,o){return{restrict:"E",scope:{element:"="},controller:["$scope","$element",function(e,o){t.configureForElement(e,o),t.configureForContainer(e,o),e.sortableOptions.axis="y"}],templateUrl:o.templateUrl("Column"),replace:!0,link:function(e,t,o){t.find(".layout-column-resize-bar").draggable({axis:"x",helper:"clone",revert:!0,start:function(t,o){e.$apply(function(){e.element.editor.isResizing=!0})},drag:function(o,n){var l=t.parent(),a=l.width()/e.element.width,i=!o.ctrlKey;if($(o.target).hasClass("layout-column-resize-bar-left")){var r=n.offset.left-l.offset().left;-a>r&&e.element.canExpandLeft(i)?e.$apply(function(){e.element.expandLeft(i)}):r>a&&e.element.canContractLeft(i)&&e.$apply(function(){e.element.contractLeft(i)})}else if($(o.target).hasClass("layout-column-resize-bar-right")){var r=n.offset.left-l.width()-l.offset().left;r>a&&e.element.canExpandRight(i)?e.$apply(function(){e.element.expandRight(i)}):-a>r&&e.element.canContractRight(i)&&e.$apply(function(){e.element.contractRight(i)})}},stop:function(t,o){e.$apply(function(){e.element.editor.isResizing=!1})}})}}}]),angular.module("LayoutEditor").directive("orcLayoutContent",["$sce","scopeConfigurator","environment",function(e,t,o){return{restrict:"E",scope:{element:"="},controller:["$scope","$element",function(o,n){t.configureForElement(o,n),o.edit=function(){o.$root.editElement(o.element).then(function(e){o.$apply(function(){e.cancel||(o.element.data=e.element.data,o.element.setHtml(e.element.html))})})},o.element.setHtml=function(t){o.element.html=t,o.element.htmlUnsafe=e.trustAsHtml(t)},o.element.setHtml(o.element.html)}],templateUrl:o.templateUrl("Content"),replace:!0}}]),angular.module("LayoutEditor").directive("orcLayoutHtml",["$sce","scopeConfigurator","environment",function(e,t,o){return{restrict:"E",scope:{element:"="},controller:["$scope","$element",function(o,n){t.configureForElement(o,n),o.edit=function(){o.$root.editElement(o.element).then(function(e){o.$apply(function(){e.cancel||(o.element.data=e.element.data,o.element.setHtml(e.element.html))})})},o.updateContent=function(e){o.element.setHtml(e.target.innerHTML)},o.element.setHtml=function(t){o.element.html=t,o.element.htmlUnsafe=e.trustAsHtml(t)},o.element.setHtml(o.element.html)}],templateUrl:o.templateUrl("Html"),replace:!0,link:function(e,t){t.find(".layout-content-markup").mousedown(function(t){e.element.editor.inlineEditingIsActive&&t.stopPropagation()})}}}]),angular.module("LayoutEditor").directive("orcLayoutGrid",["$compile","scopeConfigurator","environment",function(e,t,o){return{restrict:"E",scope:{element:"="},controller:["$scope","$element",function(e,o){t.configureForElement(e,o),t.configureForContainer(e,o),e.sortableOptions.axis="y"}],templateUrl:o.templateUrl("Grid"),replace:!0}}]),angular.module("LayoutEditor").directive("orcLayoutRow",["$compile","scopeConfigurator","environment",function(e,t,o){return{restrict:"E",scope:{element:"="},controller:["$scope","$element",function(e,o){t.configureForElement(e,o),t.configureForContainer(e,o),e.sortableOptions.axis="x",e.sortableOptions["ui-floating"]=!0}],templateUrl:o.templateUrl("Row"),replace:!0}}]),angular.module("LayoutEditor").directive("orcLayoutPopup",[function(){return{restrict:"A",link:function(e,t,o){var n=$(t),l=n.closest(".layout-popup-trigger"),a=n.closest(".layout-element");l.click(function(){n.toggle(),n.is(":visible")&&(n.position({my:o.orcLayoutPopupMy||"left top",at:o.orcLayoutPopupAt||"left bottom+4px",of:l}),n.find("input").first().focus())}),n.click(function(e){e.stopPropagation()}),a.click(function(e){n.hide()}),n.keydown(function(e){e.ctrlKey||e.shiftKey||e.altKey||27!=e.which||n.hide(),e.stopPropagation()}),n.on("cut copy paste",function(e){e.stopPropagation()})}}}]),angular.module("LayoutEditor").directive("orcLayoutToolbox",["$compile","environment",function(e,t){return{restrict:"E",controller:["$scope","$element",function(e,t){e.resetElements=function(){e.gridElements=[LayoutEditor.Grid.from({toolboxIcon:"",toolboxLabel:"Grid",toolboxDescription:"Empty grid.",children:[]})],e.rowElements=[LayoutEditor.Row.from({toolboxIcon:"",toolboxLabel:"Row (1 column)",toolboxDescription:"Row with 1 column.",children:LayoutEditor.Column.times(1)}),LayoutEditor.Row.from({toolboxIcon:"",toolboxLabel:"Row (2 columns)",toolboxDescription:"Row with 2 columns.",children:LayoutEditor.Column.times(2)}),LayoutEditor.Row.from({toolboxIcon:"",toolboxLabel:"Row (3 columns)",toolboxDescription:"Row with 3 columns.",children:LayoutEditor.Column.times(3)}),LayoutEditor.Row.from({toolboxIcon:"",toolboxLabel:"Row (4 columns)",toolboxDescription:"Row with 4 columns.",children:LayoutEditor.Column.times(4)}),LayoutEditor.Row.from({toolboxIcon:"",toolboxLabel:"Row (6 columns)",toolboxDescription:"Row with 6 columns.",children:LayoutEditor.Column.times(6)}),LayoutEditor.Row.from({toolboxIcon:"",toolboxLabel:"Row (12 columns)",toolboxDescription:"Row with 12 columns.",children:LayoutEditor.Column.times(12)}),LayoutEditor.Row.from({toolboxIcon:"",toolboxLabel:"Row (empty)",toolboxDescription:"Empty row.",children:[]})],e.columnElements=[LayoutEditor.Column.from({toolboxIcon:"",toolboxLabel:"Column",toolboxDescription:"Empty column.",width:1,offset:0,children:[]})],e.canvasElements=[LayoutEditor.Canvas.from({toolboxIcon:"",toolboxLabel:"Canvas",toolboxDescription:"Empty canvas.",children:[]})],e.contentElementCategories=_(e.element.config.categories).map(function(e){return{name:e.name,elements:_(e.contentTypes).map(function(e){var t=e.type,o=LayoutEditor.factories[t]||LayoutEditor.factories.Content,n={isTemplated:!1,contentType:e.id,contentTypeLabel:e.label,contentTypeClass:e.typeClass,data:null,hasEditor:e.hasEditor,html:e.html},l=o(n);return l.toolboxIcon=e.icon||"",l.toolboxLabel=e.label,l.toolboxDescription=e.description,l})}})},e.resetElements(),e.getSortableOptions=function(o){var n,l,a=t.closest(".layout-editor").attr("id"),i=!1;switch(o){case"Grid":n=[".layout-canvas",".layout-column",".layout-common-holder"],l="layout-element layout-container layout-grid ui-sortable-placeholder";break;case"Row":n=[".layout-grid"],l="layout-element layout-container layout-row row ui-sortable-placeholder";break;case"Column":n=[".layout-row:not(.layout-row-full)"],l="layout-element layout-container layout-column ui-sortable-placeholder",i=!0;break;case"Content":n=[".layout-canvas",".layout-column",".layout-common-holder"],l="layout-element layout-content ui-sortable-placeholder";break;case"Canvas":n=[".layout-canvas",".layout-column",".layout-common-holder"],l="layout-element layout-container layout-grid ui-sortable-placeholder"}return{cursor:"move",connectWith:_(n).map(function(e){return"#"+a+" "+e+":not(.layout-container-sealed) > .layout-element-wrapper > .layout-children"}).join(", "),placeholder:l,"ui-floating":i,create:function(e,t){e.target.isToolbox=!0},start:function(t,o){e.$apply(function(){e.element.isDragging=!0})},stop:function(t,o){e.$apply(function(){e.element.isDragging=!1,e.resetElements()})},over:function(t,o){e.$apply(function(){e.element.canvas.setIsDropTarget(!1)})}}};var o="layoutToolboxCategory_Layout_IsCollapsed";e.layoutIsCollapsed="true"===$.cookie(o),e.toggleLayoutIsCollapsed=function(t){e.layoutIsCollapsed=!e.layoutIsCollapsed,$.cookie(o,e.layoutIsCollapsed,{expires:365}),t.preventDefault(),t.stopPropagation()}}],templateUrl:t.templateUrl("Toolbox"),replace:!0,link:function(e,t){var o=t.find(".layout-toolbox");$(window).on("resize scroll",function(e){var n=t.parent().find(".layout-canvas"),l=!!n&&n.height()>o.height(),a=$(window).scrollTop();l&&a>t.offset().top+t.height()-o.height()?(o.addClass("sticky-bottom"),o.removeClass("sticky-top")):l&&a>t.offset().top?(o.addClass("sticky-top"),o.removeClass("sticky-bottom")):(o.removeClass("sticky-top"),o.removeClass("sticky-bottom"))})}}}]),angular.module("LayoutEditor").directive("orcLayoutToolboxGroup",["$compile","environment",function(e,t){return{restrict:"E",scope:{category:"="},controller:["$scope","$element",function(e,t){var o="layoutToolboxCategory_"+e.category.name+"_IsCollapsed";e.isCollapsed="true"===$.cookie(o),e.toggleIsCollapsed=function(t){e.isCollapsed=!e.isCollapsed,$.cookie(o,e.isCollapsed,{expires:365}),t.preventDefault(),t.stopPropagation()}}],templateUrl:t.templateUrl("ToolboxGroup"),replace:!0}}]);
\ No newline at end of file
+angular.module("LayoutEditor",["ngSanitize","ngResource","ui.sortable"]);var LayoutEditor;!function(e){var t=function(){var e=this;this._clipboardData={},this._isDisabled=!1,this._wasInvoked=!1,this.setData=function(t,o){e._clipboardData[t]=o,e._wasInvoked=!0},this.getData=function(t){return e._clipboardData[t]},this.disable=function(){e._isDisabled=!0,e._wasInvoked=!1,e._clipboardData={}},this.isDisabled=function(){return e._isDisabled},this.wasInvoked=function(){return e._wasInvoked}};e.Clipboard=new t,angular.module("LayoutEditor").factory("clipboard",[function(){return{setData:e.Clipboard.setData,getData:e.Clipboard.getData,disable:e.Clipboard.disable,isDisabled:e.Clipboard.isDisabled,wasInvoked:e.Clipboard.wasInvoked}}])}(LayoutEditor||(LayoutEditor={})),angular.module("LayoutEditor").factory("scopeConfigurator",["$timeout","clipboard",function(e,t){return{configureForElement:function(e,o){o.find(".layout-panel").click(function(e){e.stopPropagation()}),o.parent().keydown(function(n){var l=!1,a=!1,r=e.element;if(!r.editor.isDragging){if(!t.isDisabled()){var i=r.editor.focusedElement;if(i&&n.ctrlKey)switch(n.which){case 67:i.copy(t);break;case 88:i.cut(t);break;case 86:i.paste(t)}}if(n.ctrlKey||n.shiftKey||n.altKey||46!=n.which?n.ctrlKey||n.shiftKey||n.altKey||32!=n.which&&27!=n.which||(o.find(".layout-panel-action-properties").first().click(),l=!0):(e["delete"](r),l=!0),"Content"==r.type&&(n.ctrlKey||n.shiftKey||n.altKey||13!=n.which||(o.find(".layout-panel-action-edit").first().click(),l=!0)),r.children&&(n.ctrlKey||n.shiftKey||!n.altKey||40!=n.which||(r.children.length>0&&r.children[0].setIsFocused(),l=!0),"Column"==r.type)){var c=!n.ctrlKey;37==n.which?(n.altKey&&r.expandLeft(c),n.shiftKey&&r.contractRight(c),l=!0):39==n.which&&(n.altKey&&r.contractLeft(c),n.shiftKey&&r.expandRight(c),l=!0)}r.parent&&(n.altKey&&38==n.which&&(r.parent.setIsFocused(),l=!0),"Row"==r.parent.type?n.ctrlKey||n.shiftKey||n.altKey||37!=n.which?n.ctrlKey||n.shiftKey||n.altKey||39!=n.which?!n.ctrlKey||n.shiftKey||n.altKey||37!=n.which?!n.ctrlKey||n.shiftKey||n.altKey||39!=n.which||(r.moveDown(),l=!0):(r.moveUp(),a=!0,l=!0):(r.parent.moveFocusNextChild(r),l=!0):(r.parent.moveFocusPrevChild(r),l=!0):n.ctrlKey||n.shiftKey||n.altKey||38!=n.which?n.ctrlKey||n.shiftKey||n.altKey||40!=n.which?!n.ctrlKey||n.shiftKey||n.altKey||38!=n.which?!n.ctrlKey||n.shiftKey||n.altKey||40!=n.which||(r.moveDown(),l=!0):(r.moveUp(),a=!0,l=!0):(r.parent.moveFocusNextChild(r),l=!0):(r.parent.moveFocusPrevChild(r),l=!0)),l&&n.preventDefault(),n.stopPropagation(),e.$apply(),a&&window.setTimeout(function(){e.$apply(function(){r.editor.focusedElement.setIsFocused()})},100)}}),e.element.setIsFocusedEventHandlers.push(function(){o.parent().focus()}),e["delete"]=function(e){e["delete"]()}},configureForContainer:function(t,o){var n=t.element;t.getShowChildrenPlaceholder=function(){return 0===t.element.children.length&&!t.element.getIsDropTarget()},t.sortableOptions={cursor:"move",delay:150,disabled:n.getIsSealed(),distance:5,start:function(e,o){t.$apply(function(){n.setIsDropTarget(!0),n.editor.isDragging=!0}),o.placeholder.height(o.item.height()-4),o.placeholder.css("min-height",0)},stop:function(e,o){t.$apply(function(){n.editor.isDragging=!1,n.setIsDropTarget(!1)})},over:function(t,l){l.sender&&l.sender[0].isToolbox&&(l.sender[0].dropTargetTimeout&&(e.cancel(l.sender[0].dropTargetTimeout),l.sender[0].dropTargetTimeout=null),e(function(){if("Row"==n.type){var e=n.editor.dropTargetElement;e&&"Row"==e.type&&e.rollbackAddColumn()}n.setIsDropTarget(!1)}),l.sender[0].dropTargetTimeout=e(function(){if("Row"==n.type){var e=l.item.sortable.model,t=Math.floor(12/(n.children.length+1));e.width=t,e.offset=0,n.beginAddColumn(t);var a=_.max(_(o.find("> .layout-children > .layout-column:not(.ui-sortable-placeholder)")).map(function(e){return $(e).height()}));for(i=1;i<=12;i++)l.placeholder.removeClass("col-xs-"+i);l.placeholder.addClass("col-xs-"+e.width),a>0?(l.placeholder.height(a),l.placeholder.css("min-height",0)):(l.placeholder.height(0),l.placeholder.css("min-height",""))}n.setIsDropTarget(!0)},150))},receive:function(o,l){l.sender&&l.sender[0].isToolbox&&t.$apply(function(){var o=l.item.sortable.model;o&&("Row"==n.type&&n.commitAddColumn(),o.setEditor(n.editor),o.setParent(n),o.hasEditor&&t.$root.editElement(o).then(function(t){t.cancel||(o.data=t.element.data,o.applyElementEditorModel(t.elementEditorModel),o.setHtml&&o.setHtml(t.element.html)),e(function(){t.cancel?o["delete"]():o.setIsFocused(),n.setIsDropTarget(!1)})})),e(function(){n.setIsDropTarget(!1),o&&o.setIsFocused()})})}},t.click=function(e,t){e.editor.isDragging||e.setIsFocused(),t.stopPropagation()},t.getClasses=function(e){var t=["layout-element"];return e.children&&(t.push("layout-container"),e.getIsSealed()&&t.push("layout-container-sealed")),t.push("layout-"+e.type.toLowerCase()),e.dropTargetClass&&t.push(e.dropTargetClass),"Row"==e.type&&(t.push("row"),e.canAddColumn()||t.push("layout-row-full")),"Column"==e.type&&(t.push("col-xs-"+e.width),t.push("col-xs-offset-"+e.offset)),"Content"==e.type&&t.push("layout-content-"+e.contentTypeClass),e.getIsActive()&&t.push("layout-element-active"),e.getIsFocused()&&t.push("layout-element-focused"),e.getIsSelected()&&t.push("layout-element-selected"),e.getIsDropTarget()&&t.push("layout-element-droptarget"),e.isTemplated&&t.push("layout-element-templated"),t}}}}]),angular.module("LayoutEditor").directive("orcLayoutEditor",["environment",function(environment){return{restrict:"E",scope:{},controller:["$scope","$element","$attrs","$compile","clipboard",function($scope,$element,$attrs,$compile,clipboard){if(!$attrs.model)throw new Error("The 'model' attribute must evaluate to a LayoutEditor.Editor object.");$scope.element=eval($attrs.model),$scope.click=function(e,t){e.editor.isDragging||e.setIsFocused(),t.stopPropagation()},$scope.getClasses=function(e){var t=["layout-element","layout-container","layout-canvas"];return e.getIsActive()&&t.push("layout-element-active"),e.getIsFocused()&&t.push("layout-element-focused"),e.getIsSelected()&&t.push("layout-element-selected"),e.getIsDropTarget()&&t.push("layout-element-droptarget"),e.isTemplated&&t.push("layout-element-templated"),t};var layoutDesignerHost=$(".layout-designer").data("layout-designer-host");$scope.$root.layoutDesignerHost=layoutDesignerHost,layoutDesignerHost.element.on("replacecanvas",function(e,t){var o=$scope.element,n={data:t.canvas.data,htmlId:t.canvas.htmlId,htmlClass:t.canvas.htmlClass,htmlStyle:t.canvas.htmlStyle,isTemplated:t.canvas.isTemplated,children:t.canvas.children};layoutDesignerHost.editor=window.layoutEditor=new LayoutEditor.Editor(o.config,n);var l="",a=$compile(l)($scope);$(".layout-editor-holder").html(a)}),$scope.$root.editElement=function(e){var t=$scope.$root.layoutDesignerHost;return t.editElement(e)},$scope.$root.addElement=function(e){var t=$scope.$root.layoutDesignerHost;return t.addElement(e)},$(document).on("cut copy paste",function(e){if(clipboard.wasInvoked())e.originalEvent.clipboardData.setData("text/plain",clipboard.getData("text/plain")),e.originalEvent.clipboardData.setData("text/json",clipboard.getData("text/json")),e.preventDefault();else{var t=$scope.element.focusedElement;t&&($scope.$apply(function(){switch(e.type){case"copy":t.copy(e.originalEvent.clipboardData);break;case"cut":t.cut(e.originalEvent.clipboardData);break;case"paste":t.paste(e.originalEvent.clipboardData)}}),window.setTimeout(function(){$scope.$apply(function(){$scope.element.focusedElement&&$scope.element.focusedElement.setIsFocused()})},100),e.preventDefault())}clipboard.disable()})}],templateUrl:environment.templateUrl("Editor"),replace:!0,link:function(e,t){t.find(".layout-toolbar-container").click(function(e){e.stopPropagation()}),$(window).click(function(t){e.$apply(function(){e.element.activeElement=null,e.element.focusedElement=null})})}}}]),angular.module("LayoutEditor").directive("orcLayoutCanvas",["scopeConfigurator","environment",function(e,t){return{restrict:"E",scope:{element:"="},controller:["$scope","$element","$attrs",function(t,o,n){e.configureForElement(t,o),e.configureForContainer(t,o),t.sortableOptions.axis="y"}],templateUrl:t.templateUrl("Canvas"),replace:!0}}]),angular.module("LayoutEditor").directive("orcLayoutChild",["$compile",function(e){return{restrict:"E",scope:{element:"="},link:function(t,o){var n="",l=e(n)(t);$(o).replaceWith(l)}}}]),angular.module("LayoutEditor").directive("orcLayoutColumn",["$compile","scopeConfigurator","environment",function(e,t,o){return{restrict:"E",scope:{element:"="},controller:["$scope","$element",function(e,o){t.configureForElement(e,o),t.configureForContainer(e,o),e.sortableOptions.axis="y"}],templateUrl:o.templateUrl("Column"),replace:!0,link:function(e,t,o){t.find(".layout-column-resize-bar").draggable({axis:"x",helper:"clone",revert:!0,start:function(t,o){e.$apply(function(){e.element.editor.isResizing=!0})},drag:function(o,n){var l=t.parent(),a=l.width()/e.element.width,r=!o.ctrlKey;if($(o.target).hasClass("layout-column-resize-bar-left")){var i=n.offset.left-l.offset().left;-a>i&&e.element.canExpandLeft(r)?e.$apply(function(){e.element.expandLeft(r)}):i>a&&e.element.canContractLeft(r)&&e.$apply(function(){e.element.contractLeft(r)})}else if($(o.target).hasClass("layout-column-resize-bar-right")){var i=n.offset.left-l.width()-l.offset().left;i>a&&e.element.canExpandRight(r)?e.$apply(function(){e.element.expandRight(r)}):-a>i&&e.element.canContractRight(r)&&e.$apply(function(){e.element.contractRight(r)})}},stop:function(t,o){e.$apply(function(){e.element.editor.isResizing=!1})}})}}}]),angular.module("LayoutEditor").directive("orcLayoutContent",["$sce","scopeConfigurator","environment",function(e,t,o){return{restrict:"E",scope:{element:"="},controller:["$scope","$element",function(o,n){t.configureForElement(o,n),o.edit=function(){o.$root.editElement(o.element).then(function(e){o.$apply(function(){e.cancel||(o.element.data=e.element.data,o.element.setHtml(e.element.html))})})},o.element.setHtml=function(t){o.element.html=t,o.element.htmlUnsafe=e.trustAsHtml(t)},o.element.setHtml(o.element.html)}],templateUrl:o.templateUrl("Content"),replace:!0}}]),angular.module("LayoutEditor").directive("orcLayoutHtml",["$sce","scopeConfigurator","environment",function(e,t,o){return{restrict:"E",scope:{element:"="},controller:["$scope","$element",function(o,n){t.configureForElement(o,n),o.edit=function(){o.$root.editElement(o.element).then(function(e){o.$apply(function(){e.cancel||(o.element.data=e.element.data,o.element.setHtml(e.element.html))})})},o.updateContent=function(e){o.element.setHtml(e.target.innerHTML)},o.element.setHtml=function(t){o.element.html=t,o.element.htmlUnsafe=e.trustAsHtml(t)},o.element.setHtml(o.element.html)}],templateUrl:o.templateUrl("Html"),replace:!0,link:function(e,t){}}}]),angular.module("LayoutEditor").directive("orcLayoutGrid",["$compile","scopeConfigurator","environment",function(e,t,o){return{restrict:"E",scope:{element:"="},controller:["$scope","$element",function(e,o){t.configureForElement(e,o),t.configureForContainer(e,o),e.sortableOptions.axis="y"}],templateUrl:o.templateUrl("Grid"),replace:!0}}]),angular.module("LayoutEditor").directive("orcLayoutRow",["$compile","scopeConfigurator","environment",function(e,t,o){return{restrict:"E",scope:{element:"="},controller:["$scope","$element",function(e,o){t.configureForElement(e,o),t.configureForContainer(e,o),e.sortableOptions.axis="x",e.sortableOptions["ui-floating"]=!0}],templateUrl:o.templateUrl("Row"),replace:!0}}]),angular.module("LayoutEditor").directive("orcLayoutPopup",[function(){return{restrict:"A",link:function(e,t,o){var n=$(t),l=n.closest(".layout-popup-trigger"),a=n.closest(".layout-element");l.click(function(){n.toggle(),n.is(":visible")&&(n.position({my:o.orcLayoutPopupMy||"left top",at:o.orcLayoutPopupAt||"left bottom+4px",of:l}),n.find("input").first().focus())}),n.click(function(e){e.stopPropagation()}),a.click(function(e){n.hide()}),n.keydown(function(e){e.ctrlKey||e.shiftKey||e.altKey||27!=e.which||n.hide(),e.stopPropagation()}),n.on("cut copy paste",function(e){e.stopPropagation()})}}}]),angular.module("LayoutEditor").directive("orcLayoutToolbox",["$compile","environment",function(e,t){return{restrict:"E",controller:["$scope","$element",function(e,t){e.resetElements=function(){e.gridElements=[LayoutEditor.Grid.from({toolboxIcon:"",toolboxLabel:"Grid",toolboxDescription:"Empty grid.",children:[]})],e.rowElements=[LayoutEditor.Row.from({toolboxIcon:"",toolboxLabel:"Row (1 column)",toolboxDescription:"Row with 1 column.",children:LayoutEditor.Column.times(1)}),LayoutEditor.Row.from({toolboxIcon:"",toolboxLabel:"Row (2 columns)",toolboxDescription:"Row with 2 columns.",children:LayoutEditor.Column.times(2)}),LayoutEditor.Row.from({toolboxIcon:"",toolboxLabel:"Row (3 columns)",toolboxDescription:"Row with 3 columns.",children:LayoutEditor.Column.times(3)}),LayoutEditor.Row.from({toolboxIcon:"",toolboxLabel:"Row (4 columns)",toolboxDescription:"Row with 4 columns.",children:LayoutEditor.Column.times(4)}),LayoutEditor.Row.from({toolboxIcon:"",toolboxLabel:"Row (6 columns)",toolboxDescription:"Row with 6 columns.",children:LayoutEditor.Column.times(6)}),LayoutEditor.Row.from({toolboxIcon:"",toolboxLabel:"Row (12 columns)",toolboxDescription:"Row with 12 columns.",children:LayoutEditor.Column.times(12)}),LayoutEditor.Row.from({toolboxIcon:"",toolboxLabel:"Row (empty)",toolboxDescription:"Empty row.",children:[]})],e.columnElements=[LayoutEditor.Column.from({toolboxIcon:"",toolboxLabel:"Column",toolboxDescription:"Empty column.",width:1,offset:0,children:[]})],e.canvasElements=[LayoutEditor.Canvas.from({toolboxIcon:"",toolboxLabel:"Canvas",toolboxDescription:"Empty canvas.",children:[]})],e.contentElementCategories=_(e.element.config.categories).map(function(e){return{name:e.name,elements:_(e.contentTypes).map(function(e){var t=e.type,o=LayoutEditor.factories[t]||LayoutEditor.factories.Content,n={isTemplated:!1,contentType:e.id,contentTypeLabel:e.label,contentTypeClass:e.typeClass,data:null,hasEditor:e.hasEditor,html:e.html},l=o(n);return l.toolboxIcon=e.icon||"",l.toolboxLabel=e.label,l.toolboxDescription=e.description,l})}})},e.resetElements(),e.getSortableOptions=function(o){var n,l,a=t.closest(".layout-editor").attr("id"),r=!1;switch(o){case"Grid":n=[".layout-canvas",".layout-column",".layout-common-holder"],l="layout-element layout-container layout-grid ui-sortable-placeholder";break;case"Row":n=[".layout-grid"],l="layout-element layout-container layout-row row ui-sortable-placeholder";break;case"Column":n=[".layout-row:not(.layout-row-full)"],l="layout-element layout-container layout-column ui-sortable-placeholder",r=!0;break;case"Content":n=[".layout-canvas",".layout-column",".layout-common-holder"],l="layout-element layout-content ui-sortable-placeholder";break;case"Canvas":n=[".layout-canvas",".layout-column",".layout-common-holder"],l="layout-element layout-container layout-grid ui-sortable-placeholder"}return{cursor:"move",connectWith:_(n).map(function(e){return"#"+a+" "+e+":not(.layout-container-sealed) > .layout-element-wrapper > .layout-children"}).join(", "),placeholder:l,"ui-floating":r,create:function(e,t){e.target.isToolbox=!0},start:function(t,o){e.$apply(function(){e.element.isDragging=!0})},stop:function(t,o){e.$apply(function(){e.element.isDragging=!1,e.resetElements()})},over:function(t,o){e.$apply(function(){e.element.canvas.setIsDropTarget(!1)})}}};var o="layoutToolboxCategory_Layout_IsCollapsed";e.layoutIsCollapsed="true"===$.cookie(o),e.toggleLayoutIsCollapsed=function(t){e.layoutIsCollapsed=!e.layoutIsCollapsed,$.cookie(o,e.layoutIsCollapsed,{expires:365}),t.preventDefault(),t.stopPropagation()}}],templateUrl:t.templateUrl("Toolbox"),replace:!0,link:function(e,t){var o=t.find(".layout-toolbox");$(window).on("resize scroll",function(e){var n=t.parent().find(".layout-canvas"),l=!!n&&n.height()>o.height(),a=$(window).scrollTop();l&&a>t.offset().top+t.height()-o.height()?(o.addClass("sticky-bottom"),o.removeClass("sticky-top")):l&&a>t.offset().top?(o.addClass("sticky-top"),o.removeClass("sticky-bottom")):(o.removeClass("sticky-top"),o.removeClass("sticky-bottom"))})}}}]),angular.module("LayoutEditor").directive("orcLayoutToolboxGroup",["$compile","environment",function(e,t){return{restrict:"E",scope:{category:"="},controller:["$scope","$element",function(e,t){var o="layoutToolboxCategory_"+e.category.name+"_IsCollapsed";e.isCollapsed="true"===$.cookie(o),e.toggleIsCollapsed=function(t){e.isCollapsed=!e.isCollapsed,$.cookie(o,e.isCollapsed,{expires:365}),t.preventDefault(),t.stopPropagation()}}],templateUrl:t.templateUrl("ToolboxGroup"),replace:!0}}]);
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js b/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
index c79c8401e..4e7f4a183 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
@@ -52,7 +52,6 @@ var LayoutEditor;
this.focusedElement = null;
this.dropTargetElement = null;
this.isDragging = false;
- this.inlineEditingIsActive = false;
this.isResizing = false;
this.resetToolboxElements = function () {
@@ -133,7 +132,7 @@ var LayoutEditor;
this.setIsActive = function (value) {
if (!this.editor)
return;
- if (this.editor.isDragging || this.editor.inlineEditingIsActive || this.editor.isResizing)
+ if (this.editor.isDragging || this.editor.isResizing)
return;
if (value)
@@ -153,7 +152,7 @@ var LayoutEditor;
return;
if (!this.children && this.isTemplated)
return;
- if (this.editor.isDragging || this.editor.inlineEditingIsActive || this.editor.isResizing)
+ if (this.editor.isDragging || this.editor.isResizing)
return;
this.editor.focusedElement = this;
@@ -1050,4 +1049,4 @@ var LayoutEditor;
LayoutEditor.registerFactory("Html", function(value) { return LayoutEditor.Html.from(value); });
})(jQuery, LayoutEditor || (LayoutEditor = {}));
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["Helpers.js","Editor.js","Element.js","Container.js","Canvas.js","Grid.js","Row.js","Column.js","Content.js","Html.js"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC1CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AChCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACnMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC9IA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AClCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC7BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC7RA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC5JA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC1DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"Models.js","sourcesContent":["var LayoutEditor;\r\n(function (LayoutEditor) {\r\n\r\n    Array.prototype.move = function (from, to) {\r\n        this.splice(to, 0, this.splice(from, 1)[0]);\r\n    };\r\n\r\n    LayoutEditor.childrenFrom = function(values) {\r\n        return _(values).map(function(value) {\r\n            return LayoutEditor.elementFrom(value);\r\n        });\r\n    };\r\n\r\n    var registerFactory = LayoutEditor.registerFactory = function(type, factory) {\r\n        var factories = LayoutEditor.factories = LayoutEditor.factories || {};\r\n        factories[type] = factory;\r\n    };\r\n\r\n    registerFactory(\"Canvas\", function (value) { return LayoutEditor.Canvas.from(value); });\r\n    registerFactory(\"Grid\", function(value) { return LayoutEditor.Grid.from(value); });\r\n    registerFactory(\"Row\", function(value) { return LayoutEditor.Row.from(value); });\r\n    registerFactory(\"Column\", function(value) { return LayoutEditor.Column.from(value); });\r\n    registerFactory(\"Content\", function(value) { return LayoutEditor.Content.from(value); });\r\n\r\n    LayoutEditor.elementFrom = function (value) {\r\n        var factory = LayoutEditor.factories[value.type];\r\n\r\n        if (!factory)\r\n            throw new Error(\"No element with type \\\"\" + value.type + \"\\\" was found.\");\r\n\r\n        var element = factory(value);\r\n        return element;\r\n    };\r\n\r\n    LayoutEditor.setModel = function (elementSelector, model) {\r\n        $(elementSelector).scope().element = model;\r\n    };\r\n\r\n    LayoutEditor.getModel = function (elementSelector) {\r\n        return $(elementSelector).scope().element;\r\n    };\r\n\r\n})(LayoutEditor || (LayoutEditor = {}));","var LayoutEditor;\r\n(function (LayoutEditor) {\r\n\r\n    LayoutEditor.Editor = function (config, canvasData) {\r\n        this.config = config;\r\n        this.canvas = LayoutEditor.Canvas.from(canvasData);\r\n        this.initialState = JSON.stringify(this.canvas.toObject());\r\n        this.activeElement = null;\r\n        this.focusedElement = null;\r\n        this.dropTargetElement = null;\r\n        this.isDragging = false;\r\n        this.inlineEditingIsActive = false;\r\n        this.isResizing = false;\r\n\r\n        this.resetToolboxElements = function () {\r\n            this.toolboxElements = [\r\n                LayoutEditor.Row.from({\r\n                    children: []\r\n                })\r\n            ];\r\n        };\r\n\r\n        this.isDirty = function() {\r\n            var currentState = JSON.stringify(this.canvas.toObject());\r\n            return this.initialState != currentState;\r\n        };\r\n\r\n        this.resetToolboxElements();\r\n        this.canvas.setEditor(this);\r\n    };\r\n\r\n})(LayoutEditor || (LayoutEditor = {}));\r\n","var LayoutEditor;\r\n(function (LayoutEditor) {\r\n\r\n    LayoutEditor.Element = function (type, data, htmlId, htmlClass, htmlStyle, isTemplated, rule) {\r\n        if (!type)\r\n            throw new Error(\"Parameter 'type' is required.\");\r\n\r\n        this.type = type;\r\n        this.data = data;\r\n        this.htmlId = htmlId;\r\n        this.htmlClass = htmlClass;\r\n        this.htmlStyle = htmlStyle;\r\n        this.isTemplated = isTemplated;\r\n        this.rule = rule;\r\n\r\n        this.editor = null;\r\n        this.parent = null;\r\n        this.setIsFocusedEventHandlers = [];\r\n\r\n        this.setEditor = function (editor) {\r\n            this.editor = editor;\r\n            if (!!this.children && _.isArray(this.children)) {\r\n                _(this.children).each(function (child) {\r\n                    child.setEditor(editor);\r\n                });\r\n            }\r\n        };\r\n\r\n        this.setParent = function(parentElement) {\r\n            this.parent = parentElement;\r\n            this.parent.onChildAdded(this);\r\n\r\n            var currentAncestor = parentElement;\r\n            while (!!currentAncestor) {\r\n                currentAncestor.onDescendantAdded(this, parentElement);\r\n                currentAncestor = currentAncestor.parent;\r\n            }\r\n        };\r\n\r\n        this.setIsTemplated = function (value) {\r\n            this.isTemplated = value;\r\n            if (!!this.children && _.isArray(this.children)) {\r\n                _(this.children).each(function (child) {\r\n                    child.setIsTemplated(value);\r\n                });\r\n            }\r\n        };\r\n\r\n        this.applyElementEditorModel = function() { /* Virtual */ };\r\n\r\n        this.getIsActive = function () {\r\n            if (!this.editor)\r\n                return false;\r\n            return this.editor.activeElement === this && !this.getIsFocused();\r\n        };\r\n\r\n        this.setIsActive = function (value) {\r\n            if (!this.editor)\r\n                return;\r\n            if (this.editor.isDragging || this.editor.inlineEditingIsActive || this.editor.isResizing)\r\n                return;\r\n\r\n            if (value)\r\n                this.editor.activeElement = this;\r\n            else\r\n                this.editor.activeElement = this.parent;\r\n        };\r\n\r\n        this.getIsFocused = function () {\r\n            if (!this.editor)\r\n                return false;\r\n            return this.editor.focusedElement === this;\r\n        };\r\n\r\n        this.setIsFocused = function () {\r\n            if (!this.editor)\r\n            \treturn;\r\n            if (!this.children && this.isTemplated)\r\n            \treturn;\r\n            if (this.editor.isDragging || this.editor.inlineEditingIsActive || this.editor.isResizing)\r\n                return;\r\n\r\n            this.editor.focusedElement = this;\r\n            _(this.setIsFocusedEventHandlers).each(function (item) {\r\n                try {\r\n                    item();\r\n                }\r\n                catch (ex) {\r\n                    // Ignore.\r\n                }\r\n            });\r\n        };\r\n\r\n        this.getIsSelected = function () {\r\n            if (this.getIsFocused())\r\n                return true;\r\n\r\n            if (!!this.children && _.isArray(this.children)) {\r\n                return _(this.children).any(function(child) {\r\n                    return child.getIsSelected();\r\n                });\r\n            }\r\n\r\n            return false;\r\n        };\r\n\r\n        this.getIsDropTarget = function () {\r\n            if (!this.editor)\r\n                return false;\r\n            return this.editor.dropTargetElement === this;\r\n        }\r\n\r\n        this.setIsDropTarget = function (value) {\r\n            if (!this.editor)\r\n                return;\r\n            if (value)\r\n                this.editor.dropTargetElement = this;\r\n            else\r\n                this.editor.dropTargetElement = null;\r\n        };\r\n\r\n        this.canDelete = function () {\r\n            if (this.isTemplated || !this.parent)\r\n                return false;\r\n            return true;\r\n        };\r\n\r\n        this.delete = function () {\r\n            if (!this.canDelete())\r\n                return;\r\n            this.parent.deleteChild(this);\r\n        };\r\n\r\n        this.canMoveUp = function () {\r\n            if (this.isTemplated || !this.parent)\r\n                return false;\r\n            return this.parent.canMoveChildUp(this);\r\n        };\r\n\r\n        this.moveUp = function () {\r\n            if (!this.canMoveUp())\r\n                return;\r\n            this.parent.moveChildUp(this);\r\n        };\r\n\r\n        this.canMoveDown = function () {\r\n            if (this.isTemplated || !this.parent)\r\n                return false;\r\n            return this.parent.canMoveChildDown(this);\r\n        };\r\n\r\n        this.moveDown = function () {\r\n            if (!this.canMoveDown())\r\n                return;\r\n            this.parent.moveChildDown(this);\r\n        };\r\n\r\n        this.elementToObject = function () {\r\n            return {\r\n                type: this.type,\r\n                data: this.data,\r\n                htmlId: this.htmlId,\r\n                htmlClass: this.htmlClass,\r\n                htmlStyle: this.htmlStyle,\r\n                isTemplated: this.isTemplated,\r\n                rule: this.rule\r\n            };\r\n        };\r\n\r\n        this.getEditorObject = function() {\r\n            return {};\r\n        };\r\n\r\n        this.copy = function (clipboardData) {\r\n            var text = this.getInnerText();\r\n            clipboardData.setData(\"text/plain\", text);\r\n\r\n            var data = this.toObject();\r\n            var json = JSON.stringify(data, null, \"\\t\");\r\n            clipboardData.setData(\"text/json\", json);\r\n        };\r\n\r\n        this.cut = function (clipboardData) {\r\n            if (this.canDelete()) {\r\n                this.copy(clipboardData);\r\n                this.delete();\r\n            }\r\n        };\r\n\r\n        this.paste = function (clipboardData) {\r\n            if (!!this.parent)\r\n                this.parent.paste(clipboardData);\r\n        };\r\n    };\r\n\r\n})(LayoutEditor || (LayoutEditor = {}));","var LayoutEditor;\r\n(function (LayoutEditor) {\r\n\r\n    LayoutEditor.Container = function (allowedChildTypes, children) {\r\n\r\n        this.allowedChildTypes = allowedChildTypes;\r\n        this.children = children;\r\n        this.isContainer = true;\r\n\r\n        var self = this;\r\n\r\n        this.onChildAdded = function (element) { /* Virtual */ };\r\n        this.onDescendantAdded = function (element, parentElement) { /* Virtual */ };\r\n\r\n        this.setChildren = function (children) {\r\n            this.children = children;\r\n            _(this.children).each(function (child) {\r\n                child.setParent(self);\r\n            });\r\n        };\r\n\r\n        this.setChildren(children);\r\n\r\n        this.getIsSealed = function () {\r\n            return _(this.children).any(function (child) {\r\n                return child.isTemplated;\r\n            });\r\n        };\r\n\r\n        var _baseSetIsFocused = this.setIsFocused;\r\n        this.setIsFocused = function () {\r\n            if (this.getIsSealed())\r\n                return;\r\n            _baseSetIsFocused.call(this);\r\n        };\r\n\r\n        this.addChild = function (child) {\r\n            if (!_(this.children).contains(child) && (_(this.allowedChildTypes).contains(child.type) || child.isContainable))\r\n                this.children.push(child);\r\n            child.setEditor(this.editor);\r\n            child.setIsTemplated(false);\r\n            child.setParent(this);\r\n        };\r\n\r\n        this.deleteChild = function (child) {\r\n            var index = _(this.children).indexOf(child);\r\n            if (index >= 0) {\r\n                this.children.splice(index, 1);\r\n                if (child.getIsActive())\r\n                    this.editor.activeElement = null;\r\n                if (child.getIsFocused()) {\r\n                    // If the deleted child was focused, try to set new focus to the most appropriate sibling or parent.\r\n                    if (this.children.length > index)\r\n                        this.children[index].setIsFocused();\r\n                    else if (index > 0)\r\n                        this.children[index - 1].setIsFocused();\r\n                    else\r\n                        this.setIsFocused();\r\n                }\r\n            }\r\n        };\r\n\r\n        this.moveFocusPrevChild = function (child) {\r\n            if (this.children.length < 2)\r\n                return;\r\n            var index = _(this.children).indexOf(child);\r\n            if (index > 0)\r\n                this.children[index - 1].setIsFocused();\r\n        };\r\n\r\n        this.moveFocusNextChild = function (child) {\r\n            if (this.children.length < 2)\r\n                return;\r\n            var index = _(this.children).indexOf(child);\r\n            if (index < this.children.length - 1)\r\n                this.children[index + 1].setIsFocused();\r\n        };\r\n\r\n        this.insertChild = function (child, afterChild) {\r\n            if (!_(this.children).contains(child)) {\r\n                var index = Math.max(_(this.children).indexOf(afterChild), 0);\r\n                this.children.splice(index + 1, 0, child);\r\n                child.setEditor(this.editor);\r\n                child.parent = this;\r\n            }\r\n        };\r\n\r\n        this.moveChildUp = function (child) {\r\n            if (!this.canMoveChildUp(child))\r\n                return;\r\n            var index = _(this.children).indexOf(child);\r\n            this.children.move(index, index - 1);\r\n        };\r\n\r\n        this.moveChildDown = function (child) {\r\n            if (!this.canMoveChildDown(child))\r\n                return;\r\n            var index = _(this.children).indexOf(child);\r\n            this.children.move(index, index + 1);\r\n        };\r\n\r\n        this.canMoveChildUp = function (child) {\r\n            var index = _(this.children).indexOf(child);\r\n            return index > 0;\r\n        };\r\n\r\n        this.canMoveChildDown = function (child) {\r\n            var index = _(this.children).indexOf(child);\r\n            return index < this.children.length - 1;\r\n        };\r\n\r\n        this.childrenToObject = function () {\r\n            return _(this.children).map(function (child) {\r\n                return child.toObject();\r\n            });\r\n        };\r\n\r\n        this.getInnerText = function () {\r\n            return _(this.children).reduce(function (memo, child) {\r\n                return memo + \"\\n\" + child.getInnerText();\r\n            }, \"\");\r\n        }\r\n\r\n        this.paste = function (clipboardData) {\r\n            var json = clipboardData.getData(\"text/json\");\r\n            if (!!json) {\r\n                var data = JSON.parse(json);\r\n                var child = LayoutEditor.elementFrom(data);\r\n                this.pasteChild(child);\r\n            }\r\n        };\r\n\r\n        this.pasteChild = function (child) {\r\n            if (_(this.allowedChildTypes).contains(child.type) || child.isContainable) {\r\n                this.addChild(child);\r\n                child.setIsFocused();\r\n            }\r\n            else if (!!this.parent)\r\n                this.parent.pasteChild(child);\r\n        }\r\n    };\r\n\r\n})(LayoutEditor || (LayoutEditor = {}));","var LayoutEditor;\r\n(function (LayoutEditor) {\r\n\r\n    LayoutEditor.Canvas = function (data, htmlId, htmlClass, htmlStyle, isTemplated, rule, children) {\r\n        LayoutEditor.Element.call(this, \"Canvas\", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);\r\n        LayoutEditor.Container.call(this, [\"Canvas\", \"Grid\", \"Content\"], children);\r\n\r\n        this.isContainable = true;\r\n\r\n        this.toObject = function () {\r\n            var result = this.elementToObject();\r\n            result.children = this.childrenToObject();\r\n            return result;\r\n        };\r\n    };\r\n\r\n    LayoutEditor.Canvas.from = function (value) {\r\n        var result = new LayoutEditor.Canvas(\r\n            value.data,\r\n            value.htmlId,\r\n            value.htmlClass,\r\n            value.htmlStyle,\r\n            value.isTemplated,\r\n            value.rule,\r\n            LayoutEditor.childrenFrom(value.children));\r\n\r\n        result.toolboxIcon = value.toolboxIcon;\r\n        result.toolboxLabel = value.toolboxLabel;\r\n        result.toolboxDescription = value.toolboxDescription;\r\n\r\n        return result;\r\n    };\r\n\r\n})(LayoutEditor || (LayoutEditor = {}));\r\n","var LayoutEditor;\r\n(function (LayoutEditor) {\r\n\r\n    LayoutEditor.Grid = function (data, htmlId, htmlClass, htmlStyle, isTemplated, rule, children) {\r\n        LayoutEditor.Element.call(this, \"Grid\", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);\r\n        LayoutEditor.Container.call(this, [\"Row\"], children);\r\n\r\n        this.toObject = function () {\r\n            var result = this.elementToObject();\r\n            result.children = this.childrenToObject();\r\n            return result;\r\n        };\r\n    };\r\n\r\n    LayoutEditor.Grid.from = function (value) {\r\n        var result = new LayoutEditor.Grid(\r\n            value.data,\r\n            value.htmlId,\r\n            value.htmlClass,\r\n            value.htmlStyle,\r\n            value.isTemplated,\r\n            value.rule,\r\n            LayoutEditor.childrenFrom(value.children));\r\n        result.toolboxIcon = value.toolboxIcon;\r\n        result.toolboxLabel = value.toolboxLabel;\r\n        result.toolboxDescription = value.toolboxDescription;\r\n        return result;\r\n    };\r\n\r\n})(LayoutEditor || (LayoutEditor = {}));","var LayoutEditor;\r\n(function (LayoutEditor) {\r\n\r\n    LayoutEditor.Row = function (data, htmlId, htmlClass, htmlStyle, isTemplated, rule, children) {\r\n        LayoutEditor.Element.call(this, \"Row\", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);\r\n        LayoutEditor.Container.call(this, [\"Column\"], children);\r\n\r\n        var _self = this;\r\n\r\n        function _getTotalColumnsWidth() {\r\n            return _(_self.children).reduce(function (memo, child) {\r\n                return memo + child.offset + child.width;\r\n            }, 0);\r\n        }\r\n\r\n        // Implements a simple algorithm to distribute space (either positive or negative)\r\n        // between the child columns of the row. Negative space is distributed when making\r\n        // room for a new column (e.c. clipboard paste or dropping from the toolbox) while\r\n        // positive space is distributed when filling the grap of a removed column.\r\n        function _distributeSpace(space) {\r\n            if (space == 0)\r\n                return true;\r\n             \r\n            var undistributedSpace = space;\r\n\r\n            if (undistributedSpace < 0) {\r\n                var vacantSpace = 12 - _getTotalColumnsWidth();\r\n                undistributedSpace += vacantSpace;\r\n                if (undistributedSpace > 0)\r\n                    undistributedSpace = 0;\r\n            }\r\n\r\n            // If space is negative, try to decrease offsets first.\r\n            while (undistributedSpace < 0 && _(_self.children).any(function (column) { return column.offset > 0; })) { // While there is still offset left to remove.\r\n                for (i = 0; i < _self.children.length && undistributedSpace < 0; i++) {\r\n                    var column = _self.children[i];\r\n                    if (column.offset > 0) {\r\n                        column.offset--;\r\n                        undistributedSpace++;\r\n                    }\r\n                }\r\n            }\r\n\r\n            function hasWidth(column) {\r\n                if (undistributedSpace > 0)\r\n                    return column.width < 12;\r\n                else if (undistributedSpace < 0)\r\n                    return column.width > 1;\r\n                return false;\r\n            }\r\n\r\n            // Try to distribute remaining space (could be negative or positive) using widths.\r\n            while (undistributedSpace != 0) {\r\n                // Any more column width available for distribution?\r\n                if (!_(_self.children).any(hasWidth))\r\n                    break;\r\n                for (i = 0; i < _self.children.length && undistributedSpace != 0; i++) {\r\n                    var column = _self.children[i % _self.children.length];\r\n                    if (hasWidth(column)) {\r\n                        var delta = undistributedSpace / Math.abs(undistributedSpace);\r\n                        column.width += delta;\r\n                        undistributedSpace -= delta;\r\n                    }\r\n                }                \r\n            }\r\n\r\n            return undistributedSpace == 0;\r\n        }\r\n\r\n        var _isAddingColumn = false;\r\n\r\n        this.canAddColumn = function () {\r\n            return this.children.length < 12;\r\n        };\r\n\r\n        this.beginAddColumn = function (newColumnWidth) {\r\n            if (!!_isAddingColumn)\r\n                throw new Error(\"Column add operation is already in progress.\")\r\n            _(this.children).each(function (column) {\r\n                column.beginChange();\r\n            });\r\n            if (_distributeSpace(-newColumnWidth)) {\r\n                _isAddingColumn = true;\r\n                return true;\r\n            }\r\n            _(this.children).each(function (column) {\r\n                column.rollbackChange();\r\n            });\r\n            return false;\r\n        };\r\n\r\n        this.commitAddColumn = function () {\r\n            if (!_isAddingColumn)\r\n                throw new Error(\"No column add operation in progress.\")\r\n            _(this.children).each(function (column) {\r\n                column.commitChange();\r\n            });\r\n            _isAddingColumn = false;\r\n        };\r\n\r\n        this.rollbackAddColumn = function () {\r\n            if (!_isAddingColumn)\r\n                throw new Error(\"No column add operation in progress.\")\r\n            _(this.children).each(function (column) {\r\n                column.rollbackChange();\r\n            });\r\n            _isAddingColumn = false;\r\n        };\r\n\r\n        var _baseDeleteChild = this.deleteChild;\r\n        this.deleteChild = function (column) { \r\n            var width = column.width;\r\n            _baseDeleteChild.call(this, column);\r\n            _distributeSpace(width);\r\n        };\r\n\r\n        this.canContractColumnRight = function (column, connectAdjacent) {\r\n            var index = _(this.children).indexOf(column);\r\n            if (index >= 0)\r\n                return column.width > 1;\r\n            return false;\r\n        };\r\n\r\n        this.contractColumnRight = function (column, connectAdjacent) {\r\n            if (!this.canContractColumnRight(column, connectAdjacent))\r\n                return;\r\n\r\n            var index = _(this.children).indexOf(column);\r\n            if (index >= 0) {\r\n                if (column.width > 1) {\r\n                    column.width--;\r\n                    if (this.children.length > index + 1) {\r\n                        var nextColumn = this.children[index + 1];\r\n                        if (connectAdjacent && nextColumn.offset == 0)\r\n                            nextColumn.width++;\r\n                        else\r\n                            nextColumn.offset++;\r\n                    }\r\n                }\r\n            }\r\n        };\r\n\r\n        this.canExpandColumnRight = function (column, connectAdjacent) {\r\n            var index = _(this.children).indexOf(column);\r\n            if (index >= 0) {\r\n                if (column.width >= 12)\r\n                    return false;\r\n                if (this.children.length > index + 1) {\r\n                    var nextColumn = this.children[index + 1];\r\n                    if (connectAdjacent && nextColumn.offset == 0)\r\n                        return nextColumn.width > 1;\r\n                    else\r\n                        return nextColumn.offset > 0;\r\n                }\r\n                return _getTotalColumnsWidth() < 12;\r\n            }\r\n            return false;\r\n        };\r\n\r\n        this.expandColumnRight = function (column, connectAdjacent) {\r\n            if (!this.canExpandColumnRight(column, connectAdjacent))\r\n                return;\r\n\r\n            var index = _(this.children).indexOf(column);\r\n            if (index >= 0) {\r\n                if (this.children.length > index + 1) {\r\n                    var nextColumn = this.children[index + 1];\r\n                    if (connectAdjacent && nextColumn.offset == 0)\r\n                        nextColumn.width--;\r\n                    else\r\n                        nextColumn.offset--;\r\n                }\r\n                column.width++;\r\n            }\r\n        };\r\n\r\n        this.canExpandColumnLeft = function (column, connectAdjacent) {\r\n            var index = _(this.children).indexOf(column);\r\n            if (index >= 0) {\r\n                if (column.width >= 12)\r\n                    return false;\r\n                if (index > 0) {\r\n                    var prevColumn = this.children[index - 1];\r\n                    if (connectAdjacent && column.offset == 0)\r\n                        return prevColumn.width > 1;\r\n                }\r\n                return column.offset > 0;\r\n            }\r\n            return false;\r\n        };\r\n\r\n        this.expandColumnLeft = function (column, connectAdjacent) {\r\n            if (!this.canExpandColumnLeft(column, connectAdjacent))\r\n                return;\r\n\r\n            var index = _(this.children).indexOf(column);\r\n            if (index >= 0) {\r\n                if (index > 0) {\r\n                    var prevColumn = this.children[index - 1];\r\n                    if (connectAdjacent && column.offset == 0)\r\n                        prevColumn.width--;\r\n                    else\r\n                        column.offset--;\r\n                }\r\n                else\r\n                    column.offset--;\r\n                column.width++;\r\n            }\r\n        };\r\n\r\n        this.canContractColumnLeft = function (column, connectAdjacent) {\r\n            var index = _(this.children).indexOf(column);\r\n            if (index >= 0)\r\n                return column.width > 1;\r\n            return false;\r\n        };\r\n\r\n        this.contractColumnLeft = function (column, connectAdjacent) {\r\n            if (!this.canContractColumnLeft(column, connectAdjacent))\r\n                return;\r\n\r\n            var index = _(this.children).indexOf(column);\r\n            if (index >= 0) {\r\n                if (index > 0) {\r\n                    var prevColumn = this.children[index - 1];\r\n                    if (connectAdjacent && column.offset == 0)\r\n                        prevColumn.width++;\r\n                    else\r\n                        column.offset++;\r\n                }\r\n                else\r\n                    column.offset++;\r\n                column.width--;\r\n            }\r\n        };\r\n\r\n        this.evenColumns = function () {\r\n            if (this.children.length == 0)\r\n                return;\r\n\r\n            var evenWidth = Math.floor(12 / this.children.length);\r\n            _(this.children).each(function (column) {\r\n                column.width = evenWidth;\r\n                column.offset = 0;\r\n            });\r\n\r\n            var rest = 12 % this.children.length;\r\n            if (rest > 0)\r\n                _distributeSpace(rest);\r\n        };\r\n\r\n        var _basePasteChild = this.pasteChild;\r\n        this.pasteChild = function (child) {\r\n            if (child.type == \"Column\") {\r\n                if (this.beginAddColumn(child.width)) {\r\n                    this.commitAddColumn();\r\n                    _basePasteChild.call(this, child)\r\n                }\r\n            }\r\n            else if (!!this.parent)\r\n                this.parent.pasteChild(child);\r\n        }\r\n\r\n        this.toObject = function () {\r\n            var result = this.elementToObject();\r\n            result.children = this.childrenToObject();\r\n            return result;\r\n        };\r\n    };\r\n\r\n    LayoutEditor.Row.from = function (value) {\r\n        var result = new LayoutEditor.Row(\r\n            value.data,\r\n            value.htmlId,\r\n            value.htmlClass,\r\n            value.htmlStyle,\r\n            value.isTemplated,\r\n            value.rule,\r\n            LayoutEditor.childrenFrom(value.children));\r\n        result.toolboxIcon = value.toolboxIcon;\r\n        result.toolboxLabel = value.toolboxLabel;\r\n        result.toolboxDescription = value.toolboxDescription;\r\n        return result;\r\n    };\r\n\r\n})(LayoutEditor || (LayoutEditor = {}));","var LayoutEditor;\r\n(function (LayoutEditor) {\r\n    LayoutEditor.Column = function (data, htmlId, htmlClass, htmlStyle, isTemplated, width, offset, collapsible, rule, children) {\r\n        LayoutEditor.Element.call(this, \"Column\", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);\r\n        LayoutEditor.Container.call(this, [\"Grid\", \"Content\"], children);\r\n\r\n        this.width = width;\r\n        this.offset = offset;\r\n        this.collapsible = collapsible;\r\n\r\n        var _hasPendingChange = false;\r\n        var _origWidth = 0;\r\n        var _origOffset = 0;\r\n\r\n        this.beginChange = function () {\r\n            if (!!_hasPendingChange)\r\n                throw new Error(\"Column already has a pending change.\");\r\n            _hasPendingChange = true;\r\n            _origWidth = this.width;\r\n            _origOffset = this.offset;\r\n        };\r\n\r\n        this.commitChange = function () {\r\n            if (!_hasPendingChange)\r\n                throw new Error(\"Column has no pending change.\");\r\n            _origWidth = 0;\r\n            _origOffset = 0;\r\n            _hasPendingChange = false;\r\n        };\r\n\r\n        this.rollbackChange = function () {\r\n            if (!_hasPendingChange)\r\n                throw new Error(\"Column has no pending change.\");\r\n            this.width = _origWidth;\r\n            this.offset = _origOffset;\r\n            _origWidth = 0;\r\n            _origOffset = 0;\r\n            _hasPendingChange = false;\r\n        };\r\n\r\n        this.canSplit = function () {\r\n            if (this.isTemplated)\r\n                return false;\r\n            return this.width > 1;\r\n        };\r\n\r\n        this.split = function () {\r\n            if (!this.canSplit())\r\n                return;\r\n\r\n            var newColumnWidth = Math.floor(this.width / 2);\r\n            var newColumn = LayoutEditor.Column.from({\r\n                data: null,\r\n                htmlId: null,\r\n                htmlClass: null,\r\n                htmlStyle: null,\r\n                width: newColumnWidth,\r\n                offset: 0,\r\n                children: []\r\n            });\r\n\r\n            this.width = this.width - newColumnWidth;\r\n            this.parent.insertChild(newColumn, this);\r\n            newColumn.setIsFocused();\r\n        };\r\n\r\n        this.canContractRight = function (connectAdjacent) {\r\n            if (this.isTemplated)\r\n                return false;\r\n            return this.parent.canContractColumnRight(this, connectAdjacent);\r\n        };\r\n\r\n        this.contractRight = function (connectAdjacent) {\r\n            if (!this.canContractRight(connectAdjacent))\r\n                return;\r\n            this.parent.contractColumnRight(this, connectAdjacent);\r\n        };\r\n\r\n        this.canExpandRight = function (connectAdjacent) {\r\n            if (this.isTemplated)\r\n                return false;\r\n            return this.parent.canExpandColumnRight(this, connectAdjacent);\r\n        };\r\n\r\n        this.expandRight = function (connectAdjacent) {\r\n            if (!this.canExpandRight(connectAdjacent))\r\n                return;\r\n            this.parent.expandColumnRight(this, connectAdjacent);\r\n        };\r\n\r\n        this.canExpandLeft = function (connectAdjacent) {\r\n            if (this.isTemplated)\r\n                return false;\r\n            return this.parent.canExpandColumnLeft(this, connectAdjacent);\r\n        };\r\n\r\n        this.expandLeft = function (connectAdjacent) {\r\n            if (!this.canExpandLeft(connectAdjacent))\r\n                return;\r\n            this.parent.expandColumnLeft(this, connectAdjacent);\r\n        };\r\n\r\n        this.canContractLeft = function (connectAdjacent) {\r\n            if (this.isTemplated)\r\n                return false;\r\n            return this.parent.canContractColumnLeft(this, connectAdjacent);\r\n        };\r\n\r\n        this.contractLeft = function (connectAdjacent) {\r\n            if (!this.canContractLeft(connectAdjacent))\r\n                return;\r\n            this.parent.contractColumnLeft(this, connectAdjacent);\r\n        };\r\n\r\n        this.toObject = function () {\r\n            var result = this.elementToObject();\r\n            result.width = this.width;\r\n            result.offset = this.offset;\r\n            result.collapsible = this.collapsible;\r\n            result.children = this.childrenToObject();\r\n            return result;\r\n        };\r\n    };\r\n\r\n    LayoutEditor.Column.from = function (value) {\r\n        var result = new LayoutEditor.Column(\r\n            value.data,\r\n            value.htmlId,\r\n            value.htmlClass,\r\n            value.htmlStyle,\r\n            value.isTemplated,\r\n            value.width,\r\n            value.offset,\r\n            value.collapsible,\r\n            value.rule,\r\n            LayoutEditor.childrenFrom(value.children));\r\n        result.toolboxIcon = value.toolboxIcon;\r\n        result.toolboxLabel = value.toolboxLabel;\r\n        result.toolboxDescription = value.toolboxDescription;\r\n        return result;\r\n    };\r\n\r\n    LayoutEditor.Column.times = function (value) {\r\n        return _.times(value, function (n) {\r\n            return LayoutEditor.Column.from({\r\n                data: null,\r\n                htmlId: null,\r\n                htmlClass: null,\r\n                isTemplated: false,\r\n                width: 12 / value,\r\n                offset: 0,\r\n                collapsible: null,\r\n                children: []\r\n            });\r\n        });\r\n    };\r\n})(LayoutEditor || (LayoutEditor = {}));","var LayoutEditor;\r\n(function (LayoutEditor) {\r\n\r\n    LayoutEditor.Content = function (data, htmlId, htmlClass, htmlStyle, isTemplated, contentType, contentTypeLabel, contentTypeClass, html, hasEditor, rule) {\r\n        LayoutEditor.Element.call(this, \"Content\", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);\r\n\r\n        this.contentType = contentType;\r\n        this.contentTypeLabel = contentTypeLabel;\r\n        this.contentTypeClass = contentTypeClass;\r\n        this.html = html;\r\n        this.hasEditor = hasEditor;\r\n\r\n        this.getInnerText = function () {\r\n            return $($.parseHTML(\"<div>\" + this.html + \"</div>\")).text();\r\n        };\r\n\r\n        // This function will be overwritten by the Content directive.\r\n        this.setHtml = function (html) {\r\n            this.html = html;\r\n            this.htmlUnsafe = html;\r\n        }\r\n\r\n        this.toObject = function () {\r\n            return {\r\n                \"type\": \"Content\"\r\n            };\r\n        };\r\n\r\n        this.toObject = function () {\r\n            var result = this.elementToObject();\r\n            result.contentType = this.contentType;\r\n            result.contentTypeLabel = this.contentTypeLabel;\r\n            result.contentTypeClass = this.contentTypeClass;\r\n            result.html = this.html;\r\n            result.hasEditor = hasEditor;\r\n            return result;\r\n        };\r\n\r\n        this.setHtml(html);\r\n    };\r\n\r\n    LayoutEditor.Content.from = function (value) {\r\n        var result = new LayoutEditor.Content(\r\n            value.data,\r\n            value.htmlId,\r\n            value.htmlClass,\r\n            value.htmlStyle,\r\n            value.isTemplated,\r\n            value.contentType,\r\n            value.contentTypeLabel,\r\n            value.contentTypeClass,\r\n            value.html,\r\n            value.hasEditor,\r\n            value.rule);\r\n\r\n        return result;\r\n    };\r\n\r\n})(LayoutEditor || (LayoutEditor = {}));","var LayoutEditor;\r\n(function ($, LayoutEditor) {\r\n\r\n    LayoutEditor.Html = function (data, htmlId, htmlClass, htmlStyle, isTemplated, contentType, contentTypeLabel, contentTypeClass, html, hasEditor, rule) {\r\n        LayoutEditor.Element.call(this, \"Html\", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);\r\n\r\n        this.contentType = contentType;\r\n        this.contentTypeLabel = contentTypeLabel;\r\n        this.contentTypeClass = contentTypeClass;\r\n        this.html = html;\r\n        this.hasEditor = hasEditor;\r\n        this.isContainable = true;\r\n\r\n        this.getInnerText = function () {\r\n            return $($.parseHTML(\"<div>\" + this.html + \"</div>\")).text();\r\n        };\r\n\r\n        // This function will be overwritten by the Content directive.\r\n        this.setHtml = function (html) {\r\n            this.html = html;\r\n            this.htmlUnsafe = html;\r\n        }\r\n\r\n        this.toObject = function () {\r\n            return {\r\n                \"type\": \"Html\"\r\n            };\r\n        };\r\n\r\n        this.toObject = function () {\r\n            var result = this.elementToObject();\r\n            result.contentType = this.contentType;\r\n            result.contentTypeLabel = this.contentTypeLabel;\r\n            result.contentTypeClass = this.contentTypeClass;\r\n            result.html = this.html;\r\n            result.hasEditor = hasEditor;\r\n            return result;\r\n        };\r\n\r\n        var getEditorObject = this.getEditorObject;\r\n        this.getEditorObject = function () {\r\n            var dto = getEditorObject();\r\n            return $.extend(dto, {\r\n                Content: this.html\r\n            });\r\n        }\r\n\r\n        this.setHtml(html);\r\n    };\r\n\r\n    LayoutEditor.Html.from = function (value) {\r\n        var result = new LayoutEditor.Html(\r\n            value.data,\r\n            value.htmlId,\r\n            value.htmlClass,\r\n            value.htmlStyle,\r\n            value.isTemplated,\r\n            value.contentType,\r\n            value.contentTypeLabel,\r\n            value.contentTypeClass,\r\n            value.html,\r\n            value.hasEditor,\r\n            value.rule);\r\n\r\n        return result;\r\n    };\r\n\r\n    LayoutEditor.registerFactory(\"Html\", function(value) { return LayoutEditor.Html.from(value); });\r\n\r\n})(jQuery, LayoutEditor || (LayoutEditor = {}));"],"sourceRoot":"/source/"}
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["Helpers.js","Editor.js","Element.js","Container.js","Canvas.js","Grid.js","Row.js","Column.js","Content.js","Html.js"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC1CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC/BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACnMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC9IA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AClCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC7BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC7RA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC5JA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AC1DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"Models.js","sourcesContent":["var LayoutEditor;\r\n(function (LayoutEditor) {\r\n\r\n    Array.prototype.move = function (from, to) {\r\n        this.splice(to, 0, this.splice(from, 1)[0]);\r\n    };\r\n\r\n    LayoutEditor.childrenFrom = function(values) {\r\n        return _(values).map(function(value) {\r\n            return LayoutEditor.elementFrom(value);\r\n        });\r\n    };\r\n\r\n    var registerFactory = LayoutEditor.registerFactory = function(type, factory) {\r\n        var factories = LayoutEditor.factories = LayoutEditor.factories || {};\r\n        factories[type] = factory;\r\n    };\r\n\r\n    registerFactory(\"Canvas\", function (value) { return LayoutEditor.Canvas.from(value); });\r\n    registerFactory(\"Grid\", function(value) { return LayoutEditor.Grid.from(value); });\r\n    registerFactory(\"Row\", function(value) { return LayoutEditor.Row.from(value); });\r\n    registerFactory(\"Column\", function(value) { return LayoutEditor.Column.from(value); });\r\n    registerFactory(\"Content\", function(value) { return LayoutEditor.Content.from(value); });\r\n\r\n    LayoutEditor.elementFrom = function (value) {\r\n        var factory = LayoutEditor.factories[value.type];\r\n\r\n        if (!factory)\r\n            throw new Error(\"No element with type \\\"\" + value.type + \"\\\" was found.\");\r\n\r\n        var element = factory(value);\r\n        return element;\r\n    };\r\n\r\n    LayoutEditor.setModel = function (elementSelector, model) {\r\n        $(elementSelector).scope().element = model;\r\n    };\r\n\r\n    LayoutEditor.getModel = function (elementSelector) {\r\n        return $(elementSelector).scope().element;\r\n    };\r\n\r\n})(LayoutEditor || (LayoutEditor = {}));","var LayoutEditor;\r\n(function (LayoutEditor) {\r\n\r\n    LayoutEditor.Editor = function (config, canvasData) {\r\n        this.config = config;\r\n        this.canvas = LayoutEditor.Canvas.from(canvasData);\r\n        this.initialState = JSON.stringify(this.canvas.toObject());\r\n        this.activeElement = null;\r\n        this.focusedElement = null;\r\n        this.dropTargetElement = null;\r\n        this.isDragging = false;\r\n        this.isResizing = false;\r\n\r\n        this.resetToolboxElements = function () {\r\n            this.toolboxElements = [\r\n                LayoutEditor.Row.from({\r\n                    children: []\r\n                })\r\n            ];\r\n        };\r\n\r\n        this.isDirty = function() {\r\n            var currentState = JSON.stringify(this.canvas.toObject());\r\n            return this.initialState != currentState;\r\n        };\r\n\r\n        this.resetToolboxElements();\r\n        this.canvas.setEditor(this);\r\n    };\r\n\r\n})(LayoutEditor || (LayoutEditor = {}));\r\n","var LayoutEditor;\r\n(function (LayoutEditor) {\r\n\r\n    LayoutEditor.Element = function (type, data, htmlId, htmlClass, htmlStyle, isTemplated, rule) {\r\n        if (!type)\r\n            throw new Error(\"Parameter 'type' is required.\");\r\n\r\n        this.type = type;\r\n        this.data = data;\r\n        this.htmlId = htmlId;\r\n        this.htmlClass = htmlClass;\r\n        this.htmlStyle = htmlStyle;\r\n        this.isTemplated = isTemplated;\r\n        this.rule = rule;\r\n\r\n        this.editor = null;\r\n        this.parent = null;\r\n        this.setIsFocusedEventHandlers = [];\r\n\r\n        this.setEditor = function (editor) {\r\n            this.editor = editor;\r\n            if (!!this.children && _.isArray(this.children)) {\r\n                _(this.children).each(function (child) {\r\n                    child.setEditor(editor);\r\n                });\r\n            }\r\n        };\r\n\r\n        this.setParent = function(parentElement) {\r\n            this.parent = parentElement;\r\n            this.parent.onChildAdded(this);\r\n\r\n            var currentAncestor = parentElement;\r\n            while (!!currentAncestor) {\r\n                currentAncestor.onDescendantAdded(this, parentElement);\r\n                currentAncestor = currentAncestor.parent;\r\n            }\r\n        };\r\n\r\n        this.setIsTemplated = function (value) {\r\n            this.isTemplated = value;\r\n            if (!!this.children && _.isArray(this.children)) {\r\n                _(this.children).each(function (child) {\r\n                    child.setIsTemplated(value);\r\n                });\r\n            }\r\n        };\r\n\r\n        this.applyElementEditorModel = function() { /* Virtual */ };\r\n\r\n        this.getIsActive = function () {\r\n            if (!this.editor)\r\n                return false;\r\n            return this.editor.activeElement === this && !this.getIsFocused();\r\n        };\r\n\r\n        this.setIsActive = function (value) {\r\n            if (!this.editor)\r\n                return;\r\n            if (this.editor.isDragging || this.editor.isResizing)\r\n                return;\r\n\r\n            if (value)\r\n                this.editor.activeElement = this;\r\n            else\r\n                this.editor.activeElement = this.parent;\r\n        };\r\n\r\n        this.getIsFocused = function () {\r\n            if (!this.editor)\r\n                return false;\r\n            return this.editor.focusedElement === this;\r\n        };\r\n\r\n        this.setIsFocused = function () {\r\n            if (!this.editor)\r\n            \treturn;\r\n            if (!this.children && this.isTemplated)\r\n            \treturn;\r\n            if (this.editor.isDragging || this.editor.isResizing)\r\n                return;\r\n\r\n            this.editor.focusedElement = this;\r\n            _(this.setIsFocusedEventHandlers).each(function (item) {\r\n                try {\r\n                    item();\r\n                }\r\n                catch (ex) {\r\n                    // Ignore.\r\n                }\r\n            });\r\n        };\r\n\r\n        this.getIsSelected = function () {\r\n            if (this.getIsFocused())\r\n                return true;\r\n\r\n            if (!!this.children && _.isArray(this.children)) {\r\n                return _(this.children).any(function(child) {\r\n                    return child.getIsSelected();\r\n                });\r\n            }\r\n\r\n            return false;\r\n        };\r\n\r\n        this.getIsDropTarget = function () {\r\n            if (!this.editor)\r\n                return false;\r\n            return this.editor.dropTargetElement === this;\r\n        }\r\n\r\n        this.setIsDropTarget = function (value) {\r\n            if (!this.editor)\r\n                return;\r\n            if (value)\r\n                this.editor.dropTargetElement = this;\r\n            else\r\n                this.editor.dropTargetElement = null;\r\n        };\r\n\r\n        this.canDelete = function () {\r\n            if (this.isTemplated || !this.parent)\r\n                return false;\r\n            return true;\r\n        };\r\n\r\n        this.delete = function () {\r\n            if (!this.canDelete())\r\n                return;\r\n            this.parent.deleteChild(this);\r\n        };\r\n\r\n        this.canMoveUp = function () {\r\n            if (this.isTemplated || !this.parent)\r\n                return false;\r\n            return this.parent.canMoveChildUp(this);\r\n        };\r\n\r\n        this.moveUp = function () {\r\n            if (!this.canMoveUp())\r\n                return;\r\n            this.parent.moveChildUp(this);\r\n        };\r\n\r\n        this.canMoveDown = function () {\r\n            if (this.isTemplated || !this.parent)\r\n                return false;\r\n            return this.parent.canMoveChildDown(this);\r\n        };\r\n\r\n        this.moveDown = function () {\r\n            if (!this.canMoveDown())\r\n                return;\r\n            this.parent.moveChildDown(this);\r\n        };\r\n\r\n        this.elementToObject = function () {\r\n            return {\r\n                type: this.type,\r\n                data: this.data,\r\n                htmlId: this.htmlId,\r\n                htmlClass: this.htmlClass,\r\n                htmlStyle: this.htmlStyle,\r\n                isTemplated: this.isTemplated,\r\n                rule: this.rule\r\n            };\r\n        };\r\n\r\n        this.getEditorObject = function() {\r\n            return {};\r\n        };\r\n\r\n        this.copy = function (clipboardData) {\r\n            var text = this.getInnerText();\r\n            clipboardData.setData(\"text/plain\", text);\r\n\r\n            var data = this.toObject();\r\n            var json = JSON.stringify(data, null, \"\\t\");\r\n            clipboardData.setData(\"text/json\", json);\r\n        };\r\n\r\n        this.cut = function (clipboardData) {\r\n            if (this.canDelete()) {\r\n                this.copy(clipboardData);\r\n                this.delete();\r\n            }\r\n        };\r\n\r\n        this.paste = function (clipboardData) {\r\n            if (!!this.parent)\r\n                this.parent.paste(clipboardData);\r\n        };\r\n    };\r\n\r\n})(LayoutEditor || (LayoutEditor = {}));","var LayoutEditor;\r\n(function (LayoutEditor) {\r\n\r\n    LayoutEditor.Container = function (allowedChildTypes, children) {\r\n\r\n        this.allowedChildTypes = allowedChildTypes;\r\n        this.children = children;\r\n        this.isContainer = true;\r\n\r\n        var self = this;\r\n\r\n        this.onChildAdded = function (element) { /* Virtual */ };\r\n        this.onDescendantAdded = function (element, parentElement) { /* Virtual */ };\r\n\r\n        this.setChildren = function (children) {\r\n            this.children = children;\r\n            _(this.children).each(function (child) {\r\n                child.setParent(self);\r\n            });\r\n        };\r\n\r\n        this.setChildren(children);\r\n\r\n        this.getIsSealed = function () {\r\n            return _(this.children).any(function (child) {\r\n                return child.isTemplated;\r\n            });\r\n        };\r\n\r\n        var _baseSetIsFocused = this.setIsFocused;\r\n        this.setIsFocused = function () {\r\n            if (this.getIsSealed())\r\n                return;\r\n            _baseSetIsFocused.call(this);\r\n        };\r\n\r\n        this.addChild = function (child) {\r\n            if (!_(this.children).contains(child) && (_(this.allowedChildTypes).contains(child.type) || child.isContainable))\r\n                this.children.push(child);\r\n            child.setEditor(this.editor);\r\n            child.setIsTemplated(false);\r\n            child.setParent(this);\r\n        };\r\n\r\n        this.deleteChild = function (child) {\r\n            var index = _(this.children).indexOf(child);\r\n            if (index >= 0) {\r\n                this.children.splice(index, 1);\r\n                if (child.getIsActive())\r\n                    this.editor.activeElement = null;\r\n                if (child.getIsFocused()) {\r\n                    // If the deleted child was focused, try to set new focus to the most appropriate sibling or parent.\r\n                    if (this.children.length > index)\r\n                        this.children[index].setIsFocused();\r\n                    else if (index > 0)\r\n                        this.children[index - 1].setIsFocused();\r\n                    else\r\n                        this.setIsFocused();\r\n                }\r\n            }\r\n        };\r\n\r\n        this.moveFocusPrevChild = function (child) {\r\n            if (this.children.length < 2)\r\n                return;\r\n            var index = _(this.children).indexOf(child);\r\n            if (index > 0)\r\n                this.children[index - 1].setIsFocused();\r\n        };\r\n\r\n        this.moveFocusNextChild = function (child) {\r\n            if (this.children.length < 2)\r\n                return;\r\n            var index = _(this.children).indexOf(child);\r\n            if (index < this.children.length - 1)\r\n                this.children[index + 1].setIsFocused();\r\n        };\r\n\r\n        this.insertChild = function (child, afterChild) {\r\n            if (!_(this.children).contains(child)) {\r\n                var index = Math.max(_(this.children).indexOf(afterChild), 0);\r\n                this.children.splice(index + 1, 0, child);\r\n                child.setEditor(this.editor);\r\n                child.parent = this;\r\n            }\r\n        };\r\n\r\n        this.moveChildUp = function (child) {\r\n            if (!this.canMoveChildUp(child))\r\n                return;\r\n            var index = _(this.children).indexOf(child);\r\n            this.children.move(index, index - 1);\r\n        };\r\n\r\n        this.moveChildDown = function (child) {\r\n            if (!this.canMoveChildDown(child))\r\n                return;\r\n            var index = _(this.children).indexOf(child);\r\n            this.children.move(index, index + 1);\r\n        };\r\n\r\n        this.canMoveChildUp = function (child) {\r\n            var index = _(this.children).indexOf(child);\r\n            return index > 0;\r\n        };\r\n\r\n        this.canMoveChildDown = function (child) {\r\n            var index = _(this.children).indexOf(child);\r\n            return index < this.children.length - 1;\r\n        };\r\n\r\n        this.childrenToObject = function () {\r\n            return _(this.children).map(function (child) {\r\n                return child.toObject();\r\n            });\r\n        };\r\n\r\n        this.getInnerText = function () {\r\n            return _(this.children).reduce(function (memo, child) {\r\n                return memo + \"\\n\" + child.getInnerText();\r\n            }, \"\");\r\n        }\r\n\r\n        this.paste = function (clipboardData) {\r\n            var json = clipboardData.getData(\"text/json\");\r\n            if (!!json) {\r\n                var data = JSON.parse(json);\r\n                var child = LayoutEditor.elementFrom(data);\r\n                this.pasteChild(child);\r\n            }\r\n        };\r\n\r\n        this.pasteChild = function (child) {\r\n            if (_(this.allowedChildTypes).contains(child.type) || child.isContainable) {\r\n                this.addChild(child);\r\n                child.setIsFocused();\r\n            }\r\n            else if (!!this.parent)\r\n                this.parent.pasteChild(child);\r\n        }\r\n    };\r\n\r\n})(LayoutEditor || (LayoutEditor = {}));","var LayoutEditor;\r\n(function (LayoutEditor) {\r\n\r\n    LayoutEditor.Canvas = function (data, htmlId, htmlClass, htmlStyle, isTemplated, rule, children) {\r\n        LayoutEditor.Element.call(this, \"Canvas\", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);\r\n        LayoutEditor.Container.call(this, [\"Canvas\", \"Grid\", \"Content\"], children);\r\n\r\n        this.isContainable = true;\r\n\r\n        this.toObject = function () {\r\n            var result = this.elementToObject();\r\n            result.children = this.childrenToObject();\r\n            return result;\r\n        };\r\n    };\r\n\r\n    LayoutEditor.Canvas.from = function (value) {\r\n        var result = new LayoutEditor.Canvas(\r\n            value.data,\r\n            value.htmlId,\r\n            value.htmlClass,\r\n            value.htmlStyle,\r\n            value.isTemplated,\r\n            value.rule,\r\n            LayoutEditor.childrenFrom(value.children));\r\n\r\n        result.toolboxIcon = value.toolboxIcon;\r\n        result.toolboxLabel = value.toolboxLabel;\r\n        result.toolboxDescription = value.toolboxDescription;\r\n\r\n        return result;\r\n    };\r\n\r\n})(LayoutEditor || (LayoutEditor = {}));\r\n","var LayoutEditor;\r\n(function (LayoutEditor) {\r\n\r\n    LayoutEditor.Grid = function (data, htmlId, htmlClass, htmlStyle, isTemplated, rule, children) {\r\n        LayoutEditor.Element.call(this, \"Grid\", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);\r\n        LayoutEditor.Container.call(this, [\"Row\"], children);\r\n\r\n        this.toObject = function () {\r\n            var result = this.elementToObject();\r\n            result.children = this.childrenToObject();\r\n            return result;\r\n        };\r\n    };\r\n\r\n    LayoutEditor.Grid.from = function (value) {\r\n        var result = new LayoutEditor.Grid(\r\n            value.data,\r\n            value.htmlId,\r\n            value.htmlClass,\r\n            value.htmlStyle,\r\n            value.isTemplated,\r\n            value.rule,\r\n            LayoutEditor.childrenFrom(value.children));\r\n        result.toolboxIcon = value.toolboxIcon;\r\n        result.toolboxLabel = value.toolboxLabel;\r\n        result.toolboxDescription = value.toolboxDescription;\r\n        return result;\r\n    };\r\n\r\n})(LayoutEditor || (LayoutEditor = {}));","var LayoutEditor;\r\n(function (LayoutEditor) {\r\n\r\n    LayoutEditor.Row = function (data, htmlId, htmlClass, htmlStyle, isTemplated, rule, children) {\r\n        LayoutEditor.Element.call(this, \"Row\", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);\r\n        LayoutEditor.Container.call(this, [\"Column\"], children);\r\n\r\n        var _self = this;\r\n\r\n        function _getTotalColumnsWidth() {\r\n            return _(_self.children).reduce(function (memo, child) {\r\n                return memo + child.offset + child.width;\r\n            }, 0);\r\n        }\r\n\r\n        // Implements a simple algorithm to distribute space (either positive or negative)\r\n        // between the child columns of the row. Negative space is distributed when making\r\n        // room for a new column (e.c. clipboard paste or dropping from the toolbox) while\r\n        // positive space is distributed when filling the grap of a removed column.\r\n        function _distributeSpace(space) {\r\n            if (space == 0)\r\n                return true;\r\n             \r\n            var undistributedSpace = space;\r\n\r\n            if (undistributedSpace < 0) {\r\n                var vacantSpace = 12 - _getTotalColumnsWidth();\r\n                undistributedSpace += vacantSpace;\r\n                if (undistributedSpace > 0)\r\n                    undistributedSpace = 0;\r\n            }\r\n\r\n            // If space is negative, try to decrease offsets first.\r\n            while (undistributedSpace < 0 && _(_self.children).any(function (column) { return column.offset > 0; })) { // While there is still offset left to remove.\r\n                for (i = 0; i < _self.children.length && undistributedSpace < 0; i++) {\r\n                    var column = _self.children[i];\r\n                    if (column.offset > 0) {\r\n                        column.offset--;\r\n                        undistributedSpace++;\r\n                    }\r\n                }\r\n            }\r\n\r\n            function hasWidth(column) {\r\n                if (undistributedSpace > 0)\r\n                    return column.width < 12;\r\n                else if (undistributedSpace < 0)\r\n                    return column.width > 1;\r\n                return false;\r\n            }\r\n\r\n            // Try to distribute remaining space (could be negative or positive) using widths.\r\n            while (undistributedSpace != 0) {\r\n                // Any more column width available for distribution?\r\n                if (!_(_self.children).any(hasWidth))\r\n                    break;\r\n                for (i = 0; i < _self.children.length && undistributedSpace != 0; i++) {\r\n                    var column = _self.children[i % _self.children.length];\r\n                    if (hasWidth(column)) {\r\n                        var delta = undistributedSpace / Math.abs(undistributedSpace);\r\n                        column.width += delta;\r\n                        undistributedSpace -= delta;\r\n                    }\r\n                }                \r\n            }\r\n\r\n            return undistributedSpace == 0;\r\n        }\r\n\r\n        var _isAddingColumn = false;\r\n\r\n        this.canAddColumn = function () {\r\n            return this.children.length < 12;\r\n        };\r\n\r\n        this.beginAddColumn = function (newColumnWidth) {\r\n            if (!!_isAddingColumn)\r\n                throw new Error(\"Column add operation is already in progress.\")\r\n            _(this.children).each(function (column) {\r\n                column.beginChange();\r\n            });\r\n            if (_distributeSpace(-newColumnWidth)) {\r\n                _isAddingColumn = true;\r\n                return true;\r\n            }\r\n            _(this.children).each(function (column) {\r\n                column.rollbackChange();\r\n            });\r\n            return false;\r\n        };\r\n\r\n        this.commitAddColumn = function () {\r\n            if (!_isAddingColumn)\r\n                throw new Error(\"No column add operation in progress.\")\r\n            _(this.children).each(function (column) {\r\n                column.commitChange();\r\n            });\r\n            _isAddingColumn = false;\r\n        };\r\n\r\n        this.rollbackAddColumn = function () {\r\n            if (!_isAddingColumn)\r\n                throw new Error(\"No column add operation in progress.\")\r\n            _(this.children).each(function (column) {\r\n                column.rollbackChange();\r\n            });\r\n            _isAddingColumn = false;\r\n        };\r\n\r\n        var _baseDeleteChild = this.deleteChild;\r\n        this.deleteChild = function (column) { \r\n            var width = column.width;\r\n            _baseDeleteChild.call(this, column);\r\n            _distributeSpace(width);\r\n        };\r\n\r\n        this.canContractColumnRight = function (column, connectAdjacent) {\r\n            var index = _(this.children).indexOf(column);\r\n            if (index >= 0)\r\n                return column.width > 1;\r\n            return false;\r\n        };\r\n\r\n        this.contractColumnRight = function (column, connectAdjacent) {\r\n            if (!this.canContractColumnRight(column, connectAdjacent))\r\n                return;\r\n\r\n            var index = _(this.children).indexOf(column);\r\n            if (index >= 0) {\r\n                if (column.width > 1) {\r\n                    column.width--;\r\n                    if (this.children.length > index + 1) {\r\n                        var nextColumn = this.children[index + 1];\r\n                        if (connectAdjacent && nextColumn.offset == 0)\r\n                            nextColumn.width++;\r\n                        else\r\n                            nextColumn.offset++;\r\n                    }\r\n                }\r\n            }\r\n        };\r\n\r\n        this.canExpandColumnRight = function (column, connectAdjacent) {\r\n            var index = _(this.children).indexOf(column);\r\n            if (index >= 0) {\r\n                if (column.width >= 12)\r\n                    return false;\r\n                if (this.children.length > index + 1) {\r\n                    var nextColumn = this.children[index + 1];\r\n                    if (connectAdjacent && nextColumn.offset == 0)\r\n                        return nextColumn.width > 1;\r\n                    else\r\n                        return nextColumn.offset > 0;\r\n                }\r\n                return _getTotalColumnsWidth() < 12;\r\n            }\r\n            return false;\r\n        };\r\n\r\n        this.expandColumnRight = function (column, connectAdjacent) {\r\n            if (!this.canExpandColumnRight(column, connectAdjacent))\r\n                return;\r\n\r\n            var index = _(this.children).indexOf(column);\r\n            if (index >= 0) {\r\n                if (this.children.length > index + 1) {\r\n                    var nextColumn = this.children[index + 1];\r\n                    if (connectAdjacent && nextColumn.offset == 0)\r\n                        nextColumn.width--;\r\n                    else\r\n                        nextColumn.offset--;\r\n                }\r\n                column.width++;\r\n            }\r\n        };\r\n\r\n        this.canExpandColumnLeft = function (column, connectAdjacent) {\r\n            var index = _(this.children).indexOf(column);\r\n            if (index >= 0) {\r\n                if (column.width >= 12)\r\n                    return false;\r\n                if (index > 0) {\r\n                    var prevColumn = this.children[index - 1];\r\n                    if (connectAdjacent && column.offset == 0)\r\n                        return prevColumn.width > 1;\r\n                }\r\n                return column.offset > 0;\r\n            }\r\n            return false;\r\n        };\r\n\r\n        this.expandColumnLeft = function (column, connectAdjacent) {\r\n            if (!this.canExpandColumnLeft(column, connectAdjacent))\r\n                return;\r\n\r\n            var index = _(this.children).indexOf(column);\r\n            if (index >= 0) {\r\n                if (index > 0) {\r\n                    var prevColumn = this.children[index - 1];\r\n                    if (connectAdjacent && column.offset == 0)\r\n                        prevColumn.width--;\r\n                    else\r\n                        column.offset--;\r\n                }\r\n                else\r\n                    column.offset--;\r\n                column.width++;\r\n            }\r\n        };\r\n\r\n        this.canContractColumnLeft = function (column, connectAdjacent) {\r\n            var index = _(this.children).indexOf(column);\r\n            if (index >= 0)\r\n                return column.width > 1;\r\n            return false;\r\n        };\r\n\r\n        this.contractColumnLeft = function (column, connectAdjacent) {\r\n            if (!this.canContractColumnLeft(column, connectAdjacent))\r\n                return;\r\n\r\n            var index = _(this.children).indexOf(column);\r\n            if (index >= 0) {\r\n                if (index > 0) {\r\n                    var prevColumn = this.children[index - 1];\r\n                    if (connectAdjacent && column.offset == 0)\r\n                        prevColumn.width++;\r\n                    else\r\n                        column.offset++;\r\n                }\r\n                else\r\n                    column.offset++;\r\n                column.width--;\r\n            }\r\n        };\r\n\r\n        this.evenColumns = function () {\r\n            if (this.children.length == 0)\r\n                return;\r\n\r\n            var evenWidth = Math.floor(12 / this.children.length);\r\n            _(this.children).each(function (column) {\r\n                column.width = evenWidth;\r\n                column.offset = 0;\r\n            });\r\n\r\n            var rest = 12 % this.children.length;\r\n            if (rest > 0)\r\n                _distributeSpace(rest);\r\n        };\r\n\r\n        var _basePasteChild = this.pasteChild;\r\n        this.pasteChild = function (child) {\r\n            if (child.type == \"Column\") {\r\n                if (this.beginAddColumn(child.width)) {\r\n                    this.commitAddColumn();\r\n                    _basePasteChild.call(this, child)\r\n                }\r\n            }\r\n            else if (!!this.parent)\r\n                this.parent.pasteChild(child);\r\n        }\r\n\r\n        this.toObject = function () {\r\n            var result = this.elementToObject();\r\n            result.children = this.childrenToObject();\r\n            return result;\r\n        };\r\n    };\r\n\r\n    LayoutEditor.Row.from = function (value) {\r\n        var result = new LayoutEditor.Row(\r\n            value.data,\r\n            value.htmlId,\r\n            value.htmlClass,\r\n            value.htmlStyle,\r\n            value.isTemplated,\r\n            value.rule,\r\n            LayoutEditor.childrenFrom(value.children));\r\n        result.toolboxIcon = value.toolboxIcon;\r\n        result.toolboxLabel = value.toolboxLabel;\r\n        result.toolboxDescription = value.toolboxDescription;\r\n        return result;\r\n    };\r\n\r\n})(LayoutEditor || (LayoutEditor = {}));","var LayoutEditor;\r\n(function (LayoutEditor) {\r\n    LayoutEditor.Column = function (data, htmlId, htmlClass, htmlStyle, isTemplated, width, offset, collapsible, rule, children) {\r\n        LayoutEditor.Element.call(this, \"Column\", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);\r\n        LayoutEditor.Container.call(this, [\"Grid\", \"Content\"], children);\r\n\r\n        this.width = width;\r\n        this.offset = offset;\r\n        this.collapsible = collapsible;\r\n\r\n        var _hasPendingChange = false;\r\n        var _origWidth = 0;\r\n        var _origOffset = 0;\r\n\r\n        this.beginChange = function () {\r\n            if (!!_hasPendingChange)\r\n                throw new Error(\"Column already has a pending change.\");\r\n            _hasPendingChange = true;\r\n            _origWidth = this.width;\r\n            _origOffset = this.offset;\r\n        };\r\n\r\n        this.commitChange = function () {\r\n            if (!_hasPendingChange)\r\n                throw new Error(\"Column has no pending change.\");\r\n            _origWidth = 0;\r\n            _origOffset = 0;\r\n            _hasPendingChange = false;\r\n        };\r\n\r\n        this.rollbackChange = function () {\r\n            if (!_hasPendingChange)\r\n                throw new Error(\"Column has no pending change.\");\r\n            this.width = _origWidth;\r\n            this.offset = _origOffset;\r\n            _origWidth = 0;\r\n            _origOffset = 0;\r\n            _hasPendingChange = false;\r\n        };\r\n\r\n        this.canSplit = function () {\r\n            if (this.isTemplated)\r\n                return false;\r\n            return this.width > 1;\r\n        };\r\n\r\n        this.split = function () {\r\n            if (!this.canSplit())\r\n                return;\r\n\r\n            var newColumnWidth = Math.floor(this.width / 2);\r\n            var newColumn = LayoutEditor.Column.from({\r\n                data: null,\r\n                htmlId: null,\r\n                htmlClass: null,\r\n                htmlStyle: null,\r\n                width: newColumnWidth,\r\n                offset: 0,\r\n                children: []\r\n            });\r\n\r\n            this.width = this.width - newColumnWidth;\r\n            this.parent.insertChild(newColumn, this);\r\n            newColumn.setIsFocused();\r\n        };\r\n\r\n        this.canContractRight = function (connectAdjacent) {\r\n            if (this.isTemplated)\r\n                return false;\r\n            return this.parent.canContractColumnRight(this, connectAdjacent);\r\n        };\r\n\r\n        this.contractRight = function (connectAdjacent) {\r\n            if (!this.canContractRight(connectAdjacent))\r\n                return;\r\n            this.parent.contractColumnRight(this, connectAdjacent);\r\n        };\r\n\r\n        this.canExpandRight = function (connectAdjacent) {\r\n            if (this.isTemplated)\r\n                return false;\r\n            return this.parent.canExpandColumnRight(this, connectAdjacent);\r\n        };\r\n\r\n        this.expandRight = function (connectAdjacent) {\r\n            if (!this.canExpandRight(connectAdjacent))\r\n                return;\r\n            this.parent.expandColumnRight(this, connectAdjacent);\r\n        };\r\n\r\n        this.canExpandLeft = function (connectAdjacent) {\r\n            if (this.isTemplated)\r\n                return false;\r\n            return this.parent.canExpandColumnLeft(this, connectAdjacent);\r\n        };\r\n\r\n        this.expandLeft = function (connectAdjacent) {\r\n            if (!this.canExpandLeft(connectAdjacent))\r\n                return;\r\n            this.parent.expandColumnLeft(this, connectAdjacent);\r\n        };\r\n\r\n        this.canContractLeft = function (connectAdjacent) {\r\n            if (this.isTemplated)\r\n                return false;\r\n            return this.parent.canContractColumnLeft(this, connectAdjacent);\r\n        };\r\n\r\n        this.contractLeft = function (connectAdjacent) {\r\n            if (!this.canContractLeft(connectAdjacent))\r\n                return;\r\n            this.parent.contractColumnLeft(this, connectAdjacent);\r\n        };\r\n\r\n        this.toObject = function () {\r\n            var result = this.elementToObject();\r\n            result.width = this.width;\r\n            result.offset = this.offset;\r\n            result.collapsible = this.collapsible;\r\n            result.children = this.childrenToObject();\r\n            return result;\r\n        };\r\n    };\r\n\r\n    LayoutEditor.Column.from = function (value) {\r\n        var result = new LayoutEditor.Column(\r\n            value.data,\r\n            value.htmlId,\r\n            value.htmlClass,\r\n            value.htmlStyle,\r\n            value.isTemplated,\r\n            value.width,\r\n            value.offset,\r\n            value.collapsible,\r\n            value.rule,\r\n            LayoutEditor.childrenFrom(value.children));\r\n        result.toolboxIcon = value.toolboxIcon;\r\n        result.toolboxLabel = value.toolboxLabel;\r\n        result.toolboxDescription = value.toolboxDescription;\r\n        return result;\r\n    };\r\n\r\n    LayoutEditor.Column.times = function (value) {\r\n        return _.times(value, function (n) {\r\n            return LayoutEditor.Column.from({\r\n                data: null,\r\n                htmlId: null,\r\n                htmlClass: null,\r\n                isTemplated: false,\r\n                width: 12 / value,\r\n                offset: 0,\r\n                collapsible: null,\r\n                children: []\r\n            });\r\n        });\r\n    };\r\n})(LayoutEditor || (LayoutEditor = {}));","var LayoutEditor;\r\n(function (LayoutEditor) {\r\n\r\n    LayoutEditor.Content = function (data, htmlId, htmlClass, htmlStyle, isTemplated, contentType, contentTypeLabel, contentTypeClass, html, hasEditor, rule) {\r\n        LayoutEditor.Element.call(this, \"Content\", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);\r\n\r\n        this.contentType = contentType;\r\n        this.contentTypeLabel = contentTypeLabel;\r\n        this.contentTypeClass = contentTypeClass;\r\n        this.html = html;\r\n        this.hasEditor = hasEditor;\r\n\r\n        this.getInnerText = function () {\r\n            return $($.parseHTML(\"<div>\" + this.html + \"</div>\")).text();\r\n        };\r\n\r\n        // This function will be overwritten by the Content directive.\r\n        this.setHtml = function (html) {\r\n            this.html = html;\r\n            this.htmlUnsafe = html;\r\n        }\r\n\r\n        this.toObject = function () {\r\n            return {\r\n                \"type\": \"Content\"\r\n            };\r\n        };\r\n\r\n        this.toObject = function () {\r\n            var result = this.elementToObject();\r\n            result.contentType = this.contentType;\r\n            result.contentTypeLabel = this.contentTypeLabel;\r\n            result.contentTypeClass = this.contentTypeClass;\r\n            result.html = this.html;\r\n            result.hasEditor = hasEditor;\r\n            return result;\r\n        };\r\n\r\n        this.setHtml(html);\r\n    };\r\n\r\n    LayoutEditor.Content.from = function (value) {\r\n        var result = new LayoutEditor.Content(\r\n            value.data,\r\n            value.htmlId,\r\n            value.htmlClass,\r\n            value.htmlStyle,\r\n            value.isTemplated,\r\n            value.contentType,\r\n            value.contentTypeLabel,\r\n            value.contentTypeClass,\r\n            value.html,\r\n            value.hasEditor,\r\n            value.rule);\r\n\r\n        return result;\r\n    };\r\n\r\n})(LayoutEditor || (LayoutEditor = {}));","var LayoutEditor;\r\n(function ($, LayoutEditor) {\r\n\r\n    LayoutEditor.Html = function (data, htmlId, htmlClass, htmlStyle, isTemplated, contentType, contentTypeLabel, contentTypeClass, html, hasEditor, rule) {\r\n        LayoutEditor.Element.call(this, \"Html\", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);\r\n\r\n        this.contentType = contentType;\r\n        this.contentTypeLabel = contentTypeLabel;\r\n        this.contentTypeClass = contentTypeClass;\r\n        this.html = html;\r\n        this.hasEditor = hasEditor;\r\n        this.isContainable = true;\r\n\r\n        this.getInnerText = function () {\r\n            return $($.parseHTML(\"<div>\" + this.html + \"</div>\")).text();\r\n        };\r\n\r\n        // This function will be overwritten by the Content directive.\r\n        this.setHtml = function (html) {\r\n            this.html = html;\r\n            this.htmlUnsafe = html;\r\n        }\r\n\r\n        this.toObject = function () {\r\n            return {\r\n                \"type\": \"Html\"\r\n            };\r\n        };\r\n\r\n        this.toObject = function () {\r\n            var result = this.elementToObject();\r\n            result.contentType = this.contentType;\r\n            result.contentTypeLabel = this.contentTypeLabel;\r\n            result.contentTypeClass = this.contentTypeClass;\r\n            result.html = this.html;\r\n            result.hasEditor = hasEditor;\r\n            return result;\r\n        };\r\n\r\n        var getEditorObject = this.getEditorObject;\r\n        this.getEditorObject = function () {\r\n            var dto = getEditorObject();\r\n            return $.extend(dto, {\r\n                Content: this.html\r\n            });\r\n        }\r\n\r\n        this.setHtml(html);\r\n    };\r\n\r\n    LayoutEditor.Html.from = function (value) {\r\n        var result = new LayoutEditor.Html(\r\n            value.data,\r\n            value.htmlId,\r\n            value.htmlClass,\r\n            value.htmlStyle,\r\n            value.isTemplated,\r\n            value.contentType,\r\n            value.contentTypeLabel,\r\n            value.contentTypeClass,\r\n            value.html,\r\n            value.hasEditor,\r\n            value.rule);\r\n\r\n        return result;\r\n    };\r\n\r\n    LayoutEditor.registerFactory(\"Html\", function(value) { return LayoutEditor.Html.from(value); });\r\n\r\n})(jQuery, LayoutEditor || (LayoutEditor = {}));"],"sourceRoot":"/source/"}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js b/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
index de69e3feb..9f7d3923c 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
@@ -1 +1 @@
-var LayoutEditor;!function(t){Array.prototype.move=function(t,i){this.splice(i,0,this.splice(t,1)[0])},t.childrenFrom=function(i){return _(i).map(function(i){return t.elementFrom(i)})};var i=t.registerFactory=function(i,n){var e=t.factories=t.factories||{};e[i]=n};i("Canvas",function(i){return t.Canvas.from(i)}),i("Grid",function(i){return t.Grid.from(i)}),i("Row",function(i){return t.Row.from(i)}),i("Column",function(i){return t.Column.from(i)}),i("Content",function(i){return t.Content.from(i)}),t.elementFrom=function(i){var n=t.factories[i.type];if(!n)throw new Error('No element with type "'+i.type+'" was found.');var e=n(i);return e},t.setModel=function(t,i){$(t).scope().element=i},t.getModel=function(t){return $(t).scope().element}}(LayoutEditor||(LayoutEditor={}));var LayoutEditor;!function(t){t.Editor=function(i,n){this.config=i,this.canvas=t.Canvas.from(n),this.initialState=JSON.stringify(this.canvas.toObject()),this.activeElement=null,this.focusedElement=null,this.dropTargetElement=null,this.isDragging=!1,this.inlineEditingIsActive=!1,this.isResizing=!1,this.resetToolboxElements=function(){this.toolboxElements=[t.Row.from({children:[]})]},this.isDirty=function(){var t=JSON.stringify(this.canvas.toObject());return this.initialState!=t},this.resetToolboxElements(),this.canvas.setEditor(this)}}(LayoutEditor||(LayoutEditor={}));var LayoutEditor;!function(t){t.Element=function(t,i,n,e,o,s,h){if(!t)throw new Error("Parameter 'type' is required.");this.type=t,this.data=i,this.htmlId=n,this.htmlClass=e,this.htmlStyle=o,this.isTemplated=s,this.rule=h,this.editor=null,this.parent=null,this.setIsFocusedEventHandlers=[],this.setEditor=function(t){this.editor=t,this.children&&_.isArray(this.children)&&_(this.children).each(function(i){i.setEditor(t)})},this.setParent=function(t){this.parent=t,this.parent.onChildAdded(this);for(var i=t;i;)i.onDescendantAdded(this,t),i=i.parent},this.setIsTemplated=function(t){this.isTemplated=t,this.children&&_.isArray(this.children)&&_(this.children).each(function(i){i.setIsTemplated(t)})},this.applyElementEditorModel=function(){},this.getIsActive=function(){return this.editor?this.editor.activeElement===this&&!this.getIsFocused():!1},this.setIsActive=function(t){this.editor&&(this.editor.isDragging||this.editor.inlineEditingIsActive||this.editor.isResizing||(this.editor.activeElement=t?this:this.parent))},this.getIsFocused=function(){return this.editor?this.editor.focusedElement===this:!1},this.setIsFocused=function(){this.editor&&(this.children||!this.isTemplated)&&(this.editor.isDragging||this.editor.inlineEditingIsActive||this.editor.isResizing||(this.editor.focusedElement=this,_(this.setIsFocusedEventHandlers).each(function(t){try{t()}catch(i){}})))},this.getIsSelected=function(){return this.getIsFocused()?!0:this.children&&_.isArray(this.children)?_(this.children).any(function(t){return t.getIsSelected()}):!1},this.getIsDropTarget=function(){return this.editor?this.editor.dropTargetElement===this:!1},this.setIsDropTarget=function(t){this.editor&&(this.editor.dropTargetElement=t?this:null)},this.canDelete=function(){return this.isTemplated||!this.parent?!1:!0},this["delete"]=function(){this.canDelete()&&this.parent.deleteChild(this)},this.canMoveUp=function(){return this.isTemplated||!this.parent?!1:this.parent.canMoveChildUp(this)},this.moveUp=function(){this.canMoveUp()&&this.parent.moveChildUp(this)},this.canMoveDown=function(){return this.isTemplated||!this.parent?!1:this.parent.canMoveChildDown(this)},this.moveDown=function(){this.canMoveDown()&&this.parent.moveChildDown(this)},this.elementToObject=function(){return{type:this.type,data:this.data,htmlId:this.htmlId,htmlClass:this.htmlClass,htmlStyle:this.htmlStyle,isTemplated:this.isTemplated,rule:this.rule}},this.getEditorObject=function(){return{}},this.copy=function(t){var i=this.getInnerText();t.setData("text/plain",i);var n=this.toObject(),e=JSON.stringify(n,null," ");t.setData("text/json",e)},this.cut=function(t){this.canDelete()&&(this.copy(t),this["delete"]())},this.paste=function(t){this.parent&&this.parent.paste(t)}}}(LayoutEditor||(LayoutEditor={}));var LayoutEditor;!function(t){t.Container=function(i,n){this.allowedChildTypes=i,this.children=n,this.isContainer=!0;var e=this;this.onChildAdded=function(t){},this.onDescendantAdded=function(t,i){},this.setChildren=function(t){this.children=t,_(this.children).each(function(t){t.setParent(e)})},this.setChildren(n),this.getIsSealed=function(){return _(this.children).any(function(t){return t.isTemplated})};var o=this.setIsFocused;this.setIsFocused=function(){this.getIsSealed()||o.call(this)},this.addChild=function(t){_(this.children).contains(t)||!_(this.allowedChildTypes).contains(t.type)&&!t.isContainable||this.children.push(t),t.setEditor(this.editor),t.setIsTemplated(!1),t.setParent(this)},this.deleteChild=function(t){var i=_(this.children).indexOf(t);i>=0&&(this.children.splice(i,1),t.getIsActive()&&(this.editor.activeElement=null),t.getIsFocused()&&(this.children.length>i?this.children[i].setIsFocused():i>0?this.children[i-1].setIsFocused():this.setIsFocused()))},this.moveFocusPrevChild=function(t){if(!(this.children.length<2)){var i=_(this.children).indexOf(t);i>0&&this.children[i-1].setIsFocused()}},this.moveFocusNextChild=function(t){if(!(this.children.length<2)){var i=_(this.children).indexOf(t);i0},this.canMoveChildDown=function(t){var i=_(this.children).indexOf(t);return i0?t.width<12:0>e?t.width>1:!1}if(0==t)return!0;var e=t;if(0>e){var o=12-c();e+=o,e>0&&(e=0)}for(;0>e&&_(d.children).any(function(t){return t.offset>0});)for(i=0;ie;i++){var s=d.children[i];s.offset>0&&(s.offset--,e++)}for(;0!=e&&_(d.children).any(n);)for(i=0;i=0?t.width>1:!1},this.contractColumnRight=function(t,i){if(this.canContractColumnRight(t,i)){var n=_(this.children).indexOf(t);if(n>=0&&t.width>1&&(t.width--,this.children.length>n+1)){var e=this.children[n+1];i&&0==e.offset?e.width++:e.offset++}}},this.canExpandColumnRight=function(t,i){var n=_(this.children).indexOf(t);if(n>=0){if(t.width>=12)return!1;if(this.children.length>n+1){var e=this.children[n+1];return i&&0==e.offset?e.width>1:e.offset>0}return c()<12}return!1},this.expandColumnRight=function(t,i){if(this.canExpandColumnRight(t,i)){var n=_(this.children).indexOf(t);if(n>=0){if(this.children.length>n+1){var e=this.children[n+1];i&&0==e.offset?e.width--:e.offset--}t.width++}}},this.canExpandColumnLeft=function(t,i){var n=_(this.children).indexOf(t);if(n>=0){if(t.width>=12)return!1;if(n>0){var e=this.children[n-1];if(i&&0==t.offset)return e.width>1}return t.offset>0}return!1},this.expandColumnLeft=function(t,i){if(this.canExpandColumnLeft(t,i)){var n=_(this.children).indexOf(t);if(n>=0){if(n>0){var e=this.children[n-1];i&&0==t.offset?e.width--:t.offset--}else t.offset--;t.width++}}},this.canContractColumnLeft=function(t,i){var n=_(this.children).indexOf(t);return n>=0?t.width>1:!1},this.contractColumnLeft=function(t,i){if(this.canContractColumnLeft(t,i)){var n=_(this.children).indexOf(t);if(n>=0){if(n>0){var e=this.children[n-1];i&&0==t.offset?e.width++:t.offset++}else t.offset++;t.width--}}},this.evenColumns=function(){if(0!=this.children.length){var t=Math.floor(12/this.children.length);_(this.children).each(function(i){i.width=t,i.offset=0});var i=12%this.children.length;i>0&&a(i)}};var m=this.pasteChild;this.pasteChild=function(t){"Column"==t.type?this.beginAddColumn(t.width)&&(this.commitAddColumn(),m.call(this,t)):this.parent&&this.parent.pasteChild(t)},this.toObject=function(){var t=this.elementToObject();return t.children=this.childrenToObject(),t}},t.Row.from=function(i){var n=new t.Row(i.data,i.htmlId,i.htmlClass,i.htmlStyle,i.isTemplated,i.rule,t.childrenFrom(i.children));return n.toolboxIcon=i.toolboxIcon,n.toolboxLabel=i.toolboxLabel,n.toolboxDescription=i.toolboxDescription,n}}(LayoutEditor||(LayoutEditor={}));var LayoutEditor;!function(t){t.Column=function(i,n,e,o,s,h,r,l,c,a){t.Element.call(this,"Column",i,n,e,o,s,c),t.Container.call(this,["Grid","Content"],a),this.width=h,this.offset=r,this.collapsible=l;var d=!1,u=0,f=0;this.beginChange=function(){if(d)throw new Error("Column already has a pending change.");d=!0,u=this.width,f=this.offset},this.commitChange=function(){if(!d)throw new Error("Column has no pending change.");u=0,f=0,d=!1},this.rollbackChange=function(){if(!d)throw new Error("Column has no pending change.");this.width=u,this.offset=f,u=0,f=0,d=!1},this.canSplit=function(){return this.isTemplated?!1:this.width>1},this.split=function(){if(this.canSplit()){var i=Math.floor(this.width/2),n=t.Column.from({data:null,htmlId:null,htmlClass:null,htmlStyle:null,width:i,offset:0,children:[]});this.width=this.width-i,this.parent.insertChild(n,this),n.setIsFocused()}},this.canContractRight=function(t){return this.isTemplated?!1:this.parent.canContractColumnRight(this,t)},this.contractRight=function(t){this.canContractRight(t)&&this.parent.contractColumnRight(this,t)},this.canExpandRight=function(t){return this.isTemplated?!1:this.parent.canExpandColumnRight(this,t)},this.expandRight=function(t){this.canExpandRight(t)&&this.parent.expandColumnRight(this,t)},this.canExpandLeft=function(t){return this.isTemplated?!1:this.parent.canExpandColumnLeft(this,t)},this.expandLeft=function(t){this.canExpandLeft(t)&&this.parent.expandColumnLeft(this,t)},this.canContractLeft=function(t){return this.isTemplated?!1:this.parent.canContractColumnLeft(this,t)},this.contractLeft=function(t){this.canContractLeft(t)&&this.parent.contractColumnLeft(this,t)},this.toObject=function(){var t=this.elementToObject();return t.width=this.width,t.offset=this.offset,t.collapsible=this.collapsible,t.children=this.childrenToObject(),t}},t.Column.from=function(i){var n=new t.Column(i.data,i.htmlId,i.htmlClass,i.htmlStyle,i.isTemplated,i.width,i.offset,i.collapsible,i.rule,t.childrenFrom(i.children));return n.toolboxIcon=i.toolboxIcon,n.toolboxLabel=i.toolboxLabel,n.toolboxDescription=i.toolboxDescription,n},t.Column.times=function(i){return _.times(i,function(n){return t.Column.from({data:null,htmlId:null,htmlClass:null,isTemplated:!1,width:12/i,offset:0,collapsible:null,children:[]})})}}(LayoutEditor||(LayoutEditor={}));var LayoutEditor;!function(t){t.Content=function(i,n,e,o,s,h,r,l,c,a,d){t.Element.call(this,"Content",i,n,e,o,s,d),this.contentType=h,this.contentTypeLabel=r,this.contentTypeClass=l,this.html=c,this.hasEditor=a,this.getInnerText=function(){return $($.parseHTML("
@Html.ActionLink(T("Media Library").ToString(), "Index", "Admin", new { area = "Orchard.MediaLibrary" }, new {}) >
@if (Model.FolderPath != null) {
- foreach (var folder in Model.FolderPath.Split('/')) {
- if (!String.IsNullOrEmpty(folder)) {
- @Html.ActionLink(folder, "Edit", new {folderPath = folder})
- >
+ var fullPath = "";
+ foreach (var folder in Model.FolderPath.Split(new[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar })) {
+ if (!String.IsNullOrEmpty(folder)) {
+ fullPath = Path.Combine(fullPath, folder);
+ @Html.ActionLink(folder, "Index", "Admin", new {folderPath = fullPath }, null)
+ >
}
}
}
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.MediaPicker/Properties/AssemblyInfo.cs
index a94255147..50015b9c8 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Drivers/ImageProfilePartDriver.cs b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Drivers/ImageProfilePartDriver.cs
index 5be244d11..7862fad31 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Drivers/ImageProfilePartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Drivers/ImageProfilePartDriver.cs
@@ -85,6 +85,11 @@ namespace Orchard.MediaProcessing.Drivers {
}
protected override void Importing(ImageProfilePart part, ImportContentContext context) {
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
+ }
+
var element = context.Data.Element(part.PartDefinition.Name);
part.Name = element.Attribute("Name").Value;
diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Module.txt b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Module.txt
index 394da957c..640c442fe 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: John Murdock, Sébastien Ros
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: Module for processing Media e.g. image resizing
Category: Media
diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Properties/AssemblyInfo.cs
index 2f9f5381f..2a68b3c6b 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProcessingFileNameProvider.cs b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProcessingFileNameProvider.cs
index f8a7cf19a..340c2031d 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProcessingFileNameProvider.cs
+++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProcessingFileNameProvider.cs
@@ -58,7 +58,7 @@ namespace Orchard.MediaProcessing.Services {
}
private IDictionary GetProfileCache(string profile) {
- return _cacheManager.Get("MediaProcessing_" + profile, ctx => {
+ return _cacheManager.Get("MediaProcessing_" + profile, true, ctx => {
ctx.Monitor(_signals.When("MediaProcessing_Saved_" + profile));
var dictionary = new Dictionary();
diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProfileService.cs b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProfileService.cs
index c002f657f..3a3a982fa 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProfileService.cs
+++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProfileService.cs
@@ -32,7 +32,7 @@ namespace Orchard.MediaProcessing.Services {
public ImageProfilePart GetImageProfileByName(string name) {
- var profileId = _cacheManager.Get("ProfileId_" + name, ctx => {
+ var profileId = _cacheManager.Get("ProfileId_" + name, true, ctx => {
var profile = _contentManager.Query()
.Where(x => x.Name == name)
.Slice(0, 1)
diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/Services/DefaultMessageBus.cs b/src/Orchard.Web/Modules/Orchard.MessageBus/Services/DefaultMessageBus.cs
index e38098db8..9265fdc6b 100644
--- a/src/Orchard.Web/Modules/Orchard.MessageBus/Services/DefaultMessageBus.cs
+++ b/src/Orchard.Web/Modules/Orchard.MessageBus/Services/DefaultMessageBus.cs
@@ -1,15 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Web;
-using System.Threading.Tasks;
using Orchard.Logging;
namespace Orchard.MessageBus.Services {
public class DefaultMessageBus : IMessageBus {
private readonly IMessageBroker _messageBroker;
+ private readonly IHostNameProvider _hostNameProvider;
- public DefaultMessageBus(IEnumerable messageBrokers) {
+ public DefaultMessageBus(IEnumerable messageBrokers, IHostNameProvider hostNameProvider) {
+ _hostNameProvider = hostNameProvider;
_messageBroker = messageBrokers.FirstOrDefault();
Logger = NullLogger.Instance;
@@ -23,7 +23,7 @@ namespace Orchard.MessageBus.Services {
}
_messageBroker.Subscribe(channel, handler);
- Logger.Debug("{0} subscribed to {1}", GetHostName(), channel);
+ Logger.Debug("{0} subscribed to {1}", _hostNameProvider.GetHostName(), channel);
}
public void Publish(string channel, string message) {
@@ -32,12 +32,7 @@ namespace Orchard.MessageBus.Services {
}
_messageBroker.Publish(channel, message);
- Logger.Debug("{0} published {1}", GetHostName(), channel);
- }
-
- private string GetHostName() {
- // use the current host and the process id as two servers could run on the same machine
- return System.Net.Dns.GetHostName() + ":" + System.Diagnostics.Process.GetCurrentProcess().Id;
+ Logger.Debug("{0} published {1}", _hostNameProvider.GetHostName(), channel);
}
}
}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Module.txt b/src/Orchard.Web/Modules/Orchard.Migrations/Module.txt
index f61fedfc6..071f782bd 100644
--- a/src/Orchard.Web/Modules/Orchard.Migrations/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Migrations/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: Data migration commands.
FeatureDescription: Data migration commands.
diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Migrations/Properties/AssemblyInfo.cs
index bb9bb12a5..5ea8d1cbb 100644
--- a/src/Orchard.Web/Modules/Orchard.Migrations/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Migrations/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Module.txt b/src/Orchard.Web/Modules/Orchard.Modules/Module.txt
index 694c5ab70..904320448 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: The Modules module enables the administrator of the site to manage the installed modules as well as activate and de-activate features.
FeatureDescription: Standard module and feature management.
@@ -11,4 +11,4 @@ Features:
Orchard.Modules:
Description: Standard module and feature management.
Dependencies: Orchard.jQuery
- Category: Core
\ No newline at end of file
+ Category: Core
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Modules/Properties/AssemblyInfo.cs
index 8b9dd9e82..0b0e90035 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs
index 0977ff396..8a65f804d 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs
@@ -88,11 +88,12 @@ namespace Orchard.MultiTenancy.Controllers {
Modules = viewModel.Modules.Where(x => x.Checked).Select(x => x.ModuleId).ToArray()
});
+ Services.Notifier.Information(T("Tenant '{0}' was created successfully.", viewModel.Name));
return RedirectToAction("Index");
}
catch (ArgumentException ex) {
Logger.Error(ex, "Error while creating tenant.");
- Services.Notifier.Error(T("Tenant creation failed with error: {0}", ex.Message));
+ Services.Notifier.Error(T("Tenant creation failed with error: {0}.", ex.Message));
return View(viewModel);
}
}
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt
index 8039b934e..a38acafa3 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt
@@ -3,7 +3,7 @@ Path: MultiTenancy
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: The multi-tenancy module enables multiple Orchard sites to run in isolation inside of a single web application, improving site density on a single server or hosted account.
FeatureDescription: Configure multiple site tenants.
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Properties/AssemblyInfo.cs
index a67929f06..1701491ec 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.cshtml
index a7e6faa07..a887a2022 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.cshtml
@@ -13,8 +13,8 @@
@tenant.Name
+ @if (!String.IsNullOrEmpty(tenant.RequestUrlHost)) {
var tenantClone = new ShellSettings(tenant);
foreach (var t in tenant.RequestUrlHost.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) {
tenantClone.RequestUrlHost = t;
diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
index 6c7922cb6..4084f8db6 100644
--- a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
+++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
@@ -463,7 +463,7 @@ namespace Orchard.OutputCache.Filters {
private CacheSettings CacheSettings {
get {
- return _cacheSettings ?? (_cacheSettings = _cacheManager.Get(CacheSettings.CacheKey, context => {
+ return _cacheSettings ?? (_cacheSettings = _cacheManager.Get(CacheSettings.CacheKey, true, context => {
context.Monitor(_signals.When(CacheSettings.CacheKey));
return new CacheSettings(_workContext.CurrentSite.As());
}));
diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Handlers/CacheSettingsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Handlers/CacheSettingsPartHandler.cs
index dbcbb2304..f39ae5add 100644
--- a/src/Orchard.Web/Modules/Orchard.OutputCache/Handlers/CacheSettingsPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Handlers/CacheSettingsPartHandler.cs
@@ -1,4 +1,7 @@
-using System.Globalization;
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Xml.Linq;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Handlers;
using Orchard.Core.Common.Models;
@@ -22,6 +25,9 @@ namespace Orchard.OutputCache.Handlers {
// Evict modified routable content when updated.
OnPublished((context, part) => Invalidate(part));
+
+ OnExporting(ExportRouteSettings);
+ OnImporting(ImportRouteSettings);
}
private void Invalidate(IContent content) {
@@ -36,5 +42,45 @@ namespace Orchard.OutputCache.Handlers {
}
}
}
+
+ private void ExportRouteSettings(ExportContentContext context, CacheSettingsPart part) {
+ var routes = _cacheService.GetRouteConfigs();
+ var routesElement = new XElement("Routes",
+ routes.Select(x => new XElement("Route")
+ .Attr("Key", x.RouteKey)
+ .Attr("Url", x.Url)
+ .Attr("Priority", x.Priority)
+ .Attr("Duration", x.Duration)
+ .Attr("GraceTime", x.GraceTime)
+ .Attr("MaxAge", x.MaxAge)
+ .Attr("FeatureName", x.FeatureName)));
+
+ context.Element(part.PartDefinition.Name).Add(routesElement);
+ }
+
+ private void ImportRouteSettings(ImportContentContext context, CacheSettingsPart part) {
+ var partElement = context.Data.Element(part.PartDefinition.Name);
+
+ // Don't do anything if the tag is not specified.
+ if (partElement == null)
+ return;
+
+ var routesElement = partElement.Element("Routes");
+
+ if (routesElement == null)
+ return;
+
+ var routeConfigs = routesElement.Elements().Select(x => new CacheRouteConfig {
+ RouteKey = x.Attr("Key"),
+ Duration = x.Attr("Duration"),
+ Priority = x.Attr("Priority"),
+ Url = x.Attr("Url"),
+ MaxAge = x.Attr("MaxAge"),
+ GraceTime = x.Attr("GraceTime"),
+ FeatureName = x.Attr("FeatureName")
+ });
+
+ _cacheService.SaveRouteConfigs(routeConfigs);
+ }
}
}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Module.txt b/src/Orchard.Web/Modules/Orchard.OutputCache/Module.txt
index d81483d68..2a80f3879 100644
--- a/src/Orchard.Web/Modules/Orchard.OutputCache/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net/
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: Adds output caching functionality
Features:
diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Properties/AssemblyInfo.cs
index d5838e09c..8fe99b206 100644
--- a/src/Orchard.Web/Modules/Orchard.OutputCache/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Services/CacheService.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Services/CacheService.cs
index 542983ab6..012a494d1 100644
--- a/src/Orchard.Web/Modules/Orchard.OutputCache/Services/CacheService.cs
+++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Services/CacheService.cs
@@ -99,7 +99,7 @@ namespace Orchard.OutputCache.Services {
}
public IEnumerable GetRouteConfigs() {
- return _cacheManager.Get(RouteConfigsCacheKey,
+ return _cacheManager.Get(RouteConfigsCacheKey, true,
ctx => {
ctx.Monitor(_signals.When(RouteConfigsCacheKey));
return _repository.Fetch(c => true).Select(c => new CacheRouteConfig { RouteKey = c.RouteKey, Duration = c.Duration, GraceTime = c.GraceTime }).ToReadOnlyCollection();
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Module.txt b/src/Orchard.Web/Modules/Orchard.Packaging/Module.txt
index 135d99ad0..1f64222c9 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: The packaging module enables packaging modules using the OPC format.
FeatureDescription: Commands for creating/installing local modules.
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs
index 8b0c883dd..f5f93c45f 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Module.txt b/src/Orchard.Web/Modules/Orchard.Pages/Module.txt
index bc4ec9972..8120573d1 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: Introduces a preconfigured page content type.
FeatureDescription: A basic page content type.
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Pages/Properties/AssemblyInfo.cs
index 97c305278..3cca30d9e 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Drivers/NavigationQueryPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Projections/Drivers/NavigationQueryPartDriver.cs
index 0335cbb4a..7f3d6a0ca 100644
--- a/src/Orchard.Web/Modules/Orchard.Projections/Drivers/NavigationQueryPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Projections/Drivers/NavigationQueryPartDriver.cs
@@ -54,8 +54,13 @@ namespace Orchard.Projections.Drivers {
}
protected override void Importing(NavigationQueryPart part, ImportContentContext context) {
- IfNotNull(context.Attribute(part.PartDefinition.Name, "Items"), x => part.Record.Items = Int32.Parse(x));
- IfNotNull(context.Attribute(part.PartDefinition.Name, "Offset"), x => part.Record.Skip = Int32.Parse(x));
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
+ }
+
+ context.ImportAttribute(part.PartDefinition.Name, "Items", x => part.Record.Items = Int32.Parse(x));
+ context.ImportAttribute(part.PartDefinition.Name, "Offset", x => part.Record.Skip = Int32.Parse(x));
}
protected override void Imported(NavigationQueryPart part, ImportContentContext context) {
@@ -65,13 +70,7 @@ namespace Orchard.Projections.Drivers {
part.Record.QueryPartRecord = context.GetItemFromSession(query).As().Record;
}
}
-
- private static void IfNotNull(T value, Action then) where T : class {
- if(value != null) {
- then(value);
- }
- }
-
+
protected override void Exporting(NavigationQueryPart part, ExportContentContext context) {
context.Element(part.PartDefinition.Name).SetAttributeValue("Items", part.Record.Items);
context.Element(part.PartDefinition.Name).SetAttributeValue("Offset", part.Record.Skip);
diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Drivers/ProjectionPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Projections/Drivers/ProjectionPartDriver.cs
index b330ca497..c3578566d 100644
--- a/src/Orchard.Web/Modules/Orchard.Projections/Drivers/ProjectionPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Projections/Drivers/ProjectionPartDriver.cs
@@ -294,12 +294,17 @@ namespace Orchard.Projections.Drivers {
}
protected override void Importing(ProjectionPart part, ImportContentContext context) {
- IfNotNull(context.Attribute(part.PartDefinition.Name, "Items"), x => part.Record.Items = Int32.Parse(x));
- IfNotNull(context.Attribute(part.PartDefinition.Name, "ItemsPerPage"), x => part.Record.ItemsPerPage = Int32.Parse(x));
- IfNotNull(context.Attribute(part.PartDefinition.Name, "Offset"), x => part.Record.Skip = Int32.Parse(x));
- IfNotNull(context.Attribute(part.PartDefinition.Name, "PagerSuffix"), x => part.Record.PagerSuffix = x);
- IfNotNull(context.Attribute(part.PartDefinition.Name, "MaxItems"), x => part.Record.MaxItems = Int32.Parse(x));
- IfNotNull(context.Attribute(part.PartDefinition.Name, "DisplayPager"), x => part.Record.DisplayPager = Boolean.Parse(x));
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
+ }
+
+ context.ImportAttribute(part.PartDefinition.Name, "Items", x => part.Record.Items = Int32.Parse(x));
+ context.ImportAttribute(part.PartDefinition.Name, "ItemsPerPage", x => part.Record.ItemsPerPage = Int32.Parse(x));
+ context.ImportAttribute(part.PartDefinition.Name, "Offset", x => part.Record.Skip = Int32.Parse(x));
+ context.ImportAttribute(part.PartDefinition.Name, "PagerSuffix", x => part.Record.PagerSuffix = x);
+ context.ImportAttribute(part.PartDefinition.Name, "MaxItems", x => part.Record.MaxItems = Int32.Parse(x));
+ context.ImportAttribute(part.PartDefinition.Name, "DisplayPager", x => part.Record.DisplayPager = Boolean.Parse(x));
}
protected override void Imported(ProjectionPart part, ImportContentContext context) {
@@ -318,13 +323,7 @@ namespace Orchard.Projections.Drivers {
}
}
}
-
- private static void IfNotNull(T value, Action then) {
- if(value != null) {
- then(value);
- }
- }
-
+
protected override void Exporting(ProjectionPart part, ExportContentContext context) {
context.Element(part.PartDefinition.Name).SetAttributeValue("Items", part.Record.Items);
context.Element(part.PartDefinition.Name).SetAttributeValue("ItemsPerPage", part.Record.ItemsPerPage);
diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Drivers/QueryPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Projections/Drivers/QueryPartDriver.cs
index 5fccf47d5..0ea7eca70 100644
--- a/src/Orchard.Web/Modules/Orchard.Projections/Drivers/QueryPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Projections/Drivers/QueryPartDriver.cs
@@ -103,6 +103,11 @@ namespace Orchard.Projections.Drivers {
}
protected override void Importing(QueryPart part, ImportContentContext context) {
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
+ }
+
var queryElement = context.Data.Element(part.PartDefinition.Name);
part.Record.FilterGroups.Clear();
diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Module.txt b/src/Orchard.Web/Modules/Orchard.Projections/Module.txt
index 2d8e7986d..e2ab873b8 100644
--- a/src/Orchard.Web/Modules/Orchard.Projections/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Projections/Module.txt
@@ -2,7 +2,7 @@ Name: Projector
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardprojections.codeplex.com
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: Provides methods to control how lists of content items are filtered and displayed
Category: Content
diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Projections/Properties/AssemblyInfo.cs
index 1280f5e17..0c39f98cb 100644
--- a/src/Orchard.Web/Modules/Orchard.Projections/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Projections/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Projections/Tests/Properties/AssemblyInfo.cs
index f084a96a2..82fde3134 100644
--- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs b/src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs
index 10448faba..18ddc1757 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs
@@ -110,10 +110,14 @@ namespace Orchard.PublishLater.Drivers {
}
protected override void Importing(PublishLaterPart part, ImportContentContext context) {
- var scheduledUtc = context.Attribute(part.PartDefinition.Name, "ScheduledPublishUtc");
- if (scheduledUtc != null) {
- part.ScheduledPublishUtc.Value = XmlConvert.ToDateTime(scheduledUtc, XmlDateTimeSerializationMode.Utc);
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
}
+
+ context.ImportAttribute(part.PartDefinition.Name, "ScheduledPublishUtc", scheduledUtc =>
+ part.ScheduledPublishUtc.Value = XmlConvert.ToDateTime(scheduledUtc, XmlDateTimeSerializationMode.Utc)
+ );
}
protected override void Exporting(PublishLaterPart part, ExportContentContext context) {
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt b/src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt
index 97db93b5c..4636715dc 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt
@@ -3,7 +3,7 @@ Path: PublishLater
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: The PublishLater module introduces draft creation and scheduled publishing functionality.
FeatureDescription: Draft creation and scheduled publishing.
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.PublishLater/Properties/AssemblyInfo.cs
index 053fcff7b..d5d9e9bde 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Module.txt b/src/Orchard.Web/Modules/Orchard.Recipes/Module.txt
index b2c80e04b..0e2408ffe 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: Provides Orchard Recipes.
FeatureDescription: Implementation of Orchard recipes.
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
index 0ccc7055d..eb0ef9f00 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
@@ -91,6 +91,7 @@
+
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Properties/AssemblyInfo.cs
index ca3889b57..7096827ef 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ActivateShellStep.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ActivateShellStep.cs
new file mode 100644
index 000000000..6a291bf67
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ActivateShellStep.cs
@@ -0,0 +1,23 @@
+using Orchard.Environment.Configuration;
+using Orchard.Recipes.Models;
+using Orchard.Recipes.Services;
+
+namespace Orchard.Recipes.Providers.Executors {
+ public class ActivateShellStep : RecipeExecutionStep {
+ private readonly ShellSettings _shellSettings;
+ private readonly IShellSettingsManager _shellSettingsManager;
+
+ public ActivateShellStep(ShellSettings shellSettings, IShellSettingsManager shellSettingsManager, RecipeExecutionLogger logger)
+ : base(logger) {
+ _shellSettings = shellSettings;
+ _shellSettingsManager = shellSettingsManager;
+ }
+
+ public override string Name { get { return "ActivateShell"; } }
+
+ public override void Execute(RecipeExecutionContext context) {
+ _shellSettings.State = TenantState.Running;
+ _shellSettingsManager.SaveSettings(_shellSettings);
+ }
+ }
+}
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ContentStep.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ContentStep.cs
index f2736a1e7..0df320916 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ContentStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ContentStep.cs
@@ -98,13 +98,14 @@ namespace Orchard.Recipes.Providers.Executors {
var nextIdentity = importContentSession.GetNextInBatch();
while (nextIdentity != null) {
var itemId = "";
- if (elementDictionary[nextIdentity.ToString()].HasAttributes) {
- itemId = elementDictionary[nextIdentity.ToString()].FirstAttribute.Value;
+ var nextIdentityValue = nextIdentity.ToString();
+ if (elementDictionary[nextIdentityValue].HasAttributes) {
+ itemId = elementDictionary[nextIdentityValue].FirstAttribute.Value;
}
Logger.Information("Importing data item '{0}' (item {1}/{2}).", itemId, itemIndex + 1, elementDictionary.Count);
try {
_orchardServices.ContentManager.Import(
- elementDictionary[nextIdentity.ToString()],
+ elementDictionary[nextIdentityValue],
importContentSession);
}
catch (Exception ex) {
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/RecipesStep.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/RecipesStep.cs
index d01f88a53..5d25acb45 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/RecipesStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/RecipesStep.cs
@@ -16,9 +16,9 @@ namespace Orchard.Recipes.Providers.Executors {
private readonly ITransactionManager _transactionManager;
public RecipesStep(
- IRecipeHarvester recipeHarvester,
- IRecipeStepQueue recipeStepQueue,
- IRepository recipeStepResultRecordRepository,
+ IRecipeHarvester recipeHarvester,
+ IRecipeStepQueue recipeStepQueue,
+ IRepository recipeStepResultRecordRepository,
ITransactionManager transactionManager,
RecipeExecutionLogger logger) : base(logger) {
@@ -54,7 +54,7 @@ namespace Orchard.Recipes.Providers.Executors {
if (!recipes.ContainsKey(recipeName))
throw new Exception(String.Format("No recipe named '{0}' was found in extension '{1}'.", recipeName, extensionId));
- EnqueueRecipe(session, context.ExecutionId, recipes[recipeName]);
+ EnqueueRecipe(context.ExecutionId, recipes[recipeName]);
}
catch (Exception ex) {
Logger.Error(ex, "Error while executing recipe '{0}' in extension '{1}'.", recipeName, extensionId);
@@ -63,7 +63,7 @@ namespace Orchard.Recipes.Providers.Executors {
}
}
- private void EnqueueRecipe(ISession session, string executionId, Recipe recipe) {
+ private void EnqueueRecipe(string executionId, Recipe recipe) {
foreach (var recipeStep in recipe.RecipeSteps) {
_recipeStepQueue.Enqueue(executionId, recipeStep);
_recipeStepResultRecordRepository.Create(new RecipeStepResultRecord {
@@ -76,7 +76,12 @@ namespace Orchard.Recipes.Providers.Executors {
}
private IDictionary HarvestRecipes(string extensionId) {
- return _recipeHarvester.HarvestRecipes(extensionId).ToDictionary(x => x.Name);
+ try {
+ return _recipeHarvester.HarvestRecipes(extensionId).ToDictionary(x => x.Name);
+ }
+ catch (ArgumentException ex) {
+ throw new OrchardFatalException(T("A recipe with the same name has been detected for extension \"{0}\". Please make sure recipes are uniquely named.", extensionId), ex);
+ }
}
}
}
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeHarvester.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeHarvester.cs
index d177be9ef..d1ca05060 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeHarvester.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeHarvester.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using Orchard.Environment.Extensions;
+using Orchard.Environment.Extensions.Models;
using Orchard.FileSystems.WebSite;
using Orchard.Localization;
using Orchard.Logging;
@@ -29,27 +30,35 @@ namespace Orchard.Recipes.Services {
public Localizer T { get; set; }
public ILogger Logger { get; set; }
- public IEnumerable HarvestRecipes(string extensionId) {
- var recipes = new List();
+ public IEnumerable HarvestRecipes() {
+ return _extensionManager.AvailableExtensions().SelectMany(HarvestRecipes);
+ }
+ public IEnumerable HarvestRecipes(string extensionId) {
var extension = _extensionManager.GetExtension(extensionId);
if (extension != null) {
- var recipeLocation = Path.Combine(extension.Location, extensionId, "Recipes");
- var recipeFiles = _webSiteFolder.ListFiles(recipeLocation, true);
-
- recipeFiles.Where(r => r.EndsWith(".recipe.xml", StringComparison.OrdinalIgnoreCase)).ToList().ForEach(r => {
- try {
- recipes.Add(_recipeParser.ParseRecipe(_webSiteFolder.ReadFile(r)));
- }
- catch (Exception ex) {
- Logger.Error(ex, "Error while parsing recipe file '{0}'.", r);
- }
- });
- }
- else {
- Logger.Error("Could not discover recipes because module '{0}' was not found.", extensionId);
+ return HarvestRecipes(extension);
}
+ Logger.Error("Could not discover recipes because module '{0}' was not found.", extensionId);
+ return Enumerable.Empty();
+ }
+
+ private IEnumerable HarvestRecipes(ExtensionDescriptor extension) {
+ var recipes = new List();
+
+ var recipeLocation = Path.Combine(extension.Location, extension.Id, "Recipes");
+ var recipeFiles = _webSiteFolder.ListFiles(recipeLocation, true);
+
+ recipeFiles.Where(r => r.EndsWith(".recipe.xml", StringComparison.OrdinalIgnoreCase)).ToList().ForEach(r => {
+ try {
+ recipes.Add(_recipeParser.ParseRecipe(_webSiteFolder.ReadFile(r)));
+ }
+ catch (Exception ex) {
+ Logger.Error(ex, "Error while parsing recipe file '{0}'.", r);
+ }
+ });
+
return recipes;
}
}
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeStepExecutor.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeStepExecutor.cs
index 14cfba976..a50fa0d63 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeStepExecutor.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeStepExecutor.cs
@@ -74,7 +74,13 @@ namespace Orchard.Recipes.Services {
if (!String.IsNullOrWhiteSpace(recipeName))
query = from record in query where record.RecipeName == recipeName select record;
- var stepResultRecord = query.Single();
+ var stepResultRecord = query.SingleOrDefault();
+
+ if (stepResultRecord == null)
+ // No step result record was created when scheduling the step, so simply ignore.
+ // The only reason where one would not create such a record would be Setup,
+ // when no database exists to store the record but still wants to schedule a recipe step (such as the "StopViewsBackgroundCompilationStep").
+ return;
stepResultRecord.IsCompleted = true;
stepResultRecord.IsSuccessful = isSuccessful;
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/BuilderSteps/Content.cshtml b/src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/BuilderSteps/Content.cshtml
index 99c7cb340..8121ccab9 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/BuilderSteps/Content.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/BuilderSteps/Content.cshtml
@@ -9,13 +9,14 @@
@T("Content Type")
-
@T("Content")
-
@T("Content Definition")
-
-
-
-
-
+
+
+ @T("Content")
+
+
+
+ @T("Content Definition")
+
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs
index 0136273ba..68fd4d30a 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs
@@ -96,29 +96,32 @@ namespace Orchard.Roles.Drivers {
}
protected override void Importing(UserRolesPart part, ContentManagement.Handlers.ImportContentContext context) {
- var roles = context.Attribute(part.PartDefinition.Name, "Roles");
- if(string.IsNullOrEmpty(roles)) {
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
return;
}
- var userRoles = roles.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries);
+ context.ImportAttribute(part.PartDefinition.Name, "Roles", roles => {
- // create new roles
- foreach (var role in userRoles) {
- var roleRecord = _roleService.GetRoleByName(role);
+ var userRoles = roles.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
- // create the role if it doesn't already exist
- if (roleRecord == null) {
- _roleService.CreateRole(role);
+ // create new roles
+ foreach (var role in userRoles) {
+ var roleRecord = _roleService.GetRoleByName(role);
+
+ // create the role if it doesn't already exist
+ if (roleRecord == null) {
+ _roleService.CreateRole(role);
+ }
}
- }
- var currentUserRoleRecords = _userRolesRepository.Fetch(x => x.UserId == part.ContentItem.Id).ToList();
- var currentRoleRecords = currentUserRoleRecords.Select(x => x.Role).ToList();
- var targetRoleRecords = userRoles.Select(x => _roleService.GetRoleByName(x)).ToList();
- foreach (var addingRole in targetRoleRecords.Where(x => !currentRoleRecords.Contains(x))) {
- _userRolesRepository.Create(new UserRolesPartRecord { UserId = part.ContentItem.Id, Role = addingRole });
- }
+ var currentUserRoleRecords = _userRolesRepository.Fetch(x => x.UserId == part.ContentItem.Id).ToList();
+ var currentRoleRecords = currentUserRoleRecords.Select(x => x.Role).ToList();
+ var targetRoleRecords = userRoles.Select(x => _roleService.GetRoleByName(x)).ToList();
+ foreach (var addingRole in targetRoleRecords.Where(x => !currentRoleRecords.Contains(x))) {
+ _userRolesRepository.Create(new UserRolesPartRecord { UserId = part.ContentItem.Id, Role = addingRole });
+ }
+ });
}
protected override void Exporting(UserRolesPart part, ContentManagement.Handlers.ExportContentContext context) {
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Module.txt b/src/Orchard.Web/Modules/Orchard.Roles/Module.txt
index ebb53546b..6d541d28a 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: The roles module is adding the ability to assign roles to users. It's also providing a set of default roles for which other modules can define default permissions.
Features:
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Roles/Properties/AssemblyInfo.cs
index cc98d6d52..90c1f2338 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Rules/Properties/AssemblyInfo.cs
index 82134899a..af9e606fa 100644
--- a/src/Orchard.Web/Modules/Orchard.Rules/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Rules/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Module.txt b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Module.txt
index 31745fc1f..5c87533ac 100644
--- a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: Description for the module
Features:
diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Properties/AssemblyInfo.cs
index 48d965414..6bcb11475 100644
--- a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Module.txt b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Module.txt
index a24842c5b..c670994b4 100644
--- a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: The DLR scripting module enables the possibility to execute scripts using the DLR.
FeatureDescription: DLR scripting support.
diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Properties/AssemblyInfo.cs
index 10e89dd3c..8b2e1c8c3 100644
--- a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Services/RubyScriptExpressionEvaluator.cs b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Services/RubyScriptExpressionEvaluator.cs
index 61a283ce3..e4a1385b6 100644
--- a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Services/RubyScriptExpressionEvaluator.cs
+++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Services/RubyScriptExpressionEvaluator.cs
@@ -14,7 +14,7 @@ namespace Orchard.Scripting.Dlr.Services {
}
public object Evaluate(string expression, IEnumerable providers) {
- object execContextType = _cacheManager.Get("---", ctx => (object)_scriptingManager.ExecuteExpression(@"
+ object execContextType = _cacheManager.Get("---", true, ctx => (object)_scriptingManager.ExecuteExpression(@"
class ExecBlock
def initialize(callbacks)
@callbacks = callbacks
@@ -38,7 +38,7 @@ class ExecContext
end
ExecContext
"));
- var ops = _cacheManager.Get("----", ctx => (ObjectOperations)_scriptingManager.ExecuteOperation(x => x));
+ var ops = _cacheManager.Get("----", true, ctx => (ObjectOperations)_scriptingManager.ExecuteOperation(x => x));
object execContext = _cacheManager.Get(expression, ctx => (object)ops.InvokeMember(execContextType, "alloc", expression));
dynamic result = ops.InvokeMember(execContext, "evaluate", new CallbackApi(this, providers));
return ConvertRubyValue(result);
diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Module.txt b/src/Orchard.Web/Modules/Orchard.Scripting/Module.txt
index 7abadab67..d78cb94bf 100644
--- a/src/Orchard.Web/Modules/Orchard.Scripting/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Scripting/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: The scripting module enables the possibility to execute scripts using a simple custom scripting language.
FeatureDescription: Scripting support.
diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Properties/AssemblyInfo.cs
index 4752104df..01a2db377 100644
--- a/src/Orchard.Web/Modules/Orchard.Scripting/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Scripting/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/ScriptExpressionEvaluator.cs b/src/Orchard.Web/Modules/Orchard.Scripting/ScriptExpressionEvaluator.cs
index b6ebf4635..7d0148717 100644
--- a/src/Orchard.Web/Modules/Orchard.Scripting/ScriptExpressionEvaluator.cs
+++ b/src/Orchard.Web/Modules/Orchard.Scripting/ScriptExpressionEvaluator.cs
@@ -20,7 +20,7 @@ namespace Orchard.Scripting {
public Localizer T { get; set; }
public object Evaluate(string expression, IEnumerable providers) {
- var expr = _cacheManager.Get(expression, ctx => {
+ var expr = _cacheManager.Get(expression, true, ctx => {
var ast = ParseExpression(expression);
return new { Tree = ast, Errors = ast.GetErrors().ToList() };
});
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
index 78dffda8a..8d6e91e5a 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
@@ -75,7 +75,7 @@ namespace Orchard.Search.Controllers {
// ignore search results which content item has been removed or unpublished
var foundItems = _contentManager.GetMany(foundIds, VersionOptions.Published, new QueryHints()).ToList();
foreach (var contentItem in foundItems) {
- list.Add(_contentManager.BuildDisplay(contentItem, "Summary"));
+ list.Add(_contentManager.BuildDisplay(contentItem, searchSettingPart.DisplayType));
}
searchHits.TotalItemCount -= foundIds.Count() - foundItems.Count();
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Drivers/AdminSearchSettingsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Search/Drivers/AdminSearchSettingsPartDriver.cs
index 8c8bd3dd6..c3f36ce2c 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Drivers/AdminSearchSettingsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Drivers/AdminSearchSettingsPartDriver.cs
@@ -1,6 +1,7 @@
using System.Linq;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Drivers;
+using Orchard.ContentManagement.Handlers;
using Orchard.Environment.Extensions;
using Orchard.Indexing;
using Orchard.Search.Models;
@@ -37,5 +38,16 @@ namespace Orchard.Search.Drivers {
return shapeHelper.EditorTemplate(TemplateName: "Parts/AdminSearch.SiteSettings", Model: model, Prefix: Prefix);
}).OnGroup("search");
}
+
+ protected override void Importing(AdminSearchSettingsPart part, ImportContentContext context) {
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
+ }
+
+ context.ImportAttribute(part.PartDefinition.Name, "SearchFields", value => {
+ part.Store("SearchFields", value);
+ });
+ }
}
-}
\ No newline at end of file
+}
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs
index 499a61405..1235779eb 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
-using System.Xml.Linq;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Drivers;
using Orchard.ContentManagement.Handlers;
@@ -49,10 +47,13 @@ namespace Orchard.Search.Drivers {
var model = new SearchSettingsFieldsViewModel();
var searchFields = part.SearchFields;
+ model.DisplayType = part.DisplayType;
+
if (updater != null) {
if (updater.TryUpdateModel(model, Prefix, null, null)) {
part.SearchFields = model.Entries.ToDictionary(x => x.Index, x => x.Fields.Where(e => e.Selected).Select(e => e.Field).ToArray());
part.FilterCulture = model.FilterCulture;
+ part.DisplayType = model.DisplayType;
}
}
else if (_indexManager.HasIndexProvider()) {
@@ -79,15 +80,14 @@ namespace Orchard.Search.Drivers {
}
protected override void Importing(SearchSettingsPart part, ImportContentContext context) {
- var xElement = context.Data.Element(part.PartDefinition.Name);
- if (xElement == null) return;
-
- var searchFields = xElement.Attribute("SearchFields");
- if (searchFields != null) {
- searchFields.Remove();
-
- part.Store("SearchFields", searchFields.Value);
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
}
+
+ context.ImportAttribute(part.PartDefinition.Name, "SearchFields", value => {
+ part.Store("SearchFields", value);
+ });
}
}
}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsPart.cs b/src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsPart.cs
index bee81e330..a98c40977 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsPart.cs
@@ -24,5 +24,10 @@ namespace Orchard.Search.Models {
get { return this.Retrieve(x => x.SearchIndex); }
set { this.Store(x => x.SearchIndex, value); }
}
+
+ public string DisplayType {
+ get { return this.Retrieve(x => x.DisplayType, "Summary"); }
+ set { this.Store(x => x.DisplayType, value); }
+ }
}
}
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Module.txt b/src/Orchard.Web/Modules/Orchard.Search/Module.txt
index 417ed47d6..2f1a91db0 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Search/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: The search module enables the management of the search index and provides the front-end searching user interface.
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Search/Properties/AssemblyInfo.cs
index 318685b54..f1051b1e1 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchSettingsIndexViewModel.cs b/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchSettingsIndexViewModel.cs
index 5be47b5b5..8117589ad 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchSettingsIndexViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchSettingsIndexViewModel.cs
@@ -16,6 +16,7 @@ namespace Orchard.Search.ViewModels {
public IList Entries { get; set; }
public bool FilterCulture { get; set; }
+ public string DisplayType { get; set; }
}
public class IndexSettingsEntry {
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.Fields.cshtml b/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.Fields.cshtml
index 2f80a7095..08edd41f2 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.Fields.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.Fields.cshtml
@@ -44,5 +44,9 @@
@T("If checked, search results will only include content items localized in the current culture of the request.")
-
+
+
+ @Html.TextBoxFor(m => m.DisplayType, new { @class = "text single-line" })
+ @T("The display type to use for content items in the search results page.")
+
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Drivers/SslSettingsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Drivers/SslSettingsPartDriver.cs
index 89dd0cd63..794df2d37 100644
--- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Drivers/SslSettingsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Drivers/SslSettingsPartDriver.cs
@@ -36,7 +36,6 @@ namespace Orchard.SecureSocketsLayer.Drivers {
}
protected override void Importing(SslSettingsPart part, ImportContentContext context) {
- base.Importing(part, context);
_signals.Trigger(SslSettingsPart.CacheKey);
}
}
diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Module.txt b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Module.txt
index 916d28c75..140f74b56 100644
--- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Module.txt
@@ -2,7 +2,7 @@ Name: Secure Sockets Layer
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: This module will ensure SSL is used when accessing specific parts of the website like the dashboard, authentication pages or custom pages.
FeatureName: Secure Sockets Layer
diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Properties/AssemblyInfo.cs
index 168f1af0d..263450c07 100644
--- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Commands/SetupCommand.cs b/src/Orchard.Web/Modules/Orchard.Setup/Commands/SetupCommand.cs
index e56c2cd61..306c626fe 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Commands/SetupCommand.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Commands/SetupCommand.cs
@@ -2,14 +2,17 @@
using System.Collections.Generic;
using System.Linq;
using Orchard.Commands;
+using Orchard.Recipes.Services;
using Orchard.Setup.Services;
namespace Orchard.Setup.Commands {
public class SetupCommand : DefaultOrchardCommandHandler {
private readonly ISetupService _setupService;
+ private readonly IRecipeHarvester _recipeHarvester;
- public SetupCommand(ISetupService setupService) {
+ public SetupCommand(ISetupService setupService, IRecipeHarvester recipeHarvester) {
_setupService = setupService;
+ _recipeHarvester = recipeHarvester;
}
[OrchardSwitch]
@@ -51,6 +54,7 @@ namespace Orchard.Setup.Commands {
.Where(s => !String.IsNullOrEmpty(s));
}
Recipe = String.IsNullOrEmpty(Recipe) ? "Default" : Recipe;
+ var recipe = _setupService.Recipes().GetRecipeByName(Recipe);
var setupContext = new SetupContext {
SiteName = SiteName,
@@ -60,7 +64,7 @@ namespace Orchard.Setup.Commands {
DatabaseConnectionString = DatabaseConnectionString,
DatabaseTablePrefix = DatabaseTablePrefix,
EnabledFeatures = enabledFeatures,
- Recipe = Recipe,
+ Recipe = recipe,
};
var executionId = _setupService.Setup(setupContext);
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
index fba6a53a5..8c2eb4687 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
@@ -7,6 +7,7 @@ using Orchard.Logging;
using Orchard.Setup.Services;
using Orchard.Setup.ViewModels;
using Orchard.Localization;
+using Orchard.Recipes.Services;
using Orchard.Themes;
using Orchard.UI.Notify;
@@ -20,10 +21,11 @@ namespace Orchard.Setup.Controllers {
private const string DefaultRecipe = "Default";
public SetupController(
- INotifier notifier,
- ISetupService setupService,
+ INotifier notifier,
+ ISetupService setupService,
IViewsBackgroundCompilation viewsBackgroundCompilation,
ShellSettings shellSettings) {
+
_viewsBackgroundCompilation = viewsBackgroundCompilation;
_shellSettings = shellSettings;
_notifier = notifier;
@@ -31,10 +33,12 @@ namespace Orchard.Setup.Controllers {
T = NullLocalizer.Instance;
Logger = NullLogger.Instance;
+ RecipeExecutionTimeout = 600;
}
public Localizer T { get; set; }
public ILogger Logger { get; set; }
+ public int RecipeExecutionTimeout { get; set; }
private ActionResult IndexViewResult(SetupViewModel model) {
return View(model);
@@ -44,10 +48,11 @@ namespace Orchard.Setup.Controllers {
var initialSettings = _setupService.Prime();
var recipes = _setupService.Recipes().ToList();
string recipeDescription = null;
+
if (recipes.Count > 0) {
recipeDescription = recipes[0].Description;
}
-
+
// On the first time installation of Orchard, the user gets to the setup screen, which
// will take a while to finish (user inputting data and the setup process itself).
// We use this opportunity to start a background task to "pre-compile" all the known
@@ -56,10 +61,10 @@ namespace Orchard.Setup.Controllers {
if (StringComparer.OrdinalIgnoreCase.Equals(initialSettings.Name, ShellSettings.DefaultName)) {
_viewsBackgroundCompilation.Start();
}
-
+
return IndexViewResult(new SetupViewModel {
AdminUsername = "admin",
- DatabaseIsPreconfigured = !string.IsNullOrEmpty(initialSettings.DataProvider),
+ DatabaseIsPreconfigured = !String.IsNullOrEmpty(initialSettings.DataProvider),
Recipes = recipes,
RecipeDescription = recipeDescription
});
@@ -67,8 +72,8 @@ namespace Orchard.Setup.Controllers {
[HttpPost, ActionName("Index")]
public ActionResult IndexPOST(SetupViewModel model) {
- // Sets the setup request timeout to 10 minutes to give enough time to execute custom recipes.
- HttpContext.Server.ScriptTimeout = 600;
+ // Sets the setup request timeout to a configurable amount of seconds to give enough time to execute custom recipes.
+ HttpContext.Server.ScriptTimeout = RecipeExecutionTimeout;
var recipes = _setupService.Recipes().ToList();
@@ -76,17 +81,17 @@ namespace Orchard.Setup.Controllers {
if (model.DatabaseProvider != SetupDatabaseType.Builtin && string.IsNullOrEmpty(model.DatabaseConnectionString))
ModelState.AddModelError("DatabaseConnectionString", T("A connection string is required.").Text);
- if (!string.IsNullOrWhiteSpace(model.ConfirmPassword) && model.AdminPassword != model.ConfirmPassword ) {
+ if (!String.IsNullOrWhiteSpace(model.ConfirmPassword) && model.AdminPassword != model.ConfirmPassword) {
ModelState.AddModelError("ConfirmPassword", T("Password confirmation must match.").Text);
}
if (model.DatabaseProvider != SetupDatabaseType.Builtin && !string.IsNullOrWhiteSpace(model.DatabaseTablePrefix)) {
model.DatabaseTablePrefix = model.DatabaseTablePrefix.Trim();
- if(!char.IsLetter(model.DatabaseTablePrefix[0])) {
+ if (!Char.IsLetter(model.DatabaseTablePrefix[0])) {
ModelState.AddModelError("DatabaseTablePrefix", T("The table prefix must begin with a letter.").Text);
}
- if(model.DatabaseTablePrefix.Any(x => !Char.IsLetterOrDigit(x))) {
+ if (model.DatabaseTablePrefix.Any(x => !Char.IsLetterOrDigit(x))) {
ModelState.AddModelError("DatabaseTablePrefix", T("The table prefix must contain letters or digits.").Text);
}
}
@@ -103,16 +108,15 @@ namespace Orchard.Setup.Controllers {
foreach (var recipe in recipes.Where(recipe => recipe.Name == model.Recipe)) {
model.RecipeDescription = recipe.Description;
}
- model.DatabaseIsPreconfigured = !string.IsNullOrEmpty(_setupService.Prime().DataProvider);
-
+ model.DatabaseIsPreconfigured = !String.IsNullOrEmpty(_setupService.Prime().DataProvider);
+
return IndexViewResult(model);
}
try {
string providerName = null;
- switch (model.DatabaseProvider)
- {
+ switch (model.DatabaseProvider) {
case SetupDatabaseType.Builtin:
providerName = "SqlCe";
break;
@@ -133,6 +137,7 @@ namespace Orchard.Setup.Controllers {
throw new ApplicationException("Unknown database type: " + model.DatabaseProvider);
}
+ var recipe = _setupService.Recipes().GetRecipeByName(model.Recipe);
var setupContext = new SetupContext {
SiteName = model.SiteName,
AdminUsername = model.AdminUsername,
@@ -140,11 +145,11 @@ namespace Orchard.Setup.Controllers {
DatabaseProvider = providerName,
DatabaseConnectionString = model.DatabaseConnectionString,
DatabaseTablePrefix = model.DatabaseTablePrefix,
- EnabledFeatures = null, // default list
- Recipe = model.Recipe
+ EnabledFeatures = null, // Default list
+ Recipe = recipe
};
- string executionId = _setupService.Setup(setupContext);
+ var executionId = _setupService.Setup(setupContext);
// First time installation if finally done. Tell the background views compilation
// process to stop, so that it doesn't interfere with the user (asp.net compilation
@@ -153,7 +158,8 @@ namespace Orchard.Setup.Controllers {
// Redirect to the welcome page.
return Redirect("~/" + _shellSettings.RequestUrlPrefix);
- } catch (Exception ex) {
+ }
+ catch (Exception ex) {
Logger.Error(ex, "Setup failed");
_notifier.Error(T("Setup failed: {0}", ex.Message));
@@ -161,7 +167,7 @@ namespace Orchard.Setup.Controllers {
foreach (var recipe in recipes.Where(recipe => recipe.Name == model.Recipe)) {
model.RecipeDescription = recipe.Description;
}
- model.DatabaseIsPreconfigured = !string.IsNullOrEmpty(_setupService.Prime().DataProvider);
+ model.DatabaseIsPreconfigured = !String.IsNullOrEmpty(_setupService.Prime().DataProvider);
return IndexViewResult(model);
}
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupDatabaseType.cs b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupDatabaseType.cs
deleted file mode 100644
index 48265336c..000000000
--- a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupDatabaseType.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Orchard.Setup.Controllers
-{
- public enum SetupDatabaseType
- {
- Builtin,
- SqlServer,
- MySql,
- PostgreSql,
- }
-}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Module.txt b/src/Orchard.Web/Modules/Orchard.Setup/Module.txt
index 9895478e3..10e6b8582 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Module.txt
@@ -1,8 +1,14 @@
Name: Setup
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: The setup module is creating the application's setup experience.
FeatureDescription: Standard site setup. This feature is disabled automatically once setup is over.
Category: Core
+Dependencies: Orchard.Setup.Services
+Features:
+ Orchard.Setup.Services
+ Name: Setup Services
+ Description: Provides programmatic APIs to the setup service.
+ Category: Core
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
index 94d8c676d..6e7182827 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
@@ -25,6 +25,7 @@
+ true
@@ -78,7 +79,7 @@
-
+
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Setup/Properties/AssemblyInfo.cs
index b64d7d032..72f4c97ed 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Routes.cs b/src/Orchard.Web/Modules/Orchard.Setup/Routes.cs
index 2bc323f36..faafaa50e 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Routes.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Routes.cs
@@ -4,8 +4,7 @@ using System.Web.Routing;
using Orchard.Mvc.Routes;
namespace Orchard.Setup {
- public class Routes : IRouteProvider
- {
+ public class Routes : IRouteProvider {
public void GetRoutes(ICollection routes) {
foreach (var routeDescriptor in GetRoutes())
routes.Add(routeDescriptor);
@@ -13,24 +12,24 @@ namespace Orchard.Setup {
public IEnumerable GetRoutes() {
return new[] {
- new RouteDescriptor {
- Route = new Route(
- "{controller}/{action}",
- new RouteValueDictionary {
- {"area", "Orchard.Setup"},
- {"controller", "Setup"},
- {"action", "Index"}
- },
- new RouteValueDictionary {
- {"area", "Orchard.Setup"},
- {"controller", "Setup"},
- },
- new RouteValueDictionary {
- {"area", "Orchard.Setup"}
- },
- new MvcRouteHandler())
- }
- };
+ new RouteDescriptor {
+ Route = new Route(
+ "{controller}/{action}",
+ new RouteValueDictionary {
+ {"area", "Orchard.Setup"},
+ {"controller", "Setup"},
+ {"action", "Index"}
+ },
+ new RouteValueDictionary {
+ {"area", "Orchard.Setup"},
+ {"controller", "Setup"},
+ },
+ new RouteValueDictionary {
+ {"area", "Orchard.Setup"}
+ },
+ new MvcRouteHandler())
+ }
+ };
}
}
}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupContext.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupContext.cs
index 06c32c914..0c87402bc 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupContext.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupContext.cs
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using Orchard.Recipes.Models;
namespace Orchard.Setup.Services {
public class SetupContext {
@@ -9,6 +10,6 @@ namespace Orchard.Setup.Services {
public string DatabaseConnectionString { get; set; }
public string DatabaseTablePrefix { get; set; }
public IEnumerable EnabledFeatures { get; set; }
- public string Recipe { get; set; }
+ public Recipe Recipe { get; set; }
}
}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index 16b3e465b..7549405cb 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Web;
+using System.Xml.Linq;
using Orchard.ContentManagement;
using Orchard.Core.Settings.Models;
using Orchard.Data;
@@ -16,7 +17,6 @@ using Orchard.Environment.Descriptor.Models;
using Orchard.Environment.Extensions;
using Orchard.Environment.ShellBuilders;
using Orchard.Environment.State;
-using Orchard.Localization;
using Orchard.Localization.Services;
using Orchard.Logging;
using Orchard.Recipes.Models;
@@ -26,14 +26,14 @@ using Orchard.Settings;
using Orchard.Utility.Extensions;
namespace Orchard.Setup.Services {
- public class SetupService : ISetupService {
+ [OrchardFeature("Orchard.Setup.Services")]
+ public class SetupService : Component, ISetupService {
private readonly ShellSettings _shellSettings;
private readonly IOrchardHost _orchardHost;
private readonly IShellSettingsManager _shellSettingsManager;
private readonly IShellContainerFactory _shellContainerFactory;
private readonly ICompositionStrategy _compositionStrategy;
private readonly IProcessingEngine _processingEngine;
- private readonly IExtensionManager _extensionManager;
private readonly IRecipeHarvester _recipeHarvester;
private IEnumerable _recipes;
@@ -44,23 +44,17 @@ namespace Orchard.Setup.Services {
IShellContainerFactory shellContainerFactory,
ICompositionStrategy compositionStrategy,
IProcessingEngine processingEngine,
- IExtensionManager extensionManager,
IRecipeHarvester recipeHarvester) {
+
_shellSettings = shellSettings;
_orchardHost = orchardHost;
_shellSettingsManager = shellSettingsManager;
_shellContainerFactory = shellContainerFactory;
_compositionStrategy = compositionStrategy;
_processingEngine = processingEngine;
- _extensionManager = extensionManager;
_recipeHarvester = recipeHarvester;
- T = NullLocalizer.Instance;
- Logger = NullLogger.Instance;
}
- public Localizer T { get; set; }
- public ILogger Logger { get; set; }
-
public ShellSettings Prime() {
return _shellSettings;
}
@@ -68,54 +62,60 @@ namespace Orchard.Setup.Services {
public IEnumerable Recipes() {
if (_recipes == null) {
var recipes = new List();
-
- foreach (var extension in _extensionManager.AvailableExtensions()) {
- recipes.AddRange(_recipeHarvester.HarvestRecipes(extension.Id).Where(recipe => recipe.IsSetupRecipe));
- }
-
+ recipes.AddRange(_recipeHarvester.HarvestRecipes().Where(recipe => recipe.IsSetupRecipe));
_recipes = recipes;
}
-
return _recipes;
}
public string Setup(SetupContext context) {
+ var initialState = _shellSettings.State;
+ try {
+ return SetupInternal(context);
+ }
+ catch {
+ _shellSettings.State = initialState;
+ throw;
+ }
+ }
+
+ private string SetupInternal(SetupContext context) {
string executionId;
Logger.Information("Running setup for tenant '{0}'.", _shellSettings.Name);
// The vanilla Orchard distibution has the following features enabled.
string[] hardcoded = {
- // Framework
- "Orchard.Framework",
- // Core
- "Common", "Containers", "Contents", "Dashboard", "Feeds", "Navigation","Scheduling", "Settings", "Shapes", "Title",
- // Modules
- "Orchard.Pages", "Orchard.ContentPicker", "Orchard.Themes", "Orchard.Users", "Orchard.Roles", "Orchard.Modules",
- "PackagingServices", "Orchard.Packaging", "Gallery", "Orchard.Recipes"
- };
+ // Framework
+ "Orchard.Framework",
+ // Core
+ "Common", "Containers", "Contents", "Dashboard", "Feeds", "Navigation","Scheduling", "Settings", "Shapes", "Title",
+ // Modules
+ "Orchard.Pages", "Orchard.ContentPicker", "Orchard.Themes", "Orchard.Users", "Orchard.Roles", "Orchard.Modules",
+ "PackagingServices", "Orchard.Packaging", "Gallery", "Orchard.Recipes"
+ };
context.EnabledFeatures = hardcoded.Union(context.EnabledFeatures ?? Enumerable.Empty()).Distinct().ToList();
+ // Set shell state to "Initializing" so that subsequent HTTP requests are responded to with "Service Unavailable" while Orchard is setting up.
+ _shellSettings.State = TenantState.Initializing;
+
var shellSettings = new ShellSettings(_shellSettings);
- if (string.IsNullOrEmpty(shellSettings.DataProvider)) {
+ if (String.IsNullOrEmpty(shellSettings.DataProvider)) {
shellSettings.DataProvider = context.DatabaseProvider;
shellSettings.DataConnectionString = context.DatabaseConnectionString;
shellSettings.DataTablePrefix = context.DatabaseTablePrefix;
}
- #region Encryption Settings
-
shellSettings.EncryptionAlgorithm = "AES";
- // randomly generated key
+
+ // Randomly generated key.
shellSettings.EncryptionKey = SymmetricAlgorithm.Create(shellSettings.EncryptionAlgorithm).Key.ToHexString();
-
shellSettings.HashAlgorithm = "HMACSHA256";
- // randomly generated key
- shellSettings.HashKey = HMAC.Create(shellSettings.HashAlgorithm).Key.ToHexString();
- #endregion
+ // Randomly generated key.
+ shellSettings.HashKey = HMAC.Create(shellSettings.HashAlgorithm).Key.ToHexString();
var shellDescriptor = new ShellDescriptor {
Features = context.EnabledFeatures.Select(name => new ShellFeature { Name = name })
@@ -123,12 +123,12 @@ namespace Orchard.Setup.Services {
var shellBlueprint = _compositionStrategy.Compose(shellSettings, shellDescriptor);
- // initialize database explicitly, and store shell descriptor
+ // Initialize database explicitly, and store shell descriptor.
using (var bootstrapLifetimeScope = _shellContainerFactory.CreateContainer(shellSettings, shellBlueprint)) {
using (var environment = bootstrapLifetimeScope.CreateWorkContextScope()) {
- // check if the database is already created (in case an exception occured in the second phase)
+ // Check if the database is already created (in case an exception occured in the second phase).
var schemaBuilder = new SchemaBuilder(environment.Resolve());
var installationPresent = true;
try {
@@ -143,7 +143,7 @@ namespace Orchard.Setup.Services {
throw new OrchardException(T("A previous Orchard installation was detected in this database with this table prefix."));
}
- // Make a workaround to avoid the Transaction issue for PostgreSQL
+ // Workaround to avoid some Transaction issue for PostgreSQL.
environment.Resolve().RequireNew();
schemaBuilder.CreateTable("Orchard_Framework_DataMigrationRecord", table => table
@@ -168,16 +168,13 @@ namespace Orchard.Setup.Services {
}
}
- // in effect "pump messages" see PostMessage circa 1980
+ // In effect "pump messages" see PostMessage circa 1980.
while (_processingEngine.AreTasksPending())
_processingEngine.ExecuteNextTask();
- // creating a standalone environment.
+ // Creating a standalone environment.
// in theory this environment can be used to resolve any normal components by interface, and those
- // components will exist entirely in isolation - no crossover between the safemode container currently in effect
-
- // must mark state as Running - otherwise standalone enviro is created "for setup"
- shellSettings.State = TenantState.Running;
+ // components will exist entirely in isolation - no crossover between the safemode container currently in effect.
using (var environment = _orchardHost.CreateStandaloneEnvironment(shellSettings)) {
try {
executionId = CreateTenantData(context, environment);
@@ -189,23 +186,21 @@ namespace Orchard.Setup.Services {
}
_shellSettingsManager.SaveSettings(shellSettings);
-
return executionId;
}
private string CreateTenantData(SetupContext context, IWorkContextScope environment) {
- // create superuser
+ // Create site owner.
var membershipService = environment.Resolve();
- var user =
- membershipService.CreateUser(new CreateUserParams(context.AdminUsername, context.AdminPassword,
- String.Empty, String.Empty, String.Empty,
- true));
+ var user = membershipService.CreateUser(
+ new CreateUserParams(context.AdminUsername, context.AdminPassword,
+ String.Empty, String.Empty, String.Empty, true));
- // set superuser as current user for request (it will be set as the owner of all content items)
+ // Set site owner as current user for request (it will be set as the owner of all content items).
var authenticationService = environment.Resolve();
authenticationService.SetAuthenticatedUserForRequest(user);
- // set site name and settings
+ // Set site name and settings.
var siteService = environment.Resolve();
var siteSettings = siteService.GetSiteSettings().As();
siteSettings.SiteSalt = Guid.NewGuid().ToString("N");
@@ -213,19 +208,27 @@ namespace Orchard.Setup.Services {
siteSettings.SuperUser = context.AdminUsername;
siteSettings.SiteCulture = "en-US";
- // add default culture
+ // Add default culture.
var cultureManager = environment.Resolve();
cultureManager.AddCulture("en-US");
var recipeManager = environment.Resolve();
- var recipe = Recipes().FirstOrDefault(r => r.Name.Equals(context.Recipe, StringComparison.OrdinalIgnoreCase));
-
- if (recipe == null)
- throw new OrchardException(T("The recipe '{0}' could not be found.", context.Recipe));
-
+ var recipe = context.Recipe;
var executionId = recipeManager.Execute(recipe);
- // null check: temporary fix for running setup in command line
+ // Once the recipe has finished executing, we need to update the shell state to "Running", so add a recipe step that does exactly that.
+ var recipeStepQueue = environment.Resolve();
+ var recipeStepResultRecordRepository = environment.Resolve>();
+ var activateShellStep = new RecipeStep(Guid.NewGuid().ToString("N"), recipe.Name, "ActivateShell", new XElement("ActivateShell"));
+ recipeStepQueue.Enqueue(executionId, activateShellStep);
+ recipeStepResultRecordRepository.Create(new RecipeStepResultRecord {
+ ExecutionId = executionId,
+ RecipeName = recipe.Name,
+ StepId = activateShellStep.Id,
+ StepName = activateShellStep.Name
+ });
+
+ // Null check: temporary fix for running setup in command line.
if (HttpContext.Current != null) {
authenticationService.SignIn(user, true);
}
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
index ec675dac8..e0ee00076 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
@@ -1,5 +1,4 @@
using System;
-using System.Collections.Generic;
using System.Web.Routing;
using Autofac;
using Orchard.Caching;
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupDatabaseType.cs b/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupDatabaseType.cs
new file mode 100644
index 000000000..f57a86748
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupDatabaseType.cs
@@ -0,0 +1,10 @@
+namespace Orchard.Setup.ViewModels
+{
+ public enum SetupDatabaseType
+ {
+ Builtin,
+ SqlServer,
+ MySql,
+ PostgreSql,
+ }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
index b1990c468..9f6fe9130 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
@@ -1,5 +1,6 @@
@model Orchard.Setup.ViewModels.SetupViewModel
@using Orchard.Recipes.Models;
+@using Orchard.Setup.ViewModels
@{
Script.Require("jQuery");
Script.Require("ShapesBase");
@@ -47,19 +48,19 @@ if (!Model.DatabaseIsPreconfigured) {
@Html.ValidationMessage("DatabaseOptions", "Unable to setup data storage.")
- @Html.RadioButtonFor(svm => svm.DatabaseProvider, Orchard.Setup.Controllers.SetupDatabaseType.Builtin.ToString(), new { id = "builtin" })
+ @Html.RadioButtonFor(svm => svm.DatabaseProvider, SetupDatabaseType.Builtin.ToString(), new { id = "builtin" })
- @Html.RadioButtonFor(svm => svm.DatabaseProvider, Orchard.Setup.Controllers.SetupDatabaseType.SqlServer.ToString(), new { id = "sqlserver" })
+ @Html.RadioButtonFor(svm => svm.DatabaseProvider, SetupDatabaseType.SqlServer.ToString(), new { id = "sqlserver" })
- @Html.RadioButtonFor(svm => svm.DatabaseProvider, Orchard.Setup.Controllers.SetupDatabaseType.MySql.ToString(), new { id = "mysql" })
+ @Html.RadioButtonFor(svm => svm.DatabaseProvider, SetupDatabaseType.MySql.ToString(), new { id = "mysql" })
- @Html.RadioButtonFor(svm => svm.DatabaseProvider, Orchard.Setup.Controllers.SetupDatabaseType.PostgreSql.ToString(), new { id = "postgresql" })
+ @Html.RadioButtonFor(svm => svm.DatabaseProvider, SetupDatabaseType.PostgreSql.ToString(), new { id = "postgresql" })
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagCloudDriver.cs b/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagCloudDriver.cs
index 345c8f576..eb3fe1538 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagCloudDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagCloudDriver.cs
@@ -43,6 +43,11 @@ namespace Orchard.Tags.Drivers {
}
protected override void Importing(TagCloudPart part, ImportContentContext context) {
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
+ }
+
part.Slug = context.Attribute(part.PartDefinition.Name, "Slug");
part.Buckets = Convert.ToInt32(context.Attribute(part.PartDefinition.Name, "Buckets"));
}
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs
index 2c42a27c8..669ed9df7 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs
@@ -70,6 +70,11 @@ namespace Orchard.Tags.Drivers {
}
protected override void Importing(TagsPart part, ImportContentContext context) {
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
+ }
+
var tagString = context.Attribute(part.PartDefinition.Name, "Tags");
if (tagString != null) {
var tags = tagString.Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries);
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Module.txt b/src/Orchard.Web/Modules/Orchard.Tags/Module.txt
index 5fedb9b0e..c29f0a14b 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Features:
Orchard.Tags:
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Tags/Properties/AssemblyInfo.cs
index 62e65e560..2c420e1bd 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Services/TagCloudService.cs b/src/Orchard.Web/Modules/Orchard.Tags/Services/TagCloudService.cs
index 26dbf2c52..a05644f69 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Services/TagCloudService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Services/TagCloudService.cs
@@ -32,7 +32,7 @@ namespace Orchard.Tags.Services {
public IEnumerable GetPopularTags(int buckets, string slug) {
var cacheKey = "Orchard.Tags.TagCloud." + (slug ?? "") + '.' + buckets;
- return _cacheManager.Get(cacheKey,
+ return _cacheManager.Get(cacheKey, true,
ctx => {
ctx.Monitor(_signals.When(TagCloudTagsChanged));
IEnumerable tagCounts;
diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Models/TaskLeaseRecord.cs b/src/Orchard.Web/Modules/Orchard.TaskLease/Models/TaskLeaseRecord.cs
index 3e28a67f3..039e0d27e 100644
--- a/src/Orchard.Web/Modules/Orchard.TaskLease/Models/TaskLeaseRecord.cs
+++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Models/TaskLeaseRecord.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
using Orchard.Data.Conventions;
namespace Orchard.TaskLease.Models
diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt b/src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
index 7748ef35a..868d44247 100644
--- a/src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
@@ -2,7 +2,7 @@ Name: Task Lease
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardtasklease.codeplex.com
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
LifecycleStatus: Deprecated
Description: Provides services to synchronize tasks in a farm environment.
diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.TaskLease/Properties/AssemblyInfo.cs
index 3dabfb343..b2b8e12fd 100644
--- a/src/Orchard.Web/Modules/Orchard.TaskLease/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Services/ITaskLeaseService.cs b/src/Orchard.Web/Modules/Orchard.TaskLease/Services/ITaskLeaseService.cs
index 625472446..c32e3d37e 100644
--- a/src/Orchard.Web/Modules/Orchard.TaskLease/Services/ITaskLeaseService.cs
+++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Services/ITaskLeaseService.cs
@@ -6,7 +6,7 @@ namespace Orchard.TaskLease.Services {
/// Describes a service to save and acquire task leases. A task lease can't be acquired by two different machines,
/// for a specific amount of time. Optionnally a State can be saved along with the lease.
///
- [Obsolete("Use Orchard.Tasks.Locking.IDistributedLockService and the AcquireLockForMachine/TryAcquireLockForMachine methods instead.")]
+ [Obsolete("Use Orchard.Tasks.Locking.IDistributedLockService instead.")]
public interface ITaskLeaseService : IDependency {
///
diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Services/TaskLeaseService.cs b/src/Orchard.Web/Modules/Orchard.TaskLease/Services/TaskLeaseService.cs
index 8cf04b3fe..0c1025173 100644
--- a/src/Orchard.Web/Modules/Orchard.TaskLease/Services/TaskLeaseService.cs
+++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Services/TaskLeaseService.cs
@@ -9,25 +9,25 @@ namespace Orchard.TaskLease.Services {
///
/// Provides a database driven implementation of
///
- [Obsolete("Use Orchard.Tasks.Locking.DistributedLockService and the AcquireLockForMachine/TryAcquireLockForMachine methods instead.")]
+ [Obsolete("Use Orchard.Tasks.Locking.DistributedLockService instead.")]
public class TaskLeaseService : ITaskLeaseService {
private readonly IRepository _repository;
private readonly IClock _clock;
- private readonly IMachineNameProvider _machineNameProvider;
+ private readonly IApplicationEnvironment _applicationEnvironment;
public TaskLeaseService(
IRepository repository,
IClock clock,
- IMachineNameProvider machineNameProvider) {
+ IApplicationEnvironment applicationEnvironment) {
_repository = repository;
_clock = clock;
- _machineNameProvider = machineNameProvider;
+ _applicationEnvironment = applicationEnvironment;
}
public string Acquire(string taskName, DateTime expiredUtc) {
- var machineName = _machineNameProvider.GetMachineName();
+ var environmentIdentifier = _applicationEnvironment.GetEnvironmentIdentifier();
// retrieve current lease for the specified task
var taskLease = _repository.Get(x => x.TaskName == taskName);
@@ -36,7 +36,7 @@ namespace Orchard.TaskLease.Services {
if (taskLease == null) {
taskLease = new TaskLeaseRecord {
TaskName = taskName,
- MachineName = machineName,
+ MachineName = environmentIdentifier,
State = String.Empty,
UpdatedUtc = _clock.UtcNow,
ExpiredUtc = expiredUtc
@@ -49,12 +49,12 @@ namespace Orchard.TaskLease.Services {
}
// lease can't be aquired only if for a different machine and it has not expired
- if (taskLease.MachineName != machineName && taskLease.ExpiredUtc >= _clock.UtcNow) {
+ if (taskLease.MachineName != environmentIdentifier && taskLease.ExpiredUtc >= _clock.UtcNow) {
return null;
}
// otherwise update information
- taskLease.MachineName = machineName;
+ taskLease.MachineName = environmentIdentifier;
taskLease.UpdatedUtc = _clock.UtcNow;
taskLease.ExpiredUtc = expiredUtc;
@@ -64,10 +64,10 @@ namespace Orchard.TaskLease.Services {
}
public void Update(string taskName, string state) {
- var machineName = _machineNameProvider.GetMachineName();
+ var environmentIdentifier = _applicationEnvironment.GetEnvironmentIdentifier();
// retrieve current lease for the specified task
- var taskLease = _repository.Get(x => x.TaskName == taskName && x.MachineName == machineName);
+ var taskLease = _repository.Get(x => x.TaskName == taskName && x.MachineName == environmentIdentifier);
if (taskLease == null) {
return;
@@ -78,10 +78,10 @@ namespace Orchard.TaskLease.Services {
}
public void Update(string taskName, string state, DateTime expiredUtc) {
- var machineName = _machineNameProvider.GetMachineName();
+ var environmentIdentifier = _applicationEnvironment.GetEnvironmentIdentifier();
// retrieve current lease for the specified task
- var taskLease = _repository.Get(x => x.TaskName == taskName && x.MachineName == machineName);
+ var taskLease = _repository.Get(x => x.TaskName == taskName && x.MachineName == environmentIdentifier);
if (taskLease == null) {
return;
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TagsController.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TagsController.cs
new file mode 100644
index 000000000..bc1d929f3
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TagsController.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Web.Http;
+using Orchard.ContentManagement;
+using Orchard.Core.Title.Models;
+using Orchard.Localization;
+using Orchard.Logging;
+using Orchard.Taxonomies.Helpers;
+using Orchard.Taxonomies.Models;
+using Orchard.Taxonomies.Services;
+using System.Linq;
+using Orchard.Security;
+using Orchard.Taxonomies.ViewModels;
+
+namespace Orchard.Taxonomies.Controllers {
+ public class TagsController : ApiController {
+ private readonly ITaxonomyService _taxonomyService;
+ private readonly IContentManager _contentManager;
+ private readonly IAuthorizer _authorizer;
+ public Localizer T { get; set; }
+ protected ILogger Logger { get; set; }
+
+ public TagsController(
+ ITaxonomyService taxonomyService,
+ IContentManager contentManager,
+ IAuthorizer authorizer) {
+ _taxonomyService = taxonomyService;
+ T = NullLocalizer.Instance;
+ _contentManager = contentManager;
+ _authorizer = authorizer;
+ Logger = NullLogger.Instance;
+ }
+
+ public IEnumerable Get(int taxonomyId, bool leavesOnly, string query) {
+ if (!_authorizer.Authorize(StandardPermissions.AccessAdminPanel)) {
+ throw new UnauthorizedAccessException("Can't access the admin");
+ }
+ if (string.IsNullOrEmpty(query)) return new List();
+ var allTerms = leavesOnly
+ ? _taxonomyService.GetTerms(taxonomyId).ToList()
+ : new List();
+ var matchingTerms = _contentManager.Query()
+ .Where(t => t.TaxonomyId == taxonomyId)
+ .Join()
+ .Where(r => r.Title.Contains(query))
+ .List()
+ .Select(t => BuildTag(t, leavesOnly, allTerms))
+ .OrderBy(t => t.Label)
+ .ToList();
+ return matchingTerms;
+ }
+
+ private static Tag BuildTag(TermPart term, bool leavesOnly, IEnumerable terms) {
+ return new Tag {
+ Value = term.Id,
+ Label = term.Name,
+ Disabled = !term.Selectable || (leavesOnly && terms.Any(t => t.Path.Contains(term.Path + term.Id))),
+ Levels = term.GetLevels()
+ };
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs
index 7cbc32363..eed4d476c 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs
@@ -60,7 +60,7 @@ namespace Orchard.Taxonomies.Drivers {
var settings = field.PartFieldDefinition.Settings.GetModel();
var appliedTerms = GetAppliedTerms(part, field, VersionOptions.Latest).ToDictionary(t => t.Id, t => t);
var taxonomy = _taxonomyService.GetTaxonomyByName(settings.Taxonomy);
- var terms = taxonomy != null
+ var terms = taxonomy != null && !settings.Autocomplete
? _taxonomyService.GetTerms(taxonomy.Id).Where(t => !string.IsNullOrWhiteSpace(t.Name)).Select(t => t.CreateTermEntry()).ToList()
: new List(0);
@@ -70,9 +70,11 @@ namespace Orchard.Taxonomies.Drivers {
DisplayName = field.DisplayName,
Name = field.Name,
Terms = terms,
+ SelectedTerms = appliedTerms.Select(t => t.Value),
Settings = settings,
- SingleTermId = terms.Where(t => t.IsChecked).Select(t => t.Id).FirstOrDefault(),
- TaxonomyId = taxonomy != null ? taxonomy.Id : 0
+ SingleTermId = appliedTerms.Select(t => t.Key).FirstOrDefault(),
+ TaxonomyId = taxonomy != null ? taxonomy.Id : 0,
+ HasTerms = taxonomy != null && _taxonomyService.GetTermsCount(taxonomy.Id) > 0
};
var templateName = settings.Autocomplete ? "Fields/TaxonomyField.Autocomplete" : "Fields/TaxonomyField";
@@ -108,10 +110,10 @@ namespace Orchard.Taxonomies.Drivers {
var appliedTerms = _taxonomyService.GetTermsForContentItem(part.ContentItem.Id, field.Name);
// stores all content items associated to this field
- var termIdentities = appliedTerms.Select(x => Services.ContentManager.GetItemMetadata(x).Identity.ToString())
- .ToArray();
+ var termIdentities = appliedTerms.Select(x => Services.ContentManager.GetItemMetadata(x).Identity.ToString()).ToArray();
- context.Element(XmlConvert.EncodeLocalName(field.FieldDefinition.Name + "." + field.Name)).SetAttributeValue("Terms", String.Join(",", termIdentities));
+ if (termIdentities.Any())
+ context.Element(XmlConvert.EncodeLocalName(field.FieldDefinition.Name + "." + field.Name)).SetAttributeValue("Terms", String.Join(",", termIdentities));
}
protected override void Importing(ContentPart part, TaxonomyField field, ImportContentContext context) {
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyNavigationPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyNavigationPartDriver.cs
index 2e94695b4..58bf62dc9 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyNavigationPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyNavigationPartDriver.cs
@@ -101,6 +101,11 @@ namespace Orchard.Taxonomies.Drivers {
}
protected override void Importing(TaxonomyNavigationPart part, ImportContentContext context) {
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
+ }
+
part.DisplayContentCount = Boolean.Parse(context.Attribute(part.PartDefinition.Name, "DisplayContentCount"));
part.DisplayRootTerm = Boolean.Parse(context.Attribute(part.PartDefinition.Name, "DisplayRootTerm"));
part.HideEmptyTerms = Boolean.Parse(context.Attribute(part.PartDefinition.Name, "HideEmptyTerms"));
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyPartDriver.cs
index 017664b74..e796aa789 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyPartDriver.cs
@@ -65,6 +65,11 @@ namespace Orchard.Taxonomies.Drivers {
}
protected override void Importing(TaxonomyPart part, ImportContentContext context) {
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
+ }
+
part.TermTypeName = context.Attribute(part.PartDefinition.Name, "TermTypeName");
}
}
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs
index 10440230b..c99b638a6 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs
@@ -126,6 +126,11 @@ namespace Orchard.Taxonomies.Drivers {
}
protected override void Importing(TermPart part, ImportContentContext context) {
+ // Don't do anything if the tag is not specified.
+ if (context.Data.Element(part.PartDefinition.Name) == null) {
+ return;
+ }
+
part.Count = Int32.Parse(context.Attribute(part.PartDefinition.Name, "Count"));
part.Selectable = Boolean.Parse(context.Attribute(part.PartDefinition.Name, "Selectable"));
part.Weight = Int32.Parse(context.Attribute(part.PartDefinition.Name, "Weight"));
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Module.txt b/src/Orchard.Web/Modules/Orchard.Taxonomies/Module.txt
index bf7079a4e..294a899c6 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Module.txt
@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
-Version: 1.9.1
+Version: 1.9.2
OrchardVersion: 1.9
Description: The taxonomy module is providing custom categorization of arbitrary content types.
Features:
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj b/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
index 28d48a98d..b3725af1a 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
@@ -50,6 +50,9 @@
+
+ ..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll
+ 3.5
@@ -59,6 +62,10 @@
+
+ False
+ ..\..\..\..\lib\aspnetwebapi\System.Web.Http.dll
+ False..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll
@@ -72,6 +79,8 @@
+
+
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Properties/AssemblyInfo.cs
index 2e45f4835..92f4e3d3d 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Scripts/admin-taxonomy-tags.js b/src/Orchard.Web/Modules/Orchard.Taxonomies/Scripts/admin-taxonomy-tags.js
index 26518b153..95033e84b 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Scripts/admin-taxonomy-tags.js
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Scripts/admin-taxonomy-tags.js
@@ -2,49 +2,24 @@
/* Helper functions
**********************************************************************/
- var addTag = function ($plugin, label) {
- $plugin.tagit("add", label);
- };
-
- var removeTag = function ($plugin, label) {
- var tags = $plugin.tagit("tags");
- var index = findTagIndexByLabel(tags, label);
-
- if (index == -1)
- return;
-
- tags.splice(index, 1);
- $plugin.tagit("fill", tags);
- };
-
- var findTagIndexByLabel = function (tags, label) {
- for (var i = 0; i < tags.length; i++) {
- var tag = tags[i];
-
- if (tag.label == label) {
- return i;
- }
- }
- return -1;
- };
-
var createTermCheckbox = function ($wrapper, tag) {
var $ul = $("ul.terms", $wrapper);
var singleChoice = $(".terms-editor", $wrapper).data("singlechoice");
var namePrefix = $wrapper.data("name-prefix");
var idPrefix = $wrapper.data("id-prefix");
var nextIndex = $("li", $ul).length;
+ var id = isNaN(tag.value) ? -nextIndex : tag.value;
var checkboxId = idPrefix + "_Terms_" + nextIndex + "__IsChecked";
var checkboxName = namePrefix + ".Terms[" + nextIndex + "].IsChecked";
var radioName = namePrefix + ".SingleTermId";
- var checkboxHtml = "";
- var radioHtml = "";
+ var checkboxHtml = "";
+ var radioHtml = "";
var inputHtml = singleChoice ? radioHtml : checkboxHtml;
var $li = $("