Merge branch '1.8.x' into 1.x

src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/Media/AzureBlobStorageProvider.cs

@@ -23,6 +23,10 @@ namespace Orchard.Azure.Services.FileSystems.Media {
 
         public bool TrySaveStream(string path, Stream inputStream) {
             try {
+                if (FileExists(path)) {
+                    return false;
+                }
+
                 SaveStream(path, inputStream);
             }
             catch {

src/Orchard.Web/Modules/Orchard.MultiTenancy/Scripts/multi-tenancy.admin.js

@@ -1,5 +1,9 @@
 (function ($) {
     $(function () {
+        $(".available-extensions")
+            .find("label")
+            .expandoControl(function (controller) { return controller.next("div"); }, { collapse: false, remember: true });
+
         $(".select-all").click(function () {
             var $checkbox = $(this);
             var $allCheckboxes = $checkbox.closest("ol").find(":checkbox");

src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.cshtml

@@ -4,6 +4,7 @@
     Layout.Title = T("Add New Tenant").ToString();
 
     Script.Require("jQuery").AtFoot();
+    Script.Include(Url.Content("~/Themes/TheAdmin/Scripts/admin.js")).AtFoot();
     Script.Include("multi-tenancy.admin.js").AtFoot();
 }
 
@@ -54,9 +55,9 @@
         </div>
     </fieldset>
     
-    <fieldset>
+    <fieldset class="available-extensions">
+        <label for="@Html.FieldIdFor(m => m.Themes)">@T("Available Themes")</label>
         <div>
-            <label for="@Html.FieldIdFor(m => m.Themes)">@T("Available Themes")</label>
             <span class="hint">@T("Select the Themes which should be available for this tenant. If none is selected, they will all be available.")</span>
             
             <ol>
@@ -81,9 +82,9 @@
         </div>  
     </fieldset>
     
-    <fieldset>
+   <fieldset class="available-extensions">
+        <label for="@Html.FieldIdFor(m => m.Modules)">@T("Available Modules")</label>
         <div>
-            <label for="@Html.FieldIdFor(m => m.Modules)">@T("Available Modules")</label>
             <span class="hint">@T("Select the Modules which should be available for this tenant. If none is selected, they will all be available.")</span>
 
             <ol>

src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml

@@ -5,6 +5,7 @@
     Layout.Title = T("Edit Tenant").ToString();
 
     Script.Require("jQuery").AtFoot();
+    Script.Include(Url.Content("~/Themes/TheAdmin/Scripts/admin.js")).AtFoot();
     Script.Include("multi-tenancy.admin.js").AtFoot();
 }
 
@@ -55,9 +56,9 @@
         </div>
     </fieldset>
     
-    <fieldset>
+    <fieldset class="available-extensions">
+        <label for="@Html.FieldIdFor(m => m.Themes)">@T("Available Themes")</label>
         <div>
-            <label for="@Html.FieldIdFor(m => m.Themes)">@T("Available Themes")</label>
             <span class="hint">@T("Select the Themes which should be available for this tenant. If none is selected, they will all be available.")</span>
             
             <ol>
@@ -82,9 +83,9 @@
         </div>  
     </fieldset>
     
-   <fieldset>
+   <fieldset class="available-extensions">
+        <label for="@Html.FieldIdFor(m => m.Modules)">@T("Available Modules")</label>
         <div>
-            <label for="@Html.FieldIdFor(m => m.Modules)">@T("Available Modules")</label>
             <span class="hint">@T("Select the Modules which should be available for this tenant. If none is selected, they will all be available.")</span>
 
             <ol>

src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs

@@ -298,6 +298,10 @@ namespace Orchard.FileSystems.Media {
         /// <returns>True if success; False otherwise.</returns>
         public bool TrySaveStream(string path, Stream inputStream) {
             try {
+                if (FileExists(path)) {
+                    return false;
+                }
+
                 SaveStream(path, inputStream);
             }
             catch {