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

Feature: New Theme

Browse Source 
New icon, theme, and fuzzy time. Add moment.js
This commit is contained in:
Gary Sharp
2013-12-24 14:15:07 +11:00
parent ec118a3395
commit f1ee2937cd
216 changed files with 7816 additions and 1948 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Views/Job/Create.generated.cs
+1
View File
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
Disco.Web/Views/Job/Create_Redirect.generated.cs
+2 -1
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
Disco.Web/Views/Job/Index.cshtml
+1 -1
View File
@@ -54,7 +54,7 @@
height: 175,
animation: false
},
colors: ['#BBBBBB', '#005fab', '#DB761D'],
colors: ['#BBBBBB', '#005fab', '#60ab1e'],
title: {
text: null
},
Disco.Web/Views/Job/Index.generated.cs
+3 -2
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
@@ -159,7 +160,7 @@ WriteLiteral(">\r\n (function () {\r\n var cha
" renderTo: \'chartHostJobDailyOpenedClosed\',\r\n " +
" height: 175,\r\n animation" +
": false\r\n },\r\n col" +
"ors: [\'#BBBBBB\', \'#005fab\', \'#DB761D\'],\r\n title: " +
"ors: [\'#BBBBBB\', \'#005fab\', \'#60ab1e\'],\r\n title: " +
"{\r\n text: null\r\n " +
" },\r\n plotOptions: {\r\n " +
" series: {\r\n marker: {\r\n " +
Disco.Web/Views/Job/JobParts/Components.generated.cs
+2 -1
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
Disco.Web/Views/Job/JobParts/Flags.generated.cs
+2 -1
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
Disco.Web/Views/Job/JobParts/Insurance.cshtml
+1 -1
View File
@@ -526,7 +526,7 @@
<script>
$(function () {
var updateUrl = '@(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)))';
var jobOpenDate = '@(Model.Job.OpenedDate.ToJavascriptDateTime())';
var jobOpenDate = '@(Model.Job.OpenedDate.ToJavaScript())';
document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Claim Form Sent Date', 'Job_JobMetaInsurance_ClaimFormSentDate', 'Job_JobMetaInsurance_ClaimFormSentUserId', 'InsuranceClaimFormSentDate', 'Not Sent', jobOpenDate, false);
});
Disco.Web/Views/Job/JobParts/Insurance.generated.cs
+3 -2
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
@@ -1673,7 +1674,7 @@ WriteLiteral("\';\r\n var jobOpenDate = \'");
#line 529 "..\..\Views\Job\JobParts\Insurance.cshtml"
Write(Model.Job.OpenedDate.ToJavascriptDateTime());
Write(Model.Job.OpenedDate.ToJavaScript());
#line default
Disco.Web/Views/Job/JobParts/JobMetaAdditions1.generated.cs
+2 -1
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
#line 2 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"
Disco.Web/Views/Job/JobParts/NonWarranty.generated.cs
+2 -1
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
Disco.Web/Views/Job/JobParts/NonWarrantyFinance.cshtml
+1 -1
View File
@@ -125,7 +125,7 @@
<script>
$(function () {
var updateUrl = '@(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)))';
var jobOpenDate = '@(Model.Job.OpenedDate.ToJavascriptDateTime())';
var jobOpenDate = '@(Model.Job.OpenedDate.ToJavaScript())';
@if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.AccountingChargeRequired))
{<text>document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Accounting Charge Required', 'Job_JobMetaNonWarranty_AccountingChargeRequiredDate', 'Job_JobMetaNonWarranty_AccountingChargeRequiredUser', 'NonWarrantyAccountingChargeRequired', 'Not Required', jobOpenDate, false);</text>}
Disco.Web/Views/Job/JobParts/NonWarrantyFinance.generated.cs
+3 -2
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
@@ -459,7 +460,7 @@ WriteLiteral("\';\r\n var jobOpenDate = \'");
#line 128 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(Model.Job.OpenedDate.ToJavascriptDateTime());
Write(Model.Job.OpenedDate.ToJavaScript());
#line default
Disco.Web/Views/Job/JobParts/Repairs.cshtml
+1 -1
View File
@@ -81,7 +81,7 @@
<script>
$(function () {
var updateUrl = '@(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)))';
var jobOpenDate = '@(Model.Job.OpenedDate.ToJavascriptDateTime())';
var jobOpenDate = '@(Model.Job.OpenedDate.ToJavaScript())';
@if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.RepairerLoggedDate))
{<text>document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Repairer Name', 'Job_JobMetaNonWarranty_RepairerLoggedDate', null, 'NonWarrantyRepairerLoggedDate', 'Not Logged', jobOpenDate, false);</text>}
Disco.Web/Views/Job/JobParts/Repairs.generated.cs
+3 -2
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
@@ -344,7 +345,7 @@ WriteLiteral("\';\r\n var jobOpenDate = \'");
#line 84 "..\..\Views\Job\JobParts\Repairs.cshtml"
Write(Model.Job.OpenedDate.ToJavascriptDateTime());
Write(Model.Job.OpenedDate.ToJavaScript());
#line default
Disco.Web/Views/Job/JobParts/Resources.cshtml
+2 -2
View File
@@ -30,7 +30,7 @@
{
<div data-logid="@jl.Id">
<span class="author">@jl.TechUser.ToString()</span>@if (canRemoveAnyLogs || (canRemoveOwnLogs && jl.TechUserId == CurrentUser.Id))
{<text><span class="remove"></span></text>}<span class="timestamp" title="@jl.Timestamp.ToFullDateTime()">@jl.Timestamp.ToFuzzy()</span>
{<text><span class="remove"></span></text>}<span class="timestamp" title="@jl.Timestamp.ToFullDateTime()">@jl.Timestamp.FromNow()</span>
<span class="comment">@jl.Comments.ToMultilineJobRefString()</span>
</div>
}
@@ -59,7 +59,7 @@
else
{ @ja.Comments }}
</span><span class="author">@ja.TechUser.ToString()</span>@if (canRemoveAnyAttachments || (canRemoveOwnAttachments && ja.TechUserId == CurrentUser.Id))
{<text><span class="remove"></span></text>}<span class="timestamp" title="@ja.Timestamp.ToFullDateTime()">@ja.Timestamp.ToFuzzy()</span>
{<text><span class="remove"></span></text>}<span class="timestamp" title="@ja.Timestamp.ToFullDateTime()">@ja.Timestamp.FromNow()</span>
</a>
}
</div>
Disco.Web/Views/Job/JobParts/Resources.generated.cs
+3 -2
View File
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
@@ -206,7 +207,7 @@ WriteLiteral(">");
#line 33 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(jl.Timestamp.ToFuzzy());
Write(jl.Timestamp.FromNow());
#line default
@@ -498,7 +499,7 @@ WriteLiteral(">");
#line 62 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(ja.Timestamp.ToFuzzy());
Write(ja.Timestamp.FromNow());
#line default
Disco.Web/Views/Job/JobParts/Warranty.generated.cs
+2 -1
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
Disco.Web/Views/Job/JobParts/_Subject.cshtml
+3 -3
View File
@@ -202,7 +202,7 @@
{
<div id="Job_Show_Device_Details_HWar">
<div>DEVICE WARRANTY</div>
<div>Until: <span id="Job_Show_Device_Details_HWar_ValidUntil">@Model.Job.Device.DeviceBatch.WarrantyValidUntil.ToFuzzy("Unknown")</span></div>
<div>Until: <span id="Job_Show_Device_Details_HWar_ValidUntil">@Model.Job.Device.DeviceBatch.WarrantyValidUntil.FromNow("Unknown")</span></div>
@if (!string.IsNullOrWhiteSpace(Model.Job.Device.DeviceBatch.WarrantyDetails))
{
<a id="Job_Show_Device_Details_HWar_Details_Button" href="#">Show Details</a>
@@ -232,7 +232,7 @@
<div id="Job_Show_Device_Details_HNWar">
<div>INSURANCE</div>
<div id="Job_Show_Device_Details_HNWar_InsuranceSupplier">@Model.Job.Device.DeviceBatch.InsuranceSupplier</div>
<div>Until: <span id="Job_Show_Device_Details_HNWar_ValidUntil">@Model.Job.Device.DeviceBatch.InsuredUntil.ToFuzzy("Unknown")</span></div>
<div>Until: <span id="Job_Show_Device_Details_HNWar_ValidUntil">@Model.Job.Device.DeviceBatch.InsuredUntil.FromNow("Unknown")</span></div>
@if (!string.IsNullOrWhiteSpace(Model.Job.Device.DeviceBatch.InsuranceDetails))
{
<a id="Job_Show_Device_Details_HNWar_Details_Button" href="#">Show Details</a>
@@ -367,7 +367,7 @@
{
<div id="Job_Show_User_WaitingForUserAction" class="status">
<h4>Awaiting Action</h4>
Since: @Model.Job.WaitingForUserAction.ToFuzzy()
Since: @Model.Job.WaitingForUserAction.FromNow()
</div>
}
</div>
Disco.Web/Views/Job/JobParts/_Subject.generated.cs
+5 -4
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
@@ -842,7 +843,7 @@ WriteLiteral(">");
#line 205 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Model.Job.Device.DeviceBatch.WarrantyValidUntil.ToFuzzy("Unknown"));
Write(Model.Job.Device.DeviceBatch.WarrantyValidUntil.FromNow("Unknown"));
#line default
@@ -966,7 +967,7 @@ WriteLiteral(">");
#line 235 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Model.Job.Device.DeviceBatch.InsuredUntil.ToFuzzy("Unknown"));
Write(Model.Job.Device.DeviceBatch.InsuredUntil.FromNow("Unknown"));
#line default
@@ -1549,7 +1550,7 @@ WriteLiteral(">\r\n <h4>Awaiting Action</h4>\r\n
#line 370 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Model.Job.WaitingForUserAction.ToFuzzy());
Write(Model.Job.WaitingForUserAction.FromNow());
#line default
Disco.Web/Views/Job/List.generated.cs
+2 -1
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
Disco.Web/Views/Job/LogWarranty.generated.cs
+2 -1
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
Disco.Web/Views/Job/LogWarrantyDisclose.generated.cs
+2 -1
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
Disco.Web/Views/Job/LogWarrantyError.generated.cs
+2 -1
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
Disco.Web/Views/Job/Show.cshtml
+2 -2
View File
@@ -14,8 +14,8 @@
<div id="Job_Show">
<div id="Job_Show_Status">
@{ var jobStatusInfo = Model.Job.Status();}
<span class="icon JobStatus@(jobStatusInfo.Item1)"></span>@jobStatusInfo.Item2 @if (Model.IsLongRunning)
{<span class="smallMessage">(Long Running)</span>}
<span class="icon JobStatus@(jobStatusInfo.Item1)"></span>@jobStatusInfo.Item2 @if (Model.LongRunning.HasValue)
{<span class="smallMessage">(Long Running: @Model.LongRunning.Value.Humanize(false))</span>}
<script type="text/javascript">
$(function () {
$('#Job_Show_Status').appendTo('#layout_PageHeading')
Disco.Web/Views/Job/Show.generated.cs
+13 -3
View File
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
@@ -108,7 +109,7 @@ WriteLiteral(" ");
#line 17 "..\..\Views\Job\Show.cshtml"
if (Model.IsLongRunning)
if (Model.LongRunning.HasValue)
{
#line default
@@ -117,11 +118,20 @@ WriteLiteral("<span");
WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">(Long Running)</span>");
WriteLiteral(">(Long Running: ");
#line 18 "..\..\Views\Job\Show.cshtml"
}
Write(Model.LongRunning.Value.Humanize(false));
#line default
#line hidden
WriteLiteral(")</span>");
#line 18 "..\..\Views\Job\Show.cshtml"
}
#line default
Disco.Web/Views/Job/WarrantyProviderJobDetails.generated.cs
+2 -1
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
Disco.Web/Views/Job/_CreateSubject.generated.cs
+2 -1
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;
Disco.Web/Views/Job/_ViewStart.generated.cs
+2 -1
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18051
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services.Authorization;