From 4e737f7a89387e70ab03cd7d37e572131dba91a9 Mon Sep 17 00:00:00 2001
From: sebastiaan <unknown@kiln.example.com>
Date: Tue, 4 Sep 2012 06:39:49 -0200
Subject: [PATCH] Include mediadashboard in release config, ignore kraftwerk
 web.config, include upload icon

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj           | 9 +++++----
 src/Umbraco.Web.UI/config/Dashboard.Release.config | 5 +++++
 src/Umbraco.Web/Umbraco.Web.csproj                 | 4 +++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 2fd46b6d50..6855df28d8 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -342,6 +342,7 @@
     <Content Include="umbraco\images\download.png" />
     <Content Include="umbraco\images\editor\doc.gif" />
     <Content Include="umbraco\images\editor\documentType.gif" />
+    <Content Include="umbraco\images\editor\upload.png" />
     <Content Include="umbraco\images\information.png" />
     <Content Include="umbraco\images\listItemOrange.gif" />
     <Content Include="umbraco\images\pencil.png" />
@@ -1458,10 +1459,6 @@
       <DependentUpon>Web.Template.config</DependentUpon>
       <SubType>Designer</SubType>
     </None>
-    <Content Include="web.Template.KRAFTWERK.Debug.config">
-      <DependentUpon>web.Template.config</DependentUpon>
-      <SubType>Designer</SubType>
-    </Content>
     <None Include="web.Template.Release.config">
       <DependentUpon>Web.Template.config</DependentUpon>
       <SubType>Designer</SubType>
@@ -1972,6 +1969,10 @@
     <None Include="web.Template.MBP13-PC.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </None>
+    <None Include="web.Template.KRAFTWERK.Debug.config">
+      <DependentUpon>web.Template.config</DependentUpon>
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Code\" />
diff --git a/src/Umbraco.Web.UI/config/Dashboard.Release.config b/src/Umbraco.Web.UI/config/Dashboard.Release.config
index a44d6d8aa5..bf78ad3c8c 100644
--- a/src/Umbraco.Web.UI/config/Dashboard.Release.config
+++ b/src/Umbraco.Web.UI/config/Dashboard.Release.config
@@ -32,6 +32,11 @@
     <areas>
       <area>media</area>
     </areas>
+    <tab caption="Content">
+      <control showOnce="false" addPanel="false" panelCaption="">
+        /umbraco/dashboard/mediadashboardfolderbrowser.ascx
+      </control>
+    </tab>	
     <tab caption="Get Started">
       <control showOnce="true" addPanel="true" panelCaption="">
         /umbraco/dashboard/mediadashboardintro.ascx
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index fbb9496646..9730424676 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1972,7 +1972,9 @@
     <Content Include="umbraco.presentation\umbraco\settings\EditDictionaryItem.aspx" />
     <Content Include="umbraco.presentation\umbraco\settings\editLanguage.aspx" />
     <Content Include="umbraco.presentation\umbraco\settings\EditMediaType.aspx" />
-    <Content Include="umbraco.presentation\umbraco\settings\EditNodeTypeNew.aspx" />
+    <Content Include="umbraco.presentation\umbraco\settings\EditNodeTypeNew.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
     <Content Include="umbraco.presentation\umbraco\settings\editTemplate.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>