From d040ab094c054ccd71978735627f1aae75a470e1 Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Thu, 5 Jun 2014 20:57:45 +1000 Subject: [PATCH] Bug Fix: Floats must come first [Firefox] Floated elements need to come first, otherwise float layout occurs underneath non-floated content. --- Disco.Web/Views/Shared/_JobTableRender.cshtml | 3 +- .../Views/Shared/_JobTableRender.generated.cs | 214 +++++++++--------- 2 files changed, 109 insertions(+), 108 deletions(-) diff --git a/Disco.Web/Views/Shared/_JobTableRender.cshtml b/Disco.Web/Views/Shared/_JobTableRender.cshtml index 19e6dfc0..3735b401 100644 --- a/Disco.Web/Views/Shared/_JobTableRender.cshtml +++ b/Disco.Web/Views/Shared/_JobTableRender.cshtml @@ -68,7 +68,7 @@ @if (Model.ShowStatus) { var statusItem = (JobTableStatusItemModel)item; -  @item.StatusDescription + @if (statusItem.ActiveJobQueues != null) {
@foreach (var jqToken in ((JobTableStatusItemModel)item).ActiveJobQueues.Select(jqj => new Tuple(jqj, Disco.Services.Jobs.JobQueues.JobQueueService.GetQueue(jqj.QueueId)))) @@ -76,6 +76,7 @@ }
} +  @item.StatusDescription } @if (Model.ShowLastActivityDate) {@CommonHelpers.FriendlyDate(item.LastActivityDate)} diff --git a/Disco.Web/Views/Shared/_JobTableRender.generated.cs b/Disco.Web/Views/Shared/_JobTableRender.generated.cs index bfc16fb6..25eaa08c 100644 --- a/Disco.Web/Views/Shared/_JobTableRender.generated.cs +++ b/Disco.Web/Views/Shared/_JobTableRender.generated.cs @@ -469,31 +469,7 @@ WriteLiteral(" (item.StatusId - - #line default - #line hidden -, 3411), false) -); - -WriteLiteral("> "); - - - #line 71 "..\..\Views\Shared\_JobTableRender.cshtml" - Write(item.StatusDescription); - - - #line default - #line hidden -WriteLiteral("\r\n"); +WriteLiteral(">\r\n"); #line 72 "..\..\Views\Shared\_JobTableRender.cshtml" @@ -530,44 +506,44 @@ WriteLiteral(">\r\n"); #line hidden WriteLiteral(" (jqToken.Item2.JobQueue.Icon +, Tuple.Create(Tuple.Create("", 3889), Tuple.Create(jqToken.Item2.JobQueue.Icon + + #line default + #line hidden +, 3889), false) +, Tuple.Create(Tuple.Create(" ", 3919), Tuple.Create("fa-fw", 3920), true) +, Tuple.Create(Tuple.Create(" ", 3925), Tuple.Create("d-", 3926), true) + + #line 76 "..\..\Views\Shared\_JobTableRender.cshtml" + , Tuple.Create(Tuple.Create("", 3928), Tuple.Create(jqToken.Item2.JobQueue.IconColour + + #line default + #line hidden +, 3928), false) +); + +WriteAttribute("title", Tuple.Create(" title=\"", 3965), Tuple.Create("\"", 4031) + + #line 76 "..\..\Views\Shared\_JobTableRender.cshtml" + , Tuple.Create(Tuple.Create("", 3973), Tuple.Create(jqToken.Item2.JobQueue.Name #line default #line hidden , 3973), false) -, Tuple.Create(Tuple.Create(" ", 4003), Tuple.Create("fa-fw", 4004), true) -, Tuple.Create(Tuple.Create(" ", 4009), Tuple.Create("d-", 4010), true) +, Tuple.Create(Tuple.Create(" ", 4003), Tuple.Create("[", 4004), true) #line 76 "..\..\Views\Shared\_JobTableRender.cshtml" - , Tuple.Create(Tuple.Create("", 4012), Tuple.Create(jqToken.Item2.JobQueue.IconColour + , Tuple.Create(Tuple.Create("", 4005), Tuple.Create(jqToken.Item1.Priority #line default #line hidden -, 4012), false) -); - -WriteAttribute("title", Tuple.Create(" title=\"", 4049), Tuple.Create("\"", 4115) - - #line 76 "..\..\Views\Shared\_JobTableRender.cshtml" - , Tuple.Create(Tuple.Create("", 4057), Tuple.Create(jqToken.Item2.JobQueue.Name - - #line default - #line hidden -, 4057), false) -, Tuple.Create(Tuple.Create(" ", 4087), Tuple.Create("[", 4088), true) - - #line 76 "..\..\Views\Shared\_JobTableRender.cshtml" - , Tuple.Create(Tuple.Create("", 4089), Tuple.Create(jqToken.Item1.Priority - - #line default - #line hidden -, 4089), false) -, Tuple.Create(Tuple.Create("", 4114), Tuple.Create("]", 4114), true) +, 4005), false) +, Tuple.Create(Tuple.Create("", 4030), Tuple.Create("]", 4030), true) ); WriteLiteral(">\r\n"); @@ -588,10 +564,34 @@ WriteLiteral(" "); #line default #line hidden -WriteLiteral(" "); +WriteLiteral(" (item.StatusId + + #line default + #line hidden +, 4184), false) +); + +WriteLiteral("> "); #line 79 "..\..\Views\Shared\_JobTableRender.cshtml" + Write(item.StatusDescription); + + + #line default + #line hidden +WriteLiteral("\r\n "); + + + #line 80 "..\..\Views\Shared\_JobTableRender.cshtml" } @@ -600,7 +600,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 80 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 81 "..\..\Views\Shared\_JobTableRender.cshtml" if (Model.ShowLastActivityDate) { @@ -613,7 +613,7 @@ WriteLiteral(" class=\"lastActive\""); WriteLiteral(">"); - #line 81 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 82 "..\..\Views\Shared\_JobTableRender.cshtml" Write(CommonHelpers.FriendlyDate(item.LastActivityDate)); @@ -622,7 +622,7 @@ WriteLiteral(">"); WriteLiteral(""); - #line 81 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 82 "..\..\Views\Shared\_JobTableRender.cshtml" } @@ -631,7 +631,7 @@ WriteLiteral(""); WriteLiteral(" "); - #line 82 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 83 "..\..\Views\Shared\_JobTableRender.cshtml" if (Model.ShowDates) { @@ -644,21 +644,21 @@ WriteLiteral(" class=\"dates\""); WriteLiteral(">"); - #line 83 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 84 "..\..\Views\Shared\_JobTableRender.cshtml" if (item.ClosedDate.HasValue) { #line default #line hidden - #line 84 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 85 "..\..\Views\Shared\_JobTableRender.cshtml" Write(CommonHelpers.FriendlyDate(item.ClosedDate.Value)); #line default #line hidden - #line 84 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 85 "..\..\Views\Shared\_JobTableRender.cshtml" } else { @@ -666,14 +666,14 @@ WriteLiteral(">"); #line default #line hidden - #line 86 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 87 "..\..\Views\Shared\_JobTableRender.cshtml" Write(CommonHelpers.FriendlyDate(item.OpenedDate)); #line default #line hidden - #line 86 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 87 "..\..\Views\Shared\_JobTableRender.cshtml" } #line default @@ -681,7 +681,7 @@ WriteLiteral(">"); WriteLiteral(""); - #line 86 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 87 "..\..\Views\Shared\_JobTableRender.cshtml" } @@ -690,7 +690,7 @@ WriteLiteral(""); WriteLiteral(" "); - #line 87 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 88 "..\..\Views\Shared\_JobTableRender.cshtml" if (Model.ShowType) { @@ -702,20 +702,20 @@ WriteLiteral(" class=\"type\""); WriteLiteral(">(item.JobTypeDescription + #line 89 "..\..\Views\Shared\_JobTableRender.cshtml" +, Tuple.Create(Tuple.Create("", 4903), Tuple.Create(item.JobTypeDescription #line default #line hidden -, 4869), false) +, 4903), false) ); WriteLiteral(">"); - #line 88 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 89 "..\..\Views\Shared\_JobTableRender.cshtml" Write(item.JobTypeId); @@ -724,7 +724,7 @@ WriteLiteral(">"); WriteLiteral(""); - #line 88 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 89 "..\..\Views\Shared\_JobTableRender.cshtml" } @@ -733,7 +733,7 @@ WriteLiteral(""); WriteLiteral(" "); - #line 89 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 90 "..\..\Views\Shared\_JobTableRender.cshtml" if (Model.ShowDevice) { @@ -746,13 +746,13 @@ WriteLiteral(" class=\"device\""); WriteLiteral(">\r\n"); - #line 91 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 92 "..\..\Views\Shared\_JobTableRender.cshtml" #line default #line hidden - #line 91 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 92 "..\..\Views\Shared\_JobTableRender.cshtml" if (item.DeviceSerialNumber != null) { if (Authorization.Has(Claims.Device.Show)) @@ -761,14 +761,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 94 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 95 "..\..\Views\Shared\_JobTableRender.cshtml" Write(Html.ActionLink(item.DeviceSerialNumber, MVC.Device.Show(item.DeviceSerialNumber), new { Title = item.DeviceModelDescription })); #line default #line hidden - #line 94 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 95 "..\..\Views\Shared\_JobTableRender.cshtml" } else { @@ -777,20 +777,20 @@ WriteLiteral(">\r\n"); #line hidden WriteLiteral("(item.DeviceModelDescription + #line 97 "..\..\Views\Shared\_JobTableRender.cshtml" +, Tuple.Create(Tuple.Create("", 5475), Tuple.Create(item.DeviceModelDescription #line default #line hidden -, 5441), false) +, 5475), false) ); WriteLiteral(">"); - #line 96 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 97 "..\..\Views\Shared\_JobTableRender.cshtml" Write(item.DeviceSerialNumber); @@ -799,7 +799,7 @@ WriteLiteral(">"); WriteLiteral(""); - #line 96 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 97 "..\..\Views\Shared\_JobTableRender.cshtml" } } else @@ -814,7 +814,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">N/A"); - #line 99 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 100 "..\..\Views\Shared\_JobTableRender.cshtml" } #line default @@ -822,7 +822,7 @@ WriteLiteral(">N/A"); WriteLiteral(""); - #line 99 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 100 "..\..\Views\Shared\_JobTableRender.cshtml" } @@ -831,7 +831,7 @@ WriteLiteral(""); WriteLiteral(" "); - #line 100 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 101 "..\..\Views\Shared\_JobTableRender.cshtml" if (Model.ShowUser) { @@ -844,13 +844,13 @@ WriteLiteral(" class=\"user\""); WriteLiteral(">\r\n"); - #line 102 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 103 "..\..\Views\Shared\_JobTableRender.cshtml" #line default #line hidden - #line 102 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 103 "..\..\Views\Shared\_JobTableRender.cshtml" if (item.UserId != null) { if (Authorization.Has(Claims.User.Show)) @@ -859,14 +859,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 105 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 106 "..\..\Views\Shared\_JobTableRender.cshtml" Write(Html.ActionLink(string.Format("{0} ({1})", item.UserDisplayName, item.UserFriendlyId), MVC.User.Show(item.UserId))); #line default #line hidden - #line 105 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 106 "..\..\Views\Shared\_JobTableRender.cshtml" } else { @@ -874,14 +874,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 107 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 108 "..\..\Views\Shared\_JobTableRender.cshtml" Write(string.Format("{0} ({1})", item.UserDisplayName, item.UserFriendlyId)); #line default #line hidden - #line 107 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 108 "..\..\Views\Shared\_JobTableRender.cshtml" } } else @@ -896,7 +896,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">N/A"); - #line 110 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 111 "..\..\Views\Shared\_JobTableRender.cshtml" } #line default @@ -904,7 +904,7 @@ WriteLiteral(">N/A"); WriteLiteral(""); - #line 110 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 111 "..\..\Views\Shared\_JobTableRender.cshtml" } @@ -913,7 +913,7 @@ WriteLiteral(""); WriteLiteral(" "); - #line 111 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 112 "..\..\Views\Shared\_JobTableRender.cshtml" if (Model.ShowTechnician) { @@ -925,20 +925,20 @@ WriteLiteral(" class=\"technician\""); WriteLiteral(">(item.OpenedTechUserDisplayName + #line 113 "..\..\Views\Shared\_JobTableRender.cshtml" +, Tuple.Create(Tuple.Create("", 6479), Tuple.Create(item.OpenedTechUserDisplayName #line default #line hidden -, 6445), false) +, 6479), false) ); WriteLiteral(">"); - #line 112 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 113 "..\..\Views\Shared\_JobTableRender.cshtml" Write(item.OpenedTechUserFriendlyId); @@ -947,7 +947,7 @@ WriteLiteral(">"); WriteLiteral(""); - #line 112 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 113 "..\..\Views\Shared\_JobTableRender.cshtml" } @@ -956,7 +956,7 @@ WriteLiteral(""); WriteLiteral(" "); - #line 113 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 114 "..\..\Views\Shared\_JobTableRender.cshtml" if (Model.ShowLocation) { @@ -969,7 +969,7 @@ WriteLiteral(" class=\"location\""); WriteLiteral(">"); - #line 114 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 115 "..\..\Views\Shared\_JobTableRender.cshtml" Write(item.DeviceHeldLocation ?? "Unknown"); @@ -978,7 +978,7 @@ WriteLiteral(">"); WriteLiteral(""); - #line 114 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 115 "..\..\Views\Shared\_JobTableRender.cshtml" } @@ -987,7 +987,7 @@ WriteLiteral(""); WriteLiteral(" "); - #line 115 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 116 "..\..\Views\Shared\_JobTableRender.cshtml" } @@ -996,7 +996,7 @@ WriteLiteral(" "); WriteLiteral(" \r\n \r\n"); - #line 118 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 119 "..\..\Views\Shared\_JobTableRender.cshtml" if (Model.HideClosedJobs && Model.Items.All(j => j.ClosedDate.HasValue)) { @@ -1016,7 +1016,7 @@ WriteLiteral(" class=\"dataTables_showStatusClosed button small\""); WriteLiteral(">Show Closed Jobs ("); - #line 122 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 123 "..\..\Views\Shared\_JobTableRender.cshtml" Write(Model.Items.Count()); @@ -1025,7 +1025,7 @@ WriteLiteral(">Show Closed Jobs ("); WriteLiteral(")\r\n \r\n"); - #line 124 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 125 "..\..\Views\Shared\_JobTableRender.cshtml" } } else @@ -1037,7 +1037,7 @@ WriteLiteral(")\r\n \r\n"); WriteLiteral("

No jobs to display

\r\n"); - #line 129 "..\..\Views\Shared\_JobTableRender.cshtml" + #line 130 "..\..\Views\Shared\_JobTableRender.cshtml" }