diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/pages/review.scss b/src/dotnet/APIView/APIViewWeb/Client/css/pages/review.scss index e710988fa3b0..af616f12ac68 100644 --- a/src/dotnet/APIView/APIViewWeb/Client/css/pages/review.scss +++ b/src/dotnet/APIView/APIViewWeb/Client/css/pages/review.scss @@ -73,4 +73,16 @@ &.gutter-horizontal { cursor: col-resize; } +} + +.option-approved > label, .option-pending > label { + font-size: small; +} + +.option-approved > label::after { + content: ""; + font-family: "FontAwesome"; + margin-left: 10px; + color: var(--success-color); + font-size: medium; } \ No newline at end of file diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/shared/bootstraps-overrides.scss b/src/dotnet/APIView/APIViewWeb/Client/css/shared/bootstraps-overrides.scss index 242a35804545..edeed269413b 100644 --- a/src/dotnet/APIView/APIViewWeb/Client/css/shared/bootstraps-overrides.scss +++ b/src/dotnet/APIView/APIViewWeb/Client/css/shared/bootstraps-overrides.scss @@ -172,6 +172,15 @@ select { border: 1px solid var(--border-color); } +.dropdown-header { + color: var(--base-text-color); +} + +.dropdown-item:hover, .dropdown-item:focus { + color: var(--base-text-color); + background-color: var(--base-bg-color); +} + .table { color: var(--base-text-color); } diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/shared/comments.scss b/src/dotnet/APIView/APIViewWeb/Client/css/shared/comments.scss index 2c81f7c6d6e0..16ab2cfcdc5b 100644 --- a/src/dotnet/APIView/APIViewWeb/Client/css/shared/comments.scss +++ b/src/dotnet/APIView/APIViewWeb/Client/css/shared/comments.scss @@ -36,7 +36,7 @@ .comment-contents { margin-bottom: 3px; overflow-wrap: anywhere; - overflow-x: auto; + display: inline-grid; } .comment-contents .fw-bold { diff --git a/src/dotnet/APIView/APIViewWeb/Models/ReviewRevisionModel.cs b/src/dotnet/APIView/APIViewWeb/Models/ReviewRevisionModel.cs index c1bad78b98ca..0a919bc7612a 100644 --- a/src/dotnet/APIView/APIViewWeb/Models/ReviewRevisionModel.cs +++ b/src/dotnet/APIView/APIViewWeb/Models/ReviewRevisionModel.cs @@ -45,18 +45,30 @@ public string Author } [JsonIgnore] - public string DisplayNameShort + public string DisplayName { get { + string name; + if (s_oldRevisionStyle.IsMatch(Name)) + { + // old model where revision number was stored directly on Name + name = Name.Substring(Name.IndexOf('-') + 1); + } + else + { + // New model where revision number is calculated on demand. This makes + // the feature to allow for editing revision names cleaner. + name = Name; + } return Label != null ? - $"rev {RevisionNumber} - {Label}" : - $"rev {RevisionNumber}"; + $"rev {RevisionNumber} - {Label} - {name}" : + $"rev {RevisionNumber} - {name}"; } } [JsonIgnore] - public string DisplayName + public string DisplayNameVertical { get { @@ -72,7 +84,9 @@ public string DisplayName // the feature to allow for editing revision names cleaner. name = Name; } - return $"{DisplayNameShort} - {name}"; + return Label != null ? + $"rev {RevisionNumber}\n\r{Label}\n\r{name}" : + $"rev {RevisionNumber}\n\r{name}"; } } diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml index 79425fdd69cc..7df025417391 100644 --- a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml +++ b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml @@ -18,7 +18,7 @@

- Approve   + Approval  

@{ var approvalCollapseState = " show"; @@ -29,9 +29,8 @@ } }
+ + First Revision Approval Pending + + } + else + { +
  • + @if (approver != null) + { + Package has been approved for first release by @approver } else { - @if (approver != null) - { - Package has been approved for first release by @approver - } - else - { - Package has been approved for first release - } - } - + Package has been approved for first release + } +
    • } - + }

    Request Reviewers   @@ -312,7 +295,7 @@

    -
  • +
  • @if (Model.ShowDocumentation) { @@ -327,7 +310,7 @@
    • -
  • +
  • @if (userPreference.ShowHiddenApis == true) { @@ -397,7 +380,7 @@ @@ -449,7 +432,7 @@ } @foreach (var revision in Model.PreviousRevisions.Reverse()) { - var optionName = revision.IsApproved ? $"{@revision.DisplayNameShort} ✔" : @revision.DisplayNameShort; + var optionClass = revision.IsApproved ? "option-approved" : "option-pending"; var urlValue = @Url.ActionLink("Review", "Assemblies", new { id = @Model.Review.ReviewId, @@ -462,18 +445,18 @@ { if (@Model.DiffRevisionId == @revision.RevisionId) { - + } else { - + } } else { if (@Model.DiffRevisionId != @revision.RevisionId) { - + } } } @@ -544,6 +527,31 @@
    - + + +
    + + +
    diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Shared/_CommentThreadInnerPartial.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Shared/_CommentThreadInnerPartial.cshtml index af92c4acbe99..00013e4b7494 100644 --- a/src/dotnet/APIView/APIViewWeb/Pages/Shared/_CommentThreadInnerPartial.cshtml +++ b/src/dotnet/APIView/APIViewWeb/Pages/Shared/_CommentThreadInnerPartial.cshtml @@ -12,20 +12,6 @@ @Model.Username - - -
    - - -

    • .NET - Java - Python - C - JavaScript - Go - C++ + .NET + Java + Python + C + JavaScript + Go + C++
    + +
    + + +
    @if (Model.Comment.Contains("\r\n")) diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Shared/_ReviewBadge.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Shared/_ReviewBadge.cshtml index f540cbc83114..98018aac999a 100644 --- a/src/dotnet/APIView/APIViewWeb/Pages/Shared/_ReviewBadge.cshtml +++ b/src/dotnet/APIView/APIViewWeb/Pages/Shared/_ReviewBadge.cshtml @@ -27,8 +27,8 @@ { @if (Model.IsApprovedForFirstRelease) { - - + + } } diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Shared/_ReviewsPartial.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Shared/_ReviewsPartial.cshtml index b19fd0d1ecbb..4dcbbc6d2360 100644 --- a/src/dotnet/APIView/APIViewWeb/Pages/Shared/_ReviewsPartial.cshtml +++ b/src/dotnet/APIView/APIViewWeb/Pages/Shared/_ReviewsPartial.cshtml @@ -42,7 +42,7 @@ @review.Author - + @review.FilterType.ToString() @@ -56,7 +56,7 @@ } else { - + }