From f5d35ca3aeb1335b6831fcd0508e1f90dede67a0 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Mon, 21 Feb 2011 13:40:32 -0800
Subject: [PATCH] Admin menu icons configured for page, list(s), comments, blog
 content plus an updated dashboard icon (8 bit)

--HG--
branch : dev
---
 src/Orchard.Web/Core/Contents/AdminMenu.cs    |   5 +++--
 .../Core/Contents/Styles/Web.config           |  21 ++++++++++++++++++
 .../Contents/Styles/images/menu.content.png   | Bin 0 -> 236 bytes
 .../Core/Contents/Styles/menu.content.css     |   6 +++++
 .../styles/images/menu.dashboard.png          | Bin 262 -> 229 bytes
 src/Orchard.Web/Core/Orchard.Core.csproj      |   7 ++++++
 .../Modules/Orchard.Blogs/AdminMenu.cs        |   3 ++-
 .../Orchard.Blogs/Orchard.Blogs.csproj        |   2 ++
 .../Orchard.Blogs/Styles/images/menu.blog.png | Bin 0 -> 235 bytes
 .../Orchard.Blogs/Styles/menu.blog.css        |   6 +++++
 .../Modules/Orchard.Comments/AdminMenu.cs     |   7 +++---
 .../Styles/images/menu.comments.png           | Bin 0 -> 240 bytes
 .../Orchard.Comments/Styles/menu.comments.css |   6 +++++
 .../Modules/Orchard.Lists/AdminMenu.cs        |   3 ++-
 .../Orchard.Lists/Orchard.Lists.csproj        |   7 ++++++
 .../Modules/Orchard.Lists/Styles/Web.config   |  21 ++++++++++++++++++
 .../Orchard.Lists/Styles/images/menu.list.png | Bin 0 -> 242 bytes
 .../Orchard.Lists/Styles/menu.list.css        |  16 +++++++++++++
 .../Orchard.Pages/Styles/images/menu.page.png | Bin 243 -> 240 bytes
 19 files changed, 103 insertions(+), 7 deletions(-)
 create mode 100644 src/Orchard.Web/Core/Contents/Styles/Web.config
 create mode 100644 src/Orchard.Web/Core/Contents/Styles/images/menu.content.png
 create mode 100644 src/Orchard.Web/Core/Contents/Styles/menu.content.css
 create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Styles/images/menu.blog.png
 create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Styles/menu.blog.css
 create mode 100644 src/Orchard.Web/Modules/Orchard.Comments/Styles/images/menu.comments.png
 create mode 100644 src/Orchard.Web/Modules/Orchard.Comments/Styles/menu.comments.css
 create mode 100644 src/Orchard.Web/Modules/Orchard.Lists/Styles/Web.config
 create mode 100644 src/Orchard.Web/Modules/Orchard.Lists/Styles/images/menu.list.png
 create mode 100644 src/Orchard.Web/Modules/Orchard.Lists/Styles/menu.list.css

diff --git a/src/Orchard.Web/Core/Contents/AdminMenu.cs b/src/Orchard.Web/Core/Contents/AdminMenu.cs
index 347090532..f30159041 100644
--- a/src/Orchard.Web/Core/Contents/AdminMenu.cs
+++ b/src/Orchard.Web/Core/Contents/AdminMenu.cs
@@ -21,8 +21,9 @@ namespace Orchard.Core.Contents {
         public void GetNavigation(NavigationBuilder builder) {
             var contentTypeDefinitions = _contentDefinitionManager.ListTypeDefinitions().OrderBy(d => d.Name);
 
-            builder.Add(T("Content"), "2",
-                        menu => menu.Add(T("Content Items"), "1", item => item.Action("List", "Admin", new {area = "Contents", id = ""})));
+            builder.AddImageSet("content")
+                .Add(T("Content"), "2",
+                    menu => menu.Add(T("Content Items"), "1", item => item.Action("List", "Admin", new {area = "Contents", id = ""})));
 
             var contentTypes = contentTypeDefinitions.Where(ctd => ctd.Settings.GetModel<ContentTypeSettings>().Creatable).OrderBy(ctd => ctd.DisplayName);
             if (contentTypes.Count() > 0) {
diff --git a/src/Orchard.Web/Core/Contents/Styles/Web.config b/src/Orchard.Web/Core/Contents/Styles/Web.config
new file mode 100644
index 000000000..0dc62ece6
--- /dev/null
+++ b/src/Orchard.Web/Core/Contents/Styles/Web.config
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <appSettings>
+    <add key="webpages:Enabled" value="false" />
+  </appSettings>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Core/Contents/Styles/images/menu.content.png b/src/Orchard.Web/Core/Contents/Styles/images/menu.content.png
new file mode 100644
index 0000000000000000000000000000000000000000..c72fe4a09bf62336841f0991878612e604733a19
GIT binary patch
literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ#0(@;4TX*XDdu7)&kzm{j@u9Y9{{<W0X`wF
z|G{A0;d2KiZ|ni7DGBlmX88Z#CE%JONKJu9WHAE+w-5+3Ub<WN2Pi00;u=vBoS#-w
zo>-L1;Fyx1l&avCS(I9yUzA;};2dniw(0T$pgLzy7sn8enaK$b4WZl(F3oHcUR+`l
z=5=UdbXjviMan^Fb(pEa1^yN`22OTCg@;;PYBCKh%pDvDRb(857B1w=NCP@uS@dAW
T^1G%$;}|?${an^LB{Ts5i~vS$

literal 0
HcmV?d00001

diff --git a/src/Orchard.Web/Core/Contents/Styles/menu.content.css b/src/Orchard.Web/Core/Contents/Styles/menu.content.css
new file mode 100644
index 000000000..c037dd547
--- /dev/null
+++ b/src/Orchard.Web/Core/Contents/Styles/menu.content.css
@@ -0,0 +1,6 @@
+.navicon-content {
+background-image:url(images/menu.content.png) !important;
+}
+.navicon-content:hover {
+background-position:0 -30px !important;
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Dashboard/styles/images/menu.dashboard.png b/src/Orchard.Web/Core/Dashboard/styles/images/menu.dashboard.png
index 8f7b243f3f86f7c89a9a535393b91aa4ae8c853b..60ebbd37df816be2f7bdef743160172c8a073303 100644
GIT binary patch
delta 213
zcmZo;ddfIKqMnJFfq@~_Q0NGdVlH;_4B_D5xc$)o0g%fX;1lBd9}LzVK6g;^#vYKG
zk|4iehX4Ov0<I~7)D(C`7Bet#3xP1>rMq>1fPyk5t`Q}{`DrEPiAAXljw$&`sS0kH
zMXBZaMcKs)&cP;Zn=UT^s<ZKQ@pBB}n3<g5!0NL)%+$cZ(DVQY8=Jz#tsHI*J2@gJ
zB>iGKb|HYB&CQKn;@|-Wl^EtkmKog>ST)^P8DgFaX`k9}Fb8N5gQu&X%Q~loCIEao
BMa2LB

delta 246
zcmV<S015x)0fqvQ7=H)`0000OU;0-7000?uMObuGZ)S9NVRB^vL1b@YWgtmyVP|Dh
zWnpA_ami&o0001}Nkl<Zc-rii%?*Gc427w2A@45XqB?}0b);vSNJ5$dHNZgw2?q*%
zeWm;n09R55S6GSxW7yb^%M{NtPox55rw3}bHX)?cm;o%2CvQrrnypF*jyIC8>wY3^
zYgLX(DqzXE)Yi{}<}sy$zJHiHpaVLf1AYXM*ShtJrqt_93Xoz>+WrrOXEOlLL?|#c
w&q64hB7LtG5xLYh2?0i%3ZU;Drdxmk0O7P|#L+3v!2kdN07*qoM6N<$f;LxTivR!s

diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index 263a8190f..d4ac490e5 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -236,6 +236,7 @@
     <Content Include="Common\Views\Parts.Common.Metadata.cshtml" />
     <Content Include="Common\Views\Parts.Common.Metadata.SummaryAdmin.cshtml" />
     <Content Include="Containers\Module.txt" />
+    <Content Include="Contents\Styles\menu.content.css" />
     <Content Include="Contents\Views\Admin\Create.cshtml" />
     <Content Include="Contents\Views\Admin\Edit.cshtml" />
     <Content Include="Contents\Views\Admin\List.cshtml" />
@@ -317,6 +318,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="Contents\Styles\images\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Contents\Views\Web.config" />
@@ -383,6 +385,11 @@
   <ItemGroup>
     <Content Include="Dashboard\styles\Web.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Contents\Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs
index 6d176f55f..ecbc7a7c2 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs
@@ -16,7 +16,8 @@ namespace Orchard.Blogs {
         public string MenuName { get { return "admin"; } }
 
         public void GetNavigation(NavigationBuilder builder) {
-            builder.Add(T("Blogs"), "2.5", BuildMenu);
+            builder.AddImageSet("blog")
+                .Add(T("Blog"), "1.5", BuildMenu);
         }
 
         private void BuildMenu(NavigationItemBuilder menu) {
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
index 215532f54..c275f45d5 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -107,6 +107,8 @@
     <Content Include="Content\Admin\images\scheduled.gif" />
     <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\orchard-blogs-admin.css" />
     <Content Include="Styles\orchard-blogs-archives.css" />
     <Content Include="Views\BlogAdmin\Create.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Styles/images/menu.blog.png b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/images/menu.blog.png
new file mode 100644
index 0000000000000000000000000000000000000000..bed83738127662790ad8a9c8adcd071fa83e1737
GIT binary patch
literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ#0(@;4TX*XDdu7)&kzm{j@u9Y9{{<W0X`wF
z|G{A0;d2KiZ|ni7DGBlmX88Z#CE%JONKJu9WHAE+w-5+3Ub<WN2Pi00;u=vBoS#-w
zo>-L1;Fyx1l&avCS(I9yUzA;};2dniw(0T$pgJc{7sn8enaK$b4WZl(F3oHcUR+`l
z=5=Udbje8AB;{~qRVXjd7v_bG4u>3BJa%+7ak48MWKeQ3h~!gHGP%NdmWQFHRmijb
SuJ=ixX$+pOelF{r5}E+2X-I?s

literal 0
HcmV?d00001

diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Styles/menu.blog.css b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/menu.blog.css
new file mode 100644
index 000000000..3cd65ad11
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/menu.blog.css
@@ -0,0 +1,6 @@
+.navicon-blog {
+background-image:url(images/menu.blog.png) !important;
+}
+.navicon-blog:hover {
+background-position:0 -30px !important;
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs
index 810c38235..a617c922c 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs
@@ -8,9 +8,10 @@ namespace Orchard.Comments {
         public string MenuName { get { return "admin"; } }
 
         public void GetNavigation(NavigationBuilder builder) {
-            builder.Add(T("Comments"), "2.75",
-                menu => menu.Add(T("List"), "0", item => item.Action("Index", "Admin", new { area = "Orchard.Comments" })
-                    .Permission(Permissions.ManageComments)));
+            builder.AddImageSet("comments")
+                .Add(T("Comments"), "3.5",
+                    menu => menu.Add(T("List"), "0", item => item.Action("Index", "Admin", new { area = "Orchard.Comments" })
+                        .Permission(Permissions.ManageComments)));
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Styles/images/menu.comments.png b/src/Orchard.Web/Modules/Orchard.Comments/Styles/images/menu.comments.png
new file mode 100644
index 0000000000000000000000000000000000000000..80eda105f20d2fa7f3aa69d6f0a4a9f6f7768b74
GIT binary patch
literal 240
zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ#0(@;4TX*XDdu7)&kzm{j@u9Y9{{<W0X`wF
z|G{A0;d2KiZ|ni7DGBlmX88Z#CE%JONKJu9WHAE+w-5+3Ub<WN2Pi00;u=vBoS#-w
zo>-L1;Fyx1l&avCS(I9yUzA;};2dniw(0T$pgMO?7sn8enaK$b%&Wr;3=Gyr9X)Vh
zYgQ<;5Th9LX(Iz&22B=Wt{1m5`J9|3BqW@jB_$%9on<F*Y><eU)@aDEM8Jn*K{h+X
YOD>^e$@tH)KqDDEUHx3vIVCg!0Iz#Tpa1{>

literal 0
HcmV?d00001

diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Styles/menu.comments.css b/src/Orchard.Web/Modules/Orchard.Comments/Styles/menu.comments.css
new file mode 100644
index 000000000..567b7caae
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Styles/menu.comments.css
@@ -0,0 +1,6 @@
+.navicon-comments {
+background-image:url(images/menu.comments.png) !important;
+}
+.navicon-comments:hover {
+background-position:0 -30px !important;
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Lists/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Lists/AdminMenu.cs
index ad2b788e3..05d689493 100644
--- a/src/Orchard.Web/Modules/Orchard.Lists/AdminMenu.cs
+++ b/src/Orchard.Web/Modules/Orchard.Lists/AdminMenu.cs
@@ -16,7 +16,8 @@ namespace Orchard.Lists {
         public string MenuName { get { return "admin"; } }
 
         public void GetNavigation(NavigationBuilder builder) {
-            builder.Add(T("Lists"), "3", BuildMenu);
+            builder.AddImageSet("list")
+                .Add(T("Lists"), "3", BuildMenu);
         }
 
         private void BuildMenu(NavigationItemBuilder menu) {
diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj b/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj
index 13d6d780d..16dff9846 100644
--- a/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj
@@ -64,6 +64,8 @@
     <Compile Include="Migrations.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Styles\images\menu.list.png" />
+    <Content Include="Styles\menu.list.css" />
     <Content Include="Views\Items\Content-List.SummaryAdmin.cshtml" />
   </ItemGroup>
   <ItemGroup>
@@ -72,6 +74,11 @@
   <ItemGroup>
     <Content Include="Web.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Lists/Styles/Web.config
new file mode 100644
index 000000000..0dc62ece6
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Lists/Styles/Web.config
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <appSettings>
+    <add key="webpages:Enabled" value="false" />
+  </appSettings>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Styles/images/menu.list.png b/src/Orchard.Web/Modules/Orchard.Lists/Styles/images/menu.list.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ff8295162b02589bd49a06d93ed4f3942ef8444
GIT binary patch
literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ#0(@;4TX*XDdu7)&kzm{j@u9Y9{{<W0X`wF
z|G{A0;d2KiZ|ni7DGBlmX88Z#CE%JONKJu9WHAE+w-5+3Ub<WN2Pi00;u=vBoS#-w
zo>-L1;Fyx1l&avCS(I9yUzA;};2dniw(0T$pgK=a7sn8enaK$b4WZl(F3oHcUR+|@
zxJ9Z#r;TlbM90#`Q%s&~qOKlruosYGP?2$IXj!e%q56s;#n7VRh=Yz`h?s|x$rZ-4
aJPeD?gr@lSx=R8LW$<+Mb6Mw<&;$TE7)&_;

literal 0
HcmV?d00001

diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Styles/menu.list.css b/src/Orchard.Web/Modules/Orchard.Lists/Styles/menu.list.css
new file mode 100644
index 000000000..684b64022
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Lists/Styles/menu.list.css
@@ -0,0 +1,16 @@
+.navicon-list,
+.navicon-lists {
+background-image:url(images/menu.list.png) !important;
+}
+.navicon-list:hover,
+.navicon-lists:hover {
+background-position:0 -30px !important;
+}
+/* subnav */
+ul ul .navicon-list { 
+background-position:0 6px !important;
+padding-left:16px !important;
+}
+ul ul .navicon-list:hover {
+background-position:0 -26px !important;
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Styles/images/menu.page.png b/src/Orchard.Web/Modules/Orchard.Pages/Styles/images/menu.page.png
index f54a52cf7151a233c874c0886734d445987eb85b..e0ff5fdbf2015fd472fa2b4351ed19fa9472bdd6 100644
GIT binary patch
delta 224
zcmey&_<?bPL_HHT0|P^<q0kW^#a!&<8N$KAar>eF10a_(z$e7@KNze#eD0v+jXfYW
zB|(0{4FCVT1YA=DsVVS?EM{Qf76M_$OLy!300m`ATq8<?^V3So6N^$A98>a>QWe}X
zi&D$;i?WLqoP$l+HeFr-ROjyL66qMiF*7;Ap&^vJ!KImP!i!5x8@EU`=&&hVWKh}_
zmar*oZC1hpc@AC%AwDICL!lx^gi0AUNi?)DcNFj*OlfViS}>E5LI17r94`M){y;Ms
NJYD@<);T3K0RV;LOa=e|

delta 227
zcmV<90384D0rLTn7=H)`0000OU;0-7000?uMObuGZ)S9NVRB^vL1b@YWgtmyVP|Dh
zWnpA_ami&o0001$Nkl<Zc-rih!3}^Q3`MPBA@45XqB?}0b)=f!5c;vG@t`H?rGdwT
zmO#wh+!^#ZU|KenIP@K<1Odb`&MRv<Eicg`H8DwTG&=|oWn4`=gP<cI?KBrk29_#>
z(j8c!Uo}A8_|98!fCC)h00$huOEk9zKmbZLfOrujlUjoeVl{vpSPd=#7*ygf2B#hT
dq1U(zFaVPu3rDGBw?6;?002ovPDHLkV1j!jRHXm_