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

Bug Fix #87 - Scroll multiple devices on create job

Browse Source
This commit is contained in:
Gary Sharp
2016-09-29 20:02:37 +10:00
parent 687713428b
commit 0a67e9544d
5 changed files with 589 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/ClientSource/Style/User.css
+6 -6
View File
@@ -461,8 +461,10 @@
#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments { #User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments {
margin-top: 6px; margin-top: 6px;
background-color: #fff; background-color: #fff;
line-height: 1.3em; line-height: 1.3;
border: 1px solid #ddd; border: 1px solid #ddd;
max-height: 300px;
overflow-y: auto;
} }
#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment { #User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment {
display: block; display: block;
@@ -475,16 +477,14 @@
#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment:hover { #User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment:hover {
background-color: #f4f4f4; 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 { #User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment td:first-child {
width: 90px; width: 90px;
font-weight: 600; font-weight: 600;
} }
#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment img.CreateJob_Assignment_Image { #User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment img.CreateJob_Assignment_Image {
float: left;
width: 64px; width: 64px;
height: 64px; height: 64px;
margin-right: 6px;
}
#User_Show_Details_Actions_CreateJob_Dialog #CreateJob_Assignments li.CreateJob_Assignment div.CreateJob_Assignment_Details {
float: left;
} }
Disco.Web/ClientSource/Style/User.less
+7 -7
View File
@@ -487,8 +487,10 @@
#CreateJob_Assignments { #CreateJob_Assignments {
margin-top: 6px; margin-top: 6px;
background-color: @white; background-color: @white;
line-height: 1.3em; line-height: 1.3;
border: 1px solid #ddd; border: 1px solid #ddd;
max-height: 300px;
overflow-y: auto;
li.CreateJob_Assignment { li.CreateJob_Assignment {
display: block; display: block;
@@ -503,20 +505,18 @@
background-color: @TableDataBorderColour; background-color: @TableDataBorderColour;
} }
tr:first-child td {
width: 68px;
}
td:first-child { td:first-child {
width: 90px; width: 90px;
font-weight: @FontWeightBodyBold; font-weight: @FontWeightBodyBold;
} }
img.CreateJob_Assignment_Image { img.CreateJob_Assignment_Image {
float: left;
width: 64px; width: 64px;
height: 64px; height: 64px;
margin-right: 6px;
}
div.CreateJob_Assignment_Details {
float: left;
} }
} }
} }
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/Views/User/UserParts/_Subject.cshtml
+22 -13
View File
@@ -12,7 +12,8 @@
<div id="User_Show_Details_Identity"> <div id="User_Show_Details_Identity">
<table class="none verticalHeadings"> <table class="none verticalHeadings">
<tr> <tr>
<td><span>Username (Id):</span> <td>
<span>Username (Id):</span>
</td> </td>
<td> <td>
<h4 id="User_Show_Details_Identity_Id" title="Username">@Model.User.UserId</h4> <h4 id="User_Show_Details_Identity_Id" title="Username">@Model.User.UserId</h4>
@@ -115,7 +116,8 @@
<div class="clearfix"> <div class="clearfix">
<i class="fa fa-info-circle information"></i>&nbsp;Multiple devices are assigned to this user. <i class="fa fa-info-circle information"></i>&nbsp;Multiple devices are assigned to this user.
<br /> <br />
<strong>Which device should be associated with this job? <strong>
Which device should be associated with this job?
</strong> </strong>
</div> </div>
<div> <div>
@@ -123,19 +125,24 @@
@foreach (var assignment in currentDeviceAssignments) @foreach (var assignment in currentDeviceAssignments)
{ {
<li class="CreateJob_Assignment clearfix" data-createjoburl="@Url.Action(MVC.Job.Create(assignment.DeviceSerialNumber, Model.User.UserId))"> <li class="CreateJob_Assignment clearfix" data-createjoburl="@Url.Action(MVC.Job.Create(assignment.DeviceSerialNumber, Model.User.UserId))">
<img class="CreateJob_Assignment_Image" alt="Model Image" src="@Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash()))" />
<div class="CreateJob_Assignment_Details">
<table class="none"> <table class="none">
<tbody> <tbody>
<tr> <tr>
<td>Serial Number: <td rowspan="5">
<img class="CreateJob_Assignment_Image" alt="Model Image" src="@Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash()))" />
</td>
</tr>
<tr>
<td>
Serial Number:
</td> </td>
<td> <td>
<span>@assignment.Device.SerialNumber</span> (<span>@assignment.Device.ComputerName</span>) <span>@assignment.Device.SerialNumber</span> (<span>@assignment.Device.ComputerName</span>)
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Model: <td>
Model:
</td> </td>
<td> <td>
<span>@assignment.Device.DeviceModel.ToString()</span> <span>@assignment.Device.DeviceModel.ToString()</span>
@@ -162,9 +169,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </li>}
</li>
}
</ul> </ul>
</div> </div>
</div> </div>
@@ -339,7 +344,8 @@
<table class="none"> <table class="none">
<tbody> <tbody>
<tr> <tr>
<td>Serial Number: <td>
Serial Number:
</td> </td>
<td> <td>
<span class="User_Show_AssignedDevices_CurrentAssignment_SerialNumber"> <span class="User_Show_AssignedDevices_CurrentAssignment_SerialNumber">
@@ -370,7 +376,8 @@
@if (assignment.Device.DeviceModelId.HasValue) @if (assignment.Device.DeviceModelId.HasValue)
{ {
<tr> <tr>
<td>Model: <td>
Model:
</td> </td>
<td> <td>
<span class="User_Show_AssignedDevices_CurrentAssignment_Model">@assignment.Device.DeviceModel.ToString()</span> <span class="User_Show_AssignedDevices_CurrentAssignment_Model">@assignment.Device.DeviceModel.ToString()</span>
@@ -378,7 +385,8 @@
</tr> </tr>
} }
<tr> <tr>
<td>Profile: <td>
Profile:
</td> </td>
<td> <td>
<span class="User_Show_AssignedDevices_CurrentAssignment_Profile">@assignment.Device.DeviceProfile.ToString()</span> <span class="User_Show_AssignedDevices_CurrentAssignment_Profile">@assignment.Device.DeviceProfile.ToString()</span>
@@ -387,7 +395,8 @@
@if (assignment.Device.DeviceBatchId.HasValue) @if (assignment.Device.DeviceBatchId.HasValue)
{ {
<tr> <tr>
<td>Batch: <td>
Batch:
</td> </td>
<td> <td>
<span class="User_Show_AssignedDevices_CurrentAssignment_Batch">@assignment.Device.DeviceBatch.ToString()</span> <span class="User_Show_AssignedDevices_CurrentAssignment_Batch">@assignment.Device.DeviceBatch.ToString()</span>
Disco.Web/Views/User/UserParts/_Subject.generated.cs
+190 -178
View File
File diff suppressed because it is too large Load Diff