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

Generated Job Log to Markdown

Browse Source 
Generated job logs are formatted with Markdown. Includes other minor css
changes.
This commit is contained in:
Gary Sharp
2014-09-09 13:54:14 +10:00
parent 3ae99f45bb
commit 7551b39b8e
27 changed files with 246 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/API/Controllers/JobController.cs
+1 -1
View File
@@ -1510,7 +1510,7 @@ namespace Disco.Web.Areas.API.Controllers
JobId = job.Id,
TechUserId = CurrentUser.UserId,
Timestamp = DateTime.Now,
Comments = string.Format("Added Flag: {0}{1}Reason: {2}", flagStatus.Item1, Environment.NewLine, Reason)
Comments = string.Format("# Added Flag\r\n**{0}**\r\n{1}", flagStatus.Item1, string.IsNullOrWhiteSpace(Reason) ? "<no reason provided>" : Reason)
};
Database.JobLogs.Add(jobLog);
Disco.Web/ClientSource/Style/BundleSite.css
+8 -5
View File
@@ -4191,6 +4191,9 @@ hr {
border-bottom: 1px dashed #aaa;
margin-top: 15px;
}
strong {
font-weight: 600;
}
a:link {
color: #335a87;
text-decoration: none;
@@ -4308,7 +4311,7 @@ h6 {
font-size: 12px;
font-family: "Segoe UI", Arial, Verdana, Tahoma, sans-serif;
font-stretch: normal;
font-weight: bold;
font-weight: 600;
}
table {
border: none;
@@ -4325,7 +4328,7 @@ table th {
padding: 5px;
margin: 0;
text-align: left;
font-weight: bold;
font-weight: 600;
vertical-align: top;
}
table.none {
@@ -4457,7 +4460,7 @@ table.genericData td.id a {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAK0lEQVQI12OIjY39D8QSDECAzIYDqCBYApmNTQE6liCk4D/JJuB1A05fAACQykyB48rZCQAAAABJRU5ErkJggg==) /*Images/Actions/dataTableLastDisabled.png*/;
}
.dataTables_wrapper .dataTables_paginate .paginate_active {
font-weight: bold;
font-weight: 600;
color: #1e6dab;
}
.dataTables_wrapper .dataTables_paginate .paginate_button_disabled {
@@ -4915,7 +4918,7 @@ div.Disco-AttachmentUpload-DropTarget.dragHighlight h2 {
margin-top: 3em !important;
color: #2c1e02;
text-align: center;
font-weight: bold;
font-weight: 600;
}
div.Disco-AttachmentUpload-DropTarget.dragHighlight.dragHover {
background-color: rgba(173, 235, 110, 0.5);
@@ -4999,7 +5002,7 @@ div.Disco-AttachmentUpload-ImageDialog {
}
body > .User_FlagAssignment_Tooltip span.name {
display: block;
font-weight: bold;
font-weight: 600;
}
body > .User_FlagAssignment_Tooltip span.comments {
display: block;
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/Config.css
+7 -7
View File
@@ -249,7 +249,7 @@ table.expressionsTable td.parseError {
}
#organisationAddresses th {
padding: 2px;
font-weight: bold;
font-weight: 600;
width: 200px;
}
#organisationAddresses td {
@@ -356,7 +356,7 @@ table.deviceProfileTable th.deviceCount {
}
#Logging_Task_Status th.process {
text-align: left;
font-weight: bold;
font-weight: 600;
background-color: #f4f4f4;
min-height: 30px;
vertical-align: middle;
@@ -410,7 +410,7 @@ div.logEventsViewport table.logEventsViewport > thead > tr {
}
div.logEventsViewport table.logEventsViewport > thead > tr > th {
padding: 4px 2px;
font-weight: bold;
font-weight: 600;
border-bottom: 1px solid #bbb;
}
div.logEventsViewport table.logEventsViewport > thead > tr > th.icon {
@@ -566,7 +566,7 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
}
#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport > thead > tr > th {
padding: 4px 2px;
font-weight: bold;
font-weight: 600;
border-bottom: 1px solid #bbb;
}
#dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport > thead > tr > th.icon {
@@ -677,7 +677,7 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
margin: 0 0 8px 0;
}
#dialogBulkGenerate .brief .scopeDescBulkGenerate {
font-weight: bold;
font-weight: 600;
}
#dialogBulkGenerate .brief div.examples {
margin: 8px auto;
@@ -784,7 +784,7 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
}
#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport > thead > tr > th {
padding: 4px 2px;
font-weight: bold;
font-weight: 600;
border-bottom: 1px solid #bbb;
}
#importStatus #sessions .session .sessionInfoMessages table.logEventsViewport > thead > tr > th.icon {
@@ -1544,7 +1544,7 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
margin: 0 0 8px 0;
}
#Config_UserFlags_BulkAssign_AssignDialog .brief .scopeDescBulkGenerate {
font-weight: bold;
font-weight: 600;
}
#Config_UserFlags_BulkAssign_AssignDialog .brief div.examples {
margin: 8px auto;
Disco.Web/ClientSource/Style/Config.less
+7 -7
View File
@@ -174,7 +174,7 @@ table.expressionsTable {
th {
padding: 2px;
font-weight: bold;
font-weight: @FontWeightBodyBold;
width: 200px;
}
@@ -307,7 +307,7 @@ table.deviceProfileTable {
th.process {
text-align: left;
font-weight: bold;
font-weight: @FontWeightBodyBold;
background-color: @TableDataBorderColour;
min-height: 30px;
vertical-align: middle;
@@ -374,7 +374,7 @@ div.logEventsViewport {
& > th {
padding: 4px 2px;
font-weight: bold;
font-weight: @FontWeightBodyBold;
border-bottom: 1px solid #bbb;
&.icon {
@@ -574,7 +574,7 @@ div.logEventsViewport {
& > th {
padding: 4px 2px;
font-weight: bold;
font-weight: @FontWeightBodyBold;
border-bottom: 1px solid #bbb;
&.icon {
@@ -730,7 +730,7 @@ div.logEventsViewport {
margin: 0 0 8px 0;
.scopeDescBulkGenerate {
font-weight: bold;
font-weight: @FontWeightBodyBold;
}
div.examples {
@@ -861,7 +861,7 @@ div.logEventsViewport {
& > th {
padding: 4px 2px;
font-weight: bold;
font-weight: @FontWeightBodyBold;
border-bottom: 1px solid #bbb;
&.icon {
@@ -1788,7 +1788,7 @@ div.logEventsViewport {
margin: 0 0 8px 0;
.scopeDescBulkGenerate {
font-weight: bold;
font-weight: @FontWeightBodyBold;
}
div.examples {
Disco.Web/ClientSource/Style/Config.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Declarations.less
+1
View File
@@ -41,6 +41,7 @@
@FontWeightHeading: lighter;
@FontStretchHeading: condensed;
@FontSizeDefault: 12px;
@FontWeightBodyBold: 600;
// Status
@StatusUnknown: @HeaderBackgroundColour;
Disco.Web/ClientSource/Style/Device.css
+6 -6
View File
@@ -117,10 +117,10 @@
}
#Device_Show #Device_Show_Subjects #Device_Show_Details table.verticalHeadings > tbody > tr > td:first-child {
width: 104px;
font-weight: bold;
font-weight: 600;
}
#Device_Show #Device_Show_Subjects #Device_Show_Details #Device_Show_Details_Asset_Name {
font-weight: bold;
font-weight: 600;
}
#Device_Show #Device_Show_Subjects #Device_Show_Details #Device_Show_Details_Asset_Enrolled_Trusted {
display: inline-block;
@@ -146,7 +146,7 @@
}
#Device_Show #Device_Show_Subjects #Device_Show_Policies table.verticalHeadings > tbody > tr > td:first-child {
width: 120px;
font-weight: bold;
font-weight: 600;
}
#Device_Show #Device_Show_Subjects #Device_Show_Aspects #Device_Show_Aspects_Model_Image {
display: block;
@@ -200,7 +200,7 @@
#Device_Show_Policies_Profile_Actions_Update_Dialog ul li,
#Device_Show_Policies_Batch_Actions_Update_Dialog ul li {
background-color: #ffffff;
padding: 2px 0;
padding: 2px 0 2px 4px;
}
#Device_Show_Policies_Profile_Actions_Update_Dialog ul li:nth-child(odd),
#Device_Show_Policies_Batch_Actions_Update_Dialog ul li:nth-child(odd) {
@@ -208,8 +208,8 @@
}
#Device_Show_Policies_Profile_Actions_Update_Dialog ul li.selected,
#Device_Show_Policies_Batch_Actions_Update_Dialog ul li.selected {
background-color: #d8d8d8;
font-weight: bold;
background-color: #cddbec;
font-weight: 600;
}
#DeviceDetailTab-JobsContainer div.jobTable {
margin: -1px;
Disco.Web/ClientSource/Style/Device.less
+6 -6
View File
@@ -52,12 +52,12 @@
table.verticalHeadings {
& > tbody > tr > td:first-child {
width: 104px;
font-weight: bold;
font-weight: @FontWeightBodyBold;
}
}
#Device_Show_Details_Asset_Name {
font-weight: bold;
font-weight: @FontWeightBodyBold;
}
#Device_Show_Details_Asset_Enrolled_Trusted {
@@ -95,7 +95,7 @@
table.verticalHeadings {
& > tbody > tr > td:first-child {
width: 120px;
font-weight: bold;
font-weight: @FontWeightBodyBold;
}
}
}
@@ -166,15 +166,15 @@
ul {
li {
background-color: @white;
padding: 2px 0;
padding: 2px 0 2px 4px;
&:nth-child(odd) {
background-color: @TableDataRowBackgroundColor;
}
&.selected {
background-color: @TableDataDarkBorderColour;
font-weight: bold;
background-color: @HighlightColour;
font-weight: @FontWeightBodyBold;
}
}
}
Disco.Web/ClientSource/Style/Device.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Job.css
+38 -6
View File
@@ -100,6 +100,18 @@
height: 50px;
font-size: 0.6em;
}
#Jobs_Index_MyJobs {
margin-bottom: 10px;
}
#Jobs_Index_MyJobs .jobTable > h3,
#Jobs_Index_StaleJobs .jobTable > h3 {
color: #555;
font-family: "Segoe UI", Arial, Verdana, Tahoma, sans-serif;
font-weight: normal;
font-size: 12px;
margin: 8px 0 20px 20px !important;
text-transform: uppercase;
}
#Job_List {
padding-top: 20px;
}
@@ -127,13 +139,17 @@
#Job_Show #Job_Show_Subjects > tbody > tr > td:not(:last-child) {
border-right: 1px dashed #aaa;
}
#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_Type > h2 {
text-transform: uppercase;
font-size: 16px;
}
#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_Type > table {
table-layout: fixed;
}
#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_SubTypes_1,
#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_SubTypes_2 {
padding-left: 16px;
font-weight: bold;
font-weight: 600;
}
#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_SubTypes_Update {
margin-left: 16px;
@@ -152,7 +168,7 @@
vertical-align: middle;
}
#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_Job_Dates table > tbody > tr > td:first-child {
font-weight: bold;
font-weight: 600;
width: 60px;
}
#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_GenerateDocument_Container {
@@ -277,7 +293,7 @@
#jobShowResources #Comments div.commentOutput > div span.author {
color: #444;
display: block;
font-weight: bold;
font-weight: 600;
font-size: 0.95em;
float: left;
}
@@ -296,6 +312,22 @@
line-height: 1.2em;
padding-bottom: .2em;
}
#jobShowResources #Comments div.commentOutput > div div.comment h1,
#jobShowResources #Comments div.commentOutput > div div.comment h2,
#jobShowResources #Comments div.commentOutput > div div.comment h3,
#jobShowResources #Comments div.commentOutput > div div.comment h4,
#jobShowResources #Comments div.commentOutput > div div.comment h5 {
font-family: "Segoe UI", Arial, Verdana, Tahoma, sans-serif;
font-weight: 600;
font-size: 14px;
margin: 2px 0 !important;
}
#jobShowResources #Comments div.commentOutput > div div.comment hr {
margin-top: .2em;
}
#jobShowResources #Comments div.commentOutput > div div.comment code {
font-size: .9em;
}
#jobShowResources #Comments div.commentOutput > div:hover span.remove {
opacity: .5;
}
@@ -622,7 +654,7 @@
background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///zNah+Hm7dng6O7x9DddiTNah1d3nJqtw3+Xs8fS3k5vlm6JqaGzx4KatcrU4FFymDZciHGMq+ru8t/l7Pb3+V9+oeLo7vT2+MTP3LLB0dTc5fHz9gAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
}
#jobComponents tr .totalCost {
font-weight: bold;
font-weight: 600;
}
#jobWarrantyDetails {
border: solid 1px #d8d8d8;
@@ -715,7 +747,7 @@
}
#warrantyJobForm #warrantyDisclosedInformation table th {
padding: 2px;
font-weight: bold;
font-weight: 600;
width: 200px;
}
#warrantyJobForm #warrantyDisclosedInformation table td {
@@ -815,7 +847,7 @@
}
#repairJobForm #repairDisclosedInformation table th {
padding: 2px;
font-weight: bold;
font-weight: 600;
width: 200px;
}
#repairJobForm #repairDisclosedInformation table td {
Disco.Web/ClientSource/Style/Job.less
+41 -6
View File
@@ -27,6 +27,21 @@
}
}
#Jobs_Index_MyJobs {
margin-bottom: 10px;
}
#Jobs_Index_MyJobs, #Jobs_Index_StaleJobs {
.jobTable > h3 {
color: #555;
font-family: @FontFamilyBody;
font-weight: normal;
font-size: 12px;
margin: 8px 0 20px 20px !important;
text-transform: uppercase;
}
}
#Job_List {
padding-top: 20px;
@@ -64,6 +79,11 @@
#Job_Show_Job {
#Job_Show_Job_Type {
& > h2 {
text-transform: uppercase;
font-size: 16px;
}
& > table {
table-layout: fixed;
}
@@ -71,7 +91,7 @@
#Job_Show_Job_SubTypes_1, #Job_Show_Job_SubTypes_2 {
padding-left: 16px;
font-weight: bold;
font-weight: @FontWeightBodyBold;
}
#Job_Show_Job_SubTypes_Update {
@@ -94,7 +114,7 @@
}
& > tbody > tr > td:first-child {
font-weight: bold;
font-weight: @FontWeightBodyBold;
width: 60px;
}
}
@@ -253,7 +273,7 @@
span.author {
color: #444;
display: block;
font-weight: bold;
font-weight: @FontWeightBodyBold;
font-size: 0.95em;
float: left;
}
@@ -274,6 +294,21 @@
line-height: 1.2em;
padding-bottom: .2em;
}
h1, h2, h3, h4, h5 {
font-family: @FontFamilyBody;
font-weight: 600;
font-size: 14px;
margin: 2px 0 !important;
}
hr {
margin-top: .2em;
}
code {
font-size: .9em;
}
}
&:hover {
@@ -664,7 +699,7 @@
}
.totalCost {
font-weight: bold;
font-weight: @FontWeightBodyBold;
}
}
}
@@ -741,7 +776,7 @@
th {
padding: 2px;
font-weight: bold;
font-weight: @FontWeightBodyBold;
width: 200px;
}
@@ -865,7 +900,7 @@
th {
padding: 2px;
font-weight: bold;
font-weight: @FontWeightBodyBold;
width: 200px;
}
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
+8 -5
View File
@@ -424,6 +424,9 @@ hr {
border-bottom: 1px dashed #aaa;
margin-top: 15px;
}
strong {
font-weight: 600;
}
a:link {
color: #335a87;
text-decoration: none;
@@ -541,7 +544,7 @@ h6 {
font-size: 12px;
font-family: "Segoe UI", Arial, Verdana, Tahoma, sans-serif;
font-stretch: normal;
font-weight: bold;
font-weight: 600;
}
table {
border: none;
@@ -558,7 +561,7 @@ table th {
padding: 5px;
margin: 0;
text-align: left;
font-weight: bold;
font-weight: 600;
vertical-align: top;
}
table.none {
@@ -690,7 +693,7 @@ table.genericData td.id a {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAAK0lEQVQI12OIjY39D8QSDECAzIYDqCBYApmNTQE6liCk4D/JJuB1A05fAACQykyB48rZCQAAAABJRU5ErkJggg==) /*Images/Actions/dataTableLastDisabled.png*/;
}
.dataTables_wrapper .dataTables_paginate .paginate_active {
font-weight: bold;
font-weight: 600;
color: #1e6dab;
}
.dataTables_wrapper .dataTables_paginate .paginate_button_disabled {
@@ -1148,7 +1151,7 @@ div.Disco-AttachmentUpload-DropTarget.dragHighlight h2 {
margin-top: 3em !important;
color: #2c1e02;
text-align: center;
font-weight: bold;
font-weight: 600;
}
div.Disco-AttachmentUpload-DropTarget.dragHighlight.dragHover {
background-color: rgba(173, 235, 110, 0.5);
@@ -1232,7 +1235,7 @@ div.Disco-AttachmentUpload-ImageDialog {
}
body > .User_FlagAssignment_Tooltip span.name {
display: block;
font-weight: bold;
font-weight: 600;
}
body > .User_FlagAssignment_Tooltip span.comments {
display: block;
Disco.Web/ClientSource/Style/Site.less
+9 -5
View File
@@ -362,6 +362,10 @@ hr {
margin-top: 15px;
}
strong {
font-weight: @FontWeightBodyBold;
}
// Anchor Tags (Default)
a {
&:link {
@@ -484,7 +488,7 @@ h5, h6 {
font-size: 12px;
font-family: @FontFamilyHeading;
font-stretch: normal;
font-weight: bold;
font-weight: @FontWeightBodyBold;
}
table {
@@ -503,7 +507,7 @@ table {
padding: 5px;
margin: 0;
text-align: left;
font-weight: bold;
font-weight: @FontWeightBodyBold;
vertical-align: top;
}
}
@@ -633,7 +637,7 @@ table {
}
.paginate_active {
font-weight: bold;
font-weight: @FontWeightBodyBold;
color: @ButtonColour;
}
@@ -1156,7 +1160,7 @@ div.Disco-AttachmentUpload-DropTarget {
margin-top: 3em !important;
color: darken(@ThemeAmber, 40%);
text-align: center;
font-weight: bold;
font-weight: @FontWeightBodyBold;
}
&.dragHover {
@@ -1234,7 +1238,7 @@ div.Disco-AttachmentUpload-ImageDialog {
body > .User_FlagAssignment_Tooltip {
span.name {
display: block;
font-weight: bold;
font-weight: @FontWeightBodyBold;
}
span.comments {
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/ClientSource/Style/User.css
+4 -4
View File
@@ -116,10 +116,10 @@
}
#User_Show #User_Show_Subjects #User_Show_Details table.verticalHeadings > tbody > tr > td:first-child {
width: 104px;
font-weight: bold;
font-weight: 600;
}
#User_Show #User_Show_Subjects #User_Show_Details #User_Show_Details_Identity_Id {
font-weight: bold;
font-weight: 600;
}
#User_Show #User_Show_Subjects #User_Show_Details #User_Show_GenerateDocument_Container {
padding-top: 4px;
@@ -136,7 +136,7 @@
}
#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment td:first-child {
width: 90px;
font-weight: bold;
font-weight: 600;
}
#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment img.User_Show_AssignedDevices_CurrentAssignment_Image {
float: left;
@@ -472,7 +472,7 @@
}
#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment td:first-child {
width: 90px;
font-weight: bold;
font-weight: 600;
}
#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment img.CreateJob_Assignment_Image {
float: left;
Disco.Web/ClientSource/Style/User.less
+4 -4
View File
@@ -50,12 +50,12 @@
table.verticalHeadings {
& > tbody > tr > td:first-child {
width: 104px;
font-weight: bold;
font-weight: @FontWeightBodyBold;
}
}
#User_Show_Details_Identity_Id {
font-weight: bold;
font-weight: @FontWeightBodyBold;
}
#User_Show_GenerateDocument_Container {
@@ -79,7 +79,7 @@
td:first-child {
width: 90px;
font-weight: bold;
font-weight: @FontWeightBodyBold;
}
img.User_Show_AssignedDevices_CurrentAssignment_Image {
@@ -501,7 +501,7 @@
td:first-child {
width: 90px;
font-weight: bold;
font-weight: @FontWeightBodyBold;
}
img.CreateJob_Assignment_Image {
Disco.Web/ClientSource/Style/User.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/Disco.Web.csproj
-54
View File
@@ -1247,9 +1247,6 @@
<LastGenOutput>Noticeboard.generated.cs</LastGenOutput>
</None>
<Content Include="ClientBin\DiscoServices.InitialPluginLibraryManifest.json" />
<None Include="ClientSource\Scripts\Core.min.js.map">
<DependentUpon>Core.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Core\disco.dataTables.extensions.js" />
<None Include="ClientSource\Scripts\Core\disco.moment.extensions.js" />
<None Include="ClientSource\Scripts\Core\disco.unobtrusiveValidation.extensions.js" />
@@ -1268,9 +1265,6 @@
<DependentUpon>Disco-AttachmentUploader.js.bundle</DependentUpon>
</Content>
<None Include="ClientSource\Scripts\Modules\Disco-AttachmentUploader.js.bundle" />
<None Include="ClientSource\Scripts\Modules\Disco-AttachmentUploader.min.js.map">
<DependentUpon>Disco-AttachmentUploader.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\jQuery-Fancytree.js">
<DependentUpon>jQuery-Fancytree.js.bundle</DependentUpon>
</None>
@@ -1287,32 +1281,11 @@
<DependentUpon>Disco-AjaxHelperIcons.js.bundle</DependentUpon>
</Content>
<None Include="ClientSource\Scripts\Modules\Disco-AjaxHelperIcons\disco.ajaxhelpericons.js" />
<None Include="ClientSource\Scripts\Modules\Disco-DataTableHelpers.min.js.map">
<DependentUpon>Disco-DataTableHelpers.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\Disco-DataTableHelpers\disco.datatablehelpers.js" />
<None Include="ClientSource\Scripts\Modules\Disco-ExpressionEditor.min.js.map">
<DependentUpon>Disco-ExpressionEditor.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\Disco-ExpressionEditor\disco.expressioneditor.js" />
<None Include="ClientSource\Scripts\Modules\Disco-CreateJob\disco.createjob.js" />
<None Include="ClientSource\Scripts\Modules\Disco-jQueryExtensions.min.js.map">
<DependentUpon>Disco-jQueryExtensions.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\Disco-jQueryExtensions\disco.jQueryExtensions.js" />
<None Include="ClientSource\Scripts\Modules\Disco-PropertyChangeHelpers.min.js.map">
<DependentUpon>Disco-PropertyChangeHelpers.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\Disco-PropertyChangeHelpers\disco.propertychangehelpers.js" />
<None Include="ClientSource\Scripts\Modules\Highcharts.min.js.map">
<DependentUpon>Highcharts.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\jQuery-Fancytree.min.js.map">
<DependentUpon>jQuery-Fancytree.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\jQuery-Isotope.min.js.map">
<DependentUpon>jQuery-Isotope.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\jQuery-Isotope\jquery.isotope.js" />
<None Include="ClientSource\Scripts\Modules\Disco-AttachmentUploader\webcam.js" />
<Content Include="ClientSource\Scripts\Modules\Disco-AttachmentUploader\webcam.swf" />
@@ -1371,26 +1344,8 @@
</Content>
<None Include="ClientSource\Scripts\Modules\jQuery-NumberFormatter\jquery.numberformatter.js" />
<None Include="ClientSource\Scripts\Modules\jQuery-NumberFormatter\jshashtable-2.1.js" />
<None Include="ClientSource\Scripts\Modules\jQuery-NumberFormatter.min.js.map">
<DependentUpon>jQuery-NumberFormatter.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\jQuery-SignalR.min.js.map">
<DependentUpon>jQuery-SignalR.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\jQueryUI-DynaTree.min.js.map">
<DependentUpon>jQueryUI-DynaTree.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\jQueryUI-DynaTree\jquery.dynatree.js" />
<None Include="ClientSource\Scripts\Modules\jQueryUI-TimePicker.min.js.map">
<DependentUpon>jQueryUI-TimePicker.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\jQueryUI-TimePicker\jquery-ui-timepicker-addon.js" />
<None Include="ClientSource\Scripts\Modules\Knockout.min.js.map">
<DependentUpon>Knockout.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\Shadowbox.min.js.map">
<DependentUpon>Shadowbox.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\Shadowbox\shadowbox.js" />
<None Include="ClientSource\Scripts\Modules\jQuery-SignalR.js">
<DependentUpon>jQuery-SignalR.js.bundle</DependentUpon>
@@ -1423,18 +1378,12 @@
<Content Include="ClientSource\Scripts\Modules\Shadowbox.min.js">
<DependentUpon>Shadowbox.js.bundle</DependentUpon>
</Content>
<None Include="ClientSource\Scripts\Modules\Timeline.min.js.map">
<DependentUpon>Timeline.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\Timeline\disco.simileajaxextensions.js" />
<None Include="ClientSource\Scripts\Modules\Timeline\disco.timelineextensions.js" />
<None Include="ClientSource\Scripts\Modules\Timeline\labellers.js" />
<None Include="ClientSource\Scripts\Modules\Timeline\simile-ajax-bundle-DiscoMod.js" />
<None Include="ClientSource\Scripts\Modules\Timeline\timeline-bundle.js" />
<None Include="ClientSource\Scripts\Modules\Timeline\timeline.js" />
<None Include="ClientSource\Scripts\Modules\tinymce.min.js.map">
<DependentUpon>tinymce.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\tinymce\disco.tinymceextensions.js" />
<None Include="ClientSource\Scripts\Modules\tinymce.js">
<DependentUpon>tinymce.js.bundle</DependentUpon>
@@ -1791,9 +1740,6 @@
<None Include="ClientSource\Scripts\Modules\Disco-jQueryExtensions.js.bundle" />
<None Include="ClientSource\Scripts\Modules\Disco-ExpressionEditor.js.bundle" />
<None Include="ClientSource\Scripts\Modules\Disco-DataTableHelpers.js.bundle" />
<None Include="ClientSource\Scripts\Modules\Disco-AjaxHelperIcons.min.js.map">
<DependentUpon>Disco-AjaxHelperIcons.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Style\Timeline.css.bundle" />
<Content Include="ClientSource\Style\FontAwesome\fontawesome-webfont.woff" />
<Content Include="ClientSource\Style\FontAwesome\fontawesome-webfont.ttf" />
Disco.Web/Views/Job/Index.cshtml
+9 -5
View File
@@ -1,7 +1,7 @@
@model Disco.Web.Models.Job.IndexModel
@{
ViewBag.Title = "Jobs";
if (Authorization.Has(Claims.Job.ShowDailyChart))
{
Html.BundleDeferred("~/ClientScripts/Modules/Highcharts");
@@ -133,11 +133,15 @@
</div>
@if (Authorization.Has(Claims.Job.Lists.MyJobs))
{
<h2>My Jobs (@Model.MyJobs.Items.Count())</h2>
@Html.Partial(MVC.Shared.Views._JobTable, Model.MyJobs, new ViewDataDictionary())
<div id="Jobs_Index_MyJobs">
<h2>My Jobs (@Model.MyJobs.Items.Count())</h2>
@Html.Partial(MVC.Shared.Views._JobTable, Model.MyJobs, new ViewDataDictionary())
</div>
}
@if (Authorization.Has(Claims.Job.Lists.StaleJobs))
{
<h2>Stale Jobs (@Model.StaleJobs.Items.Count())</h2>
@Html.Partial(MVC.Shared.Views._JobTable, Model.StaleJobs, new ViewDataDictionary())
<div id="Jobs_Index_StaleJobs">
<h2>Stale Jobs (@Model.StaleJobs.Items.Count())</h2>
@Html.Partial(MVC.Shared.Views._JobTable, Model.StaleJobs, new ViewDataDictionary())
</div>
}
Disco.Web/Views/Job/Index.generated.cs
+73 -71
View File
@@ -48,7 +48,7 @@ namespace Disco.Web.Views.Job
#line 2 "..\..\Views\Job\Index.cshtml"
ViewBag.Title = "Jobs";
if (Authorization.Has(Claims.Job.ShowDailyChart))
{
Html.BundleDeferred("~/ClientScripts/Modules/Highcharts");
@@ -160,49 +160,49 @@ WriteLiteral(">\r\n (function () {\r\n var cha
"ew Highcharts.Chart({\r\n chart: {\r\n " +
" renderTo: \'chartHostJobDailyOpenedClosed\',\r\n " +
" height: 175,\r\n animation" +
": false,\r\n style: {\n " +
" fontFamily: \'\"Segoe UI\", Arial, Verdana, Tahoma, sans-serif\'\n " +
" }\r\n },\r\n " +
" colors: [\'#BBBBBB\', \'#005fab\', \'#60ab1e\'],\r\n " +
" title: {\r\n text: null\r\n " +
" },\r\n plotOptions: {\r" +
"\n series: {\r\n " +
" marker: {\r\n radius: 3\r\n " +
" },\r\n an" +
"imation: false\r\n }\r\n " +
" },\r\n legend: {\r\n " +
" align: \'left\',\r\n verticalAlign: \'to" +
"p\',\r\n y: 0,\r\n " +
" floating: true,\r\n borderWidth: 0,\r\n " +
" itemStyle: {\r\n " +
" color: \'#333\',\n fontWeight: \'normal\'\r" +
"\n }\r\n },\r\n " +
" xAxis: {\r\n type: " +
"\'datetime\',\r\n tickInterval: 7 * 24 * 3600 * 1" +
"000, // week\r\n tickWidth: 1,\r\n " +
" gridLineWidth: 1,\r\n date" +
"TimeLabelFormats: {\r\n week: \'%e %b\'\r\n " +
" }\r\n },\r\n " +
" yAxis: [{\r\n title: {\r\n" +
" text: null\r\n " +
" },\r\n labels: {\r\n " +
" enabled: false\r\n },\r\n " +
" min: 0\r\n }, {\r\n " +
" title: {\r\n " +
" text: null\r\n },\r\n " +
" labels: {\r\n enabled: false\r\n " +
" },\r\n min: 0" +
"\r\n }],\r\n series: [" +
"{\r\n name: \'Total Open Jobs\',\r\n " +
" data: dataTotalOpenJobs,\r\n " +
" yAxis: 1\r\n }, {\r\n " +
" name: \'Closed Jobs\',\r\n data: dataClose" +
"dJobs\r\n }, {\r\n " +
" name: \'Opened Jobs\',\r\n data: dataOpenedJobs\r" +
"\n }],\r\n credits: {" +
"\r\n enabled: false\r\n " +
" }\r\n });\r\n });\r\n " +
" }\r\n chartData = $.parseJSON(\'");
": false,\r\n style: {\r\n " +
" fontFamily: \'\"Segoe UI\", Arial, Verdana, Tahoma, sans-serif\'\r\n " +
" }\r\n },\r\n " +
" colors: [\'#BBBBBB\', \'#005fab\', \'#60ab1e\'],\r\n " +
" title: {\r\n text: null\r\n " +
" },\r\n plotOptions: " +
"{\r\n series: {\r\n " +
" marker: {\r\n radius: 3\r\n " +
" },\r\n " +
"animation: false\r\n }\r\n " +
" },\r\n legend: {\r\n " +
" align: \'left\',\r\n verticalAlign: \'" +
"top\',\r\n y: 0,\r\n " +
" floating: true,\r\n borderWidth: 0,\r\n " +
" itemStyle: {\r\n " +
" color: \'#333\',\n fontWeight: \'normal" +
"\'\r\n }\r\n },\r\n " +
" xAxis: {\r\n type" +
": \'datetime\',\r\n tickInterval: 7 * 24 * 3600 *" +
" 1000, // week\r\n tickWidth: 1,\r\n " +
" gridLineWidth: 1,\r\n da" +
"teTimeLabelFormats: {\r\n week: \'%e %b\'\r\n " +
" }\r\n },\r\n " +
" yAxis: [{\r\n title: {" +
"\r\n text: null\r\n " +
" },\r\n labels: {\r\n " +
" enabled: false\r\n },\r\n " +
" min: 0\r\n }, {\r\n " +
" title: {\r\n " +
" text: null\r\n },\r\n " +
" labels: {\r\n enabled: false\r\n" +
" },\r\n min:" +
" 0\r\n }],\r\n series:" +
" [{\r\n name: \'Total Open Jobs\',\r\n " +
" data: dataTotalOpenJobs,\r\n " +
" yAxis: 1\r\n }, {\r\n " +
" name: \'Closed Jobs\',\r\n data: dataClo" +
"sedJobs\r\n }, {\r\n " +
" name: \'Opened Jobs\',\r\n data: dataOpenedJob" +
"s\r\n }],\r\n credits:" +
" {\r\n enabled: false\r\n " +
" }\r\n });\r\n });\r\n " +
" }\r\n chartData = $.parseJSON(\'");
#line 126 "..\..\Views\Job\Index.cshtml"
@@ -231,73 +231,75 @@ WriteLiteral("</div>\r\n");
#line default
#line hidden
WriteLiteral(" <h2>My Jobs (");
WriteLiteral(" <div");
WriteLiteral(" id=\"Jobs_Index_MyJobs\"");
WriteLiteral(">\r\n <h2>My Jobs (");
#line 136 "..\..\Views\Job\Index.cshtml"
Write(Model.MyJobs.Items.Count());
#line 137 "..\..\Views\Job\Index.cshtml"
Write(Model.MyJobs.Items.Count());
#line default
#line hidden
WriteLiteral(")</h2>\r\n");
WriteLiteral(" ");
#line 137 "..\..\Views\Job\Index.cshtml"
#line default
#line hidden
#line 137 "..\..\Views\Job\Index.cshtml"
Write(Html.Partial(MVC.Shared.Views._JobTable, Model.MyJobs, new ViewDataDictionary()));
#line 138 "..\..\Views\Job\Index.cshtml"
Write(Html.Partial(MVC.Shared.Views._JobTable, Model.MyJobs, new ViewDataDictionary()));
#line default
#line hidden
WriteLiteral("\r\n </div>\r\n");
#line 137 "..\..\Views\Job\Index.cshtml"
#line 140 "..\..\Views\Job\Index.cshtml"
}
#line default
#line hidden
#line 139 "..\..\Views\Job\Index.cshtml"
#line 141 "..\..\Views\Job\Index.cshtml"
if (Authorization.Has(Claims.Job.Lists.StaleJobs))
{
#line default
#line hidden
WriteLiteral(" <h2>Stale Jobs (");
WriteLiteral(" <div");
WriteLiteral(" id=\"Jobs_Index_StaleJobs\"");
WriteLiteral(">\r\n <h2>Stale Jobs (");
#line 141 "..\..\Views\Job\Index.cshtml"
Write(Model.StaleJobs.Items.Count());
#line 144 "..\..\Views\Job\Index.cshtml"
Write(Model.StaleJobs.Items.Count());
#line default
#line hidden
WriteLiteral(")</h2>\r\n");
WriteLiteral(" ");
#line 142 "..\..\Views\Job\Index.cshtml"
#line default
#line hidden
#line 142 "..\..\Views\Job\Index.cshtml"
Write(Html.Partial(MVC.Shared.Views._JobTable, Model.StaleJobs, new ViewDataDictionary()));
#line 145 "..\..\Views\Job\Index.cshtml"
Write(Html.Partial(MVC.Shared.Views._JobTable, Model.StaleJobs, new ViewDataDictionary()));
#line default
#line hidden
WriteLiteral("\r\n </div>\r\n");
#line 142 "..\..\Views\Job\Index.cshtml"
#line 147 "..\..\Views\Job\Index.cshtml"
}
#line default