From accb94c4150daebf22e34de492bb53b8c5b3c5a3 Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Wed, 15 Dec 2010 09:27:05 -0100
Subject: [PATCH 1/2] Changes from Temp Juno SVN Repo

---
 umbraco/presentation/config/Dashboard.config  | 88 -------------------
 .../presentation/config/restExtensions.config |  4 -
 .../presentation/config/xsltExtensions.config |  6 +-
 umbraco/presentation/install/css/all.css      | 13 ++-
 .../presentation/install/steps/database.ascx  | 69 +++++++--------
 5 files changed, 48 insertions(+), 132 deletions(-)

diff --git a/umbraco/presentation/config/Dashboard.config b/umbraco/presentation/config/Dashboard.config
index 06829ce458..28226c02ad 100644
--- a/umbraco/presentation/config/Dashboard.config
+++ b/umbraco/presentation/config/Dashboard.config
@@ -13,7 +13,6 @@
       </control>
     </tab>
   </section>
-
   <section alias="StartupDeveloperDashboardSection">
     <areas>
       <area>developer</area>
@@ -27,7 +26,6 @@
       </control>
     </tab>
   </section>
-
   <section alias="StartupMediaDashboardSection">
     <areas>
       <area>media</area>
@@ -44,7 +42,6 @@
       </control>
     </tab>
   </section>
-
   <section alias="StartupDashboardSection">
     <access>
       <deny>translator</deny>
@@ -70,7 +67,6 @@
       <control addPanel="true">/umbraco/dashboard/changepassword.ascx</control>
     </tab>
   </section>
-
   <section alias="StartupMemberDashboardSection">
     <areas>
       <area>member</area>
@@ -87,88 +83,4 @@
       </control>
     </tab>
   </section>
-
-  <!-- 
-    <section>
-    <access>
-      <deny>translator</deny>
-    </access>
-    <areas>
-      <area>default</area>
-      <area>content</area>
-    </areas>
-    <tab caption="Last Edits">
-      <control>
-        /umbraco/dashboard/latestEdits.ascx
-        <access><grant>writer</grant><grant>editor</grant><deny>administrator</deny></access></control>
-    </tab>
-    <tab caption="Hidden from all but admins">
-      <access>
-        <grant>administrator</grant>
-        <grant>writer</grant>
-      </access>
-      <control>
-        <access>
-          <deny>writer</deny>
-        </access>
-        /umbraco/dashboard/latestEdits.ascx
-      </control>
-    </tab>
-    <tab caption="Only for devs">
-      <access>
-        <grant>administrator</grant>
-        <grantBySection>settings</grantBySection>
-        <deny>writer</deny>
-      </access>
-      <control>
-        <access>
-          <grant>administrator</grant>
-          <grant>writer</grant>
-        </access>
-        /umbraco/dashboard/latestEdits.ascx
-      </control>
-    </tab>
-  </section>
-  <section>
-    <areas>
-      <area>default</area>
-      <area>content</area>
-    </areas>
-    <tab caption="Contact Logs">
-      <control>/usercontrols/dashboards/ContactForm_logs.ascx</control>
-    </tab>
-    <tab caption="Email a Friend Logs">
-      <control>/usercontrols/dashboards/EmailAFriendForm_logs.ascx</control>
-    </tab>
-  </section>
-  <section>
-    <areas>
-      <area>default</area>
-      <area>member</area>
-    </areas>
-    <tab caption="Search Members">
-      <control>/umbraco/members/membersearch.ascx</control>
-    </tab>
-  </section>
-  <section id="contour">
-    <areas>
-      <area>contour</area>
-    </areas>
-    <tab caption="Umbraco Contour">
-      <control>/umbraco/plugins/umbracocontour/formsdashboard.ascx</control>
-    </tab>
-  </section>
-  <section alias="MyDashboardSection">
-    <areas>
-      <area>default</area>
-      <area>content</area>
-    </areas>
-    <tab caption="Contact Logs">
-      <control>/usercontrols/dashboards/ContactForm_logs.ascx</control>
-    </tab>
-    <tab caption="Email a Friend Logs">
-      <control>/usercontrols/dashboards/EmailAFriendForm_logs.ascx</control>
-    </tab>
-  </section>
-  -->
 </dashBoard>
\ No newline at end of file
diff --git a/umbraco/presentation/config/restExtensions.config b/umbraco/presentation/config/restExtensions.config
index ef5990acaf..991dde0bc7 100644
--- a/umbraco/presentation/config/restExtensions.config
+++ b/umbraco/presentation/config/restExtensions.config
@@ -10,8 +10,4 @@
     <permission method="setProperty" allowAll="false" />
   </ext>
 -->
-  <ext assembly="Umlaut.Umb.Blog" type="Umlaut.Umb.Blog.Library.Base" alias="Blog4Umbraco">
-    <permission method="CreateComment" returnXml="false" allowAll="true" />
-    <permission method="GetGravatarImage" returnXml="false" allowAll="true" />
-  </ext>
 </RestExtensions>
\ No newline at end of file
diff --git a/umbraco/presentation/config/xsltExtensions.config b/umbraco/presentation/config/xsltExtensions.config
index c8067ce3d7..44e4344593 100644
--- a/umbraco/presentation/config/xsltExtensions.config
+++ b/umbraco/presentation/config/xsltExtensions.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <XsltExtensions>
-<!-- <ext assembly="your.assemblyName" type="your.class.name" alias="yourAlias">
+  <!-- <ext assembly="your.assemblyName" type="your.class.name" alias="yourAlias">
   </ext> -->
-
-</XsltExtensions>
+  
+</XsltExtensions>
\ No newline at end of file
diff --git a/umbraco/presentation/install/css/all.css b/umbraco/presentation/install/css/all.css
index e642b6202a..247e9d9293 100644
--- a/umbraco/presentation/install/css/all.css
+++ b/umbraco/presentation/install/css/all.css
@@ -309,14 +309,23 @@ figure{display: block;}
 	color:#fff;
 }
 .btn-accept,
-.btn-continue{height:42px;}
+.btn-continue,
+.btn-back{height:42px;}
 .btn-accept span{
 	height:84px;
 	width:215px;
 	background:url(../images/btn-accept.png) no-repeat;
 }
+.btn-back span{
+	height:84px;
+	width:90px;
+	background:url(../images/btn-back.png) no-repeat;
+}
+
 .btn-accept:hover span,
-.btn-continue:hover span{margin:-42px 0 0;}
+.btn-continue:hover span,
+.btn-back:hover span{margin:-42px 0 0;}
+
 /* database */
 .database-hold{
 	width:100%;
diff --git a/umbraco/presentation/install/steps/database.ascx b/umbraco/presentation/install/steps/database.ascx
index 9cd0f68be4..968434670f 100644
--- a/umbraco/presentation/install/steps/database.ascx
+++ b/umbraco/presentation/install/steps/database.ascx
@@ -4,8 +4,7 @@
 	<!-- database box -->
 	<div class="tab main-tabinfo">
 		<div class="container">
-			<h1>
-				Database configuration</h1>
+			<h1>Database configuration</h1>
 			<p>
 				To complete this step, you must know some information regarding your database server
 				(”connection string”). Please contact your ISP if necessary. If you’re installingon
@@ -23,7 +22,7 @@
 						<p>
 							<strong>1. Do you have a blank database already installed?</strong></p>
 						<ul class="mini-tabset">
-							<li class="btn-yes"><a href="#database-step1" class="database-tab"><span>yes</span></a></li>
+							<li class="btn-yes"><a href="#database-sthttps://umbraco.unfuddle.com/svn/umbraco_juno/ep1" class="database-tab"><span>yes</span></a></li>
 							<li class="btn-no"><a href="#database-step2" class="database-tab"><span>no</span></a></li>
 						</ul>
 					</div>
@@ -79,7 +78,7 @@
 												<asp:Literal ID="lt_dbError" runat="server" /></strong></p>
 									</div>
 									<script type="text/javascript">
-										jQuery(document).ready(function () { showDatabaseSettings(); });
+									  jQuery(document).ready(function () { showDatabaseSettings(); });
 									</script>
 								</asp:PlaceHolder>
 								<div class="row sql" runat="server" id="DatabaseServerItem">
@@ -169,48 +168,48 @@
 		 <footer class="btn-box" style="display: none;">
 			<div class="t">&nbsp;</div>
 			 <asp:LinkButton class="btn-step btn btn-continue" runat="server" OnClick="gotoNextStep"><span>Continue</span></asp:LinkButton>
-             <asp:LinkButton class="btn-step btn btn-accept" style="display: none;" runat="server" OnClick="gotoSettings"><span>Back</span></asp:LinkButton>
+             <asp:LinkButton class="btn-step btn btn-back" style="display: none;" runat="server" OnClick="gotoSettings"><span>Back</span></asp:LinkButton>
 		</footer>
 	</div>
 
 	<script type="text/javascript">
-		var intervalId = 0;
+	  var intervalId = 0;
 
-		jQuery(document).ready(function () {
-			intervalId = setInterval("progressBarCallback()", 1000);
-			jQuery(".btn-box").hide();
-			jQuery.ajax({
-				type: 'POST',
-				contentType: 'application/json; charset=utf-8',
-				data: '{}',
-				dataType: 'json',
-				url: 'utills/p.aspx/installOrUpgrade'
-			});
-		});
+	  jQuery(document).ready(function () {
+	    intervalId = setInterval("progressBarCallback()", 1000);
+	    jQuery(".btn-box").hide();
+	    jQuery.ajax({
+	      type: 'POST',
+	      contentType: 'application/json; charset=utf-8',
+	      data: '{}',
+	      dataType: 'json',
+	      url: 'utills/p.aspx/installOrUpgrade'
+	    });
+	  });
 
-		function progressBarCallback() {
-			jQuery.getJSON('utills/p.aspx?feed=progress', function (data) {
+	  function progressBarCallback() {
+	    jQuery.getJSON('utills/p.aspx?feed=progress', function (data) {
 
-				updateProgressBar(data.percentage);
-				updateStatusMessage(data.message)
+	      updateProgressBar(data.percentage);
+	      updateStatusMessage(data.message)
 
-				if (data.error != "") {
-					clearInterval(intervalId);
-					updateStatusMessage(data.error);
+	      if (data.error != "") {
+	        clearInterval(intervalId);
+	        updateStatusMessage(data.error);
 
-					jQuery(".loader .hold").hide();
+	        jQuery(".loader .hold").hide();
 
-					jQuery(".btn-continue").hide();
-					jQuery(".btn-accept").show();
-					jQuery(".btn-box").show();
-				}
+	        jQuery(".btn-continue").hide();
+	        jQuery(".btn-back").show();
+	        jQuery(".btn-box").show();
+	      }
 
-				if (data.percentage == 100) {
-					clearInterval(intervalId);
-					jQuery(".btn-box").show();
-				}
-			});
-		}
+	      if (data.percentage == 100) {
+	        clearInterval(intervalId);
+	        jQuery(".btn-box").show();
+	      }
+	    });
+	  }
 	</script>
 
 </asp:PlaceHolder>

From 84d88161fa0f3bc9fdab74abae11f59ab8cf6e72 Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Wed, 15 Dec 2010 09:28:25 -0100
Subject: [PATCH 2/2] nuget.build file for building umbraco dlls as a nuget
 package

---
 nuget.build | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 149 insertions(+)
 create mode 100644 nuget.build

diff --git a/nuget.build b/nuget.build
new file mode 100644
index 0000000000..ba20834843
--- /dev/null
+++ b/nuget.build
@@ -0,0 +1,149 @@
+<?xml version="1.0" ?>
+<project name="umbraco" default="test" basedir=".">
+	<description>Build the umbraco 4.6 alpha Application for asp.net 3.5</description>
+
+   <property name="nant.settings.currentframework" value="net-2.0" />
+
+	<!-- filenames and directories, generally won't change -->
+
+	<property name="public.dir" value="C:\Users\per\Documents\Projects\NugetServer\packages" />
+	
+
+	<property name="root.dir" value="${directory::get-current-directory()}" />
+	<property name="source.dir" value="${root.dir}\umbraco\presentation" />
+	<property name="build.dir" value="${root.dir}\build" />
+	<property name="dlls.dir" value="${root.dir}\foreign dlls" />
+
+	<property name="nuget.dir" value="${root.dir}\nuget" />
+	<property name="nuget.app" value="C:\Program Files (x86)\nuget\nuget.exe" />
+	<property name="nuget.spec" value="${public.dir}\..\umbraco.nuspec" />
+
+	<property name="build.version" value="4.6.Alpha"/>
+
+	<property name="win.dir" value="C:\windows" />
+
+	<target name="build" depends="init">
+		<!-- set everything to writable-->
+		<attrib normal="true" readonly="false">
+			<fileset basedir="${root.dir}">
+				<include name="**/*" />
+			</fileset>
+		</attrib>
+
+		<!-- Remove those damn DLR dlls that might be left behind by careless devs...-->
+		<!-- They will get added again after build is completed, no worries no dependencies during build-->
+		<delete>
+			<fileset>
+				<include name="${source.dir}\bin\IronPython.dll" />
+				<include name="${source.dir}\bin\IronPython.Modules.dll" />
+				<include name="${source.dir}\bin\IronRuby.dll" />
+				<include name="${source.dir}\bin\IronRuby.Libraries.dll" />
+				<include name="${source.dir}\bin\IronRuby.Libraries.Yaml.dll" />
+				<include name="${source.dir}\bin\Microsoft.Dynamic.dll" />
+				<include name="${source.dir}\bin\Microsoft.ScriptinG.Core.dll" />
+				<include name="${source.dir}\bin\Microsoft.Scripting.Debugging.dll" />
+				<include name="${source.dir}\bin\Microsoft.Scripting.dll" />
+				<include name="${source.dir}\bin\Microsoft.Scripting.ExtensionAttribute.dll" />
+			</fileset>
+		</delete>
+		
+		<!-- build for 2.0 -->
+		<exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
+			<arg value="${root.dir}\umbraco.sln" />
+			<arg value="/v:n" />
+			<arg value="/p:WarningLevel=0" />
+			<arg value="/p:ToolsVersion=3.5" />
+		</exec>
+		<exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}\Net20&quot;"/>
+		
+
+		<!-- build for 4.0 -->
+		<exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
+			<arg value="${root.dir}\umbraco.sln" />
+			<arg value="/v:n" />
+			<arg value="/p:WarningLevel=0" />
+			<arg value="/p:ToolsVersion=4.0" />
+		</exec>
+		<exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}\Net40&quot;"/>
+	</target>
+	
+
+
+	<!-- Directories and files -->
+	<target name="directories" depends="build">
+		<!-- asp.net 2.0 SP1 DLR dlls -->
+		<delete>
+			<fileset>
+				<include name="${build.dir}\**\*" />
+
+				<exclude name="${build.dir}\**\businesslogic.dll" />
+				<exclude name="${build.dir}\**\cms.dll" />
+				<exclude name="${build.dir}\**\controls.dll" />
+				<exclude name="${build.dir}\**\Examine.dll" />
+
+				<exclude name="${build.dir}\**\interfaces.dll" />
+				<exclude name="${build.dir}\**\Microsoft.ApplicationBlocks.Data.dll" />
+				<exclude name="${build.dir}\**\umbraco.DataLayer.dll" />
+				<exclude name="${build.dir}\**\umbraco.dll" />
+				<exclude name="${build.dir}\**\umbraco.editorcontrols.dll" />
+				<exclude name="${build.dir}\**\umbraco.linq.core.dll" />
+				<exclude name="${build.dir}\**\umbraco.macrorenderings.dll" />
+				<exclude name="${build.dir}\**\umbraco.providers.dll" />
+				<exclude name="${build.dir}\**\UmbracoExamine.dll" />
+			</fileset>
+		</delete>
+		
+		<copy todir="${nuget.dir}\lib\Net20">
+			<fileset basedir="${build.dir}\Net20\bin">
+				<include name="*.dll" />
+			</fileset>
+		</copy>
+
+		<copy todir="${nuget.dir}\lib\Net40">
+			<fileset basedir="${build.dir}\Net40\bin">
+				<include name="*.dll" />
+			</fileset>
+		</copy>
+
+		<copy file="${nuget.spec}" tofile="${nuget.dir}\umbraco.nuspec" failonerror="false" overwrite="true"/>
+
+		<xmlpoke
+				file="${nuget.dir}\umbraco.nuspec"
+				xpath="/package/metadata/version"
+				value="${build.version}" />
+		
+	</target>
+
+	
+	<!-- will produce the a clean /build folder and nothing else-->
+	<target name="nuget" depends="directories">
+		 <exec program="${nuget.app}" commandline="pack &quot;${nuget.dir}\umbraco.nuspec&quot; /o &quot;${public.dir}&quot;"/>
+	</target>
+
+   
+   <target name="test">
+		 <exec program="${nuget.app}" commandline="pack &quot;${nuget.dir}\umbraco.nuspec&quot; /o &quot;${public.dir}&quot;"/>
+	</target>
+
+	<target name="init" description="init tasks for the build">
+
+		<!-- Clean the plugins dir any leftovers, only tinyMCE belongs in here -->
+		<delete>
+			<fileset>
+				<include name="${build.dir}\umbraco\plugins\*" />
+				<exclude name="${build.dir}\umbraco\plugins\tinymce3" />
+			</fileset>
+		</delete>
+
+		<delete dir="${build.dir}" />
+		<mkdir dir="${build.dir}" />
+
+		 <delete dir="${nuget.dir}" />
+		<mkdir dir="${nuget.dir}" />
+		<mkdir dir="${nuget.dir}\lib\Net20" />
+		<mkdir dir="${nuget.dir}\lib\Net40" />
+
+	</target>
+
+
+</project>