jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature #51: Markdown Support

Browse Source 
Markdown implemented in Job Logs, Job Queue comments, various other
places.
This commit is contained in:
Gary Sharp
2014-06-11 14:51:51 +10:00
parent 4c3a68da30
commit 8254e7ec5a
25 changed files with 439 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.BI/BI/JobBI/Utilities.cs
+2 -3
View File
@@ -49,11 +49,10 @@ namespace Disco.BI.JobBI
select new { queue = g.Key, subTypes = g };
foreach (var queue in queues)
{
var commentBuilder = new StringBuilder("Automatically added by:");
var commentBuilder = new StringBuilder("Automatically added by:").AppendLine();
foreach (var subType in queue.subTypes)
{
commentBuilder.AppendLine();
commentBuilder.Append(subType.Description);
commentBuilder.AppendLine().Append("* ").Append(subType.Description);
}
var jqj = new JobQueueJob()
Disco.Web/Areas/Config/Views/JobQueue/Index.cshtml
+10
View File
@@ -15,6 +15,7 @@
<table class="tableData">
<tr>
<th>Name</th>
<th>Description</th>
<th>Priority</th>
<th>Linked Groups/Users</th>
</tr>
@@ -27,6 +28,15 @@
@item.JobQueue.Name
</a>
</td>
<td>@if (string.IsNullOrWhiteSpace(item.JobQueue.Description))
{
<span class="smallMessage">&lt;none&gt;</span>
}
else
{
@item.JobQueue.Description.ToHtmlComment()
}
</td>
<td>
<i class="fa d-priority-@(item.JobQueue.Priority.ToString().ToLower())" title="@(item.JobQueue.Priority.ToString()) Priority"></i>
</td>
Disco.Web/Areas/Config/Views/JobQueue/Index.generated.cs
+80 -39
View File
@@ -94,17 +94,18 @@ WriteLiteral(" <table");
WriteLiteral(" class=\"tableData\"");
WriteLiteral(">\r\n <tr>\r\n <th>Name</th>\r\n <th>Priority<" +
"/th>\r\n <th>Linked Groups/Users</th>\r\n </tr>\r\n");
WriteLiteral(">\r\n <tr>\r\n <th>Name</th>\r\n <th>Descripti" +
"on</th>\r\n <th>Priority</th>\r\n <th>Linked Groups/Us" +
"ers</th>\r\n </tr>\r\n");
#line 21 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
#line 22 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
#line default
#line hidden
#line 21 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
#line 22 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
foreach (var item in Model.Tokens)
{
@@ -113,37 +114,37 @@ WriteLiteral(">\r\n <tr>\r\n <th>Name</th>\r\n
#line hidden
WriteLiteral(" <tr>\r\n <td>\r\n <a");
WriteAttribute("href", Tuple.Create(" href=\"", 852), Tuple.Create("\"", 915)
WriteAttribute("href", Tuple.Create(" href=\"", 890), Tuple.Create("\"", 953)
#line 25 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
, Tuple.Create(Tuple.Create("", 859), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.JobQueue.Index(item.JobQueue.Id))
#line 26 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
, Tuple.Create(Tuple.Create("", 897), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.JobQueue.Index(item.JobQueue.Id))
#line default
#line hidden
, 859), false)
, 897), false)
);
WriteLiteral(">\r\n <i");
WriteAttribute("class", Tuple.Create(" class=\"", 949), Tuple.Create("\"", 1020)
, Tuple.Create(Tuple.Create("", 957), Tuple.Create("fa", 957), true)
, Tuple.Create(Tuple.Create(" ", 959), Tuple.Create("fa-", 960), true)
WriteAttribute("class", Tuple.Create(" class=\"", 987), Tuple.Create("\"", 1058)
, Tuple.Create(Tuple.Create("", 995), Tuple.Create("fa", 995), true)
, Tuple.Create(Tuple.Create(" ", 997), Tuple.Create("fa-", 998), true)
#line 26 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
, Tuple.Create(Tuple.Create("", 963), Tuple.Create<System.Object, System.Int32>(item.JobQueue.Icon
#line 27 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
, Tuple.Create(Tuple.Create("", 1001), Tuple.Create<System.Object, System.Int32>(item.JobQueue.Icon
#line default
#line hidden
, 963), false)
, Tuple.Create(Tuple.Create(" ", 984), Tuple.Create("fa-lg", 985), true)
, Tuple.Create(Tuple.Create(" ", 990), Tuple.Create("d-", 991), true)
, 1001), false)
, Tuple.Create(Tuple.Create(" ", 1022), Tuple.Create("fa-lg", 1023), true)
, Tuple.Create(Tuple.Create(" ", 1028), Tuple.Create("d-", 1029), true)
#line 26 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
, Tuple.Create(Tuple.Create("", 993), Tuple.Create<System.Object, System.Int32>(item.JobQueue.IconColour
#line 27 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
, Tuple.Create(Tuple.Create("", 1031), Tuple.Create<System.Object, System.Int32>(item.JobQueue.IconColour
#line default
#line hidden
, 993), false)
, 1031), false)
);
WriteLiteral("></i>\r\n");
@@ -151,48 +152,88 @@ WriteLiteral("></i>\r\n");
WriteLiteral(" ");
#line 27 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
#line 28 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
Write(item.JobQueue.Name);
#line default
#line hidden
WriteLiteral("\r\n </a>\r\n </td>\r\n <t" +
"d>\r\n <i");
"d>");
WriteAttribute("class", Tuple.Create(" class=\"", 1186), Tuple.Create("\"", 1254)
, Tuple.Create(Tuple.Create("", 1194), Tuple.Create("fa", 1194), true)
, Tuple.Create(Tuple.Create(" ", 1196), Tuple.Create("d-priority-", 1197), true)
#line 31 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
, Tuple.Create(Tuple.Create("", 1208), Tuple.Create<System.Object, System.Int32>(item.JobQueue.Priority.ToString().ToLower()
if (string.IsNullOrWhiteSpace(item.JobQueue.Description))
{
#line default
#line hidden
, 1208), false)
WriteLiteral(" <span");
WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">&lt;none&gt;</span>\r\n");
#line 34 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
}
else
{
#line default
#line hidden
#line 37 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
Write(item.JobQueue.Description.ToHtmlComment());
#line default
#line hidden
#line 37 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" </td>\r\n <td>\r\n <i");
WriteAttribute("class", Tuple.Create(" class=\"", 1613), Tuple.Create("\"", 1681)
, Tuple.Create(Tuple.Create("", 1621), Tuple.Create("fa", 1621), true)
, Tuple.Create(Tuple.Create(" ", 1623), Tuple.Create("d-priority-", 1624), true)
#line 41 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
, Tuple.Create(Tuple.Create("", 1635), Tuple.Create<System.Object, System.Int32>(item.JobQueue.Priority.ToString().ToLower()
#line default
#line hidden
, 1635), false)
);
WriteAttribute("title", Tuple.Create(" title=\"", 1255), Tuple.Create("\"", 1308)
WriteAttribute("title", Tuple.Create(" title=\"", 1682), Tuple.Create("\"", 1735)
#line 31 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
, Tuple.Create(Tuple.Create("", 1263), Tuple.Create<System.Object, System.Int32>(item.JobQueue.Priority.ToString()
#line 41 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
, Tuple.Create(Tuple.Create("", 1690), Tuple.Create<System.Object, System.Int32>(item.JobQueue.Priority.ToString()
#line default
#line hidden
, 1263), false)
, Tuple.Create(Tuple.Create(" ", 1299), Tuple.Create("Priority", 1300), true)
, 1690), false)
, Tuple.Create(Tuple.Create(" ", 1726), Tuple.Create("Priority", 1727), true)
);
WriteLiteral("></i>\r\n </td>\r\n <td>\r\n");
#line 34 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
#line 44 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
#line default
#line hidden
#line 34 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
#line 44 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
if (item.SubjectIds.Count == 0)
{
@@ -206,7 +247,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">&lt;None&gt;</span>\r\n");
#line 37 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
#line 47 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
}
else
{
@@ -215,14 +256,14 @@ WriteLiteral(">&lt;None&gt;</span>\r\n");
#line default
#line hidden
#line 40 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
#line 50 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
Write(string.Join(", ", item.SubjectIds.OrderBy(i => i)));
#line default
#line hidden
#line 40 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
#line 50 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
}
@@ -232,7 +273,7 @@ WriteLiteral(">&lt;None&gt;</span>\r\n");
WriteLiteral(" </td>\r\n </tr>\r\n");
#line 44 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
#line 54 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
}
@@ -241,7 +282,7 @@ WriteLiteral(" </td>\r\n </tr>\r\n");
WriteLiteral(" </table>\r\n");
#line 46 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
#line 56 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
}
@@ -256,7 +297,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" ");
#line 48 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
#line 58 "..\..\Areas\Config\Views\JobQueue\Index.cshtml"
Write(Html.ActionLinkButton("Create Job Queue", MVC.Config.JobQueue.Create()));
Disco.Web/Areas/Config/Views/JobQueue/Show.cshtml
+1 -1
View File
@@ -71,7 +71,7 @@
}
else
{
@Model.Token.JobQueue.Description
@Model.Token.JobQueue.Description.ToHtmlComment()
}
</pre>
}
Disco.Web/Areas/Config/Views/JobQueue/Show.generated.cs
+67 -67
View File
@@ -297,7 +297,7 @@ WriteLiteral("\r\n");
#line hidden
#line 74 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
Write(Model.Token.JobQueue.Description);
Write(Model.Token.JobQueue.Description.ToHtmlComment());
#line default
@@ -383,25 +383,25 @@ WriteLiteral(" data-colour=\"");
#line hidden
WriteLiteral("\"");
WriteAttribute("class", Tuple.Create(" class=\"", 3596), Tuple.Create("\"", 3681)
, Tuple.Create(Tuple.Create("", 3604), Tuple.Create("fa", 3604), true)
, Tuple.Create(Tuple.Create(" ", 3606), Tuple.Create("fa-", 3607), true)
WriteAttribute("class", Tuple.Create(" class=\"", 3612), Tuple.Create("\"", 3697)
, Tuple.Create(Tuple.Create("", 3620), Tuple.Create("fa", 3620), true)
, Tuple.Create(Tuple.Create(" ", 3622), Tuple.Create("fa-", 3623), true)
#line 92 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 3610), Tuple.Create<System.Object, System.Int32>(Model.Token.JobQueue.Icon
, Tuple.Create(Tuple.Create("", 3626), Tuple.Create<System.Object, System.Int32>(Model.Token.JobQueue.Icon
#line default
#line hidden
, 3610), false)
, Tuple.Create(Tuple.Create(" ", 3638), Tuple.Create("fa-4x", 3639), true)
, Tuple.Create(Tuple.Create(" ", 3644), Tuple.Create("d-", 3645), true)
, 3626), false)
, Tuple.Create(Tuple.Create(" ", 3654), Tuple.Create("fa-4x", 3655), true)
, Tuple.Create(Tuple.Create(" ", 3660), Tuple.Create("d-", 3661), true)
#line 92 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 3647), Tuple.Create<System.Object, System.Int32>(Model.Token.JobQueue.IconColour
, Tuple.Create(Tuple.Create("", 3663), Tuple.Create<System.Object, System.Int32>(Model.Token.JobQueue.IconColour
#line default
#line hidden
, 3647), false)
, 3663), false)
);
WriteLiteral("></i>\r\n");
@@ -469,26 +469,26 @@ WriteLiteral(" data-icon=\"");
#line hidden
WriteLiteral("\"");
WriteAttribute("class", Tuple.Create(" class=\"", 4246), Tuple.Create("\"", 4271)
, Tuple.Create(Tuple.Create("", 4254), Tuple.Create("fa", 4254), true)
, Tuple.Create(Tuple.Create(" ", 4256), Tuple.Create("fa-", 4257), true)
WriteAttribute("class", Tuple.Create(" class=\"", 4262), Tuple.Create("\"", 4287)
, Tuple.Create(Tuple.Create("", 4270), Tuple.Create("fa", 4270), true)
, Tuple.Create(Tuple.Create(" ", 4272), Tuple.Create("fa-", 4273), true)
#line 102 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 4260), Tuple.Create<System.Object, System.Int32>(icon.Key
, Tuple.Create(Tuple.Create("", 4276), Tuple.Create<System.Object, System.Int32>(icon.Key
#line default
#line hidden
, 4260), false)
, 4276), false)
);
WriteAttribute("title", Tuple.Create(" title=\"", 4272), Tuple.Create("\"", 4291)
WriteAttribute("title", Tuple.Create(" title=\"", 4288), Tuple.Create("\"", 4307)
#line 102 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 4280), Tuple.Create<System.Object, System.Int32>(icon.Value
, Tuple.Create(Tuple.Create("", 4296), Tuple.Create<System.Object, System.Int32>(icon.Value
#line default
#line hidden
, 4280), false)
, 4296), false)
);
WriteLiteral("></i>\r\n");
@@ -533,27 +533,27 @@ WriteLiteral(" data-colour=\"");
#line hidden
WriteLiteral("\"");
WriteAttribute("class", Tuple.Create(" class=\"", 4623), Tuple.Create("\"", 4659)
, Tuple.Create(Tuple.Create("", 4631), Tuple.Create("fa", 4631), true)
, Tuple.Create(Tuple.Create(" ", 4633), Tuple.Create("fa-square", 4634), true)
, Tuple.Create(Tuple.Create(" ", 4643), Tuple.Create("d-", 4644), true)
WriteAttribute("class", Tuple.Create(" class=\"", 4639), Tuple.Create("\"", 4675)
, Tuple.Create(Tuple.Create("", 4647), Tuple.Create("fa", 4647), true)
, Tuple.Create(Tuple.Create(" ", 4649), Tuple.Create("fa-square", 4650), true)
, Tuple.Create(Tuple.Create(" ", 4659), Tuple.Create("d-", 4660), true)
#line 108 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 4646), Tuple.Create<System.Object, System.Int32>(colour.Key
, Tuple.Create(Tuple.Create("", 4662), Tuple.Create<System.Object, System.Int32>(colour.Key
#line default
#line hidden
, 4646), false)
, 4662), false)
);
WriteAttribute("title", Tuple.Create(" title=\"", 4660), Tuple.Create("\"", 4681)
WriteAttribute("title", Tuple.Create(" title=\"", 4676), Tuple.Create("\"", 4697)
#line 108 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 4668), Tuple.Create<System.Object, System.Int32>(colour.Value
, Tuple.Create(Tuple.Create("", 4684), Tuple.Create<System.Object, System.Int32>(colour.Value
#line default
#line hidden
, 4668), false)
, 4684), false)
);
WriteLiteral("></i>\r\n");
@@ -658,27 +658,27 @@ WriteLiteral(" </td>\r\n </tr>\r\n <tr>\r\n
#line hidden
WriteLiteral(" <i");
WriteAttribute("class", Tuple.Create(" class=\"", 9435), Tuple.Create("\"", 9483)
, Tuple.Create(Tuple.Create("", 9443), Tuple.Create("fa", 9443), true)
, Tuple.Create(Tuple.Create(" ", 9445), Tuple.Create("d-priority-", 9446), true)
WriteAttribute("class", Tuple.Create(" class=\"", 9451), Tuple.Create("\"", 9499)
, Tuple.Create(Tuple.Create("", 9459), Tuple.Create("fa", 9459), true)
, Tuple.Create(Tuple.Create(" ", 9461), Tuple.Create("d-priority-", 9462), true)
#line 201 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 9457), Tuple.Create<System.Object, System.Int32>(priorityValue.ToLower()
, Tuple.Create(Tuple.Create("", 9473), Tuple.Create<System.Object, System.Int32>(priorityValue.ToLower()
#line default
#line hidden
, 9457), false)
, 9473), false)
);
WriteAttribute("title", Tuple.Create(" title=\"", 9484), Tuple.Create("\"", 9517)
WriteAttribute("title", Tuple.Create(" title=\"", 9500), Tuple.Create("\"", 9533)
#line 201 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 9492), Tuple.Create<System.Object, System.Int32>(priorityValue
, Tuple.Create(Tuple.Create("", 9508), Tuple.Create<System.Object, System.Int32>(priorityValue
#line default
#line hidden
, 9492), false)
, Tuple.Create(Tuple.Create(" ", 9508), Tuple.Create("Priority", 9509), true)
, 9508), false)
, Tuple.Create(Tuple.Create(" ", 9524), Tuple.Create("Priority", 9525), true)
);
WriteLiteral("></i>\r\n");
@@ -1003,14 +1003,14 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <li");
WriteAttribute("class", Tuple.Create(" class=\"", 14491), Tuple.Create("\"", 14531)
WriteAttribute("class", Tuple.Create(" class=\"", 14507), Tuple.Create("\"", 14547)
#line 306 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 14499), Tuple.Create<System.Object, System.Int32>(sg.IsGroup ? "group" : "user"
, Tuple.Create(Tuple.Create("", 14515), Tuple.Create<System.Object, System.Int32>(sg.IsGroup ? "group" : "user"
#line default
#line hidden
, 14499), false)
, 14515), false)
);
WriteLiteral(">");
@@ -1054,14 +1054,14 @@ WriteLiteral("></i>");
#line hidden
WriteLiteral(" <a");
WriteAttribute("href", Tuple.Create(" href=\"", 14971), Tuple.Create("\"", 15013)
WriteAttribute("href", Tuple.Create(" href=\"", 14987), Tuple.Create("\"", 15029)
#line 312 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 14978), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.User.Show(sg.Id))
, Tuple.Create(Tuple.Create("", 14994), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.User.Show(sg.Id))
#line default
#line hidden
, 14978), false)
, 14994), false)
);
WriteLiteral("><i");
@@ -1164,14 +1164,14 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <li");
WriteAttribute("class", Tuple.Create(" class=\"", 16147), Tuple.Create("\"", 16187)
WriteAttribute("class", Tuple.Create(" class=\"", 16163), Tuple.Create("\"", 16203)
#line 328 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 16155), Tuple.Create<System.Object, System.Int32>(sg.IsGroup ? "group" : "user"
, Tuple.Create(Tuple.Create("", 16171), Tuple.Create<System.Object, System.Int32>(sg.IsGroup ? "group" : "user"
#line default
#line hidden
, 16155), false)
, 16171), false)
);
WriteLiteral(" data-subjectid=\"");
@@ -1286,14 +1286,14 @@ WriteLiteral(">Add</a>\r\n </div>\r\n
WriteLiteral(" id=\"Config_JobQueues_Subjects_Update_Dialog_Form\"");
WriteAttribute("action", Tuple.Create(" action=\"", 17578), Tuple.Create("\"", 17670)
WriteAttribute("action", Tuple.Create(" action=\"", 17594), Tuple.Create("\"", 17686)
#line 343 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 17587), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.JobQueue.UpdateSubjects(Model.Token.JobQueue.Id, null, true))
, Tuple.Create(Tuple.Create("", 17603), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.JobQueue.UpdateSubjects(Model.Token.JobQueue.Id, null, true))
#line default
#line hidden
, 17587), false)
, 17603), false)
);
WriteLiteral(" method=\"post\"");
@@ -1618,15 +1618,15 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <div");
WriteAttribute("id", Tuple.Create(" id=\"", 28934), Tuple.Create("\"", 28956)
, Tuple.Create(Tuple.Create("", 28939), Tuple.Create("trJobType", 28939), true)
WriteAttribute("id", Tuple.Create(" id=\"", 28950), Tuple.Create("\"", 28972)
, Tuple.Create(Tuple.Create("", 28955), Tuple.Create("trJobType", 28955), true)
#line 548 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 28948), Tuple.Create<System.Object, System.Int32>(jt.Id
, Tuple.Create(Tuple.Create("", 28964), Tuple.Create<System.Object, System.Int32>(jt.Id
#line default
#line hidden
, 28948), false)
, 28964), false)
);
WriteLiteral(" class=\"jobTypes\"");
@@ -1634,29 +1634,29 @@ WriteLiteral(" class=\"jobTypes\"");
WriteLiteral(">\r\n <h4>\r\n <inp" +
"ut");
WriteAttribute("id", Tuple.Create(" id=\"", 29057), Tuple.Create("\"", 29076)
, Tuple.Create(Tuple.Create("", 29062), Tuple.Create("Types_", 29062), true)
WriteAttribute("id", Tuple.Create(" id=\"", 29073), Tuple.Create("\"", 29092)
, Tuple.Create(Tuple.Create("", 29078), Tuple.Create("Types_", 29078), true)
#line 550 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 29068), Tuple.Create<System.Object, System.Int32>(jt.Id
, Tuple.Create(Tuple.Create("", 29084), Tuple.Create<System.Object, System.Int32>(jt.Id
#line default
#line hidden
, 29068), false)
, 29084), false)
);
WriteLiteral(" class=\"jobType\"");
WriteLiteral(" type=\"checkbox\"");
WriteAttribute("value", Tuple.Create(" value=\"", 29109), Tuple.Create("\"", 29125)
WriteAttribute("value", Tuple.Create(" value=\"", 29125), Tuple.Create("\"", 29141)
#line 550 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 29117), Tuple.Create<System.Object, System.Int32>(jt.Id
, Tuple.Create(Tuple.Create("", 29133), Tuple.Create<System.Object, System.Int32>(jt.Id
#line default
#line hidden
, 29117), false)
, 29133), false)
);
WriteLiteral(" ");
@@ -1670,15 +1670,15 @@ WriteLiteral(" ");
#line hidden
WriteLiteral(" /><label");
WriteAttribute("for", Tuple.Create(" for=\"", 29196), Tuple.Create("\"", 29216)
, Tuple.Create(Tuple.Create("", 29202), Tuple.Create("Types_", 29202), true)
WriteAttribute("for", Tuple.Create(" for=\"", 29212), Tuple.Create("\"", 29232)
, Tuple.Create(Tuple.Create("", 29218), Tuple.Create("Types_", 29218), true)
#line 550 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 29208), Tuple.Create<System.Object, System.Int32>(jt.Id
, Tuple.Create(Tuple.Create("", 29224), Tuple.Create<System.Object, System.Int32>(jt.Id
#line default
#line hidden
, 29208), false)
, 29224), false)
);
WriteLiteral(">");
@@ -1692,15 +1692,15 @@ WriteLiteral(">");
#line hidden
WriteLiteral("</label></h4>\r\n <div");
WriteAttribute("id", Tuple.Create(" id=\"", 29284), Tuple.Create("\"", 29306)
, Tuple.Create(Tuple.Create("", 29289), Tuple.Create("SubTypes_", 29289), true)
WriteAttribute("id", Tuple.Create(" id=\"", 29300), Tuple.Create("\"", 29322)
, Tuple.Create(Tuple.Create("", 29305), Tuple.Create("SubTypes_", 29305), true)
#line 551 "..\..\Areas\Config\Views\JobQueue\Show.cshtml"
, Tuple.Create(Tuple.Create("", 29298), Tuple.Create<System.Object, System.Int32>(jt.Id
, Tuple.Create(Tuple.Create("", 29314), Tuple.Create<System.Object, System.Int32>(jt.Id
#line default
#line hidden
, 29298), false)
, 29314), false)
);
WriteLiteral(" class=\"jobSubTypes\"");
Disco.Web/Areas/Config/Views/UserFlag/Index.cshtml
+8 -9
View File
@@ -26,15 +26,14 @@
@item.Name
</a>
</td>
<td>
<span class="smallMessage">@if (string.IsNullOrWhiteSpace(item.Description))
{
<text>&lt;none&gt;</text>
}
else
{
@item.Description.ToMultilineString()
}</span>
<td>@if (string.IsNullOrWhiteSpace(item.Description))
{
<span class="smallMessage">&lt;none&gt;</span>
}
else
{
@item.Description.ToHtmlComment()
}
</td>
</tr>
}
Disco.Web/Areas/Config/Views/UserFlag/Index.generated.cs
+25 -28
View File
@@ -158,53 +158,50 @@ WriteLiteral(" ");
#line default
#line hidden
WriteLiteral("\r\n </a>\r\n </td>\r\n <t" +
"d>\r\n <span");
"d>");
#line 29 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
if (string.IsNullOrWhiteSpace(item.Description))
{
#line default
#line hidden
WriteLiteral(" <span");
WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">");
WriteLiteral(">&lt;none&gt;</span>\r\n");
#line 30 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
if (string.IsNullOrWhiteSpace(item.Description))
{
#line default
#line hidden
WriteLiteral(" ");
WriteLiteral("&lt;none&gt;");
WriteLiteral("\r\n");
#line 33 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
else
{
#line 32 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
else
{
#line default
#line hidden
#line 36 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
Write(item.Description.ToMultilineString());
#line 35 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
Write(item.Description.ToHtmlComment());
#line default
#line hidden
#line 36 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line 35 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
}
#line default
#line hidden
WriteLiteral("</span>\r\n </td>\r\n </tr>\r\n");
WriteLiteral(" </td>\r\n </tr>\r\n");
#line 40 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line 39 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
@@ -213,7 +210,7 @@ WriteLiteral("</span>\r\n </td>\r\n </tr>\r\n"
WriteLiteral(" </table>\r\n");
#line 42 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line 41 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
@@ -228,7 +225,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" ");
#line 44 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line 43 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
Write(Html.ActionLinkButton("Create User Flag", MVC.Config.UserFlag.Create()));
Disco.Web/Areas/Config/Views/UserFlag/Show.cshtml
+1 -1
View File
@@ -71,7 +71,7 @@
}
else
{
@Model.UserFlag.Description
@Model.UserFlag.Description.ToHtmlComment()
}
</pre>
}
Disco.Web/Areas/Config/Views/UserFlag/Show.generated.cs
+27 -27
View File
@@ -296,7 +296,7 @@ WriteLiteral("\r\n");
#line hidden
#line 74 "..\..\Areas\Config\Views\UserFlag\Show.cshtml"
Write(Model.UserFlag.Description);
Write(Model.UserFlag.Description.ToHtmlComment());
#line default
@@ -382,25 +382,25 @@ WriteLiteral(" data-colour=\"");
#line hidden
WriteLiteral("\"");
WriteAttribute("class", Tuple.Create(" class=\"", 3604), Tuple.Create("\"", 3677)
, Tuple.Create(Tuple.Create("", 3612), Tuple.Create("fa", 3612), true)
, Tuple.Create(Tuple.Create(" ", 3614), Tuple.Create("fa-", 3615), true)
WriteAttribute("class", Tuple.Create(" class=\"", 3620), Tuple.Create("\"", 3693)
, Tuple.Create(Tuple.Create("", 3628), Tuple.Create("fa", 3628), true)
, Tuple.Create(Tuple.Create(" ", 3630), Tuple.Create("fa-", 3631), true)
#line 92 "..\..\Areas\Config\Views\UserFlag\Show.cshtml"
, Tuple.Create(Tuple.Create("", 3618), Tuple.Create<System.Object, System.Int32>(Model.UserFlag.Icon
, Tuple.Create(Tuple.Create("", 3634), Tuple.Create<System.Object, System.Int32>(Model.UserFlag.Icon
#line default
#line hidden
, 3618), false)
, Tuple.Create(Tuple.Create(" ", 3640), Tuple.Create("fa-4x", 3641), true)
, Tuple.Create(Tuple.Create(" ", 3646), Tuple.Create("d-", 3647), true)
, 3634), false)
, Tuple.Create(Tuple.Create(" ", 3656), Tuple.Create("fa-4x", 3657), true)
, Tuple.Create(Tuple.Create(" ", 3662), Tuple.Create("d-", 3663), true)
#line 92 "..\..\Areas\Config\Views\UserFlag\Show.cshtml"
, Tuple.Create(Tuple.Create("", 3649), Tuple.Create<System.Object, System.Int32>(Model.UserFlag.IconColour
, Tuple.Create(Tuple.Create("", 3665), Tuple.Create<System.Object, System.Int32>(Model.UserFlag.IconColour
#line default
#line hidden
, 3649), false)
, 3665), false)
);
WriteLiteral("></i>\r\n");
@@ -468,26 +468,26 @@ WriteLiteral(" data-icon=\"");
#line hidden
WriteLiteral("\"");
WriteAttribute("class", Tuple.Create(" class=\"", 4242), Tuple.Create("\"", 4267)
, Tuple.Create(Tuple.Create("", 4250), Tuple.Create("fa", 4250), true)
, Tuple.Create(Tuple.Create(" ", 4252), Tuple.Create("fa-", 4253), true)
WriteAttribute("class", Tuple.Create(" class=\"", 4258), Tuple.Create("\"", 4283)
, Tuple.Create(Tuple.Create("", 4266), Tuple.Create("fa", 4266), true)
, Tuple.Create(Tuple.Create(" ", 4268), Tuple.Create("fa-", 4269), true)
#line 102 "..\..\Areas\Config\Views\UserFlag\Show.cshtml"
, Tuple.Create(Tuple.Create("", 4256), Tuple.Create<System.Object, System.Int32>(icon.Key
, Tuple.Create(Tuple.Create("", 4272), Tuple.Create<System.Object, System.Int32>(icon.Key
#line default
#line hidden
, 4256), false)
, 4272), false)
);
WriteAttribute("title", Tuple.Create(" title=\"", 4268), Tuple.Create("\"", 4287)
WriteAttribute("title", Tuple.Create(" title=\"", 4284), Tuple.Create("\"", 4303)
#line 102 "..\..\Areas\Config\Views\UserFlag\Show.cshtml"
, Tuple.Create(Tuple.Create("", 4276), Tuple.Create<System.Object, System.Int32>(icon.Value
, Tuple.Create(Tuple.Create("", 4292), Tuple.Create<System.Object, System.Int32>(icon.Value
#line default
#line hidden
, 4276), false)
, 4292), false)
);
WriteLiteral("></i>\r\n");
@@ -532,27 +532,27 @@ WriteLiteral(" data-colour=\"");
#line hidden
WriteLiteral("\"");
WriteAttribute("class", Tuple.Create(" class=\"", 4619), Tuple.Create("\"", 4655)
, Tuple.Create(Tuple.Create("", 4627), Tuple.Create("fa", 4627), true)
, Tuple.Create(Tuple.Create(" ", 4629), Tuple.Create("fa-square", 4630), true)
, Tuple.Create(Tuple.Create(" ", 4639), Tuple.Create("d-", 4640), true)
WriteAttribute("class", Tuple.Create(" class=\"", 4635), Tuple.Create("\"", 4671)
, Tuple.Create(Tuple.Create("", 4643), Tuple.Create("fa", 4643), true)
, Tuple.Create(Tuple.Create(" ", 4645), Tuple.Create("fa-square", 4646), true)
, Tuple.Create(Tuple.Create(" ", 4655), Tuple.Create("d-", 4656), true)
#line 108 "..\..\Areas\Config\Views\UserFlag\Show.cshtml"
, Tuple.Create(Tuple.Create("", 4642), Tuple.Create<System.Object, System.Int32>(colour.Key
, Tuple.Create(Tuple.Create("", 4658), Tuple.Create<System.Object, System.Int32>(colour.Key
#line default
#line hidden
, 4642), false)
, 4658), false)
);
WriteAttribute("title", Tuple.Create(" title=\"", 4656), Tuple.Create("\"", 4677)
WriteAttribute("title", Tuple.Create(" title=\"", 4672), Tuple.Create("\"", 4693)
#line 108 "..\..\Areas\Config\Views\UserFlag\Show.cshtml"
, Tuple.Create(Tuple.Create("", 4664), Tuple.Create<System.Object, System.Int32>(colour.Value
, Tuple.Create(Tuple.Create("", 4680), Tuple.Create<System.Object, System.Int32>(colour.Value
#line default
#line hidden
, 4664), false)
, 4680), false)
);
WriteLiteral("></i>\r\n");
Disco.Web/ClientSource/Style/BundleSite.css
+3 -1
View File
@@ -4053,7 +4053,7 @@ footer a:hover,
text-decoration: none;
}
p {
margin: 0 0 20px 0;
margin: 0 0 2px 0;
line-height: 1.6em;
}
ul {
@@ -5098,6 +5098,8 @@ textarea.block {
}
#licence p {
font-size: 0.9em;
line-height: 1.6em;
margin-bottom: 1em;
}
#licence li {
font-size: 0.9em;
Disco.Web/ClientSource/Style/BundleSite.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Job.css
+12 -10
View File
@@ -287,11 +287,14 @@
font-size: 0.90em;
font-style: italic;
}
#jobShowResources #Comments div.commentOutput > div span.comment {
#jobShowResources #Comments div.commentOutput > div div.comment {
clear: both;
display: block;
margin-left: 4px;
}
#jobShowResources #Comments div.commentOutput > div div.comment p {
line-height: 1.2em;
}
#jobShowResources #Comments div.commentOutput > div:hover span.remove {
opacity: .5;
}
@@ -470,21 +473,20 @@
display: none;
position: absolute;
left: 280px;
top: 40px;
top: 30px;
}
#Job_Show_Job_Actions_AddQueue_Dialog .details h4 {
margin-bottom: 4px;
}
#Job_Show_Job_Actions_AddQueue_Dialog .details #Priority {
margin-bottom: 10px;
min-width: 200px;
#Job_Show_Job_Actions_AddQueue_Dialog .details > div {
margin: 5px 0;
}
#Job_Show_Job_Actions_AddQueue_Dialog .details #SLAExpiresMinutes {
margin-bottom: 10px;
min-width: 200px;
#Job_Show_Job_Actions_AddQueue_Dialog .details select {
min-width: 270px;
}
#Job_Show_Job_Actions_AddQueue_Dialog .details #Comment {
min-width: 280px;
#Job_Show_Job_Actions_AddQueue_Dialog .details textarea {
min-width: 270px;
height: 100px;
}
#jobDetailTab-Queues #jobQueues {
border: solid 1px #d8d8d8;
Disco.Web/ClientSource/Style/Job.less
+13 -11
View File
@@ -265,10 +265,14 @@
font-style: italic;
}
span.comment {
div.comment {
clear: both;
display: block;
margin-left: 4px;
p {
line-height: 1.2em;
}
}
&:hover {
@@ -483,24 +487,22 @@
display: none;
position: absolute;
left: 280px;
top: 40px;
top: 30px;
h4 {
margin-bottom: 4px;
}
#Priority {
margin-bottom: 10px;
min-width: 200px;
& > div {
margin: 5px 0;
}
#SLAExpiresMinutes {
margin-bottom: 10px;
min-width: 200px;
select {
min-width: 270px;
}
#Comment {
min-width: 280px;
textarea {
min-width: 270px;
height: 100px;
}
}
}
Disco.Web/ClientSource/Style/Job.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Site.css
+3 -1
View File
@@ -392,7 +392,7 @@ footer a:hover,
text-decoration: none;
}
p {
margin: 0 0 20px 0;
margin: 0 0 2px 0;
line-height: 1.6em;
}
ul {
@@ -1437,6 +1437,8 @@ textarea.block {
}
#licence p {
font-size: 0.9em;
line-height: 1.6em;
margin-bottom: 1em;
}
#licence li {
font-size: 0.9em;
Disco.Web/ClientSource/Style/Site.less
+3 -1
View File
@@ -326,7 +326,7 @@ footer, #footer {
// Element Resets
p {
margin: 0 0 20px 0;
margin: 0 0 2px 0;
line-height: 1.6em;
}
@@ -1494,6 +1494,8 @@ textarea.block {
p {
font-size: 0.9em;
line-height: 1.6em;
margin-bottom: 1em;
}
li {
Disco.Web/ClientSource/Style/Site.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/Disco.Web.csproj
+4 -1
View File
@@ -43,6 +43,9 @@
<UseVSHostingProcess>true</UseVSHostingProcess>
</PropertyGroup>
<ItemGroup>
<Reference Include="MarkdownSharp">
<HintPath>..\packages\MarkdownSharp.1.13.0.0\lib\35\MarkdownSharp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.0.3\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
@@ -2154,7 +2157,7 @@
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
<UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" />
<UserProperties BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
Disco.Web/Extensions/HtmlExtensions.cs
+15 -7
View File
@@ -13,6 +13,7 @@ using System.IO;
using System.Globalization;
using System.Text;
using Disco.Services.Interop.ActiveDirectory;
using MarkdownSharp;
namespace Disco.Web
{
@@ -109,18 +110,25 @@ namespace Disco.Web
return breadCrumbs;
}
private static Lazy<Regex> htmlCommentJobRegex = new Lazy<Regex>(() => { return new Regex(@"(#(\d+))", RegexOptions.Compiled, TimeSpan.FromSeconds(.1)); });
private static Lazy<Regex> htmlCommentUserRegex = new Lazy<Regex>(() => { return new Regex(@"(@([^\s\\]+\\)?([^\s\\]+[\w\d]))", RegexOptions.Compiled, TimeSpan.FromSeconds(.1)); });
private static Lazy<Regex> htmlCommentDeviceRegex = new Lazy<Regex>(() => { return new Regex(@"(!([\S]+[\w\d]))", RegexOptions.Compiled, TimeSpan.FromSeconds(.1)); });
private static Lazy<Regex> htmlCommentJobRegex = new Lazy<Regex>(() => { return new Regex(@"((?<!&)#(\d+))", RegexOptions.Compiled, TimeSpan.FromSeconds(.1)); });
private static Lazy<Regex> htmlCommentUserRegex = new Lazy<Regex>(() => { return new Regex(@"((?<!&)@([\w\d-_.]+\\)?([\w\d-_.]+[\w\d]))", RegexOptions.Compiled, TimeSpan.FromSeconds(.1)); });
private static Lazy<Regex> htmlCommentDeviceRegex = new Lazy<Regex>(() => { return new Regex(@"((?<!&)!([\w\d-_.]+[\w\d]))", RegexOptions.Compiled, TimeSpan.FromSeconds(.1)); });
private static IMarkdownOptions markdownOptions = new MarkdownOptions()
{
AutoNewLines = true
};
public static MvcHtmlString ToHtmlComment(this string s)
{
var urlHelper = new UrlHelper(HttpContext.Current.Request.RequestContext);
var html = HttpUtility.HtmlEncode(s);
var markdownParser = new Markdown(markdownOptions);
var markdown = markdownParser.Transform(html);
try
{
// Job Matches
html = htmlCommentJobRegex.Value.Replace(html, match => {
markdown = htmlCommentJobRegex.Value.Replace(markdown, match =>
{
int jobId;
if (int.TryParse(match.Groups[2].Value, out jobId))
return string.Format("<a href=\"{2}\" title=\"Job {1}\">{0}</a>", match.Value, jobId, urlHelper.Action(MVC.Job.Show(jobId)));
@@ -129,7 +137,7 @@ namespace Disco.Web
});
// User Matches
html = htmlCommentUserRegex.Value.Replace(html, match =>
markdown = htmlCommentUserRegex.Value.Replace(markdown, match =>
{
string domainId = match.Groups[2].Value;
string userId = match.Groups[3].Value;
@@ -153,7 +161,7 @@ namespace Disco.Web
});
// Device Matches
html = htmlCommentDeviceRegex.Value.Replace(html, match =>
markdown = htmlCommentDeviceRegex.Value.Replace(markdown, match =>
{
string deviceSerialNumber = match.Groups[2].Value;
@@ -168,7 +176,7 @@ namespace Disco.Web
// Ignore Encoding Exceptions
}
return new MvcHtmlString(html.Replace("\n", "<br />").Replace(Environment.NewLine, "<br />"));
return new MvcHtmlString(markdown);
}
public static IEnumerable<SelectListItem> ToSelectListItems(this IEnumerable<string> Items, string SelectedItem = null)
Disco.Web/Views/Job/JobParts/Resources.cshtml
+2 -2
View File
@@ -36,7 +36,7 @@
<div data-logid="@jl.Id">
<span class="author">@jl.TechUser.ToStringFriendly()</span>@if (canRemoveAnyLogs || (canRemoveOwnLogs && jl.TechUserId == CurrentUser.UserId))
{<text><span class="remove fa fa-times-circle"></span></text>}<span class="timestamp" data-livestamp="@(jl.Timestamp.ToUnixEpoc())" title="@jl.Timestamp.ToFullDateTime()">@jl.Timestamp.ToFullDateTime()</span>
<span class="comment">@jl.Comments.ToHtmlComment()</span>
<div class="comment">@jl.Comments.ToHtmlComment()</div>
</div>
}
</div>
@@ -256,7 +256,7 @@
var t = '<div><span class="author" />';
if (canRemove)
t += '<span class="remove fa fa-times-circle" />';
t += '<span class="timestamp" /><span class="comment" /></div>';
t += '<span class="timestamp" /><div class="comment" /></div>';
var e = $(t);
e.attr('data-logid', c.Id);
Disco.Web/Views/Job/JobParts/Resources.generated.cs
+36 -36
View File
@@ -232,7 +232,7 @@ WriteLiteral(">");
#line default
#line hidden
WriteLiteral("</span>\r\n <span");
WriteLiteral("</span>\r\n <div");
WriteLiteral(" class=\"comment\"");
@@ -240,12 +240,12 @@ WriteLiteral(">");
#line 39 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(jl.Comments.ToHtmlComment());
Write(jl.Comments.ToHtmlComment());
#line default
#line hidden
WriteLiteral("</span>\r\n </div>\r\n");
WriteLiteral("</div>\r\n </div>\r\n");
#line 41 "..\..\Views\Job\JobParts\Resources.cshtml"
@@ -324,14 +324,14 @@ WriteLiteral(">\r\n <div");
WriteLiteral(" id=\"Attachments\"");
WriteAttribute("class", Tuple.Create(" class=\"", 2941), Tuple.Create("\"", 3016)
WriteAttribute("class", Tuple.Create(" class=\"", 2939), Tuple.Create("\"", 3014)
#line 56 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 2949), Tuple.Create<System.Object, System.Int32>(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments"
, Tuple.Create(Tuple.Create("", 2947), Tuple.Create<System.Object, System.Int32>(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments"
#line default
#line hidden
, 2949), false)
, 2947), false)
);
WriteLiteral(">\r\n <div");
@@ -361,14 +361,14 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <a");
WriteAttribute("href", Tuple.Create(" href=\"", 3353), Tuple.Create("\"", 3410)
WriteAttribute("href", Tuple.Create(" href=\"", 3351), Tuple.Create("\"", 3408)
#line 63 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3360), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))
, Tuple.Create(Tuple.Create("", 3358), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))
#line default
#line hidden
, 3360), false)
, 3358), false)
);
WriteLiteral(" data-attachmentid=\"");
@@ -397,42 +397,42 @@ WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"icon\"");
WriteAttribute("title", Tuple.Create(" title=\"", 3520), Tuple.Create("\"", 3540)
WriteAttribute("title", Tuple.Create(" title=\"", 3518), Tuple.Create("\"", 3538)
#line 64 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3528), Tuple.Create<System.Object, System.Int32>(ja.Filename
, Tuple.Create(Tuple.Create("", 3526), Tuple.Create<System.Object, System.Int32>(ja.Filename
#line default
#line hidden
, 3528), false)
, 3526), false)
);
WriteLiteral(">\r\n <img");
WriteLiteral(" alt=\"Attachment Thumbnail\"");
WriteAttribute("src", Tuple.Create(" src=\"", 3611), Tuple.Create("\"", 3670)
WriteAttribute("src", Tuple.Create(" src=\"", 3609), Tuple.Create("\"", 3668)
#line 65 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3617), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentThumbnail(ja.Id))
, Tuple.Create(Tuple.Create("", 3615), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentThumbnail(ja.Id))
#line default
#line hidden
, 3617), false)
, 3615), false)
);
WriteLiteral(" /></span>\r\n <span");
WriteLiteral(" class=\"comments\"");
WriteAttribute("title", Tuple.Create(" title=\"", 3737), Tuple.Create("\"", 3757)
WriteAttribute("title", Tuple.Create(" title=\"", 3735), Tuple.Create("\"", 3755)
#line 66 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3745), Tuple.Create<System.Object, System.Int32>(ja.Comments
, Tuple.Create(Tuple.Create("", 3743), Tuple.Create<System.Object, System.Int32>(ja.Comments
#line default
#line hidden
, 3745), false)
, 3743), false)
);
WriteLiteral(">\r\n");
@@ -527,14 +527,14 @@ WriteLiteral(" data-livestamp=\"");
#line hidden
WriteLiteral("\"");
WriteAttribute("title", Tuple.Create(" title=\"", 4452), Tuple.Create("\"", 4490)
WriteAttribute("title", Tuple.Create(" title=\"", 4450), Tuple.Create("\"", 4488)
#line 72 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 4460), Tuple.Create<System.Object, System.Int32>(ja.Timestamp.ToFullDateTime()
, Tuple.Create(Tuple.Create("", 4458), Tuple.Create<System.Object, System.Int32>(ja.Timestamp.ToFullDateTime()
#line default
#line hidden
, 4460), false)
, 4458), false)
);
WriteLiteral(">");
@@ -936,21 +936,21 @@ WriteLiteral("\r\n }\r\n },\r\n
" addComment(c, quick, canRemove) {\r\n var t = \'<div><span class=\"a" +
"uthor\" />\';\r\n if (canRemove)\r\n t += \'<span cla" +
"ss=\"remove fa fa-times-circle\" />\';\r\n t += \'<span class=\"timestam" +
"p\" /><span class=\"comment\" /></div>\';\r\n\r\n var e = $(t);\r\n " +
" e.attr(\'data-logid\', c.Id);\r\n e.find(\'.author\').text(c.Au" +
"thor);\r\n e.find(\'.timestamp\').text(c.TimestampFull).attr(\'title\'," +
" c.TimestampFull).livestamp(c.TimestampUnixEpoc);\r\n if (canRemove" +
")\r\n e.find(\'.remove\').click(removePost);\r\n var" +
" eComment = e.find(\'.comment\').html(c.HtmlComments);\r\n\r\n $Comment" +
"Output.append(e);\r\n\r\n if (!quick) {\r\n e.animat" +
"e({ backgroundColor: \'#ffff99\' }, 500, function () {\r\n e." +
"animate({ backgroundColor: \'#fafafa\' }, 500, function () {\r\n " +
" e.css(\'background-color\', \'\');\r\n });\r\n " +
" });\r\n $CommentOutput.animate({ scrollTop: $CommentOu" +
"tput[0].scrollHeight }, 250)\r\n }\r\n }\r\n\r\n //" +
" Add Globally Available Functions\r\n document.DiscoFunctions.liveLoadC" +
"omment = loadLiveComment;\r\n document.DiscoFunctions.liveRemoveComment" +
" = liveRemoveComment;\r\n //#endregion\r\n });\r\n </script>\r\n");
"p\" /><div class=\"comment\" /></div>\';\r\n\r\n var e = $(t);\r\n " +
" e.attr(\'data-logid\', c.Id);\r\n e.find(\'.author\').text(c.Aut" +
"hor);\r\n e.find(\'.timestamp\').text(c.TimestampFull).attr(\'title\', " +
"c.TimestampFull).livestamp(c.TimestampUnixEpoc);\r\n if (canRemove)" +
"\r\n e.find(\'.remove\').click(removePost);\r\n var " +
"eComment = e.find(\'.comment\').html(c.HtmlComments);\r\n\r\n $CommentO" +
"utput.append(e);\r\n\r\n if (!quick) {\r\n e.animate" +
"({ backgroundColor: \'#ffff99\' }, 500, function () {\r\n e.a" +
"nimate({ backgroundColor: \'#fafafa\' }, 500, function () {\r\n " +
" e.css(\'background-color\', \'\');\r\n });\r\n " +
" });\r\n $CommentOutput.animate({ scrollTop: $CommentOut" +
"put[0].scrollHeight }, 250)\r\n }\r\n }\r\n\r\n // " +
"Add Globally Available Functions\r\n document.DiscoFunctions.liveLoadCo" +
"mment = loadLiveComment;\r\n document.DiscoFunctions.liveRemoveComment " +
"= liveRemoveComment;\r\n //#endregion\r\n });\r\n </script>\r\n");
#line 287 "..\..\Views\Job\JobParts\Resources.cshtml"
Disco.Web/Views/Job/JobParts/_Subject.cshtml
+8 -6
View File
@@ -715,15 +715,15 @@
<div class="details">
<div>
<h4>Job Priority</h4>
@Html.DropDownList("Priority", priorityItems) <i class="fa d-priority-@(priorityValue.ToLower())" title="@(priorityValue) Priority"></i>
@Html.DropDownList("Priority", priorityItems, new { id = "Job_Show_Job_Actions_AddQueue_Priority" }) <i class="fa d-priority-@(priorityValue.ToLower())" title="@(priorityValue) Priority"></i>
</div>
<div>
<h4>SLA Target</h4>
@Html.DropDownList("SLAExpiresMinutes", slaOptions)
@Html.DropDownList("SLAExpiresMinutes", slaOptions, new { id = "Job_Show_Job_Actions_AddQueue_SLAExpiresMinutes" })
</div>
<div>
<h4>Tasks/Comment</h4>
@Html.TextArea("Comment")
<textarea name="Comment" id="Job_Show_Job_Actions_AddQueue_Comment"></textarea>
</div>
</div>
}
@@ -750,10 +750,12 @@
if (!queueSLA)
queueSLA = 0;
details.find('#Priority').val('Normal');
details.find('#SLAExpiresMinutes').val(queueSLA);
$('#Job_Show_Job_Actions_AddQueue_Priority').val('Normal');
$('#Job_Show_Job_Actions_AddQueue_SLAExpiresMinutes').val(queueSLA);
details.show();
$('#Job_Show_Job_Actions_AddQueue_Comment').focus().select();
}
button.attr('href', '#').click(function (e) {
@@ -788,7 +790,7 @@
queueId = $('#Job_Show_Job_Actions_AddQueue_Dialog_Id');
details = buttonDialog.find('.details');
var priorityList = buttonDialog.find('#Priority');
var priorityList = $('#Job_Show_Job_Actions_AddQueue_Priority');
priorityList.change(function () {
var icon = priorityList.closest('div').find('i').first();
icon[0].className = '';
Disco.Web/Views/Job/JobParts/_Subject.generated.cs
+105 -106
View File
@@ -2453,34 +2453,34 @@ WriteLiteral(" ");
#line 718 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.DropDownList("Priority", priorityItems));
Write(Html.DropDownList("Priority", priorityItems, new { id = "Job_Show_Job_Actions_AddQueue_Priority" }));
#line default
#line hidden
WriteLiteral(" <i");
WriteAttribute("class", Tuple.Create(" class=\"", 47505), Tuple.Create("\"", 47553)
, Tuple.Create(Tuple.Create("", 47513), Tuple.Create("fa", 47513), true)
, Tuple.Create(Tuple.Create(" ", 47515), Tuple.Create("d-priority-", 47516), true)
WriteAttribute("class", Tuple.Create(" class=\"", 47560), Tuple.Create("\"", 47608)
, Tuple.Create(Tuple.Create("", 47568), Tuple.Create("fa", 47568), true)
, Tuple.Create(Tuple.Create(" ", 47570), Tuple.Create("d-priority-", 47571), true)
#line 718 "..\..\Views\Job\JobParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 47527), Tuple.Create<System.Object, System.Int32>(priorityValue.ToLower()
, Tuple.Create(Tuple.Create("", 47582), Tuple.Create<System.Object, System.Int32>(priorityValue.ToLower()
#line default
#line hidden
, 47527), false)
, 47582), false)
);
WriteAttribute("title", Tuple.Create(" title=\"", 47554), Tuple.Create("\"", 47587)
WriteAttribute("title", Tuple.Create(" title=\"", 47609), Tuple.Create("\"", 47642)
#line 718 "..\..\Views\Job\JobParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 47562), Tuple.Create<System.Object, System.Int32>(priorityValue
, Tuple.Create(Tuple.Create("", 47617), Tuple.Create<System.Object, System.Int32>(priorityValue
#line default
#line hidden
, 47562), false)
, Tuple.Create(Tuple.Create(" ", 47578), Tuple.Create("Priority", 47579), true)
, 47617), false)
, Tuple.Create(Tuple.Create(" ", 47633), Tuple.Create("Priority", 47634), true)
);
WriteLiteral("></i>\r\n </div>\r\n <div>\r\n " +
@@ -2490,24 +2490,21 @@ WriteLiteral(" ");
#line 722 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.DropDownList("SLAExpiresMinutes", slaOptions));
Write(Html.DropDownList("SLAExpiresMinutes", slaOptions, new { id = "Job_Show_Job_Actions_AddQueue_SLAExpiresMinutes" }));
#line default
#line hidden
WriteLiteral("\r\n </div>\r\n <div>\r\n " +
" <h4>Tasks/Comment</h4>\r\n");
" <h4>Tasks/Comment</h4>\r\n " +
"<textarea");
WriteLiteral(" ");
WriteLiteral(" name=\"Comment\"");
WriteLiteral(" id=\"Job_Show_Job_Actions_AddQueue_Comment\"");
#line 726 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.TextArea("Comment"));
#line default
#line hidden
WriteLiteral("\r\n </div>\r\n </div>\r\n");
WriteLiteral("></textarea>\r\n </div>\r\n </div>\r" +
"\n");
#line 729 "..\..\Views\Job\JobParts\_Subject.cshtml"
@@ -2533,45 +2530,47 @@ WriteLiteral(">\r\n $(function () {\r\n
" queueId.val(queue.attr(\'data-queueid\'));\r\n\r\n " +
" var queueSLA = queue.attr(\'data-queuesla\');\r\n " +
" if (!queueSLA)\r\n queueSLA = 0;\r\n\r\n " +
" details.find(\'#Priority\').val(\'Normal\');\r\n " +
" details.find(\'#SLAExpiresMinutes\').val(queueSLA);\r\n\r\n " +
" details.show();\r\n }\r\n " +
" \r\n button.attr(\'href\', \'#\').click(function (e) {\r\n " +
" e.preventDefault();\r\n\r\n if " +
"(!buttonDialog){\r\n buttonDialog = $(\'#Job_Show_Jo" +
"b_Actions_AddQueue_Dialog\');\r\n buttonDialog.dialo" +
"g({\r\n width: 600,\r\n " +
" height: 410,\r\n resizable: false,\r\n " +
" modal: true,\r\n " +
" autoOpen: false,\r\n buttons: {\r\n " +
" Cancel: function () {\r\n " +
" $(this).dialog(\"close\");\r\n " +
" },\r\n \"Add to Queue\": function () {\r\n " +
" if (!!queueId.val()){\r\n " +
" var $this = $(this);\r\n " +
" $this.dialog(\"disable\");\r\n " +
" $this.dialog(\"option\", \"buttons\", null);\r\n " +
" buttonDialog.find(\'form\').submit();\r\n " +
" }else{\r\n " +
" alert(\'Select a Job Queue\');\r\n }" +
"\r\n }\r\n " +
" }\r\n });\r\n\r\n queue" +
"Picker = buttonDialog.find(\'.queuePicker\');\r\n que" +
"ueId = $(\'#Job_Show_Job_Actions_AddQueue_Dialog_Id\');\r\n " +
" details = buttonDialog.find(\'.details\');\r\n\r\n " +
" var priorityList = buttonDialog.find(\'#Priority\');\r\n " +
" priorityList.change(function () {\r\n va" +
"r icon = priorityList.closest(\'div\').find(\'i\').first();\r\n " +
" icon[0].className = \'\';\r\n icon.a" +
"ddClass(\'fa d-priority-\' + priorityList.val().toLowerCase()).attr(\'title\', prior" +
"ityList.val() + \' Priority\');\r\n });\r\n\r\n " +
" queuePicker.on(\'click\', \'div.queue\', queueSelected);\r\n " +
" }\r\n\r\n buttonDialog.dialog(\'op" +
"en\');\r\n return false;\r\n });\r\n " +
" });\r\n </script>\r\n");
" $(\'#Job_Show_Job_Actions_AddQueue_Priority\').val(\'Norm" +
"al\');\r\n $(\'#Job_Show_Job_Actions_AddQueue_SLAExpiresM" +
"inutes\').val(queueSLA);\r\n\r\n details.show();\r\n\r\n " +
" $(\'#Job_Show_Job_Actions_AddQueue_Comment\').focus().select" +
"();\r\n }\r\n \r\n " +
" button.attr(\'href\', \'#\').click(function (e) {\r\n e.p" +
"reventDefault();\r\n\r\n if (!buttonDialog){\r\n " +
" buttonDialog = $(\'#Job_Show_Job_Actions_AddQueue_Dialog\');\r" +
"\n buttonDialog.dialog({\r\n " +
" width: 600,\r\n height: 410,\r\n " +
" resizable: false,\r\n " +
" modal: true,\r\n autoOpen: false,\r\n " +
" buttons: {\r\n " +
" Cancel: function () {\r\n $(this).dia" +
"log(\"close\");\r\n },\r\n " +
" \"Add to Queue\": function () {\r\n " +
" if (!!queueId.val()){\r\n " +
" var $this = $(this);\r\n $this" +
".dialog(\"disable\");\r\n $this.dialo" +
"g(\"option\", \"buttons\", null);\r\n b" +
"uttonDialog.find(\'form\').submit();\r\n " +
"}else{\r\n alert(\'Select a Job Queu" +
"e\');\r\n }\r\n " +
" }\r\n }\r\n " +
" });\r\n\r\n queuePicker = buttonDialog.find(\'." +
"queuePicker\');\r\n queueId = $(\'#Job_Show_Job_Actio" +
"ns_AddQueue_Dialog_Id\');\r\n details = buttonDialog" +
".find(\'.details\');\r\n\r\n var priorityList = $(\'#Job" +
"_Show_Job_Actions_AddQueue_Priority\');\r\n priority" +
"List.change(function () {\r\n var icon = priori" +
"tyList.closest(\'div\').find(\'i\').first();\r\n ic" +
"on[0].className = \'\';\r\n icon.addClass(\'fa d-p" +
"riority-\' + priorityList.val().toLowerCase()).attr(\'title\', priorityList.val() +" +
" \' Priority\');\r\n });\r\n\r\n " +
" queuePicker.on(\'click\', \'div.queue\', queueSelected);\r\n " +
" }\r\n\r\n buttonDialog.dialog(\'open\');\r\n " +
" return false;\r\n });\r\n " +
" });\r\n </script>\r\n");
#line 806 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 808 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
@@ -2580,7 +2579,7 @@ WriteLiteral(">\r\n $(function () {\r\n
WriteLiteral(" ");
#line 807 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 809 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanLogWarranty())
{
@@ -2588,14 +2587,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 809 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 811 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Log Warranty", MVC.Job.LogWarranty(Model.Job.Id, null, null), "Job_Show_Job_Actions_LogWarranty_Button"));
#line default
#line hidden
#line 809 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 811 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
@@ -2605,7 +2604,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 811 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 813 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanWarrantyCompleted())
{
@@ -2613,14 +2612,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 813 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 815 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Warranty Complete", MVC.API.Job.UpdateWarrantyExternalCompletedDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_WarrantyComplete_Button", "alert"));
#line default
#line hidden
#line 813 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 815 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
@@ -2630,7 +2629,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 815 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 817 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanInsuranceClaimFormSent())
{
@@ -2638,14 +2637,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 817 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 819 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Insurance Claim Sent", MVC.API.Job.UpdateInsuranceClaimFormSentDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_InsuranceClaimSent_Button", "alert"));
#line default
#line hidden
#line 817 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 819 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
@@ -2655,7 +2654,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 819 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 821 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanLogRepair())
{
@@ -2663,14 +2662,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 821 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 823 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Repairs Logged", MVC.API.Job.LogRepair(Model.Job.Id, null, null, true), "Job_Show_Job_Actions_LogRepair_Button"));
#line default
#line hidden
#line 821 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 823 "..\..\Views\Job\JobParts\_Subject.cshtml"
@@ -2687,13 +2686,13 @@ WriteLiteral(" title=\"Repairs Logged\"");
WriteLiteral(">\r\n");
#line 823 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 825 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line default
#line hidden
#line 823 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 825 "..\..\Views\Job\JobParts\_Subject.cshtml"
using (Html.BeginForm(MVC.API.Job.LogRepair(Model.Job.Id, null, null, true)))
{
@@ -2725,7 +2724,7 @@ WriteLiteral(" name=\"RepairerReference\"");
WriteLiteral(" />\r\n </p>\r\n");
#line 833 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 835 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
@@ -2763,7 +2762,7 @@ WriteLiteral(">\r\n $(function () {\r\n
" });\r\n });\r\n </script>\r\n");
#line 871 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 873 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
@@ -2772,7 +2771,7 @@ WriteLiteral(">\r\n $(function () {\r\n
WriteLiteral(" ");
#line 872 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 874 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanRepairComplete())
{
@@ -2780,14 +2779,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 874 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 876 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Repairs Complete", MVC.API.Job.UpdateNonWarrantyRepairerCompletedDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_RepairComplete_Button", "alert"));
#line default
#line hidden
#line 874 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 876 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
@@ -2797,7 +2796,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 876 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 878 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanConvertHWarToHNWar())
{
@@ -2805,14 +2804,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 878 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 880 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Convert to Non-Warranty", MVC.API.Job.ConvertHWarToHNWar(Model.Job.Id, true), "Job_Show_Job_Actions_ConvertToHNWar_Button"));
#line default
#line hidden
#line 878 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 880 "..\..\Views\Job\JobParts\_Subject.cshtml"
@@ -2860,7 +2859,7 @@ WriteLiteral(">\r\n $(function () {\r\n
" \r\n });\r\n </script>\r\n");
#line 918 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 920 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
@@ -2869,13 +2868,13 @@ WriteLiteral(">\r\n $(function () {\r\n
WriteLiteral(" </td>\r\n");
#line 920 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 922 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line default
#line hidden
#line 920 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 922 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.Device != null)
{
@@ -2889,13 +2888,13 @@ WriteLiteral(" id=\"Job_Show_Device_Actions\"");
WriteLiteral(">\r\n");
#line 923 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 925 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line default
#line hidden
#line 923 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 925 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanDeviceHeld())
{
@@ -2903,14 +2902,14 @@ WriteLiteral(">\r\n");
#line default
#line hidden
#line 925 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 927 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Device Held", MVC.API.Job.DeviceHeld(Model.Job.Id, true), "Job_Show_Device_Actions_Held_Button"));
#line default
#line hidden
#line 925 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 927 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
@@ -2920,7 +2919,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" ");
#line 927 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 929 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanDeviceReadyForReturn())
{
@@ -2928,14 +2927,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 929 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 931 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Device Ready For Return", MVC.API.Job.DeviceReadyForReturn(Model.Job.Id, true), "Job_Show_Device_Actions_DeviceReadyForReturn_Button", "alert"));
#line default
#line hidden
#line 929 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 931 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
@@ -2945,7 +2944,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 931 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 933 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanDeviceReturned())
{
@@ -2953,14 +2952,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 933 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 935 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Device Returned", MVC.API.Job.DeviceReturned(Model.Job.Id, true), "Job_Show_Device_Actions_DeviceReturned_Button", Model.Job.CanDeviceReadyForReturn() ? null : "alert"));
#line default
#line hidden
#line 933 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 935 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
@@ -2970,7 +2969,7 @@ WriteLiteral(" ");
WriteLiteral(" </td>\r\n");
#line 936 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 938 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
@@ -2979,7 +2978,7 @@ WriteLiteral(" </td>\r\n");
WriteLiteral(" ");
#line 937 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 939 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.User != null)
{
@@ -2993,13 +2992,13 @@ WriteLiteral(" id=\"Job_Show_User_Actions\"");
WriteLiteral(">\r\n\r\n\r\n");
#line 942 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 944 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line default
#line hidden
#line 942 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 944 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanWaitingForUserAction())
{
@@ -3027,13 +3026,13 @@ WriteLiteral(" title=\"Waiting for User Action\"");
WriteLiteral(">\r\n");
#line 946 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 948 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line default
#line hidden
#line 946 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 948 "..\..\Views\Job\JobParts\_Subject.cshtml"
using (Html.BeginForm(MVC.API.Job.WaitingForUserAction(Model.Job.Id, null, true)))
{
@@ -3051,7 +3050,7 @@ WriteLiteral(" class=\"block\"");
WriteLiteral("></textarea>\r\n </p>\r\n");
#line 952 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 954 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
@@ -3086,7 +3085,7 @@ WriteLiteral(">\r\n $(function () {\r\n
" });\r\n </script>\r\n");
#line 985 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 987 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
@@ -3095,7 +3094,7 @@ WriteLiteral(">\r\n $(function () {\r\n
WriteLiteral(" ");
#line 986 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 988 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanNotWaitingForUserAction())
{
@@ -3123,13 +3122,13 @@ WriteLiteral(" title=\"Not Waiting for User Action\"");
WriteLiteral(">\r\n");
#line 990 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 992 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line default
#line hidden
#line 990 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 992 "..\..\Views\Job\JobParts\_Subject.cshtml"
using (Html.BeginForm(MVC.API.Job.NotWaitingForUserAction(Model.Job.Id, null, true)))
{
@@ -3147,7 +3146,7 @@ WriteLiteral(" class=\"block\"");
WriteLiteral("></textarea>\r\n </p>\r\n");
#line 996 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 998 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
@@ -3183,7 +3182,7 @@ WriteLiteral(">\r\n $(function () {\r\n
" });\r\n </script>\r\n");
#line 1030 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 1032 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
@@ -3192,7 +3191,7 @@ WriteLiteral(">\r\n $(function () {\r\n
WriteLiteral("\r\n </td>\r\n");
#line 1033 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line 1035 "..\..\Views\Job\JobParts\_Subject.cshtml"
}
Disco.Web/Web.config
-4
View File
@@ -76,10 +76,6 @@
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<entityFramework>
Disco.Web/packages.config
+1
View File
@@ -9,6 +9,7 @@
<package id="jQuery.UI.Themes.lightness" version="1.8.22" targetFramework="net45" />
<package id="jQuery.Validation" version="1.12.0" targetFramework="net45" />
<package id="knockoutjs" version="3.1.0" targetFramework="net45" />
<package id="MarkdownSharp" version="1.13.0.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR" version="2.0.3" targetFramework="net45" />