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

#138 display device flags where appropriate in the UI

Browse Source
This commit is contained in:
Gary Sharp
2024-01-14 19:13:09 +11:00
parent aee467cb53
commit 5f4cb20900
31 changed files with 2236 additions and 1139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/ClientSource/Style/BundleSite.css
+9 -6
View File
@@ -5209,14 +5209,17 @@ table.genericData td.id a {
.dataTables_wrapper table > thead tr > th.sorting_disabled {
background-image: none;
}
table.userTable div.flags {
table.userTable div.flags,
table.deviceTable div.flags {
display: inline-block;
float: right;
}
table.userTable div.flags > i {
table.userTable div.flags > i,
table.deviceTable div.flags > i {
cursor: default;
}
table.userTable div.flags > i > .details {
table.userTable div.flags > i > .details,
table.deviceTable div.flags > i > .details {
display: none;
}
.jobStatus {
@@ -5689,15 +5692,15 @@ div.Disco-AttachmentUpload-ImageDialog {
background-color: #000 !important;
padding: 0 !important;
}
body > .User_FlagAssignment_Tooltip span.name {
body > .FlagAssignment_Tooltip span.name {
display: block;
font-weight: 600;
}
body > .User_FlagAssignment_Tooltip span.comments {
body > .FlagAssignment_Tooltip span.comments {
display: block;
padding: 2px 0 2px 4px;
}
body > .User_FlagAssignment_Tooltip span.added {
body > .FlagAssignment_Tooltip span.added {
font-style: italic;
font-size: 0.9em;
}
Disco.Web/ClientSource/Style/BundleSite.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Device.css
+12
View File
@@ -91,6 +91,18 @@
#layout_PageHeading #Device_Show_Status span.icon {
margin-right: 6px;
}
#layout_PageHeading #Device_Show_Flags {
display: inline-block;
float: right;
height: 50px;
font-size: 0.6em;
}
#layout_PageHeading #Device_Show_Flags > i {
cursor: default;
}
#layout_PageHeading #Device_Show_Flags > i > .details {
display: none;
}
#Device_Show #Device_Show_Subjects {
table-layout: fixed;
}
Disco.Web/ClientSource/Style/Device.less
+16
View File
@@ -18,6 +18,21 @@
margin-right: 6px;
}
}
#Device_Show_Flags {
display: inline-block;
float: right;
height: 50px;
font-size: 0.6em;
& > i {
cursor: default;
& > .details {
display: none;
}
}
}
}
#Device_Show {
@@ -188,6 +203,7 @@
}
}
}
.enforce-ou {
padding-top: .5em;
}
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
+10
View File
@@ -185,6 +185,16 @@
#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Details {
float: left;
}
#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Flags {
margin: 4px 0;
font-size: 16px;
}
#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Flags > i {
cursor: default;
}
#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Flags > i > .details {
display: none;
}
#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Details_HWar,
#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_Details_HNWar {
float: right;
Disco.Web/ClientSource/Style/Job.less
+13
View File
@@ -143,6 +143,19 @@
float: left;
}
#Job_Show_Device_Flags {
margin: 4px 0;
font-size: 16px;
& > i {
cursor: default;
& > .details {
display: none;
}
}
}
#Job_Show_Device_Details_HWar, #Job_Show_Device_Details_HNWar {
float: right;
border-left: 1px dashed #ddd;
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
+9 -6
View File
@@ -777,14 +777,17 @@ table.genericData td.id a {
.dataTables_wrapper table > thead tr > th.sorting_disabled {
background-image: none;
}
table.userTable div.flags {
table.userTable div.flags,
table.deviceTable div.flags {
display: inline-block;
float: right;
}
table.userTable div.flags > i {
table.userTable div.flags > i,
table.deviceTable div.flags > i {
cursor: default;
}
table.userTable div.flags > i > .details {
table.userTable div.flags > i > .details,
table.deviceTable div.flags > i > .details {
display: none;
}
.jobStatus {
@@ -1257,15 +1260,15 @@ div.Disco-AttachmentUpload-ImageDialog {
background-color: #000 !important;
padding: 0 !important;
}
body > .User_FlagAssignment_Tooltip span.name {
body > .FlagAssignment_Tooltip span.name {
display: block;
font-weight: 600;
}
body > .User_FlagAssignment_Tooltip span.comments {
body > .FlagAssignment_Tooltip span.comments {
display: block;
padding: 2px 0 2px 4px;
}
body > .User_FlagAssignment_Tooltip span.added {
body > .FlagAssignment_Tooltip span.added {
font-style: italic;
font-size: 0.9em;
}
Disco.Web/ClientSource/Style/Site.less
+2 -2
View File
@@ -746,7 +746,7 @@ table.genericData {
}
}
table.userTable {
table.userTable, table.deviceTable {
div.flags {
display: inline-block;
float: right;
@@ -1275,7 +1275,7 @@ div.Disco-AttachmentUpload-ImageDialog {
padding: 0 !important;
}
body > .User_FlagAssignment_Tooltip {
body > .FlagAssignment_Tooltip {
span.name {
display: block;
font-weight: @FontWeightBodyBold;
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
+9
View File
@@ -152,6 +152,15 @@
#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_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment .User_Show_Assigned_Devices_CurrentAssignment_Flags {
font-size: 16px;
}
#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment .User_Show_Assigned_Devices_CurrentAssignment_Flags > i {
cursor: default;
}
#User_Show #User_Show_Subjects #User_Show_AssignedDevices .User_Show_AssignedDevices_CurrentAssignment .User_Show_Assigned_Devices_CurrentAssignment_Flags > i > .details {
display: none;
}
#User_Show #User_Show_Subjects #User_Show_Subjects_Actions > td {
padding-top: 4px;
}
Disco.Web/ClientSource/Style/User.less
+12
View File
@@ -103,6 +103,18 @@
div.User_Show_AssignedDevices_CurrentAssignment_Details {
float: left;
}
.User_Show_Assigned_Devices_CurrentAssignment_Flags {
font-size: 16px;
& > i {
cursor: default;
& > .details {
display: none;
}
}
}
}
}
Disco.Web/ClientSource/Style/User.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long