Merge branch 'master' into 1.9.x

src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj

@@ -561,6 +561,23 @@
   <Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
     <AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
   </Target>
+  <Target Name="DeleteDebugFiles" AfterTargets="AfterBuild">
+    <RemoveDir Directories="Themes;Core;Modules" />
+  </Target>
+  <Target Name="CopyDebugFiles" AfterTargets="DeleteDebugFiles" Condition="'$(Configuration)' == 'Debug'">
+    <PropertyGroup>
+      <SrcFolder>..\..</SrcFolder>
+    </PropertyGroup>
+    <ItemGroup>
+      <Excluded Include="$(SrcFolder)\**\bin\**\*;$(SrcFolder)\**\obj\**\*;$(SrcFolder)\**\*.user;$(SrcFolder)\**\*.cs;$(SrcFolder)\**\*.csproj;$(SrcFolder)\**\.hg\**\*" />
+      <Src-Themes Include="$(SrcFolder)\Orchard.Web\Themes\**\*" Exclude="@(Excluded)" />
+      <Src-Core Include="$(SrcFolder)\Orchard.Web\Core\**\*" Exclude="@(Excluded)" />
+      <Src-Modules Include="$(SrcFolder)\Orchard.Web\Modules\**\*" Exclude="@(Excluded)" />
+    </ItemGroup>
+    <Copy SourceFiles="@(Src-Themes)" DestinationFolder="Themes\%(RecursiveDir)" />
+    <Copy SourceFiles="@(Src-Core)" DestinationFolder="Core\%(RecursiveDir)" />
+    <Copy SourceFiles="@(Src-Modules)" DestinationFolder="Modules\%(RecursiveDir)" />
+  </Target>
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -580,6 +597,11 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
+  <PropertyGroup>
+    <PreBuildEvent>del "$(TargetDir)\Modules"
+del "$(TargetDir)\Themes"
+del "$(TargetDir)\Media"</PreBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 		 Other similar extension points exist, see Microsoft.Common.targets.
 	<Target Name="BeforeBuild">

src/Orchard.Azure/Orchard.Azure.Web/Web.config

@@ -192,7 +192,7 @@
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-5.0.2.0" newVersion="5.0.2.0"/>
             </dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/>

src/Orchard.Specs/Hosting/Orchard.Web/Web.config

@@ -203,7 +203,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.0.2.0" newVersion="5.0.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/>

src/Orchard.Specs/Hosting/Simple.Web/Web.config

@@ -199,7 +199,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.0.2.0" newVersion="5.0.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/>

src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config

@@ -73,7 +73,7 @@
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-+               <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-5.0.2.0" newVersion="5.0.2.0"/>
             </dependentAssembly>
         </assemblyBinding>
     </runtime>

src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/AzureFileSystem.cs

@@ -355,7 +355,7 @@ namespace Orchard.Azure.Services.FileSystems {
                 // as opposed to the File System implementation, if nothing is done on the stream
                 // the file will be emptied, because Azure doesn't implement FileMode.Truncate
                 _blob.DeleteIfExists();
-                _blob = _blob.Container.GetBlockBlobReference(_blob.Uri.ToString());
+                _blob = _blob.Container.GetBlockBlobReference(_blob.Name);
                 _blob.UploadFromStream(new MemoryStream(new byte[0]));
                 return OpenWrite();
             }

src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs

@@ -237,7 +237,10 @@ namespace Orchard.Indexing.Services {
                                 // skip items from types which are not indexed
                                 var settings = GetTypeIndexingSettings(item.ContentItem);
                                 if (settings.List.Contains(indexName)) {
-                                    documentIndex = ExtractDocumentIndex(item.ContentItem);
+                                    if (item.ContentItem.HasPublished()) {
+                                        var published = _contentManager.Get(item.Id, VersionOptions.Published);
+                                        documentIndex = ExtractDocumentIndex(published);
+                                    }
                                 }
                                 else if (settings.List.Contains(indexName + ":latest")) {
                                     var latest = _contentManager.Get(item.Id, VersionOptions.Latest);

src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/AdminController.cs

@@ -156,10 +156,10 @@ namespace Orchard.MediaLibrary.Controllers {
             if (!Services.Authorizer.Authorize(Permissions.ManageOwnMedia, T("Cannot view media")))
                 return new HttpUnauthorizedResult();
 
-            var rootMediaFolder = _mediaLibraryService.GetRootMediaFolder().MediaPath;
+            var rootMediaFolder = _mediaLibraryService.GetRootMediaFolder();
-
+            var rootMediaFolderPath = rootMediaFolder == null ? null : rootMediaFolder.MediaPath;
-            var mediaParts = _mediaLibraryService.GetMediaContentItems(rootMediaFolder, skip, count, order, mediaType);
+            var mediaParts = _mediaLibraryService.GetMediaContentItems(rootMediaFolderPath, skip, count, order, mediaType);
-            var mediaPartsCount = _mediaLibraryService.GetMediaContentItemsCount(rootMediaFolder, mediaType);
+            var mediaPartsCount = _mediaLibraryService.GetMediaContentItemsCount(rootMediaFolderPath, mediaType);
 
 
             var mediaItems = mediaParts.Select(x => new MediaManagerMediaItemViewModel {

src/Orchard.Web/Modules/Orchard.MediaLibrary/Permissions.cs

@@ -31,7 +31,7 @@ namespace Orchard.MediaLibrary {
                 },
                 new PermissionStereotype {
                     Name = "Author",
-                    Permissions = new[] {ManageMediaContent}
+                    Permissions = new[] {ManageOwnMedia}
                 },
                 new PermissionStereotype {
                     Name = "Contributor",

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

@@ -71,8 +71,11 @@ $(function () {
 
         var listWidth = $('#media-library-main-list').width();
         var listHeight = $('#media-library-main-list').height();
-        var itemWidth = $('.thumbnail').first().width();
+        var itemWidth = $('#media-library-main-list li').first().width();
-        var itemHeight = $('.thumbnail').first().height();
+        var itemHeight = $('#media-library-main-list li').first().height();
+        var defaultDimension = $(window).width() < 1420 ? 120 : 200;
+        if (itemHeight == 0 || itemHeight == null) itemHeight = defaultDimension;
+        if (itemWidth == 0 || itemWidth == null) itemWidth = defaultDimension;
         var draftText = $("#media-library").data("draft-text");
 
         var itemsPerRow = Math.floor(listWidth / itemWidth);

src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-medialibrary-admin.css

@@ -1,4 +1,4 @@
-.zone-content, #content, #main, #layout-content, #layout-main {
+.zone-content, #content, #main, #layout-content, #layout-main {
     height: 100%;
     display: block;
     min-height: 400px;
@@ -155,6 +155,10 @@
             background-position: center;
         }
 
+        #media-library-main-list.pending li {
+            opacity:.3;
+        }
+
     /* Remove the space for the editor, and the scrollbar in the import page */
     #media-library-import #media-library-main-list {
         overflow-y: hidden;

src/Orchard.Web/Modules/Orchard.Search/Migrations.cs

@@ -69,10 +69,6 @@ namespace Orchard.Search {
 
         public int Create() {
             
-            _indexManager.GetSearchIndexProvider().CreateIndex("Admin");
-
-            ContentDefinitionManager.AlterTypeDefinition("Page", cfg => cfg.WithSetting("TypeIndexing.Indexes", "Page:latest"));
-
             return 1;
         }
     }

src/Orchard.Web/Web.config

@@ -185,7 +185,7 @@
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-5.0.2.0" newVersion="5.0.2.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/>