lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 03:25:23 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-10-19 17:54:53 -07:00
parent 003be16f1c 8af8279083
commit 5dcfb0607c
6 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Orchard.Azure/Orchard.Azure.Web/Advisory.html
View File

@@ -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>

1
src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
View File

@@ -154,7 +154,6 @@
<Compile Include="WebRole.cs" /> <Compile Include="WebRole.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Advisory.html" />
<Content Include="Default.aspx" /> <Content Include="Default.aspx" />
<Content Include="Global.asax" /> <Content Include="Global.asax" />
</ItemGroup> </ItemGroup>

14
src/Orchard.Web/Advisory.html
View File

@@ -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>

3
src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml
View File

@@ -1,4 +1,5 @@
@model dynamic @model dynamic
@using Orchard.Utility.Extensions;
<script type="text/javascript"> <script type="text/javascript">
// Resize iframe to full height // Resize iframe to full height
@@ -11,7 +12,7 @@
} }
</script> </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> <p>Your browser does not support iframes.</p>
</iframe> </iframe>

1
src/Orchard.Web/Orchard.Web.csproj
View File

@@ -121,7 +121,6 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Advisory.html" />
<Content Include="Default.aspx" /> <Content Include="Default.aspx" />
<Content Include="Global.asax" /> <Content Include="Global.asax" />
<Content Include="Refresh.html" /> <Content Include="Refresh.html" />

8
src/Orchard/Utility/Extensions/HttpRequestExtensions.cs
View File

@@ -1,4 +1,6 @@
using System;
using System.Web; using System.Web;
using System.Web.Mvc;
namespace Orchard.Utility.Extensions { namespace Orchard.Utility.Extensions {
public static class HttpRequestExtensions { public static class HttpRequestExtensions {
@@ -33,5 +35,11 @@ namespace Orchard.Utility.Extensions {
public static string ToUrlString(this HttpRequest request) { public static string ToUrlString(this HttpRequest request) {
return string.Format("{0}://{1}{2}", request.Url.Scheme, request.Headers["Host"], request.RawUrl); 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));
}
} }
} }