forked from praeclarum/FuGetGallery
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request praeclarum#165 from MaceWindu/issue/72
Resolve url root to support virtual directory hosting
- Loading branch information
Showing
9 changed files
with
31 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -140,7 +140,7 @@ | |
| onamespace = (onamespace ?? ns?.Key) ?? RouteData.Values["namespace"]; | ||
| otypeName = otypeName ?? RouteData.Values["typeName"]; | ||
| ocode = ocode ?? Request.Query["code"].FirstOrDefault(); | ||
| var r = "/packages"; | ||
| var r = "~/packages"; | ||
| if (oid != null) | ||
| { | ||
| r += "/" + Uri.EscapeDataString(oid.ToString()); | ||
|
|
@@ -172,8 +172,9 @@ | |
| if ("true".Equals(ocode) && package.AllowedToDecompile) | ||
| { | ||
| r += "?code=true"; | ||
| } | ||
| return r; | ||
| } | ||
|
|
||
| return Url.Content(r); | ||
| } | ||
|
|
||
| string ShortDate(DateTime? date) | ||
|
|
@@ -196,12 +197,12 @@ | |
|
|
||
| <header> | ||
| <h1> | ||
| <a href="/packages/@Uri.EscapeDataString(package.Id)"> | ||
| <img src="@package.SafeIconUrl" class="package-icon" width="64" height="64" onError="this.onerror=null;this.src='/images/no-icon.png';" /> | ||
| <a href="~/packages/@Uri.EscapeDataString(package.Id)"> | ||
| <img src="@package.SafeIconUrl" class="package-icon" width="64" height="64" onError="this.onerror=null;this.src='@Url.Content("~/images/no-icon.png")';" /> | ||
| </a> | ||
| <a href="/packages/@Uri.EscapeDataString(package.Id)">@package.Id</a> | ||
| <a href="~/packages/@Uri.EscapeDataString(package.Id)">@package.Id</a> | ||
| <small>by @authors</small> | ||
| <a href="/packages/@Uri.EscapeDataString(package.Id)/badges"><img src="/packages/@Uri.EscapeDataString(package.Id)/[email protected](versionSpec.ShortVersionString)" /></a> | ||
| <a href="~/packages/@Uri.EscapeDataString(package.Id)/badges"><img src="~/packages/@Uri.EscapeDataString(package.Id)/[email protected](versionSpec.ShortVersionString)" /></a> | ||
| </h1> | ||
| <nav> | ||
| <div class="btn-group" style="display: inline-block"> | ||
|
|
@@ -305,7 +306,7 @@ | |
| @foreach (var d in framework.Dependencies.OrderBy(x => x.PackageId)) | ||
| { | ||
| <a class="btn btn-default btn-sm" style="color:#777" | ||
| href="/packages/@Uri.EscapeDataString(d.PackageId)/@Uri.EscapeDataString(d.VersionSpec)"> | ||
| href="~/packages/@Uri.EscapeDataString(d.PackageId)/@Uri.EscapeDataString(d.VersionSpec)"> | ||
| <span class="fugeticon fugeticon-@GetIcon(d)" aria-hidden="true"></span> @d.PackageId @d.VersionSpec | ||
| </a> | ||
| } | ||
|
|
@@ -319,14 +320,14 @@ | |
| @foreach (var d in (from d in dependents let r = rand.Next() orderby r select d).Take(maxDisplayDependents).OrderBy(x => x)) | ||
| { | ||
| <a class="btn btn-default btn-sm" style="color:#777" | ||
| href="/packages/@Uri.EscapeDataString(d)"> | ||
| href="~/packages/@Uri.EscapeDataString(d)"> | ||
| <span class="fugeticon fugeticon-@packageIcon" aria-hidden="true"></span> @d | ||
| </a> | ||
| } | ||
| @if (dependents.Count > maxDisplayDependents) | ||
| { | ||
| <a class="btn btn-default btn-sm" style="color:#777" | ||
| href="/packages/@Uri.EscapeDataString(package.Id)/dependents">@(dependents.Count - maxDisplayDependents) more...</a> | ||
| href="~/packages/@Uri.EscapeDataString(package.Id)/dependents">@(dependents.Count - maxDisplayDependents) more...</a> | ||
| } | ||
| </nav> | ||
| } | ||
|
|
@@ -404,7 +405,7 @@ else | |
| var cls = (active ? "active " : "") + "public-api"; | ||
| <li> | ||
| <a class="@cls" | ||
| href="/packages/@Uri.EscapeDataString(package.Id)/@Uri.EscapeDataString(package.Version.ShortVersionString)/lib/@Uri.EscapeDataString(framework.Moniker)/@Uri.EscapeDataString(a.FileName)"> | ||
| href="~/packages/@Uri.EscapeDataString(package.Id)/@Uri.EscapeDataString(package.Version.ShortVersionString)/lib/@Uri.EscapeDataString(framework.Moniker)/@Uri.EscapeDataString(a.FileName)"> | ||
| <span class="fugeticon fugeticon-@GetIcon(a)" aria-hidden="true"></span> @a.FileName | ||
| </a> | ||
| </li> | ||
|
|
@@ -421,7 +422,7 @@ else | |
| var cls = (active ? "active " : "") + "public-api"; | ||
| <li> | ||
| <a class="@cls" | ||
| href="/packages/@Uri.EscapeDataString(package.Id)/@Uri.EscapeDataString(package.Version.ShortVersionString)/build/@Uri.EscapeDataString(framework.Moniker)/@Uri.EscapeDataString(a.FileName)"> | ||
| href="~/packages/@Uri.EscapeDataString(package.Id)/@Uri.EscapeDataString(package.Version.ShortVersionString)/build/@Uri.EscapeDataString(framework.Moniker)/@Uri.EscapeDataString(a.FileName)"> | ||
| <span class="fugeticon fugeticon-@GetIcon(a)" aria-hidden="true"></span> @a.FileName | ||
| </a> | ||
| </li> | ||
|
|
@@ -441,7 +442,7 @@ else | |
| { | ||
| <li> | ||
| <a class="@cls" | ||
| href="/packages/@Uri.EscapeDataString(package.Id)/@Uri.EscapeDataString(package.Version.ShortVersionString)/@Uri.EscapeDataString(dir)/@Uri.EscapeDataString(framework.Moniker)/@Uri.EscapeDataString(asm.FileName)/@Uri.EscapeDataString(n.Key)"> | ||
| href="~/packages/@Uri.EscapeDataString(package.Id)/@Uri.EscapeDataString(package.Version.ShortVersionString)/@Uri.EscapeDataString(dir)/@Uri.EscapeDataString(framework.Moniker)/@Uri.EscapeDataString(asm.FileName)/@Uri.EscapeDataString(n.Key)"> | ||
| <span class="fugeticon fugeticon-@GetIcon(n)" aria-hidden="true"></span> @n.Key | ||
| </a> | ||
| </li> | ||
|
|
@@ -479,7 +480,7 @@ else | |
| var color = bold == "bold" ? "#000" : "#777"; | ||
| <li> | ||
| <a style="font-weight:@bold;color:@color;" | ||
| href="/packages/@Uri.EscapeDataString(package.Id)/@Uri.EscapeDataString(package.Version.ShortVersionString)/content/@a.ArchiveEntry.FullName.Substring(8)"> | ||
| href="~/packages/@Uri.EscapeDataString(package.Id)/@Uri.EscapeDataString(package.Version.ShortVersionString)/content/@a.ArchiveEntry.FullName.Substring(8)"> | ||
| <span class="fugeticon fugeticon-@GetIcon(a)" aria-hidden="true"></span> @a.ArchiveEntry.FullName.Substring(8) | ||
| </a> | ||
| </li> | ||
|
|
@@ -496,7 +497,7 @@ else | |
| var color = bold == "bold" ? "#000" : "#777"; | ||
| <li> | ||
| <a style="font-weight:@bold;color:@color;" | ||
| href="/packages/@Uri.EscapeDataString(package.Id)/@Uri.EscapeDataString(package.Version.ShortVersionString)/tools/@a.ArchiveEntry.FullName.Substring(6)"> | ||
| href="~/packages/@Uri.EscapeDataString(package.Id)/@Uri.EscapeDataString(package.Version.ShortVersionString)/tools/@a.ArchiveEntry.FullName.Substring(6)"> | ||
| <span class="fugeticon fugeticon-@GetIcon(a)" aria-hidden="true"></span> @a.ArchiveEntry.FullName.Substring(6) | ||
| </a> | ||
| </li> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters