From cbea0ad4e7fc621307f64b337f5bbd616dd6a6d2 Mon Sep 17 00:00:00 2001
From: pgregorynz <unknown@kiln.example.com>
Date: Thu, 23 Dec 2010 10:58:27 -1300
Subject: [PATCH] sets the ie images for the filter in lt7.css to be relative
 in the installer to allow images from umbraco_client directory

---
 .../umbraco_client/Installer/css/lt7.css      | 74 +++++++++----------
 .../presentation/web.config.PETER-MAC-PC.xslt |  2 +-
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/umbraco/presentation/umbraco_client/Installer/css/lt7.css b/umbraco/presentation/umbraco_client/Installer/css/lt7.css
index be6bf09e26..4efb059fab 100644
--- a/umbraco/presentation/umbraco_client/Installer/css/lt7.css
+++ b/umbraco/presentation/umbraco_client/Installer/css/lt7.css
@@ -1,152 +1,152 @@
 * html body{width: expression(document.documentElement.clientWidth < 1000 ? "1000px" : "auto");}
-#header{
	background:url(../images/none.gif);
	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/bg-header.png', sizingmethod='scale');
+#header{
	background:url(../images/none.gif);
	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/bg-header.png', sizingmethod='scale');
 }
 .tabset .b{
 	background:url(../images/none.gif);
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/sep1.png', sizingmethod='scale');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/sep1.png', sizingmethod='scale');
 }
 .tabset ul li.active em{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/bul1.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/bul1.png', sizingmethod='crop');
 }
 .btn-box .t{
 	background:url(../images/none.gif);
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/sep1.png', sizingmethod='scale');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/sep1.png', sizingmethod='scale');
 }
 .btn-get span{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/btn-get.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/btn-get.png', sizingmethod='crop');
 }
 .btn-accept span{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/btn-accept.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/btn-accept.png', sizingmethod='crop');
 }
 .mini-tabset li.btn-yes a span{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/btn-yes.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/btn-yes.png', sizingmethod='crop');
 }
 .mini-tabset li.btn-no a span{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/btn-no.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/btn-no.png', sizingmethod='crop');
 }
 .selectArea a.selectButton{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/select-button.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/select-button.png', sizingmethod='crop');
 }
 .selectArea .left{
 	background:url(../images/none.gif);
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/select-left.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/select-left.png', sizingmethod='crop');
 }
 .selectArea .center{
 	background:url(../images/none.gif);
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/select-center.png', sizingmethod='scale');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/select-center.png', sizingmethod='scale');
 }
 .instruction-hold .row span{
 	background:url(../images/none.gif);
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/bg-inp.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/bg-inp.png', sizingmethod='crop');
 }
 .btn-continue span{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/btn-continue.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/btn-continue.png', sizingmethod='crop');
 }
 .instruction-hold .error span{
 	background:url(../images/none.gif);
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/bg-inp-error.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/bg-inp-error.png', sizingmethod='crop');
 }
 .validaing{
 	background:url(../images/none.gif);
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/ico-validaing.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/ico-validaing.png', sizingmethod='crop');
 }
 .invalidaing{
 	background:url(../images/none.gif);
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/ico-invalidaing.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/ico-invalidaing.png', sizingmethod='crop');
 }
 .drop-hold .t{
 	background:url(../images/none.gif);
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/bg-drop-t.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/bg-drop-t.png', sizingmethod='crop');
 }
 .drop-hold .b{
 	background:url(../images/none.gif);
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/bg-drop-b.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/bg-drop-b.png', sizingmethod='crop');
 }
 .add-nav ul li.hover em{
 	background:url(../images/none.gif);
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/bul3.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/bul3.png', sizingmethod='crop');
 }
 .gallery .btn-prev span{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/btn-prev.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/btn-prev.png', sizingmethod='crop');
 }
 .gallery .btn-next span{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/btn-next.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/btn-next.png', sizingmethod='crop');
 }
 .gal-drop .btn-preview span{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/btn-preview.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/btn-preview.png', sizingmethod='crop');
 }
 .gal-drop .btn-install-gal span{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/btn-install-gal.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/btn-install-gal.png', sizingmethod='crop');
 }
 .paging ul li a{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/bg-paging.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/bg-paging.png', sizingmethod='crop');
 }
 .paging ul li a:hover,
 .paging ul li.active a{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/bg-paging-h.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/bg-paging-h.png', sizingmethod='crop');
 }
 .lightbox .t{
 	background:url(../images/none.gif);
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/bg-lightbox-t.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/bg-lightbox-t.png', sizingmethod='crop');
 }
 .lightbox .b{
 	background:url(../images/none.gif);
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/bg-lightbox-b.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/bg-lightbox-b.png', sizingmethod='crop');
 }
 .lightbox .btn-install{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/btn-install.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/btn-install.png', sizingmethod='crop');
 }
 .lightbox .btn-install:hover{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/btn-install-hover.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/btn-install-hover.png', sizingmethod='crop');
 }
 .lightbox .btn-close{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/btn-close.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/btn-close.png', sizingmethod='crop');
 }
 .btn-web li.btn-set a span{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/btn-set.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/btn-set.png', sizingmethod='crop');
 }
 .btn-web li.btn-preview-web a span{
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/btn-preview-web.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/btn-preview-web.png', sizingmethod='crop');
 }
 .threcol .t{
 	background:url(../images/none.gif);
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/sep1.png', sizingmethod='scale');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/sep1.png', sizingmethod='scale');
 }
 .gallery .box {
 	filter: none !important;
@@ -154,19 +154,19 @@
 .btn-box .btn-install span {
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/btn-install.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/btn-install.png', sizingmethod='crop');
 }
 .ui-selectmenu-status {
 	background:url(../images/none.gif);
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/select-left-2.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/select-left-2.png', sizingmethod='crop');
 }
 .ui-state-default .ui-icon {
 	cursor: pointer;
 	background:url(../images/none.gif);
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/select-button.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/select-button.png', sizingmethod='crop');
 }
 .btn-box .btn-create span {
 	background:url(../images/none.gif);
 	cursor:pointer;
-	filter: progid:dximagetransform.microsoft.alphaimageloader(src='images/btn-create.png', sizingmethod='crop');
+	filter: progid:dximagetransform.microsoft.alphaimageloader(src='../umbraco_client/installer/images/btn-create.png', sizingmethod='crop');
 }
\ No newline at end of file
diff --git a/umbraco/presentation/web.config.PETER-MAC-PC.xslt b/umbraco/presentation/web.config.PETER-MAC-PC.xslt
index c3572a22e0..dcdae570e5 100644
--- a/umbraco/presentation/web.config.PETER-MAC-PC.xslt
+++ b/umbraco/presentation/web.config.PETER-MAC-PC.xslt
@@ -4,7 +4,7 @@
 
   <!-- Set up a local connection string -->
   <xsl:template match="/configuration/appSettings/add[@key='umbracoDbDSN']/@value">
-    <xsl:attribute name="value">server=.\sqlexpress;database=umb-4-dev;integrated security=false;user id=sa;pwd=password!</xsl:attribute>
+    <xsl:attribute name="value">server=.\sqlexpress;database=4.6-beta;integrated security=false;user id=sa;pwd=password!</xsl:attribute>
   </xsl:template>
 
   <xsl:template match="/configuration/appSettings/add[@key='umbracoConfigurationStatus']/@value">