From b2902c18e9dce48e9a12fe628177d817aefa66f5 Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Wed, 8 Dec 2010 10:37:04 +0000
Subject: [PATCH] New nant file for razor, and macroEngine Dependencies

[TFS Changeset #81637]
---
 default.build                                 |  9 ++-
 umbraco/presentation/install/css/all.css      |  3 +-
 umbraco/presentation/install/default.aspx     | 25 +++++++
 .../presentation/install/js/jquery.main.js    | 20 +++++-
 .../steps/Skinning/loadStarterKitDesigns.ascx | 18 ++---
 .../presentation/install/steps/skinning.ascx  | 69 +++++++------------
 .../Modules/SkinModule/SkinCustomizer.ascx.cs |  1 -
 7 files changed, 88 insertions(+), 57 deletions(-)

diff --git a/default.build b/default.build
index df8b2c1bf6..f2a51ce9ef 100644
--- a/default.build
+++ b/default.build
@@ -117,13 +117,18 @@
         <copy file="${root.dir}\config templates\config\umbracosettings.config" tofile="${build.dir}\config\umbracosettings.config" failonerror="false" overwrite="true"/>
         <copy file="${root.dir}\config templates\config\urlrewriting.config" tofile="${build.dir}\config\urlrewriting.config" failonerror="false" overwrite="true"/>
         
-        <!-- new 4.1 files -->
+        <!-- new 4.5 files -->
         <copy file="${root.dir}\config templates\config\ClientDependency.config" tofile="${build.dir}\config\ClientDependency.config" failonerror="false" overwrite="true"/>
         <copy file="${root.dir}\config templates\config\ExamineSettings.config" tofile="${build.dir}\config\ExamineSettings.config" failonerror="false" overwrite="true"/>
         <copy file="${root.dir}\config templates\config\ExamineIndex.config" tofile="${build.dir}\config\ExamineIndex.config" failonerror="false" overwrite="true"/>
         <copy file="${root.dir}\config templates\config\scripting.config" tofile="${build.dir}\config\scripting.config" failonerror="false" overwrite="true"/>
                 
-      
+        
+        <!-- 4.6 Files -->
+        <copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\Debug\umbraco.MacroEngines.dll" tofile="${build.dir}\bin\umbraco.MacroEngines.dll" failonerror="false" overwrite="true"/>
+        <copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\Debug\umbraco.MacroEngines.pdb" tofile="${build.dir}\bin\umbraco.MacroEngines.pdb" failonerror="false" overwrite="true"/>
+
+        
         <!--standard /data/packages files-->
         <mkdir dir="${build.dir}\App_Data" />
         <copy file="${root.dir}\config templates\packages\installedPackages.config" tofile="${build.dir}\app_data\packages\installed\installedPackages.config" failonerror="false" overwrite="true"/>
diff --git a/umbraco/presentation/install/css/all.css b/umbraco/presentation/install/css/all.css
index e128c4df20..e01e53455c 100644
--- a/umbraco/presentation/install/css/all.css
+++ b/umbraco/presentation/install/css/all.css
@@ -555,7 +555,7 @@ figure{display: block;}
 
 .validaing
 {
-    background:url(../images/ico-validaing.png) no-repeat !Important;
+	background:url(../images/ico-validaing.png) no-repeat !Important;
 }
 
 .invalidaing{
@@ -888,6 +888,7 @@ figure{display: block;}
 	left:-9999px;
 	padding:10px;
 	margin:0;
+	z-index: 999;
 }
 .lightbox .t,
 .lightbox .b{
diff --git a/umbraco/presentation/install/default.aspx b/umbraco/presentation/install/default.aspx
index c420cf41e0..cb9c232b97 100644
--- a/umbraco/presentation/install/default.aspx
+++ b/umbraco/presentation/install/default.aspx
@@ -115,6 +115,31 @@
 
 	</div>
 	
+
+    <!-- lightbox -->
+<div class="lightbox" id="lightbox">
+	<a href="#" class="btn-close btn-close-box">close</a>
+	<div class="t">&nbsp;</div>
+	<div class="c">
+		<div class="heading">
+			<strong class="title">Name of skin</strong>
+			<span class="create">Created by: <a href="#">Cogworks</a></span>
+		</div>
+		<div class="carusel">
+			<ul>
+				<li><img src="images/img09.jpg" alt="image description"></li>
+				<li><img src="images/img10.jpg" alt="image description"></li>
+				<li><img src="images/img11.jpg" alt="image description"></li>
+			</ul>
+		</div>
+
+		<footer class="btn-box">
+			<a href="#single-tab4" class="single-tab btn-install btn-close-box">Install</a>
+		</footer>
+	</div>
+	<div class="b">&nbsp;</div>
+</div>
+
 	<input type="hidden" runat="server" value="welcome" id="step">
 	
 	</form>
diff --git a/umbraco/presentation/install/js/jquery.main.js b/umbraco/presentation/install/js/jquery.main.js
index 30a8b69388..db15657eb2 100644
--- a/umbraco/presentation/install/js/jquery.main.js
+++ b/umbraco/presentation/install/js/jquery.main.js
@@ -473,11 +473,29 @@ function initSlide() {
         });
     })
 }
+
 function initLightBox() {
     jQuery('a.btn-preview').simpleLightbox({
         faderOpacity: 0.7,
         faderBackground: '#000000',
-        closeLink: 'a.btn-close-box'
+        closeLink: 'a.btn-close-box',
+        onClick: function () {
+            var link = jQuery(this);
+            var title = link.attr("title");
+            var desc = link.siblings("div.gal-desc").html();
+            var owner = link.siblings("div.gal-owner").html();
+
+            jQuery("#lightbox .title").text(title);
+            jQuery("#lightbox .create").html(owner);
+            jQuery("#lightbox .carusel").html(desc);
+
+            jQuery("#lightbox footer a").click(function () {
+                var installLink = link.siblings("a.btn-install-gal");
+                //this is f'ing nasty, we'll switch to a neater solution then an updatepanel after the beta
+                eval(installLink.attr('href'));
+                installLink.click();
+            });
+        }
     });
 }
 
diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx
index 508ba58022..33c1266898 100644
--- a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx
+++ b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx
@@ -31,14 +31,16 @@
 	<img class="faik-mask" src="images/bg-img.png" alt="image description" width="152" height="129">
 	<img class="faik-mask-ie6" src="images/bg-img-ie.png" alt="image description" width="201" height="178">
 
-		<div class="image">
-		<img class="zoom-img" src="<%# ((Skin)Container.DataItem).Thumbnail %>" alt="<%# ((Skin)Container.DataItem).Text %>" width="134" height="103">
-				<div class="gal-drop">
-					<a href="#lightbox" class="btn-preview"><span>Preview</span></a>
-					<asp:LinkButton CssClass="single-tab btn-install-gal" ID="bt_selectKit" runat="server" onclick="SelectStarterKitDesign" CommandArgument="<%# ((Skin)Container.DataItem).RepoGuid %>"><span>Install</span></asp:LinkButton>
-					<div class="gal-desc" style="display: none"><%# ((Skin)Container.DataItem).Description %></div>
-				</div>
-		</div>
+	<div class="image">
+	<img class="zoom-img" src="<%# ((Skin)Container.DataItem).Thumbnail %>" alt="<%# ((Skin)Container.DataItem).Text %>" width="134" height="103">
+			<div class="gal-drop">
+				<a href="#lightbox" class="btn-preview" title="<%# ((Skin)Container.DataItem).Text %>"><span>Preview</span></a>
+				<asp:LinkButton CssClass="single-tab btn-install-gal" ID="bt_selectKit" runat="server" onclick="SelectStarterKitDesign" CommandArgument="<%# ((Skin)Container.DataItem).RepoGuid %>"><span>Install</span></asp:LinkButton>
+				<div class="gal-desc" style="display: none"><%# ((Skin)Container.DataItem).Description %></div>
+                <div class="gal-owner" style="display: none">Created by: <a href="<%# ((Skin)Container.DataItem).AuthorUrl %>" target="_blank"><%# ((Skin)Container.DataItem).Author %></a></div>
+			</div>
+	</div>
+
 	</div>
 	</li>
 	</ItemTemplate>
diff --git a/umbraco/presentation/install/steps/skinning.ascx b/umbraco/presentation/install/steps/skinning.ascx
index c49c45ad8f..5781575c6b 100644
--- a/umbraco/presentation/install/steps/skinning.ascx
+++ b/umbraco/presentation/install/steps/skinning.ascx
@@ -25,6 +25,8 @@
 	function pageLoad(sender, args) {
 		if (args.get_isPartialLoad()) {
 
+		    clearInterval(intervalId);
+
 			jQuery('#single-tab1').hide();
 
 			initZoomList2();
@@ -33,37 +35,39 @@
 			initLightBox();
 
 			jQuery('.btn-install-gal').click(function () {
-				jQuery('#browseSkins').hide();
-				jQuery('#installingSkin').show();
+			    jQuery('#browseSkins').hide();
+			    jQuery('#installingSkin').show();
 
-				//fire off the progressbar
-				intervalId = setInterval("progressBarCallback()", 1000);
+			    //fire off the progressbar
+			    intervalId = setInterval("progressBarCallback()", 1000);
 
-				jQuery('#skinname').html(jQuery('span', this).html());
-				return true;
+			    alert(jQuery(this).attr("title"));
+
+			    jQuery('#skinname').html(jQuery(this).attr("title"));
+			    return true;
 			});
 		}
 	}
 
 
 	function progressBarCallback() {
-	    jQuery.getJSON('utills/p.aspx?feed=progress', function (data) {
+		jQuery.getJSON('utills/p.aspx?feed=progress', function (data) {
 
-	        if (data.percentage > 0) {
-	            updateProgressBar(data.percentage);
-	            updateStatusMessage(data.message)
-	        }
+			if (data.percentage > 0) {
+				updateProgressBar(data.percentage);
+				updateStatusMessage(data.message)
+			}
 
-	        if (data.error != "") {
-	            clearInterval(intervalId);
-	            updateStatusMessage(data.error);
-	        }
+			if (data.error != "") {
+				clearInterval(intervalId);
+				updateStatusMessage(data.error);
+			}
 
-	        if (data.percentage == 100) {
-	            clearInterval(intervalId);
-	            jQuery(".btn-box").show();
-	        }
-	    });
+			if (data.percentage == 100) {
+				clearInterval(intervalId);
+				jQuery(".btn-box").show();
+			}
+		});
 	}
 	</script>
 </script>
@@ -123,7 +127,7 @@
 <div class="tab install-tab" id="installingSkin" style="display: none">
 	<div class="container">
 		<h1>Installing Skin</h1>
-		<h2>Your <strong id="skinname">skin</strong> is installing. </h2>
+		<h2>The <strong id="skinname"></strong> skin is installing. </h2>
 
 		<div class="loader alt">
 			<div class="hold">
@@ -135,26 +139,3 @@
 	</div>	
 </div>
 
-<!-- lightbox -->
-<div class="lightbox" id="lightbox">
-	<a href="#" class="btn-close btn-close-box">close</a>
-	<div class="t">&nbsp;</div>
-	<div class="c">
-		<div class="heading">
-			<strong class="title">Name of skin</strong>
-			<span class="create">Created by: <a href="#">Cogworks</a></span>
-		</div>
-		<div class="carusel">
-			<ul>
-				<li><img src="images/img09.jpg" alt="image description"></li>
-				<li><img src="images/img10.jpg" alt="image description"></li>
-				<li><img src="images/img11.jpg" alt="image description"></li>
-			</ul>
-		</div>
-
-		<footer class="btn-box" style="display: none;">
-			<a href="#single-tab4" class="single-tab btn-install btn-close-box">Install</a>
-		</footer>
-	</div>
-	<div class="b">&nbsp;</div>
-</div>
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
index a7e52a519e..27ddd39475 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
+++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
@@ -207,7 +207,6 @@ namespace umbraco.presentation.LiveEditing.Modules.SkinModule
                     if (!skinNames.Contains(c))
                         localSkins.Add(c);
                 }
-
             }
 
             if (localSkins.Count > 0)