Browse Source

- Fixed paste expiration date not formatting correctly in profile page.

- Modified navbar formatting for services.
tags/2.0.6
Teknikode 3 years ago
parent
commit
d0628dd8df
2 changed files with 19 additions and 10 deletions
  1. 13
    5
      Teknik/Areas/User/Views/User/Index.cshtml
  2. 6
    5
      Teknik/Views/Shared/_Navbar.cshtml

+ 13
- 5
Teknik/Areas/User/Views/User/Index.cshtml View File

@@ -6,9 +6,14 @@
@if (!Model.Error)
{
bool OwnProfile = (Model.Username == User.Identity.Name || User.IsInRole("Admin"));
string gitHost = (string.IsNullOrEmpty(Model.Config.Host)) ? string.Empty : Model.Config.GitConfig.Host;
Uri gitUrl = new Uri(gitHost);
gitUrl = new Uri(gitUrl, Model.Username);
string gitHost = Model.Config.GitConfig.Host;
string gitFullUrl = string.Empty;
if (!string.IsNullOrEmpty(gitHost))
{
Uri gitUrl = new Uri(gitHost);
gitUrl = new Uri(gitUrl, Model.Username);
gitFullUrl = gitUrl.ToString();
}
string pgpFingerprint = pgpFingerprint = string.Empty;
string pgpFingerprint64 = string.Empty;

@@ -82,7 +87,10 @@
<li class="list-group-item text-right"><span class="pull-left"><strong>Email</strong></span> <a href="mailto:@Model.Email">@Model.Email</a></li>
}
<li class="list-group-item text-right"><span class="pull-left"><strong>Blog</strong></span> <a href="@Url.SubRouteUrl("blog", "Blog.Blog", new { username = Model.Username })" id="blog_title">@(string.IsNullOrEmpty(Model.BlogSettings.Title) ? string.Format("{0}'s Blog", Model.Username) : Model.BlogSettings.Title)</a></li>
<li class="list-group-item text-right"><span class="pull-left"><strong>Git</strong></span> <a href="@gitUrl.ToString()">Public Repos</a></li>
@if (!string.IsNullOrEmpty(gitFullUrl))
{
<li class="list-group-item text-right"><span class="pull-left"><strong>Git</strong></span> <a href="@gitFullUrl">Public Repos</a></li>
}
</ul>
@if (!string.IsNullOrEmpty(Model.UserSettings.Website))
{
@@ -172,7 +180,7 @@
expireDate = "<time datetime=\"" + paste.ExpireDate.Value.ToString("s") + "\">" + paste.ExpireDate.Value.ToString("MMMM dd, yyyy") + "</time>";
}
}
<p id="expireDate">@expireDate</p>
<p id="expireDate">@Html.Raw(expireDate)</p>
</div>
<div class="col-sm-2 text-center">
<label for="maxViews">Max Views</label>

+ 6
- 5
Teknik/Views/Shared/_Navbar.cshtml View File

@@ -37,17 +37,17 @@
<a href="#" id="services_menu" class="dropdown-toggle" data-toggle="dropdown">Services <strong class="caret"></strong></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="services_menu">
<li class="@Url.GetActive("blog")">
<a href="@Url.SubRouteUrl("blog", "Blog.Blog", new { username = string.Empty })">Blog</a>
<a href="@Url.SubRouteUrl("blog", "Blog.Blog", new { username = string.Empty })">Blogging</a>
</li>
<li class="@Url.GetActive("podcast")">
<a href="@Url.SubRouteUrl("podcast", "Podcast.Index")">Podcast</a>
<a href="@Url.SubRouteUrl("podcast", "Podcast.Index")">Teknikast</a>
</li>
<li class="divider"></li>
<li role="separator" class="divider"></li>
<li class="@Url.GetActive("upload", "u")">
<a href="@Url.SubRouteUrl("upload", "Upload.Index")">Upload</a>
<a href="@Url.SubRouteUrl("upload", "Upload.Index")">Uploads</a>
</li>
<li class="@Url.GetActive("paste", "p")">
<a href="@Url.SubRouteUrl("paste", "Paste.Index")">Paste</a>
<a href="@Url.SubRouteUrl("paste", "Paste.Index")">Pastebin</a>
</li>
<li class="@Url.GetActive("shorten", "s")">
<a href="@Url.SubRouteUrl("shorten", "Shortener.Index")">Shorten Url</a>
@@ -55,6 +55,7 @@
<li class="@Url.GetActive("vault", "v")">
<a href="@Url.SubRouteUrl("vault", "Vault.Index")">Vaults</a>
</li>
<li role="separator" class="divider"></li>
<li class="@Url.GetActive("git")">
<a href="@Model.Config.GitConfig.Host">Git</a>
</li>

Loading…
Cancel
Save