From 0bd0853ff7a792ea255f7d348333dfea976f6107 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebros@microsoft.com>
Date: Tue, 19 Oct 2010 17:48:12 -0700
Subject: [PATCH 1/2] Updated advisory file

--HG--
branch : dev
---
 .../Orchard.Azure.Web/Orchard.Azure.Web.csproj            | 1 -
 src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml   | 3 ++-
 src/Orchard.Web/Orchard.Web.csproj                        | 1 -
 src/Orchard/Utility/Extensions/HttpRequestExtensions.cs   | 8 ++++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
index 73110bfa0..efe8978a0 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
@@ -154,7 +154,6 @@
     <Compile Include="WebRole.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Advisory.html" />
     <Content Include="Default.aspx" />
     <Content Include="Global.asax" />
   </ItemGroup>
diff --git a/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml
index 270b70744..75c7a9394 100644
--- a/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml
@@ -1,4 +1,5 @@
 @model dynamic
+@using Orchard.Utility.Extensions;
 
 <script type="text/javascript">    
     // Resize iframe to full height
@@ -11,7 +12,7 @@
     }
 </script>
 
-<iframe id="advisory" src="http://www.orchardproject.net/advisory" frameborder="0" height="0" width="100%"  >
+<iframe id="advisory" src="http://www.orchardproject.net/advisory?url=@Server.UrlEncode(Url.AbsoluteAction("Index", "Helper", new { area = "Dashboard" }))" frameborder="0" height="0" width="100%"  >
  <p>Your browser does not support iframes.</p>
 </iframe>
 
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 11a36e4f4..3d74774da 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -121,7 +121,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Advisory.html" />
     <Content Include="Default.aspx" />
     <Content Include="Global.asax" />
     <Content Include="Refresh.html" />
diff --git a/src/Orchard/Utility/Extensions/HttpRequestExtensions.cs b/src/Orchard/Utility/Extensions/HttpRequestExtensions.cs
index 513e1267b..536d6e95b 100644
--- a/src/Orchard/Utility/Extensions/HttpRequestExtensions.cs
+++ b/src/Orchard/Utility/Extensions/HttpRequestExtensions.cs
@@ -1,4 +1,6 @@
+using System;
 using System.Web;
+using System.Web.Mvc;
 
 namespace Orchard.Utility.Extensions {
     public static class HttpRequestExtensions {
@@ -33,5 +35,11 @@ namespace Orchard.Utility.Extensions {
         public static string ToUrlString(this HttpRequest request) {
             return string.Format("{0}://{1}{2}", request.Url.Scheme, request.Headers["Host"], request.RawUrl);
         }
+
+        public static string AbsoluteAction(this UrlHelper url, string action, string controller, object routeValues) {
+            Uri requestUrl = url.RequestContext.HttpContext.Request.Url;
+            return string.Concat(requestUrl.GetLeftPart(UriPartial.Authority),url.Action(action, controller, routeValues));
+        }
+
     }
 }

From 8af82790836d747e56fed97ae6af8442ff1dcf66 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebros@microsoft.com>
Date: Tue, 19 Oct 2010 17:48:24 -0700
Subject: [PATCH 2/2] Removing old local advisory files

--HG--
branch : dev
---
 src/Orchard.Azure/Orchard.Azure.Web/Advisory.html | 14 --------------
 src/Orchard.Web/Advisory.html                     | 14 --------------
 2 files changed, 28 deletions(-)
 delete mode 100644 src/Orchard.Azure/Orchard.Azure.Web/Advisory.html
 delete mode 100644 src/Orchard.Web/Advisory.html

diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Advisory.html b/src/Orchard.Azure/Orchard.Azure.Web/Advisory.html
deleted file mode 100644
index e1951380b..000000000
--- a/src/Orchard.Azure/Orchard.Azure.Web/Advisory.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<body onload="iframeResizePipe()">
-    <iframe id="helpframe" src="" frameborder="0" width="0" height="0"></iframe>
-    <script type="text/javascript">
-        function iframeResizePipe() {
-            var height = document.body.scrollHeight;
-            var helpFrame = document.getElementById('helpframe') || frames['helpframe'];
-            helpFrame.src = 'Admin/DashboardProxy' + '#' + height;
-        }
-    </script>
-
-    <!-- Your advisory message here -->
-</body>
-</html>
\ No newline at end of file
diff --git a/src/Orchard.Web/Advisory.html b/src/Orchard.Web/Advisory.html
deleted file mode 100644
index e1951380b..000000000
--- a/src/Orchard.Web/Advisory.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<body onload="iframeResizePipe()">
-    <iframe id="helpframe" src="" frameborder="0" width="0" height="0"></iframe>
-    <script type="text/javascript">
-        function iframeResizePipe() {
-            var height = document.body.scrollHeight;
-            var helpFrame = document.getElementById('helpframe') || frames['helpframe'];
-            helpFrame.src = 'Admin/DashboardProxy' + '#' + height;
-        }
-    </script>
-
-    <!-- Your advisory message here -->
-</body>
-</html>
\ No newline at end of file