Feature #49: Active Directory Managed Groups
Document Template Attachments, Device Batches, Device Profiles and User Flags can be associated with an Active Directory group. This AD group is then automatically synchronized with relevant User/Machine accounts. Contains various other UI tweaks and configuration enhancements.
This commit is contained in:
Gary Sharp
@@ -651,9 +651,9 @@ Webcam.init();
|
||||
|
||||
xhr.open("POST", self.uploadUrl, true);
|
||||
xhr.onreadystatechange = function () {
|
||||
if (xhr.readyState === 4 && xhr.status === 200) {
|
||||
if (xhr.readyState === 4) {
|
||||
if (xhr.status !== 200) {
|
||||
alert('Error Uploading [' + fileName + ']: ' + xhr.responseText);
|
||||
alert('Error Uploading [' + fileName + ']: ' + xhr.statusText);
|
||||
}
|
||||
progress.slideUp(400, function () {
|
||||
progress.remove();
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+2
-2
@@ -250,9 +250,9 @@
|
||||
|
||||
xhr.open("POST", self.uploadUrl, true);
|
||||
xhr.onreadystatechange = function () {
|
||||
if (xhr.readyState === 4 && xhr.status === 200) {
|
||||
if (xhr.readyState === 4) {
|
||||
if (xhr.status !== 200) {
|
||||
alert('Error Uploading [' + fileName + ']: ' + xhr.responseText);
|
||||
alert('Error Uploading [' + fileName + ']: ' + xhr.statusText);
|
||||
}
|
||||
progress.slideUp(400, function () {
|
||||
progress.remove();
|
||||
|
||||
@@ -2095,6 +2095,13 @@ input:-moz-placeholder {
|
||||
font-weight: bold;
|
||||
}*/
|
||||
.ui-dialog {
|
||||
position: fixed;
|
||||
overflow: visible;
|
||||
padding: 0;
|
||||
border-color: #333333;
|
||||
background: #fcfcfc;
|
||||
box-shadow: rgba(20, 20, 20, 0.7) 0px 0px 50px;
|
||||
top: 50px !important;
|
||||
animation-name: ui-dialog-show;
|
||||
-webkit-animation-name: ui-dialog-show;
|
||||
animation-duration: .2s;
|
||||
@@ -2102,6 +2109,18 @@ input:-moz-placeholder {
|
||||
animation-timing-function: ease-in-out;
|
||||
-webkit-animation-timing-function: ease-in-out;
|
||||
}
|
||||
.ui-dialog .ui-widget-header {
|
||||
border-top: none;
|
||||
border-left: none;
|
||||
border-right: none;
|
||||
border-bottom-color: #d1d1d1;
|
||||
background: #333333;
|
||||
color: #fff;
|
||||
font-size: 1.1em;
|
||||
font-weight: normal;
|
||||
text-transform: uppercase;
|
||||
padding: .6em 1em;
|
||||
}
|
||||
@keyframes ui-dialog-show {
|
||||
0% {
|
||||
transform: translateY(-30px);
|
||||
@@ -2149,25 +2168,6 @@ input:-moz-placeholder {
|
||||
.page .dialog {
|
||||
display: none;
|
||||
}
|
||||
.ui-dialog {
|
||||
padding: 0;
|
||||
border-color: #333333;
|
||||
background: #fcfcfc;
|
||||
box-shadow: rgba(20, 20, 20, 0.7) 0px 0px 50px;
|
||||
top: 50px !important;
|
||||
}
|
||||
.ui-dialog .ui-widget-header {
|
||||
border-top: none;
|
||||
border-left: none;
|
||||
border-right: none;
|
||||
border-bottom-color: #d1d1d1;
|
||||
background: #333333;
|
||||
color: #fff;
|
||||
font-size: 1.1em;
|
||||
font-weight: normal;
|
||||
text-transform: uppercase;
|
||||
padding: .6em 1em;
|
||||
}
|
||||
body .ui-tooltip {
|
||||
border-width: 1px;
|
||||
-webkit-box-shadow: none;
|
||||
@@ -4111,7 +4111,7 @@ a.button {
|
||||
border: 1px solid #1a5f95;
|
||||
background: #1e6dab;
|
||||
color: #ffffff;
|
||||
font-weight: bold;
|
||||
font-weight: 600;
|
||||
text-transform: uppercase;
|
||||
cursor: pointer;
|
||||
white-space: nowrap;
|
||||
@@ -4753,6 +4753,43 @@ div.form > table table.sub > tbody > tr > th.name {
|
||||
border-right: none;
|
||||
padding-right: 0;
|
||||
}
|
||||
div.infoBox {
|
||||
margin: 0.4em 0;
|
||||
padding: 0.4em;
|
||||
border: 1px solid #fff397;
|
||||
background-color: #fffef7;
|
||||
}
|
||||
div.infoBox i {
|
||||
color: #1e6dab;
|
||||
}
|
||||
div.infoBox.alert {
|
||||
border: 1px solid #fa6800;
|
||||
background-color: #fff9f5;
|
||||
color: #333333;
|
||||
}
|
||||
div.infoBox.alert i {
|
||||
color: #fa6800;
|
||||
}
|
||||
div.infoBox.error {
|
||||
border: 1px solid #e51400;
|
||||
background-color: #fffaf9;
|
||||
color: #e51400;
|
||||
}
|
||||
div.infoBox.error i {
|
||||
color: #e51400;
|
||||
}
|
||||
div.infoBox p {
|
||||
line-height: 1.2em;
|
||||
}
|
||||
p.fa-p {
|
||||
text-indent: -1.48em;
|
||||
margin-left: 1.48em;
|
||||
}
|
||||
p.fa-p > i:first-child {
|
||||
text-indent: 0;
|
||||
width: 1.28em;
|
||||
margin-right: 0.2em;
|
||||
}
|
||||
div.disco-attachmentUpload-dropTarget {
|
||||
display: none;
|
||||
}
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
@@ -102,6 +102,23 @@
|
||||
font-size: 12px;
|
||||
margin-top: 8px;
|
||||
}
|
||||
.Config_HideAdvanced .Config_HideAdvanced_Item {
|
||||
display: none;
|
||||
}
|
||||
.Config_LinkedGroup_Instance {
|
||||
margin: 4px 0 8px 4px;
|
||||
padding: 4px 0 4px 6px;
|
||||
border-left: 4px solid #cccccc;
|
||||
}
|
||||
.Config_LinkedGroup_Instance div.code {
|
||||
margin-left: 2px;
|
||||
}
|
||||
#Config_LinkedGroup_Dialog h3 {
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
#Config_LinkedGroup_Dialog div.input {
|
||||
margin-top: 12px;
|
||||
}
|
||||
#expressionEditor #expressionEditorExceptionContainer {
|
||||
display: none;
|
||||
border: 1px dashed #FF9696;
|
||||
@@ -601,6 +618,21 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
|
||||
padding: 2px;
|
||||
height: 430px;
|
||||
}
|
||||
#Config_DocumentTemplates_Show > div.form > table > tbody > tr > th {
|
||||
width: 140px;
|
||||
}
|
||||
#Config_DocumentTemplates_Show #Config_DocumentTemplates_Scope_Button {
|
||||
margin-top: 4px;
|
||||
}
|
||||
#Config_DocumentTemplates_Scope_Dialog div.input {
|
||||
margin: 14px 10px 20px;
|
||||
}
|
||||
#Config_DocumentTemplates_TemplatePdf_Dialog div {
|
||||
text-align: center;
|
||||
}
|
||||
#Config_DocumentTemplates_TemplatePdf_Dialog div input {
|
||||
margin: 16px 0;
|
||||
}
|
||||
#Config_DocumentTemplates_JobSubTypes {
|
||||
border: 1px dashed #d8d8d8;
|
||||
background-color: #ffffff;
|
||||
|
||||
@@ -27,6 +27,32 @@
|
||||
}
|
||||
}
|
||||
|
||||
.Config_HideAdvanced {
|
||||
.Config_HideAdvanced_Item {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.Config_LinkedGroup_Instance {
|
||||
margin: 4px 0 8px 4px;
|
||||
padding: 4px 0 4px 6px;
|
||||
border-left: 4px solid @SubtleBorderColour;
|
||||
|
||||
div.code {
|
||||
margin-left: 2px;
|
||||
}
|
||||
}
|
||||
|
||||
#Config_LinkedGroup_Dialog {
|
||||
h3 {
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
|
||||
div.input {
|
||||
margin-top: 12px;
|
||||
}
|
||||
}
|
||||
|
||||
#expressionEditor {
|
||||
#expressionEditorExceptionContainer {
|
||||
display: none;
|
||||
@@ -624,6 +650,31 @@ div.logEventsViewport {
|
||||
}
|
||||
|
||||
// Document Templates
|
||||
#Config_DocumentTemplates_Show {
|
||||
& > div.form > table > tbody > tr > th {
|
||||
width: 140px;
|
||||
}
|
||||
|
||||
#Config_DocumentTemplates_Scope_Button {
|
||||
margin-top: 4px;
|
||||
}
|
||||
}
|
||||
#Config_DocumentTemplates_Scope_Dialog {
|
||||
div.input {
|
||||
margin: 14px 10px 20px;
|
||||
}
|
||||
}
|
||||
#Config_DocumentTemplates_TemplatePdf_Dialog {
|
||||
div {
|
||||
text-align: center;
|
||||
|
||||
input {
|
||||
margin: 16px 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#Config_DocumentTemplates_JobSubTypes {
|
||||
border: 1px dashed @TableDataDarkBorderColour;
|
||||
background-color: @white;
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
@@ -46,6 +46,7 @@
|
||||
@StatusUnknown: @HeaderBackgroundColour;
|
||||
@StatusSuccess: @ThemeGreen;
|
||||
@StatusInformation: @ButtonColour;
|
||||
@StatusHighlight: @ThemeYellow;
|
||||
@StatusWarning: @ThemeAmber;
|
||||
@StatusAlert: @ThemeOrange;
|
||||
@StatusError: @ButtonAlertColour;
|
||||
|
||||
@@ -450,7 +450,7 @@ a.button {
|
||||
border: 1px solid #1a5f95;
|
||||
background: #1e6dab;
|
||||
color: #ffffff;
|
||||
font-weight: bold;
|
||||
font-weight: 600;
|
||||
text-transform: uppercase;
|
||||
cursor: pointer;
|
||||
white-space: nowrap;
|
||||
@@ -1092,6 +1092,43 @@ div.form > table table.sub > tbody > tr > th.name {
|
||||
border-right: none;
|
||||
padding-right: 0;
|
||||
}
|
||||
div.infoBox {
|
||||
margin: 0.4em 0;
|
||||
padding: 0.4em;
|
||||
border: 1px solid #fff397;
|
||||
background-color: #fffef7;
|
||||
}
|
||||
div.infoBox i {
|
||||
color: #1e6dab;
|
||||
}
|
||||
div.infoBox.alert {
|
||||
border: 1px solid #fa6800;
|
||||
background-color: #fff9f5;
|
||||
color: #333333;
|
||||
}
|
||||
div.infoBox.alert i {
|
||||
color: #fa6800;
|
||||
}
|
||||
div.infoBox.error {
|
||||
border: 1px solid #e51400;
|
||||
background-color: #fffaf9;
|
||||
color: #e51400;
|
||||
}
|
||||
div.infoBox.error i {
|
||||
color: #e51400;
|
||||
}
|
||||
div.infoBox p {
|
||||
line-height: 1.2em;
|
||||
}
|
||||
p.fa-p {
|
||||
text-indent: -1.48em;
|
||||
margin-left: 1.48em;
|
||||
}
|
||||
p.fa-p > i:first-child {
|
||||
text-indent: 0;
|
||||
width: 1.28em;
|
||||
margin-right: 0.2em;
|
||||
}
|
||||
div.disco-attachmentUpload-dropTarget {
|
||||
display: none;
|
||||
}
|
||||
|
||||
@@ -396,7 +396,7 @@ a {
|
||||
border: 1px solid @ButtonBorderColour;
|
||||
background: @ButtonColour;
|
||||
color: @white;
|
||||
font-weight: bold;
|
||||
font-weight: 600;
|
||||
text-transform: uppercase;
|
||||
cursor: pointer;
|
||||
white-space: nowrap;
|
||||
@@ -1090,6 +1090,52 @@ div.form {
|
||||
}
|
||||
}
|
||||
|
||||
div.infoBox {
|
||||
margin: 0.4em 0;
|
||||
padding: 0.4em;
|
||||
border: 1px solid lighten(@StatusHighlight, 35%);
|
||||
background-color: lighten(@StatusHighlight, 54%);
|
||||
|
||||
i {
|
||||
color: @StatusInformation;
|
||||
}
|
||||
|
||||
&.alert {
|
||||
border: 1px solid @StatusAlert;
|
||||
background-color: lighten(@StatusAlert, 49%);
|
||||
color: @FontBodyColour;
|
||||
|
||||
i {
|
||||
color: @StatusAlert;
|
||||
}
|
||||
}
|
||||
|
||||
&.error {
|
||||
border: 1px solid @StatusError;
|
||||
background-color: lighten(@StatusError, 54%);
|
||||
color: @StatusError;
|
||||
|
||||
i {
|
||||
color: @StatusError;
|
||||
}
|
||||
}
|
||||
|
||||
p {
|
||||
line-height: 1.2em;
|
||||
}
|
||||
}
|
||||
|
||||
p.fa-p {
|
||||
text-indent: -1.48em;
|
||||
margin-left: 1.48em;
|
||||
|
||||
& > i:first-child {
|
||||
text-indent: 0;
|
||||
width: 1.28em;
|
||||
margin-right: 0.2em;
|
||||
}
|
||||
}
|
||||
|
||||
// Attachment Uploader
|
||||
div.disco-attachmentUpload-dropTarget {
|
||||
display: none;
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
@@ -240,6 +240,13 @@ input:-moz-placeholder {
|
||||
font-weight: bold;
|
||||
}*/
|
||||
.ui-dialog {
|
||||
position: fixed;
|
||||
overflow: visible;
|
||||
padding: 0;
|
||||
border-color: #333333;
|
||||
background: #fcfcfc;
|
||||
box-shadow: rgba(20, 20, 20, 0.7) 0px 0px 50px;
|
||||
top: 50px !important;
|
||||
animation-name: ui-dialog-show;
|
||||
-webkit-animation-name: ui-dialog-show;
|
||||
animation-duration: .2s;
|
||||
@@ -247,6 +254,18 @@ input:-moz-placeholder {
|
||||
animation-timing-function: ease-in-out;
|
||||
-webkit-animation-timing-function: ease-in-out;
|
||||
}
|
||||
.ui-dialog .ui-widget-header {
|
||||
border-top: none;
|
||||
border-left: none;
|
||||
border-right: none;
|
||||
border-bottom-color: #d1d1d1;
|
||||
background: #333333;
|
||||
color: #fff;
|
||||
font-size: 1.1em;
|
||||
font-weight: normal;
|
||||
text-transform: uppercase;
|
||||
padding: .6em 1em;
|
||||
}
|
||||
@keyframes ui-dialog-show {
|
||||
0% {
|
||||
transform: translateY(-30px);
|
||||
@@ -294,25 +313,6 @@ input:-moz-placeholder {
|
||||
.page .dialog {
|
||||
display: none;
|
||||
}
|
||||
.ui-dialog {
|
||||
padding: 0;
|
||||
border-color: #333333;
|
||||
background: #fcfcfc;
|
||||
box-shadow: rgba(20, 20, 20, 0.7) 0px 0px 50px;
|
||||
top: 50px !important;
|
||||
}
|
||||
.ui-dialog .ui-widget-header {
|
||||
border-top: none;
|
||||
border-left: none;
|
||||
border-right: none;
|
||||
border-bottom-color: #d1d1d1;
|
||||
background: #333333;
|
||||
color: #fff;
|
||||
font-size: 1.1em;
|
||||
font-weight: normal;
|
||||
text-transform: uppercase;
|
||||
padding: .6em 1em;
|
||||
}
|
||||
body .ui-tooltip {
|
||||
border-width: 1px;
|
||||
-webkit-box-shadow: none;
|
||||
|
||||
@@ -2,43 +2,49 @@
|
||||
|
||||
// Theme Changes
|
||||
.ui-widget {
|
||||
font-family: @FontFamilyBody;
|
||||
font-size: 1em;
|
||||
}
|
||||
.ui-widget input,
|
||||
.ui-widget select,
|
||||
.ui-widget textarea,
|
||||
.ui-widget button {
|
||||
font-family: @FontFamilyBody;
|
||||
font-family: @FontFamilyBody;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
.ui-widget input,
|
||||
.ui-widget select,
|
||||
.ui-widget textarea,
|
||||
.ui-widget button {
|
||||
font-family: @FontFamilyBody;
|
||||
}
|
||||
|
||||
.ui-corner-all,
|
||||
.ui-corner-top,
|
||||
.ui-corner-left,
|
||||
.ui-corner-tl {
|
||||
border-top-left-radius: 0;
|
||||
border-top-left-radius: 0;
|
||||
}
|
||||
|
||||
.ui-corner-all,
|
||||
.ui-corner-top,
|
||||
.ui-corner-right,
|
||||
.ui-corner-tr {
|
||||
border-top-right-radius: 0;
|
||||
border-top-right-radius: 0;
|
||||
}
|
||||
|
||||
.ui-corner-all,
|
||||
.ui-corner-bottom,
|
||||
.ui-corner-left,
|
||||
.ui-corner-bl {
|
||||
border-bottom-left-radius: 0;
|
||||
border-bottom-left-radius: 0;
|
||||
}
|
||||
|
||||
.ui-corner-all,
|
||||
.ui-corner-bottom,
|
||||
.ui-corner-right,
|
||||
.ui-corner-br {
|
||||
border-bottom-right-radius: 0;
|
||||
border-bottom-right-radius: 0;
|
||||
}
|
||||
|
||||
.ui-widget-overlay {
|
||||
background: #666666;
|
||||
opacity: .5;
|
||||
filter: Alpha(Opacity=50);
|
||||
background: #666666;
|
||||
opacity: .5;
|
||||
filter: Alpha(Opacity=50);
|
||||
}
|
||||
|
||||
// Watermark
|
||||
@@ -197,12 +203,32 @@ input:-moz-placeholder {
|
||||
// Dialogs
|
||||
|
||||
.ui-dialog {
|
||||
position: fixed;
|
||||
overflow: visible;
|
||||
padding: 0;
|
||||
border-color: @HeaderBackgroundColour;
|
||||
background: #fcfcfc;
|
||||
box-shadow: rgba(20,20,20,.7) 0px 0px 50px;
|
||||
top: 50px !important;
|
||||
animation-name: ui-dialog-show;
|
||||
-webkit-animation-name: ui-dialog-show;
|
||||
animation-duration: .2s;
|
||||
-webkit-animation-duration: .2s;
|
||||
animation-timing-function: ease-in-out;
|
||||
-webkit-animation-timing-function: ease-in-out;
|
||||
|
||||
.ui-widget-header {
|
||||
border-top: none;
|
||||
border-left: none;
|
||||
border-right: none;
|
||||
border-bottom-color: @BackgroundColour;
|
||||
background: @HeaderBackgroundColour;
|
||||
color: #fff;
|
||||
font-size: 1.1em;
|
||||
font-weight: normal;
|
||||
text-transform: uppercase;
|
||||
padding: .6em 1em;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes ui-dialog-show {
|
||||
@@ -264,27 +290,6 @@ input:-moz-placeholder {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.ui-dialog {
|
||||
padding: 0;
|
||||
border-color: @HeaderBackgroundColour;
|
||||
background: #fcfcfc;
|
||||
box-shadow: rgba(20,20,20,.7) 0px 0px 50px;
|
||||
top: 50px !important;
|
||||
}
|
||||
|
||||
.ui-dialog .ui-widget-header {
|
||||
border-top: none;
|
||||
border-left: none;
|
||||
border-right: none;
|
||||
border-bottom-color: @BackgroundColour;
|
||||
background: @HeaderBackgroundColour;
|
||||
color: #fff;
|
||||
font-size: 1.1em;
|
||||
font-weight: normal;
|
||||
text-transform: uppercase;
|
||||
padding: .6em 1em;
|
||||
}
|
||||
|
||||
// Tooltip
|
||||
body .ui-tooltip {
|
||||
border-width: 1px;
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user