diff --git a/src/Moonglade.Web/Pages/Admin/About.cshtml b/src/Moonglade.Web/Pages/Admin/About.cshtml index 724c43cf0..d1673f9b8 100644 --- a/src/Moonglade.Web/Pages/Admin/About.cshtml +++ b/src/Moonglade.Web/Pages/Admin/About.cshtml @@ -8,19 +8,14 @@ var process = Process.GetCurrentProcess(); } - -
-
- - - - - - +

+ + @SharedLocalizer["Moonglade Configuration"] +

+ +
+
- - @SharedLocalizer["Moonglade Configuration"] -
@@ -47,59 +42,56 @@
@SharedLocalizer["Version"]
+ +

+ + @SharedLocalizer["Server Information"] +

-
- - - - - - +
+
- - @SharedLocalizer["Server Information"] -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@SharedLocalizer["System"]@Helper.TryGetFullOSVersion() @(Environment.Is64BitOperatingSystem ? "(64-bit)" : "(32-bit)")
@SharedLocalizer["Directory"]@Environment.CurrentDirectory
@SharedLocalizer["Machine Name"]@Environment.MachineName
@SharedLocalizer["User Name"]@Environment.UserDomainName\@Environment.UserName
@SharedLocalizer[".NET Version"]@Environment.Version
@SharedLocalizer["Worker Process"][@process.Id] @process.ProcessName @(Environment.Is64BitProcess ? "(64-bit)" : "(32-bit)")
@SharedLocalizer["Start Time"]@process.StartTime.ToUniversalTime() (UTC)
@SharedLocalizer["Memory"]@(process.WorkingSet64 / 1024 / 1024) MB
@SharedLocalizer["Docker Container"]@(Environment.GetEnvironmentVariable("DOTNET_RUNNING_IN_CONTAINER") == "true")
@SharedLocalizer["System"]@Helper.TryGetFullOSVersion() @(Environment.Is64BitOperatingSystem ? "(64-bit)" : "(32-bit)")
@SharedLocalizer["Directory"]@Environment.CurrentDirectory
@SharedLocalizer["Machine Name"]@Environment.MachineName
@SharedLocalizer["User Name"]@Environment.UserDomainName\@Environment.UserName
@SharedLocalizer[".NET Version"]@Environment.Version
@SharedLocalizer["Worker Process"][@process.Id] @process.ProcessName @(Environment.Is64BitProcess ? "(64-bit)" : "(32-bit)")
@SharedLocalizer["Start Time"]@process.StartTime.ToUniversalTime() (UTC)
@SharedLocalizer["Memory"]@(process.WorkingSet64 / 1024 / 1024) MB
@SharedLocalizer["Docker Container"]@(Environment.GetEnvironmentVariable("DOTNET_RUNNING_IN_CONTAINER") == "true")
- + Report an issue diff --git a/src/Moonglade.Web/Pages/Admin/BlogPage.cshtml b/src/Moonglade.Web/Pages/Admin/BlogPage.cshtml index 086bade32..2885e09ee 100644 --- a/src/Moonglade.Web/Pages/Admin/BlogPage.cshtml +++ b/src/Moonglade.Web/Pages/Admin/BlogPage.cshtml @@ -25,21 +25,23 @@ } -
- - - @SharedLocalizer["New"] - - - - - @SharedLocalizer["Export"] - -
+@section admintoolbar{ +
+ + + @SharedLocalizer["New"] + + + + + @SharedLocalizer["Export"] + +
+} @if (pageSegments.Any()) { -
+
@Html.AntiForgeryToken()
diff --git a/src/Moonglade.Web/Pages/Admin/Category.cshtml b/src/Moonglade.Web/Pages/Admin/Category.cshtml index 0f9ef093e..c8bec0bca 100644 --- a/src/Moonglade.Web/Pages/Admin/Category.cshtml +++ b/src/Moonglade.Web/Pages/Admin/Category.cshtml @@ -76,21 +76,23 @@ } -
- - - @SharedLocalizer["New"] - - - - - @SharedLocalizer["Export"] - -
+@section admintoolbar{ +
+ + + @SharedLocalizer["New"] + + + + + @SharedLocalizer["Export"] + +
+} @Html.AntiForgeryToken() -
+
@foreach (var cat in Model.Categories.OrderBy(m => m.DisplayName)) {
diff --git a/src/Moonglade.Web/Pages/Admin/Comments.cshtml b/src/Moonglade.Web/Pages/Admin/Comments.cshtml index 966fa0cc5..1df5a8637 100644 --- a/src/Moonglade.Web/Pages/Admin/Comments.cshtml +++ b/src/Moonglade.Web/Pages/Admin/Comments.cshtml @@ -12,7 +12,7 @@ } - @section head{ +@section head{ } - -
+@section admintoolbar{ +
@SharedLocalizer["Delete selected"]
+} -
- @if (Model.CommentDetailedItems.Count == 0) +
+ @if (Model.CommentDetailedItems.Count == 0) {
@SharedLocalizer["No Comments"] @@ -96,7 +97,7 @@ { foreach (var item in Model.CommentDetailedItems) { -
+
@@ -122,7 +123,7 @@ - + (@item.IpAddress) @@ -130,9 +131,9 @@
+ id="replycontent-@item.Id" + name="ReplyContent" + placeholder="Content" type="text">
@@ -168,8 +169,6 @@
- -
} } diff --git a/src/Moonglade.Web/Pages/Admin/Draft.cshtml b/src/Moonglade.Web/Pages/Admin/Draft.cshtml index 6cd2d3ab9..e91e72df8 100644 --- a/src/Moonglade.Web/Pages/Admin/Draft.cshtml +++ b/src/Moonglade.Web/Pages/Admin/Draft.cshtml @@ -31,16 +31,18 @@ } - +@section admintoolbar{ + +} -
+
@if (posts.Any()) { @Html.AntiForgeryToken() @foreach (var post in posts.OrderByDescending(p => p.LastModifiedUtc)) { -
+
@@ -63,7 +65,6 @@
-
} } diff --git a/src/Moonglade.Web/Pages/Admin/EditPage.cshtml b/src/Moonglade.Web/Pages/Admin/EditPage.cshtml index f89ff7604..1b84c4c42 100644 --- a/src/Moonglade.Web/Pages/Admin/EditPage.cshtml +++ b/src/Moonglade.Web/Pages/Admin/EditPage.cshtml @@ -158,7 +158,7 @@ } -
+
diff --git a/src/Moonglade.Web/Pages/Admin/EditPost.cshtml b/src/Moonglade.Web/Pages/Admin/EditPost.cshtml index d855e40c4..b1e2f55a5 100644 --- a/src/Moonglade.Web/Pages/Admin/EditPost.cshtml +++ b/src/Moonglade.Web/Pages/Admin/EditPost.cshtml @@ -152,8 +152,7 @@ } -
- +
diff --git a/src/Moonglade.Web/Pages/Admin/FriendLink.cshtml b/src/Moonglade.Web/Pages/Admin/FriendLink.cshtml index 3b837f2d5..96621e87c 100644 --- a/src/Moonglade.Web/Pages/Admin/FriendLink.cshtml +++ b/src/Moonglade.Web/Pages/Admin/FriendLink.cshtml @@ -5,99 +5,102 @@ } @section scripts{ - + callApi(apiAddress, + httpVerb, + { + id: fid, + title: value["EditLinkRequest.Title"], + linkUrl: value["EditLinkRequest.LinkUrl"] + }, + (resp) => { + document.querySelector('#edit-form').reset(); + $("#editFriendlinkModal").modal('hide'); + window.location.reload(); + }); + } + + const form = document.querySelector('#edit-form'); + form.addEventListener('submit', handleSubmit); + } -
- - - @SharedLocalizer["New"] - - - - - @SharedLocalizer["Export"] - -
+@section admintoolbar{ +
+ + + @SharedLocalizer["New"] + -
+ + + @SharedLocalizer["Export"] + +
+} + +
@foreach (var item in Model.Links.OrderBy(m => m.Title)) { -
-
-
- @item.Title -
-
- @item.LinkUrl +
+
+
+
+ @item.Title +
+ +
+
+ +
-
-
- -
-
} @Html.AntiForgeryToken() diff --git a/src/Moonglade.Web/Pages/Admin/Pingback.cshtml b/src/Moonglade.Web/Pages/Admin/Pingback.cshtml index 17aae3b13..aac30dbe5 100644 --- a/src/Moonglade.Web/Pages/Admin/Pingback.cshtml +++ b/src/Moonglade.Web/Pages/Admin/Pingback.cshtml @@ -15,12 +15,6 @@ overflow-y: scroll; overflow-x: hidden; } - - .pingback-item { - border-bottom: 1px solid #CECECE; - padding-bottom: 15px; - margin-bottom: 15px; - } } @@ -28,14 +22,14 @@ } - -
-
-
- - - @SharedLocalizer["Clear all"] - -
-
-
- @pingbackRecords.Count item(s) +@section admintoolbar{ +
+
+
+ + + @SharedLocalizer["Clear all"] + +
+
+
+ @pingbackRecords.Count item(s) +
-
+} -
+
@foreach (var item in pingbackRecords.OrderByDescending(p => p.PingTimeUtc)) { -
-
- - @item.SourceTitle - - -
- - - @item.TargetPostTitle +
+
+
+ + @item.SourceTitle + + +
+ + + @item.TargetPostTitle +
+ +
+ @item.Domain, @item.SourceIp, + +
-
- @item.Domain, @item.SourceIp, - +
+ + +
- -
- - - -
}
diff --git a/src/Moonglade.Web/Pages/Admin/Post.cshtml b/src/Moonglade.Web/Pages/Admin/Post.cshtml index 09b177548..b35ce34de 100644 --- a/src/Moonglade.Web/Pages/Admin/Post.cshtml +++ b/src/Moonglade.Web/Pages/Admin/Post.cshtml @@ -9,14 +9,14 @@ } - +@section admintoolbar{ + +} + @Html.AntiForgeryToken() -
+
-
+
@@ -42,13 +45,13 @@ @if (Model.PostSegments.Count == 0) { - + } else { foreach (var item in Model.PostSegments) { -
+
-
} @Html.PagedListPager(Model.PostSegments, page => $"?pageIndex={page}&searchTerm={Model.SearchTerm}", new () - { - LiElementClasses = new[] {"page-item"}, - PageClasses = new[] {"page-link"}, - UlElementClasses = new[] {"pagination justify-content-end"}, - DisplayEllipsesWhenNotShowingAllPageNumbers = false - }) + { + LiElementClasses = new[] {"page-item"}, + PageClasses = new[] {"page-link"}, + UlElementClasses = new[] {"pagination justify-content-end"}, + DisplayEllipsesWhenNotShowingAllPageNumbers = false + }) }
\ No newline at end of file diff --git a/src/Moonglade.Web/Pages/Admin/RecycleBin.cshtml b/src/Moonglade.Web/Pages/Admin/RecycleBin.cshtml index 21973b584..b20a241a5 100644 --- a/src/Moonglade.Web/Pages/Admin/RecycleBin.cshtml +++ b/src/Moonglade.Web/Pages/Admin/RecycleBin.cshtml @@ -52,10 +52,13 @@ } @Html.AntiForgeryToken() - -
- +@section admintoolbar{ + +} + +
+ @SharedLocalizer["Empty Recycle Bin"] @@ -63,7 +66,7 @@ { foreach (var post in posts.OrderByDescending(p => p.CreateTimeUtc)) { -
+
@@ -83,7 +86,6 @@
-
} } diff --git a/src/Moonglade.Web/Pages/Admin/Tags.cshtml b/src/Moonglade.Web/Pages/Admin/Tags.cshtml index 0bbc6fdb1..9dd00a072 100644 --- a/src/Moonglade.Web/Pages/Admin/Tags.cshtml +++ b/src/Moonglade.Web/Pages/Admin/Tags.cshtml @@ -64,25 +64,27 @@ } -
- - - @SharedLocalizer["New"] - - - - - @SharedLocalizer["Export"] - -
+@section admintoolbar{ +
+ + + @SharedLocalizer["New"] + + + + + @SharedLocalizer["Export"] + +
+} -
+
    @foreach (var tag in tags.OrderBy(model => model.DisplayName)) { -
  • +
  • @tag.DisplayName diff --git a/src/Moonglade.Web/Pages/Admin/_DiagnosisHeader.cshtml b/src/Moonglade.Web/Pages/Admin/_DiagnosisHeader.cshtml deleted file mode 100644 index 8392097d9..000000000 --- a/src/Moonglade.Web/Pages/Admin/_DiagnosisHeader.cshtml +++ /dev/null @@ -1,11 +0,0 @@ -@{ - var currentPage = ViewContext.RouteData.Values["page"]?.ToString(); -} - -
    - -
    \ No newline at end of file diff --git a/src/Moonglade.Web/Pages/Admin/_PostManageHeader.cshtml b/src/Moonglade.Web/Pages/Admin/_PostManageHeader.cshtml index cd128edca..de5d60b38 100644 --- a/src/Moonglade.Web/Pages/Admin/_PostManageHeader.cshtml +++ b/src/Moonglade.Web/Pages/Admin/_PostManageHeader.cshtml @@ -2,7 +2,7 @@ var currentPage = ViewContext.RouteData.Values["Page"]?.ToString(); } -
    +