Making all of the admin menu (imageset) stylesheets' filenames end with -admin.

--HG--
branch : dev
rename : src/Orchard.Web/Core/Contents/Styles/menu.content.css => src/Orchard.Web/Core/Contents/Styles/menu.content-admin.css
rename : src/Orchard.Web/Core/Dashboard/styles/menu.dashboard.css => src/Orchard.Web/Core/Dashboard/styles/menu.dashboard-admin.css
rename : src/Orchard.Web/Core/Navigation/Styles/menu.navigation.css => src/Orchard.Web/Core/Navigation/Styles/menu.navigation-admin.css
rename : src/Orchard.Web/Core/Reports/Styles/menu.reports.css => src/Orchard.Web/Core/Reports/Styles/menu.reports-admin.css
rename : src/Orchard.Web/Core/Settings/Styles/menu.settings.css => src/Orchard.Web/Core/Settings/Styles/menu.settings-admin.css
rename : src/Orchard.Web/Modules/Orchard.Blogs/Styles/menu.blog.css => src/Orchard.Web/Modules/Orchard.Blogs/Styles/menu.blog-admin.css
rename : src/Orchard.Web/Modules/Orchard.Comments/Styles/menu.comments.css => src/Orchard.Web/Modules/Orchard.Comments/Styles/menu.comments-admin.css
rename : src/Orchard.Web/Modules/Orchard.Experimental/Styles/menu.experimental.css => src/Orchard.Web/Modules/Orchard.Experimental/Styles/menu.experimental-admin.css
rename : src/Orchard.Web/Modules/Orchard.Lists/Styles/menu.list.css => src/Orchard.Web/Modules/Orchard.Lists/Styles/menu.list-admin.css
rename : src/Orchard.Web/Modules/Orchard.Media/Styles/menu.media.css => src/Orchard.Web/Modules/Orchard.Media/Styles/menu.media-admin.css
rename : src/Orchard.Web/Modules/Orchard.Modules/styles/menu.modules.css => src/Orchard.Web/Modules/Orchard.Modules/styles/menu.modules-admin.css
rename : src/Orchard.Web/Modules/Orchard.Pages/Styles/menu.page.css => src/Orchard.Web/Modules/Orchard.Pages/Styles/menu.page-admin.css
rename : src/Orchard.Web/Modules/Orchard.Tags/Styles/menu.tags.css => src/Orchard.Web/Modules/Orchard.Tags/Styles/menu.tags-admin.css
rename : src/Orchard.Web/Modules/Orchard.Themes/Styles/menu.themes.css => src/Orchard.Web/Modules/Orchard.Themes/Styles/menu.themes-admin.css
rename : src/Orchard.Web/Modules/Orchard.Users/Styles/menu.users.css => src/Orchard.Web/Modules/Orchard.Users/Styles/menu.users-admin.css
rename : src/Orchard.Web/Modules/Orchard.Widgets/Styles/menu.widgets.css => src/Orchard.Web/Modules/Orchard.Widgets/Styles/menu.widgets-admin.css

src/Orchard.Web/Core/Orchard.Core.csproj

@@ -239,11 +239,11 @@
     <Content Include="Common\Views\CommonMetadataOwner.cshtml" />
     <Content Include="Containers\Module.txt" />
     <Content Include="Contents\Styles\images\menu.content.png" />
-    <Content Include="Contents\Styles\menu.content.css" />
+    <Content Include="Contents\Styles\menu.content-admin.css" />
     <Content Include="Contents\Views\Admin\Create.cshtml" />
     <Content Include="Contents\Views\Admin\Edit.cshtml" />
     <Content Include="Contents\Views\Admin\List.cshtml" />
-    <Content Include="Dashboard\styles\menu.dashboard.css" />
+    <Content Include="Dashboard\styles\menu.dashboard-admin.css" />
     <Content Include="Dashboard\styles\images\menu.dashboard.png" />
     <Content Include="Feeds\Views\Feed.cshtml" />
     <Content Include="Contents\Views\Parts.Contents.Publish.cshtml" />
@@ -254,10 +254,10 @@
     <Content Include="Contents\Module.txt" />
     <Content Include="Contents\Views\Admin\CreatableTypeList.cshtml" />
     <Content Include="Navigation\Styles\images\menu.navigation.png" />
-    <Content Include="Navigation\Styles\menu.navigation.css" />
+    <Content Include="Navigation\Styles\menu.navigation-admin.css" />
     <Content Include="Reports\Module.txt" />
     <Content Include="Reports\Styles\images\menu.reports.png" />
-    <Content Include="Reports\Styles\menu.reports.css" />
+    <Content Include="Reports\Styles\menu.reports-admin.css" />
     <Content Include="Reports\Views\Admin\Display.cshtml" />
     <Content Include="Reports\Views\Admin\Index.cshtml" />
     <Content Include="Routable\Module.txt" />
@@ -266,7 +266,7 @@
     <Content Include="Settings\Module.txt" />
     <Content Include="Settings\Styles\admin.css" />
     <Content Include="Settings\Styles\images\menu.settings.png" />
-    <Content Include="Settings\Styles\menu.settings.css" />
+    <Content Include="Settings\Styles\menu.settings-admin.css" />
     <Content Include="Settings\Views\Admin\Index.cshtml" />
     <Content Include="Settings\Views\Admin\Culture.cshtml" />
     <Content Include="Contents\Views\Content.Edit.cshtml" />

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

@@ -108,7 +108,7 @@
     <Content Include="Module.txt" />
     <Content Include="Scripts\orchard-blogs-archives.js" />
     <Content Include="Styles\images\menu.blog.png" />
-    <Content Include="Styles\menu.blog.css" />
+    <Content Include="Styles\menu.blog-admin.css" />
     <Content Include="Styles\orchard-blogs-admin.css" />
     <Content Include="Styles\orchard-blogs-archives.css" />
     <Content Include="Views\BlogAdmin\Create.cshtml" />

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

@@ -99,7 +99,7 @@
   <ItemGroup>
     <Content Include="Module.txt" />
     <Content Include="Styles\images\menu.comments.png" />
-    <Content Include="Styles\menu.comments.css" />
+    <Content Include="Styles\menu.comments-admin.css" />
     <Content Include="Styles\orchard-comments-admin.css" />
     <Content Include="Views\Admin\Details.cshtml" />
     <Content Include="Views\Web.config" />

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

@@ -76,7 +76,7 @@
   <ItemGroup>
     <Content Include="Module.txt" />
     <Content Include="Styles\images\menu.experimental.png" />
-    <Content Include="Styles\menu.experimental.css" />
+    <Content Include="Styles\menu.experimental-admin.css" />
     <Content Include="Views\Commands\Execute.cshtml" />
     <Content Include="Views\Content\Details.cshtml" />
     <Content Include="Views\Content\Index.cshtml" />

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

@@ -65,7 +65,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Styles\images\menu.list.png" />
-    <Content Include="Styles\menu.list.css" />
+    <Content Include="Styles\menu.list-admin.css" />
     <Content Include="Views\Items\Content-List.SummaryAdmin.cshtml" />
   </ItemGroup>
   <ItemGroup>

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

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

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

@@ -73,7 +73,7 @@
     <Content Include="Styles\images\menu.modules.png" />
     <Content Include="Styles\images\new.gif" />
     <Content Include="Styles\images\update.gif" />
-    <Content Include="Styles\menu.modules.css" />
+    <Content Include="Styles\menu.modules-admin.css" />
     <Content Include="Views\Admin\Index.cshtml" />
   </ItemGroup>
   <ItemGroup>

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

@@ -56,7 +56,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Styles\menu.page.css" />
+    <Content Include="Styles\menu.page-admin.css" />
     <Content Include="Styles\images\menu.page.png" />
     <Content Include="web.config" />
   </ItemGroup>

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

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

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

@@ -76,7 +76,7 @@
     <Content Include="Styles\images\menu.themes.png" />
     <Content Include="Styles\images\new.gif" />
     <Content Include="Styles\images\update.gif" />
-    <Content Include="Styles\menu.themes.css" />
+    <Content Include="Styles\menu.themes-admin.css" />
     <Content Include="Styles\orchard-themes-admin.css" />
     <Content Include="Views\Admin\Index.cshtml" />
     <Content Include="Views\ThemePreview.cshtml" />

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

@@ -84,7 +84,7 @@
     <Content Include="Content\Admin\images\online.gif" />
     <Content Include="Module.txt" />
     <Content Include="Styles\images\menu.users.png" />
-    <Content Include="Styles\menu.users.css" />
+    <Content Include="Styles\menu.users-admin.css" />
     <Content Include="Views\Account\ChangePassword.cshtml" />
     <Content Include="Views\Account\ChangePasswordSuccess.cshtml" />
     <Content Include="Views\Account\AccessDenied.cshtml" />

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

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

src/Orchard/Mvc/ViewEngines/Razor/WebViewPage.cs

@@ -49,7 +49,12 @@ namespace Orchard.Mvc.ViewEngines.Razor {
         }
 
         public void RegisterImageSet(string imageSet, string style = "", int size = 16) {
-            Style.Include(imageSet + ".css");
+            // hack to fake the style "alternate" for now so we don't have to change stylesheet names when this is hooked up
+            // todo: (heskew) deal in shapes so we have real alternates 
+            var imageSetStylesheet = !string.IsNullOrWhiteSpace(style)
+                ? string.Format("{0}-{1}.css", imageSet, style)
+                : string.Format("{0}.css", imageSet);
+            Style.Include(imageSetStylesheet);
         }
 
         public virtual void RegisterLink(LinkEntry link) {