Merge branch '1.10.x' into dev.

src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj

@@ -130,10 +130,6 @@
       <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
       <Name>Orchard.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Orchard.JobsQueue\Orchard.JobsQueue.csproj">
-      <Project>{085948ff-0e9b-4a9a-b564-f8b8b4bdddbc}</Project>
-      <Name>Orchard.JobsQueue</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\Admin\Index.cshtml" />

src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/LayoutEditor/Services/ScopeConfigurator.js

@@ -47,7 +47,7 @@
                             handled = true;
                         }
 
-                        if (element.type == "Content") { // This is a content element.
+                        if (!!element.hasEditor) { // This element has an editor dialog.
                             if (!e.ctrlKey && !e.shiftKey && !e.altKey && e.which == 13) { // Enter
                                 $element.find(".layout-panel-action-edit").first().click();
                                 handled = true;

src/Orchard.Web/Modules/Orchard.Layouts/Assets/Less/LayoutEditor/Reset.less

@@ -144,7 +144,7 @@
         content: close-quote;
     }
 
-    br {
+    br::before {
         content: '\A';
         white-space: pre;
     }

src/Orchard.Web/Modules/Orchard.Layouts/Elements/Snippet.cs

@@ -1,5 +1,6 @@
 using Orchard.Environment.Extensions;
 using Orchard.Layouts.Framework.Elements;
+using Orchard.Localization;
 
 namespace Orchard.Layouts.Elements {
     [OrchardFeature("Orchard.Layouts.Snippets")]
@@ -15,5 +16,9 @@ namespace Orchard.Layouts.Elements {
         public override bool HasEditor {
             get { return false; }
         }
+
+        public override string ToolboxIcon {
+            get { return "\uf10c"; }
+        }
     }
 }

src/Orchard.Web/Modules/Orchard.Layouts/Providers/SnippetElementHarvester.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using Orchard.DisplayManagement;
 using Orchard.DisplayManagement.Descriptors;
 using Orchard.Environment;
@@ -63,13 +64,17 @@ namespace Orchard.Layouts.Providers {
             var snippetElement = (Snippet)_elementFactory.Value.Activate(elementType);
 
             foreach (var shapeDescriptor in shapeDescriptors) {
+                var snippetManifest = ParseSnippetManifest(shapeDescriptor.Value.BindingSource);
                 var shapeType = shapeDescriptor.Value.ShapeType;
-                var elementName = GetDisplayName(shapeDescriptor.Value.BindingSource);
+                var elementName = GetDisplayName(snippetManifest, shapeDescriptor.Value.BindingSource);
+                var toolboxIcon = GetToolboxIcon(snippetManifest, snippetElement);
+                var description = GetDescription(snippetManifest, shapeType);
+                var category = GetCategory(snippetManifest, snippetElement);
                 var closureDescriptor = shapeDescriptor;
-                var snippetDescriptor = ParseSnippetDescriptor(shapeDescriptor.Value.BindingSource);
-                yield return new ElementDescriptor(elementType, shapeType, new LocalizedString(elementName), new LocalizedString(String.Format("An element that renders the {0} shape.", shapeType)), snippetElement.Category) {
+                var snippetDescriptor = ParseSnippetDescriptor(snippetManifest);
+                yield return new ElementDescriptor(elementType, shapeType, new LocalizedString(elementName), description, category) {
                     Displaying = displayContext => Displaying(displayContext, closureDescriptor.Value, snippetDescriptor),
-                    ToolboxIcon = "\uf10c",
+                    ToolboxIcon = toolboxIcon,
                     EnableEditorDialog = snippetDescriptor != null || HasSnippetFields(shapeDescriptor.Value),
                     Editor = ctx => Editor(snippetDescriptor ?? DescribeSnippet(shapeType, snippetElement), ctx),
                     UpdateEditor = ctx => UpdateEditor(snippetDescriptor ?? DescribeSnippet(shapeType, snippetElement), ctx)
@@ -132,13 +137,7 @@ namespace Orchard.Layouts.Providers {
             context.ElementShape.Snippet = shape;
         }
 
-        private string GetDisplayName(string bindingSource) {
-            var fileName = Path.GetFileNameWithoutExtension(bindingSource) ?? "";
-            var lastIndex = fileName.IndexOf(SnippetShapeSuffix, StringComparison.OrdinalIgnoreCase);
-            return fileName.Substring(0, lastIndex).CamelFriendly();
-        }
-
-        private SnippetDescriptor ParseSnippetDescriptor(string bindingSource) {
+        private dynamic ParseSnippetManifest(string bindingSource) {
             var physicalSourcePath = _wca.GetContext().HttpContext.Server.MapPath(bindingSource);
             var paramsFileName = Path.Combine(Path.GetDirectoryName(physicalSourcePath) ?? "", Path.GetFileNameWithoutExtension(physicalSourcePath) + ".txt");
 
@@ -147,7 +146,50 @@ namespace Orchard.Layouts.Providers {
 
             var yaml = File.ReadAllText(paramsFileName);
             var snippetConfig = Deserialize(yaml);
-            var fieldsConfig = snippetConfig.Fields != null ? snippetConfig.Fields.Children : new dynamic[0];
+
+            return snippetConfig;
+        }
+
+        private string GetDisplayName(dynamic snippetManifest, string bindingSource) {
+            if (snippetManifest != null && (string)snippetManifest.DisplayName != null) {
+                return (string)snippetManifest.DisplayName;
+            }
+
+            var fileName = Path.GetFileNameWithoutExtension(bindingSource) ?? "";
+            var lastIndex = fileName.IndexOf(SnippetShapeSuffix, StringComparison.OrdinalIgnoreCase);
+            return fileName.Substring(0, lastIndex).CamelFriendly();
+        }
+
+        private string GetToolboxIcon(dynamic snippetManifest, Snippet snippetElement) {
+            if (snippetManifest != null && (string)snippetManifest.ToolboxIcon != null) {
+                return Regex.Unescape((string)snippetManifest.ToolboxIcon);
+            }
+
+            return snippetElement.ToolboxIcon;
+        }
+
+        private LocalizedString GetDescription(dynamic snippetManifest, string shapeType) {
+            if (snippetManifest != null && (string)snippetManifest.Description != null) {
+                return new LocalizedString((string)snippetManifest.Description);
+            }
+
+            return new LocalizedString(String.Format("An element that renders the {0} shape.", shapeType));
+        }
+
+        private string GetCategory(dynamic snippetManifest, Snippet snippetElement) {
+            if (snippetManifest != null && (string)snippetManifest.Category != null) {
+                return (string)snippetManifest.Category;
+            }
+
+            return snippetElement.Category;
+        }
+
+        private SnippetDescriptor ParseSnippetDescriptor(dynamic snippetManifest) {
+            if(snippetManifest == null || snippetManifest.Fields.Count == 0) {
+                return null;
+            }
+
+            var fieldsConfig = snippetManifest.Fields.Children;
             var descriptor = new SnippetDescriptor();
 
             foreach (var fieldConfig in fieldsConfig) {

src/Orchard.Web/Modules/Orchard.Layouts/Views/Element/Create.cshtml

@@ -1,6 +1,6 @@
 @model Orchard.Layouts.ViewModels.EditElementViewModel
 @{
 	ViewBag.Command = "add";
-	ViewBag.TitleFormat = "Add {0}";
+	ViewBag.TitleFormat = T("Add {0}").Text;
 }
 @Html.Partial("ElementEditor", Model, ViewData)

src/Orchard.Web/Modules/Orchard.Layouts/Views/Element/Edit.cshtml

@@ -1,6 +1,6 @@
 @model Orchard.Layouts.ViewModels.EditElementViewModel
 @{
     ViewBag.Command = "update";
-    ViewBag.TitleFormat = String.IsNullOrWhiteSpace(Model.ElementData) ? "Add {0}" : "Edit {0}";
+    ViewBag.TitleFormat = String.IsNullOrWhiteSpace(Model.ElementData) ? T("Add {0}").Text : T("Edit {0}").Text;
 }
 @Html.Partial("ElementEditor", Model, ViewData)

src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js

@@ -382,7 +382,7 @@ $(function () {
                         /* NTFS uses "\" as the directory separator, but AFS uses "/".
                            Since both of them are illegal characters for file and folder names, it's safe to determine the type of file storage
                            currently in use based on the directory separator character. */
-                        var separator = deepestChildPath.contains('/') ? '/' : '\\';
+                        var separator = deepestChildPath.indexOf('/') > -1 ? '/' : '\\';
 
                         var deepestChildPathBreadCrumbs = deepestChildPath.split(separator);
                         var currentBreadCrumbs = self.folderPath().split(separator);

src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt_

@@ -1,11 +0,0 @@
-name: MultiTenancy
-antiforgery: enabled
-author: The Orchard Team
-website: http://orchardproject.net
-version: 0.5.0
-orchardversion: 0.5.0
-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.
-features:
-    Orchard.MultiTenancy:
-        Description: Configure multiple site tenants.
-        Category: Hosting

src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js

@@ -19,6 +19,7 @@
             var description = $(this).find(":selected").data("recipe-description"); // reads the html attribute of the selected option
             $("#recipedescription").text(description); // make the contents of <div id="recipe-description"></div> be the escaped description string
         });
+        $("select.recipe").change(); // trigger at page load to bring in sync
         $(".data").find('input[name=DatabaseProvider]:checked').click();
     });
 })(jQuery);