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

#19408: Fixing absolute links in tenants using Url Prefix

Browse Source 
Work Item: 19408

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2013-05-13 15:33:57 -07:00
parent 63d2596152
commit 20552d6a47
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/Index.cshtml
View File

@@ -2,9 +2,12 @@
@using Orchard.Alias
@using Orchard.Alias.ViewModels
@using Orchard.Environment.Configuration
@using Orchard.Utility.Extensions
@{
var urlPrefix = WorkContext.Resolve<ShellSettings>().RequestUrlPrefix;
Layout.Title = T("Manage Aliases").Text;
var aliasService = WorkContext.Resolve<IAliasService>();
AdminIndexOptions options = Model.Options;
@@ -70,10 +73,10 @@
<input type="checkbox" value="true" name="@Html.FieldNameFor(m => Model.AliasEntries[index].IsChecked)"/>
</td>
<td>
@Html.Link(alias.Path == String.Empty ? "/" : alias.Path, Href("~/" + alias.Path))
@Html.Link(alias.Path == String.Empty ? "/" : alias.Path, Href("~/" + urlPrefix + alias.Path))
</td>
<td>
@Html.Link(url, Href("~/" + url))
@Html.Link(url, Href("~/" + urlPrefix + "/" + url))
</td>
<td>
@Html.ActionLink(T("Edit").Text, "Edit", new { path = alias.Path == String.Empty ? "/" : alias.Path })

8
src/Orchard.Web/Themes/TheAdmin/Views/Header.cshtml
View File

@@ -1,11 +1,13 @@
@model dynamic
@using Orchard.Environment.Configuration
@model dynamic
@{
var urlPrefix = WorkContext.Resolve<ShellSettings>().RequestUrlPrefix;
var siteName = WorkContext.CurrentSite.SiteName;
var siteLinkText = !string.IsNullOrWhiteSpace(siteName) ? siteName : T("Your site").Text;
var appLinkText = !string.IsNullOrWhiteSpace(siteName) ? siteName : T("Project Orchard").Text;
}
<div id="branding">
<div id="app">@Html.Link(appLinkText, Url.Content("~/"))</div>
<div id="site">@Html.Link(siteLinkText, Url.Content("~/"))</div>
<div id="app">@Html.Link(appLinkText, Url.Content("~/" + urlPrefix))</div>
<div id="site">@Html.Link(siteLinkText, Url.Content("~/" + urlPrefix))</div>
</div>