bug: whitespace missing in device/user flag tooltips
This commit is contained in:
Gary Sharp
@@ -22,8 +22,9 @@
|
||||
{
|
||||
<i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw fa-lg d-@(flag.Item2.flag.IconColour)">
|
||||
<span class="details">
|
||||
<span class="name">@flag.Item2.flag.Name</span>@if (flag.Item1.Comments != null)
|
||||
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser)</span>
|
||||
<span class="name">@flag.Item2.flag.Name</span>
|
||||
@if (flag.Item1.Comments != null) {<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}
|
||||
<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser)</span>
|
||||
</span>
|
||||
</i>
|
||||
}
|
||||
|
||||
@@ -161,12 +161,17 @@ WriteLiteral(">");
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral("</span>");
|
||||
WriteLiteral("</span>\r\n");
|
||||
|
||||
|
||||
#line 25 "..\..\Views\User\Show.cshtml"
|
||||
if (flag.Item1.Comments != null)
|
||||
{
|
||||
#line 26 "..\..\Views\User\Show.cshtml"
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 26 "..\..\Views\User\Show.cshtml"
|
||||
if (flag.Item1.Comments != null) {
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
@@ -178,7 +183,7 @@ WriteLiteral(">");
|
||||
|
||||
|
||||
#line 26 "..\..\Views\User\Show.cshtml"
|
||||
Write(flag.Item1.Comments.ToHtmlComment());
|
||||
Write(flag.Item1.Comments.ToHtmlComment());
|
||||
|
||||
|
||||
#line default
|
||||
@@ -187,19 +192,20 @@ WriteLiteral("</span>");
|
||||
|
||||
|
||||
#line 26 "..\..\Views\User\Show.cshtml"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral("<span");
|
||||
WriteLiteral(" <span");
|
||||
|
||||
WriteLiteral(" class=\"added\"");
|
||||
|
||||
WriteLiteral(">");
|
||||
|
||||
|
||||
#line 26 "..\..\Views\User\Show.cshtml"
|
||||
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser));
|
||||
#line 27 "..\..\Views\User\Show.cshtml"
|
||||
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser));
|
||||
|
||||
|
||||
#line default
|
||||
@@ -207,7 +213,7 @@ WriteLiteral(">");
|
||||
WriteLiteral("</span>\r\n </span>\r\n </i>\r\n");
|
||||
|
||||
|
||||
#line 29 "..\..\Views\User\Show.cshtml"
|
||||
#line 30 "..\..\Views\User\Show.cshtml"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -254,7 +260,7 @@ WriteLiteral(@">
|
||||
");
|
||||
|
||||
|
||||
#line 63 "..\..\Views\User\Show.cshtml"
|
||||
#line 64 "..\..\Views\User\Show.cshtml"
|
||||
}
|
||||
|
||||
|
||||
@@ -263,7 +269,7 @@ WriteLiteral(@">
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 64 "..\..\Views\User\Show.cshtml"
|
||||
#line 65 "..\..\Views\User\Show.cshtml"
|
||||
Write(Html.Partial(MVC.User.Views.UserParts._Subject, Model));
|
||||
|
||||
|
||||
@@ -303,13 +309,13 @@ WriteLiteral(" id=\"UserDetailTabItems\"");
|
||||
WriteLiteral("></ul>\r\n");
|
||||
|
||||
|
||||
#line 100 "..\..\Views\User\Show.cshtml"
|
||||
#line 101 "..\..\Views\User\Show.cshtml"
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 100 "..\..\Views\User\Show.cshtml"
|
||||
#line 101 "..\..\Views\User\Show.cshtml"
|
||||
if (Authorization.HasAny(Claims.User.ShowComments, Claims.User.ShowJobs))
|
||||
{
|
||||
|
||||
@@ -317,14 +323,14 @@ WriteLiteral("></ul>\r\n");
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 102 "..\..\Views\User\Show.cshtml"
|
||||
#line 103 "..\..\Views\User\Show.cshtml"
|
||||
Write(Html.Partial(MVC.User.Views.UserParts._CommentsAndJobs, Model));
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 102 "..\..\Views\User\Show.cshtml"
|
||||
#line 103 "..\..\Views\User\Show.cshtml"
|
||||
|
||||
}
|
||||
|
||||
@@ -334,7 +340,7 @@ WriteLiteral("></ul>\r\n");
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 104 "..\..\Views\User\Show.cshtml"
|
||||
#line 105 "..\..\Views\User\Show.cshtml"
|
||||
if (Authorization.Has(Claims.User.ShowAssignmentHistory))
|
||||
{
|
||||
|
||||
@@ -342,14 +348,14 @@ WriteLiteral(" ");
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 106 "..\..\Views\User\Show.cshtml"
|
||||
#line 107 "..\..\Views\User\Show.cshtml"
|
||||
Write(Html.Partial(MVC.User.Views.UserParts._AssignmentHistory, Model));
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 106 "..\..\Views\User\Show.cshtml"
|
||||
#line 107 "..\..\Views\User\Show.cshtml"
|
||||
|
||||
}
|
||||
|
||||
@@ -359,7 +365,7 @@ WriteLiteral(" ");
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 108 "..\..\Views\User\Show.cshtml"
|
||||
#line 109 "..\..\Views\User\Show.cshtml"
|
||||
if (Authorization.Has(Claims.User.ShowAttachments))
|
||||
{
|
||||
|
||||
@@ -367,14 +373,14 @@ WriteLiteral(" ");
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 110 "..\..\Views\User\Show.cshtml"
|
||||
#line 111 "..\..\Views\User\Show.cshtml"
|
||||
Write(Html.Partial(MVC.User.Views.UserParts._Resources, Model));
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 110 "..\..\Views\User\Show.cshtml"
|
||||
#line 111 "..\..\Views\User\Show.cshtml"
|
||||
|
||||
}
|
||||
|
||||
@@ -384,7 +390,7 @@ WriteLiteral(" ");
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 112 "..\..\Views\User\Show.cshtml"
|
||||
#line 113 "..\..\Views\User\Show.cshtml"
|
||||
if (Authorization.Has(Claims.User.ShowFlagAssignments) || Model.User.UserFlagAssignments.CanShowAny())
|
||||
{
|
||||
|
||||
@@ -392,14 +398,14 @@ WriteLiteral(" ");
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 114 "..\..\Views\User\Show.cshtml"
|
||||
#line 115 "..\..\Views\User\Show.cshtml"
|
||||
Write(Html.Partial(MVC.User.Views.UserParts._Flags, Model));
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 114 "..\..\Views\User\Show.cshtml"
|
||||
#line 115 "..\..\Views\User\Show.cshtml"
|
||||
|
||||
}
|
||||
|
||||
@@ -409,7 +415,7 @@ WriteLiteral(" ");
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 116 "..\..\Views\User\Show.cshtml"
|
||||
#line 117 "..\..\Views\User\Show.cshtml"
|
||||
if (Authorization.Has(Claims.User.ShowAuthorization))
|
||||
{
|
||||
|
||||
@@ -417,14 +423,14 @@ WriteLiteral(" ");
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 118 "..\..\Views\User\Show.cshtml"
|
||||
#line 119 "..\..\Views\User\Show.cshtml"
|
||||
Write(Html.Partial(MVC.User.Views.UserParts._Authorization, Model));
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 118 "..\..\Views\User\Show.cshtml"
|
||||
#line 119 "..\..\Views\User\Show.cshtml"
|
||||
|
||||
}
|
||||
|
||||
@@ -434,13 +440,13 @@ WriteLiteral(" ");
|
||||
WriteLiteral(" </div>\r\n");
|
||||
|
||||
|
||||
#line 121 "..\..\Views\User\Show.cshtml"
|
||||
#line 122 "..\..\Views\User\Show.cshtml"
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 121 "..\..\Views\User\Show.cshtml"
|
||||
#line 122 "..\..\Views\User\Show.cshtml"
|
||||
if (requiresLive)
|
||||
{
|
||||
|
||||
@@ -478,7 +484,7 @@ WriteLiteral(" <script>\r\n $(function () {\r\n
|
||||
" });\r\n });\r\n </script>\r\n");
|
||||
|
||||
|
||||
#line 168 "..\..\Views\User\Show.cshtml"
|
||||
#line 169 "..\..\Views\User\Show.cshtml"
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -481,8 +481,9 @@
|
||||
{
|
||||
<i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw d-@(flag.Item2.flag.IconColour)">
|
||||
<span class="details">
|
||||
<span class="name">@flag.Item2.flag.Name</span>@if (flag.Item1.Comments != null)
|
||||
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span>
|
||||
<span class="name">@flag.Item2.flag.Name</span>
|
||||
@if (flag.Item1.Comments != null) {<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}
|
||||
<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span>
|
||||
</span>
|
||||
</i>
|
||||
}
|
||||
|
||||
@@ -1738,12 +1738,17 @@ WriteLiteral(">");
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral("</span>");
|
||||
WriteLiteral("</span>\r\n");
|
||||
|
||||
|
||||
#line 484 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
if (flag.Item1.Comments != null)
|
||||
{
|
||||
#line 485 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 485 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
if (flag.Item1.Comments != null) {
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
@@ -1755,7 +1760,7 @@ WriteLiteral(">");
|
||||
|
||||
|
||||
#line 485 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
Write(flag.Item1.Comments.ToHtmlComment());
|
||||
Write(flag.Item1.Comments.ToHtmlComment());
|
||||
|
||||
|
||||
#line default
|
||||
@@ -1764,19 +1769,21 @@ WriteLiteral("</span>");
|
||||
|
||||
|
||||
#line 485 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral("<span");
|
||||
WriteLiteral(" " +
|
||||
" <span");
|
||||
|
||||
WriteLiteral(" class=\"added\"");
|
||||
|
||||
WriteLiteral(">");
|
||||
|
||||
|
||||
#line 485 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId));
|
||||
#line 486 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId));
|
||||
|
||||
|
||||
#line default
|
||||
@@ -1786,7 +1793,7 @@ WriteLiteral("</span>\r\n
|
||||
" </i>\r\n");
|
||||
|
||||
|
||||
#line 488 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
#line 489 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1840,7 +1847,7 @@ WriteLiteral(">\r\n
|
||||
" </tr>\r\n");
|
||||
|
||||
|
||||
#line 523 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
#line 524 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
}
|
||||
|
||||
|
||||
@@ -1851,7 +1858,7 @@ WriteLiteral(" </tbody>\r\n
|
||||
" </div>\r\n");
|
||||
|
||||
|
||||
#line 528 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
#line 529 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -1867,7 +1874,7 @@ WriteLiteral(" class=\"smallMessage\"");
|
||||
WriteLiteral(">No Current Device Assignments</span>\r\n");
|
||||
|
||||
|
||||
#line 533 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
#line 534 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
}
|
||||
|
||||
|
||||
@@ -1877,7 +1884,7 @@ WriteLiteral(" </div>\r\n </div>\r\n
|
||||
"\r\n");
|
||||
|
||||
|
||||
#line 537 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
#line 538 "..\..\Views\User\UserParts\_Subject.cshtml"
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -51,8 +51,9 @@
|
||||
{
|
||||
<i class="flag fa fa-@(flag.Item2.flag.Icon) fa-fw d-@(flag.Item2.flag.IconColour)">
|
||||
<span class="details">
|
||||
<span class="name">@flag.Item2.flag.Name</span>@if (flag.Item1.Comments != null)
|
||||
{<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span>
|
||||
<span class="name">@flag.Item2.flag.Name</span>
|
||||
@if (flag.Item1.Comments != null) {<span class="comments">@flag.Item1.Comments.ToHtmlComment()</span>}
|
||||
<span class="added">@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)</span>
|
||||
</span>
|
||||
</i>
|
||||
}
|
||||
|
||||
@@ -242,12 +242,17 @@ WriteLiteral(">");
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral("</span>");
|
||||
WriteLiteral("</span>\r\n");
|
||||
|
||||
|
||||
#line 54 "..\..\Views\User\_UserTable.cshtml"
|
||||
if (flag.Item1.Comments != null)
|
||||
{
|
||||
#line 55 "..\..\Views\User\_UserTable.cshtml"
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
|
||||
#line 55 "..\..\Views\User\_UserTable.cshtml"
|
||||
if (flag.Item1.Comments != null) {
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
@@ -259,7 +264,7 @@ WriteLiteral(">");
|
||||
|
||||
|
||||
#line 55 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(flag.Item1.Comments.ToHtmlComment());
|
||||
Write(flag.Item1.Comments.ToHtmlComment());
|
||||
|
||||
|
||||
#line default
|
||||
@@ -268,19 +273,20 @@ WriteLiteral("</span>");
|
||||
|
||||
|
||||
#line 55 "..\..\Views\User\_UserTable.cshtml"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#line default
|
||||
#line hidden
|
||||
WriteLiteral("<span");
|
||||
WriteLiteral(" <span");
|
||||
|
||||
WriteLiteral(" class=\"added\"");
|
||||
|
||||
WriteLiteral(">");
|
||||
|
||||
|
||||
#line 55 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId));
|
||||
#line 56 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId));
|
||||
|
||||
|
||||
#line default
|
||||
@@ -289,7 +295,7 @@ WriteLiteral("</span>\r\n </span>
|
||||
" </i>\r\n");
|
||||
|
||||
|
||||
#line 58 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 59 "..\..\Views\User\_UserTable.cshtml"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -299,7 +305,7 @@ WriteLiteral("</span>\r\n </span>
|
||||
WriteLiteral(" </div>\r\n");
|
||||
|
||||
|
||||
#line 61 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 62 "..\..\Views\User\_UserTable.cshtml"
|
||||
}
|
||||
|
||||
|
||||
@@ -310,7 +316,7 @@ WriteLiteral(" </td>\r\n <td>\r\n"
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 64 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 65 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(item.Surname);
|
||||
|
||||
|
||||
@@ -321,7 +327,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 67 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 68 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(item.GivenName);
|
||||
|
||||
|
||||
@@ -332,7 +338,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 70 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 71 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(item.DisplayName);
|
||||
|
||||
|
||||
@@ -343,7 +349,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 73 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 74 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(item.AssignedDevicesCount);
|
||||
|
||||
|
||||
@@ -354,7 +360,7 @@ WriteLiteral("\r\n </td>\r\n <td>\
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 76 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 77 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(item.JobCountOpen);
|
||||
|
||||
|
||||
@@ -363,7 +369,7 @@ WriteLiteral(" ");
|
||||
WriteLiteral(" ");
|
||||
|
||||
|
||||
#line 76 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 77 "..\..\Views\User\_UserTable.cshtml"
|
||||
if (item.JobCount > item.JobCountOpen)
|
||||
{
|
||||
|
||||
@@ -377,7 +383,7 @@ WriteLiteral(" class=\"smallMessage\"");
|
||||
WriteLiteral(">(");
|
||||
|
||||
|
||||
#line 78 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 79 "..\..\Views\User\_UserTable.cshtml"
|
||||
Write(item.JobCount - item.JobCountOpen);
|
||||
|
||||
|
||||
@@ -386,7 +392,7 @@ WriteLiteral(">(");
|
||||
WriteLiteral(" Closed)</span>\r\n");
|
||||
|
||||
|
||||
#line 79 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 80 "..\..\Views\User\_UserTable.cshtml"
|
||||
}
|
||||
|
||||
|
||||
@@ -395,7 +401,7 @@ WriteLiteral(" Closed)</span>\r\n");
|
||||
WriteLiteral(" </td>\r\n </tr>\r\n");
|
||||
|
||||
|
||||
#line 82 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 83 "..\..\Views\User\_UserTable.cshtml"
|
||||
}
|
||||
|
||||
|
||||
@@ -430,7 +436,7 @@ WriteLiteral(">\r\n $(function () {\r\n var userTable
|
||||
"\n </script>\r\n");
|
||||
|
||||
|
||||
#line 124 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 125 "..\..\Views\User\_UserTable.cshtml"
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -445,7 +451,7 @@ WriteLiteral(" class=\"smallMessage\"");
|
||||
WriteLiteral(">No Users Found</span>\r\n");
|
||||
|
||||
|
||||
#line 128 "..\..\Views\User\_UserTable.cshtml"
|
||||
#line 129 "..\..\Views\User\_UserTable.cshtml"
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user