diff --git a/Disco.Web/ClientSource/Style/User.css b/Disco.Web/ClientSource/Style/User.css index bd358414..7835da27 100644 --- a/Disco.Web/ClientSource/Style/User.css +++ b/Disco.Web/ClientSource/Style/User.css @@ -461,8 +461,10 @@ #User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments { margin-top: 6px; background-color: #fff; - line-height: 1.3em; + line-height: 1.3; border: 1px solid #ddd; + max-height: 300px; + overflow-y: auto; } #User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment { display: block; @@ -475,16 +477,14 @@ #User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment:hover { background-color: #f4f4f4; } +#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment tr:first-child td { + width: 68px; +} #User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment td:first-child { width: 90px; font-weight: 600; } #User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment img.CreateJob_Assignment_Image { - float: left; width: 64px; height: 64px; - margin-right: 6px; -} -#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment div.CreateJob_Assignment_Details { - float: left; } \ No newline at end of file diff --git a/Disco.Web/ClientSource/Style/User.less b/Disco.Web/ClientSource/Style/User.less index 49a3234b..64425091 100644 --- a/Disco.Web/ClientSource/Style/User.less +++ b/Disco.Web/ClientSource/Style/User.less @@ -487,8 +487,10 @@ #CreateJob_Assignments { margin-top: 6px; background-color: @white; - line-height: 1.3em; + line-height: 1.3; border: 1px solid #ddd; + max-height: 300px; + overflow-y: auto; li.CreateJob_Assignment { display: block; @@ -503,20 +505,18 @@ background-color: @TableDataBorderColour; } + tr:first-child td { + width: 68px; + } + td:first-child { width: 90px; font-weight: @FontWeightBodyBold; } img.CreateJob_Assignment_Image { - float: left; width: 64px; height: 64px; - margin-right: 6px; - } - - div.CreateJob_Assignment_Details { - float: left; } } } diff --git a/Disco.Web/ClientSource/Style/User.min.css b/Disco.Web/ClientSource/Style/User.min.css index 375851fd..3a0d4c9d 100644 --- a/Disco.Web/ClientSource/Style/User.min.css +++ b/Disco.Web/ClientSource/Style/User.min.css @@ -1 +1 @@ -.tableData{border:solid 1px #f4f4f4;border-collapse:collapse;}.tableData>tbody>tr>td{border:solid 1px #f4f4f4;background-color:#fff;}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfc;}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#f4f4f4;border:solid 1px #f4f4f4;}.tableData>tbody>tr:hover>td{background-color:#fefefe;}.tableData>tbody>tr:hover:nth-child(odd)>td{background-color:#fafafa;}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#f4f4f4;}.tableDataDark{border:solid 1px #d8d8d8;border-collapse:collapse;}.tableDataDark td{border:solid 1px #d8d8d8;background-color:#fff;}.tableDataDark th{background-color:#eee;border:solid 1px #d8d8d8;}.tableDataContainer{background-color:#fff;}.tableDataVertical{border:solid 1px #f4f4f4;border-collapse:collapse;}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#f4f4f4;margin:0;padding:0;}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right;}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa;}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right;}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right;}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;}.subtleUntilHover{-moz-opacity:.3;opacity:.3;}.subtleUntilHover:hover{-moz-opacity:1;opacity:1;}#layout_PageHeading #User_Show_Flags{display:inline-block;float:right;height:50px;font-size:.6em;}#layout_PageHeading #User_Show_Flags>i{cursor:default;}#layout_PageHeading #User_Show_Flags>i>.details{display:none;}#User_Show #User_Show_Subjects{table-layout:fixed;}#User_Show #User_Show_Subjects>tbody>tr>td{padding-top:0;height:100%;}#User_Show #User_Show_Subjects>tbody>tr>td>div{position:relative;}#User_Show #User_Show_Subjects>tbody>tr>td>div div.status{margin-top:2px;padding-top:2px;border-top:1px dashed #ddd;}#User_Show #User_Show_Subjects>tbody>tr>td>div input.discreet{margin-left:-2px;}#User_Show #User_Show_Subjects>tbody>tr>td:not(:last-child){border-right:1px dashed #aaa;}#User_Show #User_Show_Subjects #User_Show_Details{width:330px;}#User_Show #User_Show_Subjects #User_Show_Details table.verticalHeadings>tbody>tr>td:first-child{width:104px;font-weight:600;}#User_Show #User_Show_Subjects #User_Show_Details #User_Show_Details_Identity_Id{font-weight:600;}#User_Show #User_Show_Subjects #User_Show_Details #User_Show_GenerateDocument_Container{padding-top:4px;}#User_Show #User_Show_Subjects #User_Show_Details #User_Show_GenerateDocument_Container #User_Show_GenerateDocument{padding:0;}#User_Show #User_Show_Subjects #User_Show_Details #User_Show_Details_Actions{margin-top:4px;}#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment{border-bottom:1px dashed #ddd;padding:4px;}#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment td:first-child{width:90px;font-weight:600;}#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment img.User_Show_AssignedDevices_CurrentAssignment_Image{float:left;width:64px;height:64px;margin-right:6px;}#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment div.User_Show_AssignedDevices_CurrentAssignment_Details{float:left;}#User_Show #User_Show_Subjects #User_Show_Subjects_Actions>td{padding-top:4px;}#UserDetailTabs{margin-top:10px;border-radius:0;background-image:none;background-color:#fff;border:none;padding:0;}#UserDetailTabs #UserDetailTabItems{border-radius:0;border-top:1px solid #ddd;border-right:1px solid #ddd;border-left:1px solid #ddd;border-bottom:none;padding:2px 0 0 4px;background-image:none;background-color:#eee;display:table;}#UserDetailTabs #UserDetailTabItems>li{top:0;border-radius:0;margin:0 5px 0 0;padding:0;line-height:normal;margin-right:4px;}#UserDetailTabs #UserDetailTabItems>li>a{padding:5px 8px;}#UserDetailTabs div.ui-tabs-panel{border-radius:0;padding:4px;border-right:1px solid #ddd;border-bottom:1px solid #ddd;border-left:1px solid #ddd;border-top:none;background-color:#eee;}#UserDetailTab-JobsContainer div.jobTable{margin:-1px;border:1px solid #ddd;}#UserDetailTab-JobsContainer .dataTables_wrapper .dataTables_filter{margin-top:-24px;-moz-opacity:1;opacity:1;}#UserDetailTab-JobsContainer .dataTables_wrapper .dataTables_length{margin-top:-24px;-moz-opacity:1;opacity:1;}#UserDetailTab-JobsContainer .dataTables_wrapper .dataTables_showStatusClosed{right:220px;margin-top:-24px;}#User_Show_Details_Actions_AddFlag_Dialog{height:400px;}#User_Show_Details_Actions_AddFlag_Dialog .flagPicker{position:absolute;width:250px;height:300px;overflow-y:auto;background-color:#fcfcfc;border:1px solid #ccc;}#User_Show_Details_Actions_AddFlag_Dialog .flagPicker>div{background-color:#fff;border-bottom:1px solid #ddd;padding:6px 0 6px 6px;cursor:pointer;}#User_Show_Details_Actions_AddFlag_Dialog .flagPicker>div:hover{background-color:#f4f4f4;}#User_Show_Details_Actions_AddFlag_Dialog .flagPicker>div.selected,#User_Show_Details_Actions_AddFlag_Dialog .flagPicker>div.selected:hover{background-color:#eee;}#User_Show_Details_Actions_AddFlag_Dialog .details{display:none;position:absolute;left:280px;top:1em;}#User_Show_Details_Actions_AddFlag_Dialog .details h4{margin-bottom:4px;}#User_Show_Details_Actions_AddFlag_Dialog .details textarea{min-width:280px;height:200px;}#UserDetailTab-Flags #userFlags{border:solid 1px #d8d8d8;border-collapse:collapse;table-layout:fixed;}#UserDetailTab-Flags #userFlags td{border:solid 1px #d8d8d8;background-color:#fff;}#UserDetailTab-Flags #userFlags th{background-color:#eee;border:solid 1px #d8d8d8;}#UserDetailTab-Flags #userFlags i.fa-edit{position:absolute;top:0;right:0;margin-top:4px;font-size:1.1em;cursor:pointer;display:none;color:#335a87;}#UserDetailTab-Flags #userFlags i.fa-edit:hover{color:#5e8cc2;}#UserDetailTab-Flags #userFlags td:hover i.fa-edit{display:inline-block;}#UserDetailTab-Flags #userFlags th.name{width:200px;}#UserDetailTab-Flags #userFlags tr.removed td{background-color:#f4f4f4;}#UserDetailTab-Flags #userFlags td.name{vertical-align:middle;}#UserDetailTab-Flags #userFlags td.name .fa-stack{line-height:1.6em;}#UserDetailTab-Flags #userFlags td.added,#UserDetailTab-Flags #userFlags td.removed{vertical-align:middle;}#UserDetailTab-Flags #userFlags td.comments{vertical-align:middle;}#UserDetailTab-Flags #userFlags td.comments .editable{position:relative;}#UserDetailTab-Flags #userFlags td.comments .commentsRaw{display:none;}#UserDetailTab-Flags #userFlags td.removed.na{vertical-align:middle;text-align:center;}#UserDetailTab-Flags>.none{text-align:center;padding:30px 0;font-style:italic;background-color:#fff;}#User_Show_Flags_Actions_EditComments_Dialog h4{margin-bottom:4px;}#User_Show_Flags_Actions_EditComments_Dialog_Comments{width:280px;}#UserDetailTab-Authorization #UserDetailTab-AuthorizationContainer{background-color:#fff;border:1px solid #ccc;}#UserDetailTab-Authorization #UserDetailTab-Authorization_ClaimsTree_Container{width:50%;float:left;padding:6px 10px 6px 4px;}#UserDetailTab-Authorization #UserDetailTab-Authorization_ClaimsTree_Container>span.smallMessage:last-child{display:block;text-align:right;}#UserDetailTab-Authorization #UserDetailTab-Authorization_Membership{width:40%;float:right;padding:6px 10px;border-left:1px dashed #ccc;border-bottom:1px dashed #ccc;}#UserDetailTab-Authorization #UserDetailTab-Authorization_Membership #UserDetailTab-Authorization_Membership_Roles{margin-bottom:10px;}#UserDetailTab-Authorization #UserDetailTab-Authorization_Membership #UserDetailTab-Authorization_Membership_Groups_Container>span.smallMessage:last-child{display:block;text-align:right;}#UserDetailTab-Authorization #UserDetailTab-Authorization_NoAccess{width:50%;float:left;padding:6px 10px;}#UserDetailTab-Authorization #UserDetailTab-Authorization_NoAccess h3{margin-bottom:10px;}#userShowResources #AttachmentsContainer{padding:0;}#userShowResources #Attachments{position:relative;border:1px solid #ccc;background-color:#fff;}#userShowResources #Attachments div.attachmentOutput{position:relative;height:115px;overflow:auto;}#userShowResources #Attachments div.attachmentOutput>a{display:block;float:left;height:48px;width:221px;padding:2px;margin:2px;font-size:.9em;border:1px solid #fff;color:#000;text-decoration:none;}#userShowResources #Attachments div.attachmentOutput>a span.comments,#userShowResources #Attachments div.attachmentOutput>a span.author,#userShowResources #Attachments div.attachmentOutput>a span.timestamp{display:block;float:left;width:168px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;height:16px;}#userShowResources #Attachments div.attachmentOutput>a span.author{color:#888;width:150px;}#userShowResources #Attachments div.attachmentOutput>a span.timestamp{color:#888;font-style:italic;}#userShowResources #Attachments div.attachmentOutput>a span.icon{display:block;float:left;height:48px;width:48px;margin-right:2px;}#userShowResources #Attachments div.attachmentOutput>a span.icon img{height:48px;width:48px;}#userShowResources #Attachments div.attachmentOutput>a span.icon img.loading{display:none;}#userShowResources #Attachments div.attachmentOutput>a:hover{background-color:#ededed;border:1px solid #ccc;}#userShowResources #Attachments div.attachmentOutput>a:hover span.remove{opacity:.5;}#userShowResources #Attachments div.attachmentOutput>a span.remove{font-size:1.4em;color:#e51400;margin-left:6px;cursor:pointer;opacity:0;}#userShowResources #Attachments div.attachmentOutput>a span.remove:hover{opacity:1;}#userShowResources #Attachments.cannotAddAttachments div.attachmentOutput{height:162px;}#userShowResources #Attachments div.attachmentInput{border-top:1px solid #ccc;height:40px;background-color:#fff;padding:3px;}#userShowResources #Attachments div.attachmentInput span.action{color:#333;display:block;margin:0 4px 0 0;font-size:1.5em;cursor:pointer;float:right;border:1px solid #fff;padding:.5em;}#userShowResources #Attachments div.attachmentInput span.action:hover{color:#335a87;background-color:#ededed;border:1px solid #ccc;}#userShowResources #Attachments div.attachmentInput span.action.disabled{color:rgba(51,51,51,.2);cursor:default;}#userShowResources #Attachments div.attachmentInput span.action.disabled:hover{color:rgba(51,51,51,.2);background-color:inherit;border:1px solid #fff;}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments{margin-top:6px;background-color:#fff;line-height:1.3em;border:1px solid #ddd;}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment{display:block;padding:4px;cursor:pointer;}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment:not(:last-child){border-bottom:1px dashed #ddd;}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment:hover{background-color:#f4f4f4;}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment td:first-child{width:90px;font-weight:600;}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment img.CreateJob_Assignment_Image{float:left;width:64px;height:64px;margin-right:6px;}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment div.CreateJob_Assignment_Details{float:left;} \ No newline at end of file +.tableData{border:solid 1px #f4f4f4;border-collapse:collapse;}.tableData>tbody>tr>td{border:solid 1px #f4f4f4;background-color:#fff;}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfc;}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#f4f4f4;border:solid 1px #f4f4f4;}.tableData>tbody>tr:hover>td{background-color:#fefefe;}.tableData>tbody>tr:hover:nth-child(odd)>td{background-color:#fafafa;}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#f4f4f4;}.tableDataDark{border:solid 1px #d8d8d8;border-collapse:collapse;}.tableDataDark td{border:solid 1px #d8d8d8;background-color:#fff;}.tableDataDark th{background-color:#eee;border:solid 1px #d8d8d8;}.tableDataContainer{background-color:#fff;}.tableDataVertical{border:solid 1px #f4f4f4;border-collapse:collapse;}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#f4f4f4;margin:0;padding:0;}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right;}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa;}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right;}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right;}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;}.subtleUntilHover{-moz-opacity:.3;opacity:.3;}.subtleUntilHover:hover{-moz-opacity:1;opacity:1;}#layout_PageHeading #User_Show_Flags{display:inline-block;float:right;height:50px;font-size:.6em;}#layout_PageHeading #User_Show_Flags>i{cursor:default;}#layout_PageHeading #User_Show_Flags>i>.details{display:none;}#User_Show #User_Show_Subjects{table-layout:fixed;}#User_Show #User_Show_Subjects>tbody>tr>td{padding-top:0;height:100%;}#User_Show #User_Show_Subjects>tbody>tr>td>div{position:relative;}#User_Show #User_Show_Subjects>tbody>tr>td>div div.status{margin-top:2px;padding-top:2px;border-top:1px dashed #ddd;}#User_Show #User_Show_Subjects>tbody>tr>td>div input.discreet{margin-left:-2px;}#User_Show #User_Show_Subjects>tbody>tr>td:not(:last-child){border-right:1px dashed #aaa;}#User_Show #User_Show_Subjects #User_Show_Details{width:330px;}#User_Show #User_Show_Subjects #User_Show_Details table.verticalHeadings>tbody>tr>td:first-child{width:104px;font-weight:600;}#User_Show #User_Show_Subjects #User_Show_Details #User_Show_Details_Identity_Id{font-weight:600;}#User_Show #User_Show_Subjects #User_Show_Details #User_Show_GenerateDocument_Container{padding-top:4px;}#User_Show #User_Show_Subjects #User_Show_Details #User_Show_GenerateDocument_Container #User_Show_GenerateDocument{padding:0;}#User_Show #User_Show_Subjects #User_Show_Details #User_Show_Details_Actions{margin-top:4px;}#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment{border-bottom:1px dashed #ddd;padding:4px;}#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment td:first-child{width:90px;font-weight:600;}#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment img.User_Show_AssignedDevices_CurrentAssignment_Image{float:left;width:64px;height:64px;margin-right:6px;}#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment div.User_Show_AssignedDevices_CurrentAssignment_Details{float:left;}#User_Show #User_Show_Subjects #User_Show_Subjects_Actions>td{padding-top:4px;}#UserDetailTabs{margin-top:10px;border-radius:0;background-image:none;background-color:#fff;border:none;padding:0;}#UserDetailTabs #UserDetailTabItems{border-radius:0;border-top:1px solid #ddd;border-right:1px solid #ddd;border-left:1px solid #ddd;border-bottom:none;padding:2px 0 0 4px;background-image:none;background-color:#eee;display:table;}#UserDetailTabs #UserDetailTabItems>li{top:0;border-radius:0;margin:0 5px 0 0;padding:0;line-height:normal;margin-right:4px;}#UserDetailTabs #UserDetailTabItems>li>a{padding:5px 8px;}#UserDetailTabs div.ui-tabs-panel{border-radius:0;padding:4px;border-right:1px solid #ddd;border-bottom:1px solid #ddd;border-left:1px solid #ddd;border-top:none;background-color:#eee;}#UserDetailTab-JobsContainer div.jobTable{margin:-1px;border:1px solid #ddd;}#UserDetailTab-JobsContainer .dataTables_wrapper .dataTables_filter{margin-top:-24px;-moz-opacity:1;opacity:1;}#UserDetailTab-JobsContainer .dataTables_wrapper .dataTables_length{margin-top:-24px;-moz-opacity:1;opacity:1;}#UserDetailTab-JobsContainer .dataTables_wrapper .dataTables_showStatusClosed{right:220px;margin-top:-24px;}#User_Show_Details_Actions_AddFlag_Dialog{height:400px;}#User_Show_Details_Actions_AddFlag_Dialog .flagPicker{position:absolute;width:250px;height:300px;overflow-y:auto;background-color:#fcfcfc;border:1px solid #ccc;}#User_Show_Details_Actions_AddFlag_Dialog .flagPicker>div{background-color:#fff;border-bottom:1px solid #ddd;padding:6px 0 6px 6px;cursor:pointer;}#User_Show_Details_Actions_AddFlag_Dialog .flagPicker>div:hover{background-color:#f4f4f4;}#User_Show_Details_Actions_AddFlag_Dialog .flagPicker>div.selected,#User_Show_Details_Actions_AddFlag_Dialog .flagPicker>div.selected:hover{background-color:#eee;}#User_Show_Details_Actions_AddFlag_Dialog .details{display:none;position:absolute;left:280px;top:1em;}#User_Show_Details_Actions_AddFlag_Dialog .details h4{margin-bottom:4px;}#User_Show_Details_Actions_AddFlag_Dialog .details textarea{min-width:280px;height:200px;}#UserDetailTab-Flags #userFlags{border:solid 1px #d8d8d8;border-collapse:collapse;table-layout:fixed;}#UserDetailTab-Flags #userFlags td{border:solid 1px #d8d8d8;background-color:#fff;}#UserDetailTab-Flags #userFlags th{background-color:#eee;border:solid 1px #d8d8d8;}#UserDetailTab-Flags #userFlags i.fa-edit{position:absolute;top:0;right:0;margin-top:4px;font-size:1.1em;cursor:pointer;display:none;color:#335a87;}#UserDetailTab-Flags #userFlags i.fa-edit:hover{color:#5e8cc2;}#UserDetailTab-Flags #userFlags td:hover i.fa-edit{display:inline-block;}#UserDetailTab-Flags #userFlags th.name{width:200px;}#UserDetailTab-Flags #userFlags tr.removed td{background-color:#f4f4f4;}#UserDetailTab-Flags #userFlags td.name{vertical-align:middle;}#UserDetailTab-Flags #userFlags td.name .fa-stack{line-height:1.6em;}#UserDetailTab-Flags #userFlags td.added,#UserDetailTab-Flags #userFlags td.removed{vertical-align:middle;}#UserDetailTab-Flags #userFlags td.comments{vertical-align:middle;}#UserDetailTab-Flags #userFlags td.comments .editable{position:relative;}#UserDetailTab-Flags #userFlags td.comments .commentsRaw{display:none;}#UserDetailTab-Flags #userFlags td.removed.na{vertical-align:middle;text-align:center;}#UserDetailTab-Flags>.none{text-align:center;padding:30px 0;font-style:italic;background-color:#fff;}#User_Show_Flags_Actions_EditComments_Dialog h4{margin-bottom:4px;}#User_Show_Flags_Actions_EditComments_Dialog_Comments{width:280px;}#UserDetailTab-Authorization #UserDetailTab-AuthorizationContainer{background-color:#fff;border:1px solid #ccc;}#UserDetailTab-Authorization #UserDetailTab-Authorization_ClaimsTree_Container{width:50%;float:left;padding:6px 10px 6px 4px;}#UserDetailTab-Authorization #UserDetailTab-Authorization_ClaimsTree_Container>span.smallMessage:last-child{display:block;text-align:right;}#UserDetailTab-Authorization #UserDetailTab-Authorization_Membership{width:40%;float:right;padding:6px 10px;border-left:1px dashed #ccc;border-bottom:1px dashed #ccc;}#UserDetailTab-Authorization #UserDetailTab-Authorization_Membership #UserDetailTab-Authorization_Membership_Roles{margin-bottom:10px;}#UserDetailTab-Authorization #UserDetailTab-Authorization_Membership #UserDetailTab-Authorization_Membership_Groups_Container>span.smallMessage:last-child{display:block;text-align:right;}#UserDetailTab-Authorization #UserDetailTab-Authorization_NoAccess{width:50%;float:left;padding:6px 10px;}#UserDetailTab-Authorization #UserDetailTab-Authorization_NoAccess h3{margin-bottom:10px;}#userShowResources #AttachmentsContainer{padding:0;}#userShowResources #Attachments{position:relative;border:1px solid #ccc;background-color:#fff;}#userShowResources #Attachments div.attachmentOutput{position:relative;height:115px;overflow:auto;}#userShowResources #Attachments div.attachmentOutput>a{display:block;float:left;height:48px;width:221px;padding:2px;margin:2px;font-size:.9em;border:1px solid #fff;color:#000;text-decoration:none;}#userShowResources #Attachments div.attachmentOutput>a span.comments,#userShowResources #Attachments div.attachmentOutput>a span.author,#userShowResources #Attachments div.attachmentOutput>a span.timestamp{display:block;float:left;width:168px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;height:16px;}#userShowResources #Attachments div.attachmentOutput>a span.author{color:#888;width:150px;}#userShowResources #Attachments div.attachmentOutput>a span.timestamp{color:#888;font-style:italic;}#userShowResources #Attachments div.attachmentOutput>a span.icon{display:block;float:left;height:48px;width:48px;margin-right:2px;}#userShowResources #Attachments div.attachmentOutput>a span.icon img{height:48px;width:48px;}#userShowResources #Attachments div.attachmentOutput>a span.icon img.loading{display:none;}#userShowResources #Attachments div.attachmentOutput>a:hover{background-color:#ededed;border:1px solid #ccc;}#userShowResources #Attachments div.attachmentOutput>a:hover span.remove{opacity:.5;}#userShowResources #Attachments div.attachmentOutput>a span.remove{font-size:1.4em;color:#e51400;margin-left:6px;cursor:pointer;opacity:0;}#userShowResources #Attachments div.attachmentOutput>a span.remove:hover{opacity:1;}#userShowResources #Attachments.cannotAddAttachments div.attachmentOutput{height:162px;}#userShowResources #Attachments div.attachmentInput{border-top:1px solid #ccc;height:40px;background-color:#fff;padding:3px;}#userShowResources #Attachments div.attachmentInput span.action{color:#333;display:block;margin:0 4px 0 0;font-size:1.5em;cursor:pointer;float:right;border:1px solid #fff;padding:.5em;}#userShowResources #Attachments div.attachmentInput span.action:hover{color:#335a87;background-color:#ededed;border:1px solid #ccc;}#userShowResources #Attachments div.attachmentInput span.action.disabled{color:rgba(51,51,51,.2);cursor:default;}#userShowResources #Attachments div.attachmentInput span.action.disabled:hover{color:rgba(51,51,51,.2);background-color:inherit;border:1px solid #fff;}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments{margin-top:6px;background-color:#fff;line-height:1.3;border:1px solid #ddd;max-height:300px;overflow-y:auto;}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment{display:block;padding:4px;cursor:pointer;}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment:not(:last-child){border-bottom:1px dashed #ddd;}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment:hover{background-color:#f4f4f4;}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment tr:first-child td{width:68px;}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment td:first-child{width:90px;font-weight:600;}#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment img.CreateJob_Assignment_Image{width:64px;height:64px;} \ No newline at end of file diff --git a/Disco.Web/Views/User/UserParts/_Subject.cshtml b/Disco.Web/Views/User/UserParts/_Subject.cshtml index 65bb6361..5595b5db 100644 --- a/Disco.Web/Views/User/UserParts/_Subject.cshtml +++ b/Disco.Web/Views/User/UserParts/_Subject.cshtml @@ -12,7 +12,8 @@
- \r\n \r\n " + -" + + \r\n \r\n "\r\n \r\n"); - #line 35 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 36 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 35 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 36 "..\..\Views\User\UserParts\_Subject.cshtml" if (Authorization.Has(Claims.User.ShowDetails)) { @@ -169,13 +172,13 @@ WriteLiteral(">\r\n \r\n "Email:\r\n \r\n "hone:\r\n \r\n "\n
Username (Id): + + Username (Id):

@Model.User.UserId

@@ -111,114 +112,118 @@ @Html.ActionLinkSmallButton("Create Job", MVC.Job.Create(Model.PrimaryDeviceSerialNumber, Model.User.UserId), "User_Show_Details_Actions_CreateJob_Button") if (currentDeviceAssignments.Count > 1) { -
-
-  Multiple devices are assigned to this user. -
- Which device should be associated with this job? - +
+
+  Multiple devices are assigned to this user. +
+ + Which device should be associated with this job? + +
+
+
    + @foreach (var assignment in currentDeviceAssignments) + { +
  • + + + + + + + + + + + + + + + + + + + + + + +
    + Model Image +
    + Serial Number: + + @assignment.Device.SerialNumber (@assignment.Device.ComputerName) +
    + Model: + + @assignment.Device.DeviceModel.ToString() +
    Asset: + @if (!string.IsNullOrEmpty(assignment.Device.AssetNumber)) + { + @assignment.Device.AssetNumber + } + else + { + Unknown + } +
    Assigned: + @CommonHelpers.FriendlyDate(assignment.AssignedDate) +
    +
    • } +
+
-
-
    - @foreach (var assignment in currentDeviceAssignments) - { -
  • - Model Image -
    - - - - - - - - - - - - - - - - - - - -
    Serial Number: - - @assignment.Device.SerialNumber (@assignment.Device.ComputerName) -
    Model: - - @assignment.Device.DeviceModel.ToString() -
    Asset: - @if (!string.IsNullOrEmpty(assignment.Device.AssetNumber)) - { - @assignment.Device.AssetNumber - } - else - { - Unknown - } -
    Assigned: - @CommonHelpers.FriendlyDate(assignment.AssignedDate) -
    -
    -
    • - } -
-
-
- + } else { - + } } @if (Model.User.CanAddUserFlags() && Model.AvailableUserFlags != null && Model.AvailableUserFlags.Count > 0) @@ -324,86 +329,90 @@ { foreach (var assignment in currentDeviceAssignments) { -
- @if (Authorization.Has(Claims.Device.Show)) - { - +
+ @if (Authorization.Has(Claims.Device.Show)) + { + + Model Image + + } + else + { Model Image - - } - else - { - Model Image - } -
- - - - - +
Serial Number: - - - @if (Authorization.Has(Claims.Device.Show)) + } +
+ + + + + - - @if (!string.IsNullOrEmpty(assignment.Device.AssetNumber)) - { - - - - } - @if (assignment.Device.DeviceModelId.HasValue) - { + @if (!string.IsNullOrEmpty(assignment.Device.AssetNumber)) + { + + + + + } + @if (assignment.Device.DeviceModelId.HasValue) + { + + + + + } - - } - - - - - @if (assignment.Device.DeviceBatchId.HasValue) - { + @if (assignment.Device.DeviceBatchId.HasValue) + { + + + + + } - + - } - - - - - -
+ Serial Number: + + + @if (Authorization.Has(Claims.Device.Show)) + { + @Html.ActionLink(assignment.Device.SerialNumber, MVC.Device.Show(assignment.Device.SerialNumber)) + } + else + { + @assignment.Device.SerialNumber + } + + @if (!string.IsNullOrWhiteSpace(assignment.Device.ComputerName)) { - @Html.ActionLink(assignment.Device.SerialNumber, MVC.Device.Show(assignment.Device.SerialNumber)) + (@assignment.Device.ComputerName) } - else - { - @assignment.Device.SerialNumber - } - - @if (!string.IsNullOrWhiteSpace(assignment.Device.ComputerName)) - { - (@assignment.Device.ComputerName) - } -
Asset: - @assignment.Device.AssetNumber
Asset: + @assignment.Device.AssetNumber +
+ Model: + + @assignment.Device.DeviceModel.ToString() +
Model: + + Profile: - @assignment.Device.DeviceModel.ToString() + @assignment.Device.DeviceProfile.ToString()
Profile: - - @assignment.Device.DeviceProfile.ToString() -
+ Batch: + + @assignment.Device.DeviceBatch.ToString() +
Batch: - Assigned: - @assignment.Device.DeviceBatch.ToString() + @CommonHelpers.FriendlyDate(assignment.AssignedDate)
Assigned: - @CommonHelpers.FriendlyDate(assignment.AssignedDate) -
+
+
-
} } else diff --git a/Disco.Web/Views/User/UserParts/_Subject.generated.cs b/Disco.Web/Views/User/UserParts/_Subject.generated.cs index a6293032..e3a36c60 100644 --- a/Disco.Web/Views/User/UserParts/_Subject.generated.cs +++ b/Disco.Web/Views/User/UserParts/_Subject.generated.cs @@ -2,7 +2,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -27,7 +27,6 @@ namespace Disco.Web.Views.User.UserParts using System.Web.UI; using System.Web.WebPages; using Disco; - using Disco.BI.Extensions; using Disco.Models.Repository; using Disco.Services; using Disco.Services.Authorization; @@ -37,9 +36,9 @@ namespace Disco.Web.Views.User.UserParts [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] [System.Web.WebPages.PageVirtualPathAttribute("~/Views/User/UserParts/_Subject.cshtml")] - public partial class Subject : Disco.Services.Web.WebViewPage + public partial class _Subject : Disco.Services.Web.WebViewPage { - public Subject() + public _Subject() { } public override void Execute() @@ -70,9 +69,13 @@ WriteLiteral(">\r\n \r\n
Us" + -"ername (Id):\r\n \r\n +
+ Username (Id): + + "); - #line 18 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 19 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Model.User.UserId); @@ -98,7 +101,7 @@ WriteLiteral(" title=\"Display Name\""); WriteLiteral(">"); - #line 23 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 24 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Model.User.DisplayName); @@ -115,7 +118,7 @@ WriteLiteral(" title=\"Given Name\""); WriteLiteral(">"); - #line 27 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 28 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Model.User.GivenName); @@ -132,7 +135,7 @@ WriteLiteral(" title=\"Surname\""); WriteLiteral(">"); - #line 31 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 32 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Model.User.Surname); @@ -142,13 +145,13 @@ WriteLiteral("
\r\n"); - #line 42 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 43 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 42 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 43 "..\..\Views\User\UserParts\_Subject.cshtml" if (!string.IsNullOrEmpty(Model.User.EmailAddress)) { @@ -191,7 +194,7 @@ WriteLiteral(" title=\"Email Address [Update in Active Directory]\""); WriteLiteral(">"); - #line 44 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 45 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Model.User.EmailAddress); @@ -200,7 +203,7 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 45 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 46 "..\..\Views\User\UserParts\_Subject.cshtml" } else { @@ -215,7 +218,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">Unknown\r\n"); - #line 49 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 50 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -226,13 +229,13 @@ WriteLiteral(" \r\n"); - #line 55 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 56 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 55 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 56 "..\..\Views\User\UserParts\_Subject.cshtml" if (!string.IsNullOrEmpty(Model.User.PhoneNumber)) { @@ -248,7 +251,7 @@ WriteLiteral(" title=\"Phone Number [Update in Active Directory]\""); WriteLiteral(">"); - #line 57 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 58 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Model.User.PhoneNumber); @@ -257,7 +260,7 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 58 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 59 "..\..\Views\User\UserParts\_Subject.cshtml" } else { @@ -272,7 +275,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">Unknown\r\n"); - #line 62 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 63 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -282,7 +285,7 @@ WriteLiteral("
\r\n
\r\n"); - #line 67 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 68 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -291,7 +294,7 @@ WriteLiteral(" \r\n WriteLiteral(" "); - #line 68 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 69 "..\..\Views\User\UserParts\_Subject.cshtml" if (Authorization.Has(Claims.User.Actions.GenerateDocuments)) { @@ -309,7 +312,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 71 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 72 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Html.DropDownList("User_Show_GenerateDocument", Model.DocumentTemplatesSelectListItems)); @@ -323,7 +326,7 @@ WriteLiteral(">\r\n $(function () {\r\n " var generatePdfUrl = \'"); - #line 74 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 75 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Url.Action(MVC.API.User.GeneratePdf(Model.User.UserId, null))); @@ -358,7 +361,7 @@ WriteLiteral("?DocumentTemplateId=\';\r\n var " \r\n"); - #line 106 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 107 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -371,13 +374,13 @@ WriteLiteral(" id=\"User_Show_Details_Actions\""); WriteLiteral(">\r\n"); - #line 108 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 109 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 108 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 109 "..\..\Views\User\UserParts\_Subject.cshtml" if (Model.User.CanCreateJob()) { Html.BundleDeferred("~/ClientScripts/Modules/Disco-CreateJob"); @@ -386,14 +389,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 111 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 112 "..\..\Views\User\UserParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Create Job", MVC.Job.Create(Model.PrimaryDeviceSerialNumber, Model.User.UserId), "User_Show_Details_Actions_CreateJob_Button")); #line default #line hidden - #line 111 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 112 "..\..\Views\User\UserParts\_Subject.cshtml" if (currentDeviceAssignments.Count > 1) { @@ -401,7 +404,7 @@ WriteLiteral(">\r\n"); #line default #line hidden -WriteLiteral(" \r\n \r\n \r\n \r\n  Multiple devices are assigned to this user. -
- Which device should be associated with this job? - - -
- + + Which device should be associated with this job? + +
+
+ \r\n"); - #line 123 "..\..\Views\User\UserParts\_Subject.cshtml" - + #line 125 "..\..\Views\User\UserParts\_Subject.cshtml" + #line default #line hidden - #line 123 "..\..\Views\User\UserParts\_Subject.cshtml" - foreach (var assignment in currentDeviceAssignments) - { + #line 125 "..\..\Views\User\UserParts\_Subject.cshtml" + foreach (var assignment in currentDeviceAssignments) + { #line default #line hidden -WriteLiteral("
- -"); + + + + + "); - #line 167 "..\..\Views\User\UserParts\_Subject.cshtml" - } + #line 172 "..\..\Views\User\UserParts\_Subject.cshtml" + } #line default #line hidden -WriteLiteral(" \r\n " + -"\r\n \r\n"); +WriteLiteral(" \r\n " + +" \r\n \r\n"); -WriteLiteral(" \r\n"); - #line 207 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 212 "..\..\Views\User\UserParts\_Subject.cshtml" } else { @@ -648,22 +656,22 @@ WriteLiteral(" + "); - #line 222 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 227 "..\..\Views\User\UserParts\_Subject.cshtml" } } @@ -673,7 +681,7 @@ WriteLiteral(@" \r\n"); - #line 313 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 318 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -913,13 +921,13 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" \r\n \r\n \r\n"); - #line 317 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 322 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 317 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 322 "..\..\Views\User\UserParts\_Subject.cshtml" if (Authorization.Has(Claims.User.ShowAssignments)) { @@ -937,13 +945,13 @@ WriteLiteral(" id=\"User_Show_AssignedDevices_Active\""); WriteLiteral(">\r\n

Current Device Assignments

\r\n"); - #line 323 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 328 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 323 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 328 "..\..\Views\User\UserParts\_Subject.cshtml" if (currentDeviceAssignments.Count > 0) { foreach (var assignment in currentDeviceAssignments) @@ -952,15 +960,15 @@ WriteLiteral(">\r\n

Current Device Assignments\r\n"); - #line 328 "..\..\Views\User\UserParts\_Subject.cshtml" - + #line 333 "..\..\Views\User\UserParts\_Subject.cshtml" + #line default #line hidden - #line 328 "..\..\Views\User\UserParts\_Subject.cshtml" - if (Authorization.Has(Claims.Device.Show)) - { - - - #line default - #line hidden -WriteLiteral(" (Url.Action(MVC.Device.Show(assignment.Device.SerialNumber)) - - #line default - #line hidden -, 20782), false) -); - -WriteLiteral(">\r\n (Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash())) - - #line default - #line hidden -, 20976), false) -); - -WriteLiteral(" />\r\n \r\n"); - - #line 333 "..\..\Views\User\UserParts\_Subject.cshtml" - } - else - { + if (Authorization.Has(Claims.Device.Show)) + { #line default #line hidden -WriteLiteral(" (Url.Action(MVC.Device.Show(assignment.Device.SerialNumber)) + + #line default + #line hidden +, 20991), false) +); + +WriteLiteral(">\r\n (Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash())) + , Tuple.Create(Tuple.Create("", 21189), Tuple.Create(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash())) #line default #line hidden -, 21389), false) +, 21189), false) +); + +WriteLiteral(" />\r\n \r\n"); + + + #line 338 "..\..\Views\User\UserParts\_Subject.cshtml" + } + else + { + + + #line default + #line hidden +WriteLiteral(" (Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash())) + + #line default + #line hidden +, 21622), false) ); WriteLiteral(" />\r\n"); - #line 337 "..\..\Views\User\UserParts\_Subject.cshtml" - } + #line 342 "..\..\Views\User\UserParts\_Subject.cshtml" + } #line default #line hidden -WriteLiteral(" \r\n \r\n - - - Serial Number: - - - + + + Serial Number: + + + \r\n"); - #line 346 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 352 "..\..\Views\User\UserParts\_Subject.cshtml" + + + #line default + #line hidden + + #line 352 "..\..\Views\User\UserParts\_Subject.cshtml" + if (Authorization.Has(Claims.Device.Show)) + { + + + #line default + #line hidden + + #line 354 "..\..\Views\User\UserParts\_Subject.cshtml" + Write(Html.ActionLink(assignment.Device.SerialNumber, MVC.Device.Show(assignment.Device.SerialNumber))); + + + #line default + #line hidden + + #line 354 "..\..\Views\User\UserParts\_Subject.cshtml" + + } + else + { + + + #line default + #line hidden + + #line 358 "..\..\Views\User\UserParts\_Subject.cshtml" + Write(assignment.Device.SerialNumber); + + + #line default + #line hidden + + #line 358 "..\..\Views\User\UserParts\_Subject.cshtml" + + } + + + #line default + #line hidden +WriteLiteral(" \r\n"); + + + #line 361 "..\..\Views\User\UserParts\_Subject.cshtml" #line default #line hidden - #line 346 "..\..\Views\User\UserParts\_Subject.cshtml" - if (Authorization.Has(Claims.Device.Show)) + #line 361 "..\..\Views\User\UserParts\_Subject.cshtml" + if (!string.IsNullOrWhiteSpace(assignment.Device.ComputerName)) { - - - #line default - #line hidden - - #line 348 "..\..\Views\User\UserParts\_Subject.cshtml" - Write(Html.ActionLink(assignment.Device.SerialNumber, MVC.Device.Show(assignment.Device.SerialNumber))); #line default #line hidden - - #line 348 "..\..\Views\User\UserParts\_Subject.cshtml" - - } - else - { - - - #line default - #line hidden - - #line 352 "..\..\Views\User\UserParts\_Subject.cshtml" - Write(assignment.Device.SerialNumber); - - - #line default - #line hidden - - #line 352 "..\..\Views\User\UserParts\_Subject.cshtml" - - } - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - #line 355 "..\..\Views\User\UserParts\_Subject.cshtml" - - - #line default - #line hidden - - #line 355 "..\..\Views\User\UserParts\_Subject.cshtml" - if (!string.IsNullOrWhiteSpace(assignment.Device.ComputerName)) - { - - - #line default - #line hidden -WriteLiteral(" "); +WriteLiteral(" "); WriteLiteral("("); - #line 357 "..\..\Views\User\UserParts\_Subject.cshtml" - Write(assignment.Device.ComputerName); + #line 363 "..\..\Views\User\UserParts\_Subject.cshtml" + Write(assignment.Device.ComputerName); #line default @@ -1149,139 +1158,107 @@ WriteLiteral(")"); WriteLiteral("\r\n"); - #line 358 "..\..\Views\User\UserParts\_Subject.cshtml" - } + #line 364 "..\..\Views\User\UserParts\_Subject.cshtml" + } #line default #line hidden -WriteLiteral(" \r\n " + -" \r\n"); +WriteLiteral(" \r\n " + +" \r\n"); - #line 361 "..\..\Views\User\UserParts\_Subject.cshtml" - + #line 367 "..\..\Views\User\UserParts\_Subject.cshtml" + #line default #line hidden - #line 361 "..\..\Views\User\UserParts\_Subject.cshtml" - if (!string.IsNullOrEmpty(assignment.Device.AssetNumber)) - { + #line 367 "..\..\Views\User\UserParts\_Subject.cshtml" + if (!string.IsNullOrEmpty(assignment.Device.AssetNumber)) + { #line default #line hidden -WriteLiteral(@" - Asset: - - + Asset: + + "); - #line 366 "..\..\Views\User\UserParts\_Subject.cshtml" - Write(assignment.Device.AssetNumber); + #line 372 "..\..\Views\User\UserParts\_Subject.cshtml" + Write(assignment.Device.AssetNumber); #line default #line hidden -WriteLiteral("\r\n \r\n " + -" \r\n"); +WriteLiteral("\r\n \r\n " + +" \r\n"); - #line 369 "..\..\Views\User\UserParts\_Subject.cshtml" - } + #line 375 "..\..\Views\User\UserParts\_Subject.cshtml" + } #line default #line hidden -WriteLiteral(" "); +WriteLiteral(" "); - #line 370 "..\..\Views\User\UserParts\_Subject.cshtml" - if (assignment.Device.DeviceModelId.HasValue) - { + #line 376 "..\..\Views\User\UserParts\_Subject.cshtml" + if (assignment.Device.DeviceModelId.HasValue) + { #line default #line hidden -WriteLiteral(@" - Model: - - - + + Model: + + + "); - #line 376 "..\..\Views\User\UserParts\_Subject.cshtml" - Write(assignment.Device.DeviceModel.ToString()); + #line 383 "..\..\Views\User\UserParts\_Subject.cshtml" + Write(assignment.Device.DeviceModel.ToString()); #line default #line hidden -WriteLiteral("\r\n \r\n " + -" \r\n"); +WriteLiteral("\r\n \r\n " + +" \r\n"); - #line 379 "..\..\Views\User\UserParts\_Subject.cshtml" - } + #line 386 "..\..\Views\User\UserParts\_Subject.cshtml" + } #line default #line hidden -WriteLiteral(@" - Profile: - - - + + Profile: + + + "); - #line 384 "..\..\Views\User\UserParts\_Subject.cshtml" - Write(assignment.Device.DeviceProfile.ToString()); - - - #line default - #line hidden -WriteLiteral("\r\n \r\n " + -" \r\n"); - - - #line 387 "..\..\Views\User\UserParts\_Subject.cshtml" - - - #line default - #line hidden - - #line 387 "..\..\Views\User\UserParts\_Subject.cshtml" - if (assignment.Device.DeviceBatchId.HasValue) - { - - - #line default - #line hidden -WriteLiteral(@" - Batch: - - - "); - - - #line 393 "..\..\Views\User\UserParts\_Subject.cshtml" - Write(assignment.Device.DeviceBatch.ToString()); + #line 392 "..\..\Views\User\UserParts\_Subject.cshtml" + Write(assignment.Device.DeviceProfile.ToString()); #line default @@ -1290,39 +1267,74 @@ WriteLiteral("\r\n " \r\n"); - #line 396 "..\..\Views\User\UserParts\_Subject.cshtml" - } + #line 395 "..\..\Views\User\UserParts\_Subject.cshtml" + + + #line default + #line hidden + + #line 395 "..\..\Views\User\UserParts\_Subject.cshtml" + if (assignment.Device.DeviceBatchId.HasValue) + { #line default #line hidden -WriteLiteral(" \r\n " + -" Assigned:\r\n " + -" \r\n <" + -"span"); +WriteLiteral(@" + + Batch: + + + "); + + + #line 402 "..\..\Views\User\UserParts\_Subject.cshtml" + Write(assignment.Device.DeviceBatch.ToString()); + + + #line default + #line hidden +WriteLiteral("\r\n \r\n " + +" \r\n"); + + + #line 405 "..\..\Views\User\UserParts\_Subject.cshtml" + } + + + #line default + #line hidden +WriteLiteral(@" + Assigned: + + "); - #line 400 "..\..\Views\User\UserParts\_Subject.cshtml" - Write(CommonHelpers.FriendlyDate(assignment.AssignedDate)); + #line 409 "..\..\Views\User\UserParts\_Subject.cshtml" + Write(CommonHelpers.FriendlyDate(assignment.AssignedDate)); #line default #line hidden WriteLiteral(@" - - - - + + + + + - "); - #line 407 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 416 "..\..\Views\User\UserParts\_Subject.cshtml" } } else @@ -1338,7 +1350,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">No Current Device Assignments\r\n"); - #line 412 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 421 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -1348,7 +1360,7 @@ WriteLiteral(" \r\n \r\n "\r\n"); - #line 416 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 425 "..\..\Views\User\UserParts\_Subject.cshtml" }