#16792: Resources should follow a [module name]-[resource name].[file extension] naming convention.

--HG--
branch : dev

src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj

@@ -60,7 +60,7 @@
   <ItemGroup>
     <Content Include="Content\Admin\images\scheduled.gif" />
     <Content Include="Module.txt" />
-    <Content Include="Styles\datetime.css" />
+    <Content Include="Styles\orchard-archivelater-datetime.css" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\Web.config" />

src/Orchard.Web/Modules/Orchard.ArchiveLater/ResourceManifest.cs

@@ -7,7 +7,7 @@ using Orchard.UI.Resources;
 namespace Orchard.ArchiveLater {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("ArchiveLater_DatePicker").SetUrl("datetime.css");
+            builder.Add().DefineStyle("ArchiveLater_DatePicker").SetUrl("orchard-archivelater-datetime.css");
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj

@@ -103,9 +103,9 @@
     <Content Include="Content\Admin\images\published.gif" />
     <Content Include="Content\Admin\images\scheduled.gif" />
     <Content Include="Module.txt" />
-    <Content Include="Scripts\archives.js" />
-    <Content Include="Styles\admin.css" />
-    <Content Include="Styles\archives.css" />
+    <Content Include="Scripts\orchard-blogs-archives.js" />
+    <Content Include="Styles\orchard-blogs-admin.css" />
+    <Content Include="Styles\orchard-blogs-archives.css" />
     <Content Include="Views\BlogAdmin\Create.cshtml" />
     <Content Include="Views\BlogAdmin\Edit.cshtml" />
     <Content Include="Views\BlogAdmin\Item.cshtml" />

src/Orchard.Web/Modules/Orchard.Blogs/ResourceManifest.cs

@@ -4,10 +4,10 @@ namespace Orchard.Blogs {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
             var manifest = builder.Add();
-            manifest.DefineStyle("BlogsAdmin").SetUrl("admin.css");
-            manifest.DefineStyle("BlogsArchives").SetUrl("archives.css");
+            manifest.DefineStyle("BlogsAdmin").SetUrl("orchard-blogs-admin.css");
+            manifest.DefineStyle("BlogsArchives").SetUrl("orchard-blogs-archives.css");
 
-            manifest.DefineScript("BlogsArchives").SetUrl("archives.js").SetDependencies("jQuery");
+            manifest.DefineScript("BlogsArchives").SetUrl("orchard-blogs-archives.js").SetDependencies("jQuery");
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj

@@ -65,6 +65,7 @@
     <Compile Include="Drivers\CommentsContainerPartDriver.cs" />
     <Compile Include="Drivers\CommentSettingsPartDriver.cs" />
     <Compile Include="Drivers\CommentsPartDriver.cs" />
+    <Compile Include="ResourceManifest.cs" />
     <Compile Include="Shapes.cs" />
     <Compile Include="Models\ClosedCommentsRecord.cs" />
     <Compile Include="Models\CommentPart.cs" />
@@ -97,7 +98,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-comments-admin.css" />
     <Content Include="Views\Admin\Details.cshtml" />
     <Content Include="Views\Web.config" />
   </ItemGroup>

src/Orchard.Web/Modules/Orchard.Comments/ResourceManifest.cs

@@ -0,0 +1,10 @@
+using Orchard.UI.Resources;
+
+namespace Orchard.Comments {
+    public class ResourceManifest : IResourceManifestProvider {
+        public void BuildManifests(ResourceManifestBuilder builder) {
+            var manifest = builder.Add();
+            manifest.DefineStyle("Admin").SetUrl("orchard-comments-admin.css");
+        }
+    }
+}

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

@@ -11,7 +11,7 @@
         </div>
         <div>
             <label for="Email">@T("Email")</label>
-            <input id="Email" class="text" name="Email" type="text" value="@Model.Email" />				
+            <input id="Email" class="text" name="Email" type="text" value="@Model.Email" />
         </div>
         <div>
             <label for="SiteName">@T("Url")</label>

src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml

@@ -4,7 +4,7 @@
 @using Orchard.Mvc.Html;
 @using Orchard.Utility.Extensions;
 @{
-    Style.Include("admin.css");
+    Style.Require("Admin");
     Script.Require("ShapesBase");
 }
 <h1>@Html.TitleForPage(T("Manage Comments").ToString())</h1>

src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj

@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-contenttypes-admin.css" />
     <Content Include="Views\Admin\AddFieldTo.cshtml" />
     <Content Include="Views\Admin\AddPartsTo.cshtml" />
     <Content Include="Views\Admin\CreatePart.cshtml" />

src/Orchard.Web/Modules/Orchard.ContentTypes/ResourceManifest.cs

@@ -7,7 +7,7 @@ using Orchard.UI.Resources;
 namespace Orchard.ContentTypes {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("ContentTypesAdmin").SetUrl("admin.css");
+            builder.Add().DefineStyle("ContentTypesAdmin").SetUrl("orchard-contenttypes-admin.css");
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj

@@ -61,8 +61,8 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
-    <Content Include="Styles\base.css" />
+    <Content Include="Styles\orchard-localization-admin.css" />
+    <Content Include="Styles\orchard-localization-base.css" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Styles\Web.config">

src/Orchard.Web/Modules/Orchard.Localization/ResourceManifest.cs

@@ -4,8 +4,8 @@ namespace Orchard.Localization {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
             var manifest = builder.Add();
-            manifest.DefineStyle("Localization").SetUrl("base.css");
-            manifest.DefineStyle("LocalizationAdmin").SetUrl("admin.css");
+            manifest.DefineStyle("Localization").SetUrl("orchard-localization-base.css");
+            manifest.DefineStyle("LocalizationAdmin").SetUrl("orchard-localization-admin.css");
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj

@@ -81,7 +81,7 @@
   <ItemGroup>
     <Content Include="Content\Admin\images\folder.gif" />
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-media-admin.css" />
     <Content Include="Content\Site.css" />
     <Content Include="Views\Web.config" />
   </ItemGroup>

src/Orchard.Web/Modules/Orchard.Media/ResourceManifest.cs

@@ -1,11 +1,9 @@
-using Orchard.Localization;
-using Orchard.UI.Navigation;
-using Orchard.UI.Resources;
+using Orchard.UI.Resources;
 
 namespace Orchard.Media {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("MediaAdmin").SetUrl("admin.css");
+            builder.Add().DefineStyle("MediaAdmin").SetUrl("orchard-media-admin.css");
         }
     }
 }

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

@@ -83,7 +83,7 @@
   <ItemGroup>
     <Content Include="Content\Admin\images\disabled.gif" />
     <Content Include="Content\Admin\images\enabled.gif" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-modules-admin.css" />
     <Content Include="Views\Admin\Features.cshtml" />
     <Content Include="Views\Web.config" />
   </ItemGroup>

src/Orchard.Web/Modules/Orchard.Modules/ResourceManifest.cs

@@ -7,7 +7,7 @@ using Orchard.UI.Resources;
 namespace Orchard.Modules {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("ModulesAdmin").SetUrl("admin.css");
+            builder.Add().DefineStyle("ModulesAdmin").SetUrl("orchard-modules-admin.css");
         }
     }
 }

src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj

@@ -70,7 +70,7 @@
     <Content Include="Content\Admin\images\disabled.gif" />
     <Content Include="Content\Admin\images\enabled.gif" />
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-multitenancy-admin.css" />
     <Content Include="Views\Admin\Add.cshtml" />
     <Content Include="Views\Admin\Edit.cshtml" />
     <Content Include="Views\Admin\DisplayTemplates\ActionsForUninitialized.cshtml" />

src/Orchard.Web/Modules/Orchard.MultiTenancy/ResourceManifest.cs

@@ -1,13 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Orchard.UI.Resources;
 
 namespace Orchard.MultiTenancy {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("MultiTenancyAdmin").SetUrl("admin.css");
+            builder.Add().DefineStyle("MultiTenancyAdmin").SetUrl("orchard-multitenancy-admin.css");
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj

@@ -87,7 +87,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-packaging-admin.css" />
     <Content Include="Views\Gallery\AddSource.cshtml" />
     <Content Include="Views\Gallery\Modules.cshtml" />
     <Content Include="Views\Gallery\Sources.cshtml" />

src/Orchard.Web/Modules/Orchard.Packaging/ResourceManifest.cs

@@ -5,7 +5,7 @@ namespace Orchard.Packaging {
     [OrchardFeature("Gallery")]
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("PackagingAdmin").SetUrl("admin.css");
+            builder.Add().DefineStyle("PackagingAdmin").SetUrl("orchard-packaging-admin.css");
         }
     }
 }

src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj

@@ -83,7 +83,7 @@
     <Content Include="Content\Admin\images\published.gif" />
     <Content Include="Content\Admin\images\scheduled.gif" />
     <Content Include="Module.txt" />
-    <Content Include="Styles\datetime.css" />
+    <Content Include="Styles\orchard-publishlater-datetime.css" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\EditorTemplates\Parts\PublishLater.cshtml" />

src/Orchard.Web/Modules/Orchard.PublishLater/ResourceManifest.cs

@@ -7,7 +7,7 @@ using Orchard.UI.Resources;
 namespace Orchard.PublishLater {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("PublishLater_DatePicker").SetUrl("datetime.css");
+            builder.Add().DefineStyle("PublishLater_DatePicker").SetUrl("orchard-publishlater-datetime.css");
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj

@@ -70,8 +70,8 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
-    <Content Include="Styles\search.css" />
+    <Content Include="Styles\orchard-search-admin.css" />
+    <Content Include="Styles\orchard-search-search.css" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>

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

@@ -7,8 +7,8 @@ using Orchard.UI.Resources;
 namespace Orchard.Search {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("SearchAdmin").SetUrl("admin.css"); // todo: this does not appear to be used anywhere
-            builder.Add().DefineStyle("Search").SetUrl("search.css");
+            builder.Add().DefineStyle("SearchAdmin").SetUrl("orchard-search-admin.css"); // todo: this does not appear to be used anywhere
+            builder.Add().DefineStyle("Search").SetUrl("orchard-search-search.css");
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj

@@ -77,7 +77,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-tags-admin.css" />
     <Content Include="Views\Web.config" />
     <Content Include="Views\Admin\Edit.cshtml" />
     <Content Include="Views\Admin\Index.cshtml" />

src/Orchard.Web/Modules/Orchard.Tags/ResourceManifest.cs

@@ -3,7 +3,7 @@ using Orchard.UI.Resources;
 namespace Orchard.Tags {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("TagsAdmin").SetUrl("admin.css");
+            builder.Add().DefineStyle("TagsAdmin").SetUrl("orchard-tags-admin.css");
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj

@@ -69,7 +69,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\orchard.ico" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-themes-admin.css" />
     <Content Include="Views\Admin\Index.cshtml" />
     <Content Include="Views\Admin\Install.cshtml" />
     <Content Include="Views\ThemePreview.cshtml" />

src/Orchard.Web/Modules/Orchard.Themes/ResourceManifest.cs

@@ -5,7 +5,7 @@ namespace Orchard.Themes {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
             var manifest = builder.Add();
-            manifest.DefineStyle("ThemesAdmin").SetUrl("admin.css");
+            manifest.DefineStyle("ThemesAdmin").SetUrl("orchard-themes-admin.css");
 
             // todo: include and define the min.js version too
             // todo: move EasySlider to common location, although it does not appear to be used anywhere right now

src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj

@@ -82,7 +82,7 @@
     <Content Include="Content\Admin\images\moveup.gif" />
     <Content Include="Content\Admin\images\movedown.gif" />
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-widgets-admin.css" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>

src/Orchard.Web/Modules/Orchard.Widgets/ResourceManifest.cs

@@ -3,7 +3,7 @@
 namespace Orchard.Widgets {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("WidgetsAdmin").SetUrl("admin.css");
+            builder.Add().DefineStyle("WidgetsAdmin").SetUrl("orchard-widgets-admin.css");
         }
     }
 }