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

Feature #26: User Flags

Browse Source 
Flags can be associated with Users. Includes minor updates to Job Queues
and improved visibility of user information.
This commit is contained in:
Gary Sharp
2014-06-10 17:16:24 +10:00
parent b64ac3b16f
commit 4c3a68da30
104 changed files with 8112 additions and 1623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/ClientSource/Style/BundleSite.css
+22
View File
@@ -4406,6 +4406,16 @@ table.genericData td.id a {
.dataTables_wrapper table > thead tr > th.sorting_disabled {
background-image: none;
}
table.userTable div.flags {
display: inline-block;
float: right;
}
table.userTable div.flags > i {
cursor: default;
}
table.userTable div.flags > i > .details {
display: none;
}
.jobStatus {
color: #333333;
}
@@ -4843,6 +4853,18 @@ div.disco-attachmentUpload-imageDialog {
width: 720px !important;
height: 540px !important;
}
body > .User_FlagAssignment_Tooltip span.name {
display: block;
font-weight: bold;
}
body > .User_FlagAssignment_Tooltip span.comments {
display: block;
padding: 2px 0 2px 4px;
}
body > .User_FlagAssignment_Tooltip span.added {
font-style: italic;
font-size: 0.9em;
}
.d-priority-high {
color: #fa6800;
width: 1.2857142857142858em;
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
+49
View File
@@ -1176,3 +1176,52 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
#Config_JobQueues_Subjects_Update_Dialog #Config_JobQueues_Subjects_Update_Dialog_List li .remove:hover {
opacity: 1;
}
#Config_UserFlags_Index i {
width: 1.2857142857142858em;
text-align: center;
}
#Config_UserFlags_Icon {
display: block;
margin: 0 0 10px 10px;
}
#Config_UserFlags_Icon_Update_Dialog {
display: none;
}
#Config_UserFlags_Icon_Update_Dialog div.colours {
text-align: center;
font-size: 30px;
}
#Config_UserFlags_Icon_Update_Dialog div.colours i {
cursor: pointer;
padding: 1px;
opacity: .9;
}
#Config_UserFlags_Icon_Update_Dialog div.colours i:hover {
opacity: 1;
}
#Config_UserFlags_Icon_Update_Dialog div.colours i.selected {
opacity: 1;
}
#Config_UserFlags_Icon_Update_Dialog div.icons {
text-align: center;
font-size: 34px;
background-color: #ffffff;
border: 1px solid #d1d1d1;
margin: 6px 0 14px 0;
}
#Config_UserFlags_Icon_Update_Dialog div.icons i {
width: 1.2857142857142858em;
text-align: center;
cursor: pointer;
padding: 6px 0px;
color: #333333;
opacity: .6;
}
#Config_UserFlags_Icon_Update_Dialog div.icons i:hover {
opacity: .9;
color: inherit;
}
#Config_UserFlags_Icon_Update_Dialog div.icons i.selected {
opacity: 1;
color: inherit;
}
Disco.Web/ClientSource/Style/Config.less
+62
View File
@@ -1368,3 +1368,65 @@ div.logEventsViewport {
}
}
}
#Config_UserFlags_Index {
i {
width: 1.2857142857142858em;
text-align: center;
}
}
#Config_UserFlags_Icon {
display: block;
margin: 0 0 10px 10px;
}
#Config_UserFlags_Icon_Update_Dialog {
display: none;
div.colours {
text-align: center;
font-size: 30px;
i {
cursor: pointer;
padding: 1px;
opacity: .9;
&:hover {
opacity: 1;
}
&.selected {
opacity: 1;
}
}
}
div.icons {
text-align: center;
font-size: 34px;
background-color: @white;
border: 1px solid @BackgroundColour;
margin: 6px 0 14px 0;
i {
width: 1.2857142857142858em;
text-align: center;
cursor: pointer;
padding: 6px 0px;
color: @HeaderBackgroundColour;
opacity: .6;
&:hover {
opacity: .9;
color: inherit;
}
&.selected {
opacity: 1;
color: inherit;
}
}
}
}
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/Device.css
+9
View File
@@ -129,6 +129,15 @@
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACWUlEQVQ4y6XRXWiSURgHcJsXa4WNNuuyiy6CoAupixERoXXhmljuxaJiFrVA1i72cVFCOSMt8rNt2YfGO5g5Z1NstWW+c4ZBq4QpqMkEbZDSCObAMprjdf90sIjxsgUdODd/zvmd5zwPCwDrf/aGB7q6utgmk8ngdruzVqt10eVyTWu1Wuk/AXK5vMpoNPpjsRgGbU8/9fbdH/J4PAuRSARKpfLKhoBYLG595nTCaDSZVjPp6TPbHQ5H0mAwfBeJRHXrAp0dna9JcqCguX2H/Xd+S625aLFYQBDE8XWBd+8/TI6Njc+vzcfGX4nLX4FOp5OuC0wGAlS53NzaPPAm2Gi32+H3+5tYJEl+pigKoVAIPp+PnpqaosPhMF1uHB2Px2mv14vya6VgMKhhHGN3d/dSMplENptFIpHA3NwcCoUCSqUSKqvScZVKBbPZHGQEFApFMZ1OI5PJIBqNrkD5fB40Ta8AlcrUajVsNpufEbh+42YxHEkh+/UbUqlZpGd/lAH8WTMzMzDd64d7NMAMDOobi/OpHqh6rqK9jcCvBQncQzK0Xm5DPn0BJ4lz6GgVIkedYAaamxqK0dEDePl4FziczehTsZGLs7BnNwdiwRac4lejvp6La83VzABv/8FF/qG9oD/WQS/fhNptHEw8rEJiuAo7ubXACAtH9m0Fu2YHxQzweEuEVIYnaiFmvQ04f1aItksi5KaP4ZFGjDB5GG/7j4LL5YYYgZYW2c/yiJbv6h/A0EvC4RjGiOsFnK4J+KgABmyjsDufL0skki8CgYCoXOLz+TWrwG+kXMkgQ6yv+QAAAABJRU5ErkJggg==) /*Images/Actions/unlocked.png*/;
background-repeat: no-repeat;
}
#Device_Show #Device_Show_Subjects #Device_Show_Details #Device_Show_User #Device_Show_User_Flags {
font-size: 16px;
}
#Device_Show #Device_Show_Subjects #Device_Show_Details #Device_Show_User #Device_Show_User_Flags > i {
cursor: default;
}
#Device_Show #Device_Show_Subjects #Device_Show_Details #Device_Show_User #Device_Show_User_Flags > i > .details {
display: none;
}
#Device_Show #Device_Show_Subjects #Device_Show_Details #Device_Show_GenerateDocument_Container {
padding-top: 4px;
}
Disco.Web/ClientSource/Style/Device.less
+14
View File
@@ -68,6 +68,20 @@
background-repeat: no-repeat;
}
#Device_Show_User {
#Device_Show_User_Flags {
font-size: 16px;
& > i {
cursor: default;
& > .details {
display: none;
}
}
}
}
#Device_Show_GenerateDocument_Container {
padding-top: 4px;
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
+13 -3
View File
@@ -192,6 +192,16 @@
#Job_Show #Job_Show_Subjects #Job_Show_Device #Job_Show_Device_DeviceHeld table > tbody > tr > td:first-child {
width: 62px;
}
#Job_Show #Job_Show_Subjects #Job_Show_User #Job_Show_User_Flags {
margin: 4px 0;
font-size: 16px;
}
#Job_Show #Job_Show_Subjects #Job_Show_User #Job_Show_User_Flags > i {
cursor: default;
}
#Job_Show #Job_Show_Subjects #Job_Show_User #Job_Show_User_Flags > i > .details {
display: none;
}
#Job_Show #Job_Show_Subjects #Job_Show_Subjects_Actions > td {
padding-top: 4px;
}
@@ -524,9 +534,9 @@
margin-top: 4px;
font-size: .9em;
}
#jobDetailTab-Queues #jobQueues td.added .comments,
#jobDetailTab-Queues #jobQueues td.removed .comments {
white-space: pre-line;
#jobDetailTab-Queues #jobQueues td.added .commentsRaw,
#jobDetailTab-Queues #jobQueues td.removed .commentsRaw {
display: none;
}
#jobDetailTab-Queues #jobQueues td.removed.na {
vertical-align: middle;
Disco.Web/ClientSource/Style/Job.less
+17 -4
View File
@@ -149,6 +149,21 @@
}
}
#Job_Show_User {
#Job_Show_User_Flags {
margin: 4px 0;
font-size: 16px;
& > i {
cursor: default;
& > .details {
display: none;
}
}
}
}
#Job_Show_Subjects_Actions {
& > td {
padding-top: 4px;
@@ -161,8 +176,6 @@
}
}
#jobDetailTabs {
margin-top: 10px;
/*.jobPart
@@ -548,8 +561,8 @@
font-size: .9em;
}
.comments {
white-space: pre-line;
.commentsRaw {
display: none;
}
}
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
+22
View File
@@ -745,6 +745,16 @@ table.genericData td.id a {
.dataTables_wrapper table > thead tr > th.sorting_disabled {
background-image: none;
}
table.userTable div.flags {
display: inline-block;
float: right;
}
table.userTable div.flags > i {
cursor: default;
}
table.userTable div.flags > i > .details {
display: none;
}
.jobStatus {
color: #333333;
}
@@ -1182,6 +1192,18 @@ div.disco-attachmentUpload-imageDialog {
width: 720px !important;
height: 540px !important;
}
body > .User_FlagAssignment_Tooltip span.name {
display: block;
font-weight: bold;
}
body > .User_FlagAssignment_Tooltip span.comments {
display: block;
padding: 2px 0 2px 4px;
}
body > .User_FlagAssignment_Tooltip span.added {
font-style: italic;
font-size: 0.9em;
}
.d-priority-high {
color: #fa6800;
width: 1.2857142857142858em;
Disco.Web/ClientSource/Style/Site.less
+32
View File
@@ -702,6 +702,21 @@ table {
}
}
table.userTable {
div.flags {
display: inline-block;
float: right;
& > i {
cursor: default;
& > .details {
display: none;
}
}
}
}
.jobStatus {
color: @StatusUnknown;
@@ -1169,6 +1184,23 @@ div.disco-attachmentUpload-imageDialog {
height: 540px !important;
}
body > .User_FlagAssignment_Tooltip {
span.name {
display: block;
font-weight: bold;
}
span.comments {
display: block;
padding: 2px 0 2px 4px;
}
span.added {
font-style: italic;
font-size: 0.9em;
}
}
// Priority Colours
.d-priority-high {
color: @PriorityHigh;
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
+119
View File
@@ -78,6 +78,18 @@
-moz-opacity: 1;
opacity: 1;
}
#layout_PageHeading #User_Show_Flags {
display: inline-block;
float: right;
height: 50px;
font-size: 0.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;
}
@@ -196,6 +208,113 @@
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: #ffffff;
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: #eeeeee;
}
#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: #ffffff;
}
#UserDetailTab-Flags #userFlags th {
background-color: #eeeeee;
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: #ffffff;
}
#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: #ffffff;
border: 1px solid #cccccc;
Disco.Web/ClientSource/Style/User.less
+150
View File
@@ -1,5 +1,22 @@
@import "Shared";
#layout_PageHeading {
#User_Show_Flags {
display: inline-block;
float: right;
height: 50px;
font-size: 0.6em;
& > i {
cursor: default;
& > .details {
display: none;
}
}
}
}
#User_Show {
#User_Show_Subjects {
table-layout: fixed;
@@ -157,6 +174,139 @@
}
}
#User_Show_Details_Actions_AddFlag_Dialog {
height: 400px;
.flagPicker {
position: absolute;
width: 250px;
height: 300px;
overflow-y: auto;
background-color: #fcfcfc;
border: 1px solid #ccc;
& > div {
background-color: @white;
border-bottom: 1px solid #ddd;
padding: 6px 0 6px 6px;
cursor: pointer;
&:hover {
background-color: @TableDataBorderColour;
}
&.selected, &.selected:hover {
background-color: @TableDataDarkBackgroundColour;
}
}
}
.details {
display: none;
position: absolute;
left: 280px;
top: 1em;
h4 {
margin-bottom: 4px;
}
textarea {
min-width: 280px;
height: 200px;
}
}
}
#UserDetailTab-Flags {
#userFlags {
.tableDataDark;
table-layout: fixed;
i.fa-edit {
position: absolute;
top: 0;
right: 0;
margin-top: 4px;
font-size: 1.1em;
cursor: pointer;
display: none;
color: @HyperLinkColour;
&:hover {
color: @HyperLinkHoverColour;
}
}
td:hover i.fa-edit {
display: inline-block;
}
th.name {
width: 200px;
}
th.added {
}
th.removed {
}
tr.removed td {
background-color: @TableDataBorderColour;
}
td.name {
vertical-align: middle;
.fa-stack {
line-height: 1.6em;
}
}
td.added, td.removed {
vertical-align: middle;
}
td.comments {
vertical-align: middle;
.editable {
position: relative;
}
.commentsRaw {
display: none;
}
}
td.removed {
&.na {
vertical-align: middle;
text-align: center;
}
}
}
& > .none {
text-align: center;
padding: 30px 0;
font-style: italic;
background-color: @white;
}
}
#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: @white;
Disco.Web/ClientSource/Style/User.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long