Feature #33: Enhanced Device Importing
Dynamic device importing. better input parsing and 5 additional import fields.
This commit is contained in:
Gary Sharp
@@ -1838,15 +1838,15 @@ body .ui-tooltip {
|
||||
border-radius: 8px;
|
||||
}
|
||||
/*!
|
||||
* Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome
|
||||
* Font Awesome 4.1.0 by @davegandy - http://fontawesome.io - @fontawesome
|
||||
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
|
||||
*/
|
||||
/* FONT PATH
|
||||
* -------------------------- */
|
||||
@font-face {
|
||||
font-family: 'FontAwesome';
|
||||
src: url('/ClientSource/Style/FontAwesome/fontawesome-webfont.eot?v=4.0.3');
|
||||
src: url('/ClientSource/Style/FontAwesome/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'), url('/ClientSource/Style/FontAwesome/fontawesome-webfont.woff?v=4.0.3') format('woff'), url('/ClientSource/Style/FontAwesome/fontawesome-webfont.ttf?v=4.0.3') format('truetype'), url('/ClientSource/Style/FontAwesome/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');
|
||||
src: url('/ClientSource/Style/FontAwesome//fontawesome-webfont.eot?v=4.1.0');
|
||||
src: url('/ClientSource/Style/FontAwesome//fontawesome-webfont.eot?#iefix&v=4.1.0') format('embedded-opentype'), url('/ClientSource/Style/FontAwesome//fontawesome-webfont.woff?v=4.1.0') format('woff'), url('/ClientSource/Style/FontAwesome//fontawesome-webfont.ttf?v=4.1.0') format('truetype'), url('/ClientSource/Style/FontAwesome//fontawesome-webfont.svg?v=4.1.0#fontawesomeregular') format('svg');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
}
|
||||
@@ -1861,7 +1861,7 @@ body .ui-tooltip {
|
||||
}
|
||||
/* makes the font 33% larger relative to the icon container */
|
||||
.fa-lg {
|
||||
font-size: 1.3333333333333333em;
|
||||
font-size: 1.33333333em;
|
||||
line-height: 0.75em;
|
||||
vertical-align: -15%;
|
||||
}
|
||||
@@ -1878,12 +1878,12 @@ body .ui-tooltip {
|
||||
font-size: 5em;
|
||||
}
|
||||
.fa-fw {
|
||||
width: 1.2857142857142858em;
|
||||
width: 1.28571429em;
|
||||
text-align: center;
|
||||
}
|
||||
.fa-ul {
|
||||
padding-left: 0;
|
||||
margin-left: 2.142857142857143em;
|
||||
margin-left: 2.14285714em;
|
||||
list-style-type: none;
|
||||
}
|
||||
.fa-ul > li {
|
||||
@@ -1892,8 +1892,8 @@ body .ui-tooltip {
|
||||
.fa-li {
|
||||
position: absolute;
|
||||
left: -2.14285714em;
|
||||
width: 2.142857142857143em;
|
||||
top: 0.14285714285714285em;
|
||||
width: 2.14285714em;
|
||||
top: 0.14285714em;
|
||||
text-align: center;
|
||||
}
|
||||
.fa-li.fa-lg {
|
||||
@@ -1946,19 +1946,13 @@ body .ui-tooltip {
|
||||
-o-transform: rotate(359deg);
|
||||
}
|
||||
}
|
||||
@-ms-keyframes spin {
|
||||
0% {
|
||||
-ms-transform: rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
-ms-transform: rotate(359deg);
|
||||
}
|
||||
}
|
||||
@keyframes spin {
|
||||
0% {
|
||||
-webkit-transform: rotate(0deg);
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
-webkit-transform: rotate(359deg);
|
||||
transform: rotate(359deg);
|
||||
}
|
||||
}
|
||||
@@ -2208,6 +2202,8 @@ body .ui-tooltip {
|
||||
.fa-video-camera:before {
|
||||
content: "\f03d";
|
||||
}
|
||||
.fa-photo:before,
|
||||
.fa-image:before,
|
||||
.fa-picture-o:before {
|
||||
content: "\f03e";
|
||||
}
|
||||
@@ -2571,6 +2567,8 @@ body .ui-tooltip {
|
||||
.fa-square:before {
|
||||
content: "\f0c8";
|
||||
}
|
||||
.fa-navicon:before,
|
||||
.fa-reorder:before,
|
||||
.fa-bars:before {
|
||||
content: "\f0c9";
|
||||
}
|
||||
@@ -2630,11 +2628,11 @@ body .ui-tooltip {
|
||||
content: "\f0dc";
|
||||
}
|
||||
.fa-sort-down:before,
|
||||
.fa-sort-asc:before {
|
||||
.fa-sort-desc:before {
|
||||
content: "\f0dd";
|
||||
}
|
||||
.fa-sort-up:before,
|
||||
.fa-sort-desc:before {
|
||||
.fa-sort-asc:before {
|
||||
content: "\f0de";
|
||||
}
|
||||
.fa-envelope:before {
|
||||
@@ -2824,12 +2822,10 @@ body .ui-tooltip {
|
||||
.fa-code:before {
|
||||
content: "\f121";
|
||||
}
|
||||
.fa-mail-reply-all:before,
|
||||
.fa-reply-all:before {
|
||||
content: "\f122";
|
||||
}
|
||||
.fa-mail-reply-all:before {
|
||||
content: "\f122";
|
||||
}
|
||||
.fa-star-half-empty:before,
|
||||
.fa-star-half-full:before,
|
||||
.fa-star-half-o:before {
|
||||
@@ -3175,6 +3171,238 @@ body .ui-tooltip {
|
||||
.fa-plus-square-o:before {
|
||||
content: "\f196";
|
||||
}
|
||||
.fa-space-shuttle:before {
|
||||
content: "\f197";
|
||||
}
|
||||
.fa-slack:before {
|
||||
content: "\f198";
|
||||
}
|
||||
.fa-envelope-square:before {
|
||||
content: "\f199";
|
||||
}
|
||||
.fa-wordpress:before {
|
||||
content: "\f19a";
|
||||
}
|
||||
.fa-openid:before {
|
||||
content: "\f19b";
|
||||
}
|
||||
.fa-institution:before,
|
||||
.fa-bank:before,
|
||||
.fa-university:before {
|
||||
content: "\f19c";
|
||||
}
|
||||
.fa-mortar-board:before,
|
||||
.fa-graduation-cap:before {
|
||||
content: "\f19d";
|
||||
}
|
||||
.fa-yahoo:before {
|
||||
content: "\f19e";
|
||||
}
|
||||
.fa-google:before {
|
||||
content: "\f1a0";
|
||||
}
|
||||
.fa-reddit:before {
|
||||
content: "\f1a1";
|
||||
}
|
||||
.fa-reddit-square:before {
|
||||
content: "\f1a2";
|
||||
}
|
||||
.fa-stumbleupon-circle:before {
|
||||
content: "\f1a3";
|
||||
}
|
||||
.fa-stumbleupon:before {
|
||||
content: "\f1a4";
|
||||
}
|
||||
.fa-delicious:before {
|
||||
content: "\f1a5";
|
||||
}
|
||||
.fa-digg:before {
|
||||
content: "\f1a6";
|
||||
}
|
||||
.fa-pied-piper-square:before,
|
||||
.fa-pied-piper:before {
|
||||
content: "\f1a7";
|
||||
}
|
||||
.fa-pied-piper-alt:before {
|
||||
content: "\f1a8";
|
||||
}
|
||||
.fa-drupal:before {
|
||||
content: "\f1a9";
|
||||
}
|
||||
.fa-joomla:before {
|
||||
content: "\f1aa";
|
||||
}
|
||||
.fa-language:before {
|
||||
content: "\f1ab";
|
||||
}
|
||||
.fa-fax:before {
|
||||
content: "\f1ac";
|
||||
}
|
||||
.fa-building:before {
|
||||
content: "\f1ad";
|
||||
}
|
||||
.fa-child:before {
|
||||
content: "\f1ae";
|
||||
}
|
||||
.fa-paw:before {
|
||||
content: "\f1b0";
|
||||
}
|
||||
.fa-spoon:before {
|
||||
content: "\f1b1";
|
||||
}
|
||||
.fa-cube:before {
|
||||
content: "\f1b2";
|
||||
}
|
||||
.fa-cubes:before {
|
||||
content: "\f1b3";
|
||||
}
|
||||
.fa-behance:before {
|
||||
content: "\f1b4";
|
||||
}
|
||||
.fa-behance-square:before {
|
||||
content: "\f1b5";
|
||||
}
|
||||
.fa-steam:before {
|
||||
content: "\f1b6";
|
||||
}
|
||||
.fa-steam-square:before {
|
||||
content: "\f1b7";
|
||||
}
|
||||
.fa-recycle:before {
|
||||
content: "\f1b8";
|
||||
}
|
||||
.fa-automobile:before,
|
||||
.fa-car:before {
|
||||
content: "\f1b9";
|
||||
}
|
||||
.fa-cab:before,
|
||||
.fa-taxi:before {
|
||||
content: "\f1ba";
|
||||
}
|
||||
.fa-tree:before {
|
||||
content: "\f1bb";
|
||||
}
|
||||
.fa-spotify:before {
|
||||
content: "\f1bc";
|
||||
}
|
||||
.fa-deviantart:before {
|
||||
content: "\f1bd";
|
||||
}
|
||||
.fa-soundcloud:before {
|
||||
content: "\f1be";
|
||||
}
|
||||
.fa-database:before {
|
||||
content: "\f1c0";
|
||||
}
|
||||
.fa-file-pdf-o:before {
|
||||
content: "\f1c1";
|
||||
}
|
||||
.fa-file-word-o:before {
|
||||
content: "\f1c2";
|
||||
}
|
||||
.fa-file-excel-o:before {
|
||||
content: "\f1c3";
|
||||
}
|
||||
.fa-file-powerpoint-o:before {
|
||||
content: "\f1c4";
|
||||
}
|
||||
.fa-file-photo-o:before,
|
||||
.fa-file-picture-o:before,
|
||||
.fa-file-image-o:before {
|
||||
content: "\f1c5";
|
||||
}
|
||||
.fa-file-zip-o:before,
|
||||
.fa-file-archive-o:before {
|
||||
content: "\f1c6";
|
||||
}
|
||||
.fa-file-sound-o:before,
|
||||
.fa-file-audio-o:before {
|
||||
content: "\f1c7";
|
||||
}
|
||||
.fa-file-movie-o:before,
|
||||
.fa-file-video-o:before {
|
||||
content: "\f1c8";
|
||||
}
|
||||
.fa-file-code-o:before {
|
||||
content: "\f1c9";
|
||||
}
|
||||
.fa-vine:before {
|
||||
content: "\f1ca";
|
||||
}
|
||||
.fa-codepen:before {
|
||||
content: "\f1cb";
|
||||
}
|
||||
.fa-jsfiddle:before {
|
||||
content: "\f1cc";
|
||||
}
|
||||
.fa-life-bouy:before,
|
||||
.fa-life-saver:before,
|
||||
.fa-support:before,
|
||||
.fa-life-ring:before {
|
||||
content: "\f1cd";
|
||||
}
|
||||
.fa-circle-o-notch:before {
|
||||
content: "\f1ce";
|
||||
}
|
||||
.fa-ra:before,
|
||||
.fa-rebel:before {
|
||||
content: "\f1d0";
|
||||
}
|
||||
.fa-ge:before,
|
||||
.fa-empire:before {
|
||||
content: "\f1d1";
|
||||
}
|
||||
.fa-git-square:before {
|
||||
content: "\f1d2";
|
||||
}
|
||||
.fa-git:before {
|
||||
content: "\f1d3";
|
||||
}
|
||||
.fa-hacker-news:before {
|
||||
content: "\f1d4";
|
||||
}
|
||||
.fa-tencent-weibo:before {
|
||||
content: "\f1d5";
|
||||
}
|
||||
.fa-qq:before {
|
||||
content: "\f1d6";
|
||||
}
|
||||
.fa-wechat:before,
|
||||
.fa-weixin:before {
|
||||
content: "\f1d7";
|
||||
}
|
||||
.fa-send:before,
|
||||
.fa-paper-plane:before {
|
||||
content: "\f1d8";
|
||||
}
|
||||
.fa-send-o:before,
|
||||
.fa-paper-plane-o:before {
|
||||
content: "\f1d9";
|
||||
}
|
||||
.fa-history:before {
|
||||
content: "\f1da";
|
||||
}
|
||||
.fa-circle-thin:before {
|
||||
content: "\f1db";
|
||||
}
|
||||
.fa-header:before {
|
||||
content: "\f1dc";
|
||||
}
|
||||
.fa-paragraph:before {
|
||||
content: "\f1dd";
|
||||
}
|
||||
.fa-sliders:before {
|
||||
content: "\f1de";
|
||||
}
|
||||
.fa-share-alt:before {
|
||||
content: "\f1e0";
|
||||
}
|
||||
.fa-share-alt-square:before {
|
||||
content: "\f1e1";
|
||||
}
|
||||
.fa-bomb:before {
|
||||
content: "\f1e2";
|
||||
}
|
||||
.tableData {
|
||||
border: solid 1px #f4f4f4;
|
||||
border-collapse: collapse;
|
||||
@@ -4692,3 +4920,8 @@ input:-moz-placeholder {
|
||||
text-transform: uppercase;
|
||||
padding: .6em 1em;
|
||||
}
|
||||
body .ui-tooltip {
|
||||
border-width: 1px;
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
@@ -373,95 +373,172 @@
|
||||
margin-right: 10px;
|
||||
color: #1e6dab;
|
||||
}
|
||||
#deviceImport #ImportFile {
|
||||
width: 100%;
|
||||
#Devices_Import #ImportFile {
|
||||
width: 96%;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
#deviceImport #documentation {
|
||||
#Devices_Import #Devices_Import_Documentation {
|
||||
width: 700px;
|
||||
margin: 20px auto;
|
||||
}
|
||||
#deviceImport #documentation > table > thead > tr > th:first-child {
|
||||
width: 100px;
|
||||
#Devices_Import #Devices_Import_Documentation > table > tbody th:first-child {
|
||||
width: 220px;
|
||||
}
|
||||
#deviceImportReview #errorMessage {
|
||||
font-weight: bold;
|
||||
color: red;
|
||||
#Devices_Import_Completed_Dialog {
|
||||
padding: 50px 0;
|
||||
text-align: center;
|
||||
}
|
||||
#deviceImportReview #devicesNavigation {
|
||||
#Devices_Import_Completed_Dialog h3 {
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
#Devices_Import_Completed_Dialog i {
|
||||
margin-right: 10px;
|
||||
color: #60a917;
|
||||
}
|
||||
#Devices_Import_Loading_Dialog {
|
||||
padding-top: 50px;
|
||||
text-align: center;
|
||||
}
|
||||
#Devices_Import_Loading_Dialog i {
|
||||
margin-right: 10px;
|
||||
color: #1e6dab;
|
||||
}
|
||||
#Devices_Import_Headers #Devices_Import_Headers_TableContainer {
|
||||
margin: 18px 0;
|
||||
overflow-x: auto;
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
#Devices_Import_Headers #Devices_Import_Headers_TableContainer table > thead {
|
||||
white-space: nowrap;
|
||||
}
|
||||
#Devices_Import_Headers #Devices_Import_Headers_TableContainer table > thead ul.importHeaderType > li > a > span:not(.ui-menu-icon) {
|
||||
padding-right: 16px;
|
||||
}
|
||||
#Devices_Import_Headers #Devices_Import_Headers_TableContainer table > thead ul.importHeaderType ul {
|
||||
z-index: 1000;
|
||||
}
|
||||
#Devices_Import_Headers #Devices_Import_Headers_TableContainer table > thead td.headerIgnoreColumn {
|
||||
background-color: #fa6800;
|
||||
}
|
||||
#Devices_Import_Headers #Devices_Import_Headers_TableContainer table > thead td:not(.headerIgnoreColumn) {
|
||||
background-color: #1e6dab;
|
||||
}
|
||||
#Devices_Import_Headers #Devices_Import_Headers_TableContainer table > tbody td.headerDeviceSerialNumber {
|
||||
border-top-color: #d1e6f7;
|
||||
border-bottom-color: #d1e6f7;
|
||||
background-color: #e2f0fa;
|
||||
}
|
||||
#Devices_Import_Headers #Devices_Import_Headers_TableContainer table > tbody td.headerIgnoreColumn {
|
||||
max-width: 150px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
-ms-text-overflow: ellipsis;
|
||||
-o-text-overflow: ellipsis;
|
||||
text-overflow: ellipsis;
|
||||
color: #cccccc;
|
||||
}
|
||||
#Devices_Import_Parsing_Dialog {
|
||||
padding-top: 50px;
|
||||
text-align: center;
|
||||
}
|
||||
#Devices_Import_Parsing_Dialog i {
|
||||
margin-right: 10px;
|
||||
color: #1e6dab;
|
||||
}
|
||||
#Devices_Import_Review #Devices_Import_Review_Navigation {
|
||||
margin-top: 15px;
|
||||
text-align: right;
|
||||
}
|
||||
#deviceImportReview #devicesNavigation ul {
|
||||
#Devices_Import_Review #Devices_Import_Review_Navigation ul {
|
||||
display: inline-block;
|
||||
padding: 1px;
|
||||
padding: 0px;
|
||||
border: 1px solid #bbb;
|
||||
}
|
||||
#deviceImportReview #devicesNavigation ul li {
|
||||
#Devices_Import_Review #Devices_Import_Review_Navigation ul li {
|
||||
display: inline-block;
|
||||
padding: 1px 6px;
|
||||
padding: 3px 10px;
|
||||
margin: 0;
|
||||
}
|
||||
#deviceImportReview #devicesNavigation ul li.statusError {
|
||||
background-color: #ffd3d3;
|
||||
#Devices_Import_Review #Devices_Import_Review_Navigation ul li.actionDetached {
|
||||
background-color: #ffd0cc;
|
||||
}
|
||||
#deviceImportReview #devicesNavigation ul li.statusUpdate {
|
||||
background-color: #d3f3ff;
|
||||
#Devices_Import_Review #Devices_Import_Review_Navigation ul li.actionModified {
|
||||
background-color: #e2f0fa;
|
||||
}
|
||||
#deviceImportReview #devicesNavigation ul li.statusNew {
|
||||
background-color: #d9ffb4;
|
||||
#Devices_Import_Review #Devices_Import_Review_Navigation ul li.actionAdded {
|
||||
background-color: #e7f9d5;
|
||||
}
|
||||
#deviceImportReview #devices {
|
||||
border: solid 1px #f4f4f4;
|
||||
border-collapse: collapse;
|
||||
margin-top: 6px;
|
||||
}
|
||||
#deviceImportReview #devices > tbody > tr > td {
|
||||
border: solid 1px #f4f4f4;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
#deviceImportReview #devices > tbody > tr:nth-child(odd) > td {
|
||||
#Devices_Import_Review #Devices_Import_Review_Navigation ul li.actionUnchanged {
|
||||
background-color: #fcfcfc;
|
||||
}
|
||||
#deviceImportReview #devices > thead > tr > th,
|
||||
#deviceImportReview #devices > tbody > tr > th {
|
||||
background-color: #f4f4f4;
|
||||
border: solid 1px #f4f4f4;
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer {
|
||||
margin: 18px 0;
|
||||
overflow-x: auto;
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
#deviceImportReview #devices > tbody > tr:hover > td {
|
||||
background-color: #fefefe;
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > thead {
|
||||
white-space: nowrap;
|
||||
}
|
||||
#deviceImportReview #devices > tbody > tr:hover:nth-child(odd) > td {
|
||||
background-color: #fafafa;
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > thead tr:nth-child(2) th {
|
||||
padding-top: 0;
|
||||
font-weight: normal;
|
||||
font-size: 0.9em;
|
||||
}
|
||||
#deviceImportReview #devices > tfoot > tr > th,
|
||||
#deviceImportReview #devices > tfoot > tr > td {
|
||||
background-color: #f4f4f4;
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody td.action {
|
||||
text-align: center;
|
||||
}
|
||||
#deviceImportReview #devices > tbody td {
|
||||
vertical-align: middle;
|
||||
min-height: 32px;
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody tr.actionDetached td.action i:before {
|
||||
color: #e51400;
|
||||
content: "\f12a";
|
||||
}
|
||||
#deviceImportReview #devices > tbody tr.statusError td {
|
||||
background-color: #ffd3d3;
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody tr.actionDetached td {
|
||||
background-color: #ffe7e5;
|
||||
}
|
||||
#deviceImportReview #devices > tbody tr.statusUpdate td {
|
||||
background-color: #d3f3ff;
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody tr.actionUnchanged td.action i:before {
|
||||
content: "\f068";
|
||||
}
|
||||
#deviceImportReview #devices > tbody tr.statusNew td {
|
||||
background-color: #d9ffb4;
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody tr.actionUnchanged td {
|
||||
background-color: #fcfcfc;
|
||||
}
|
||||
#deviceImportReview #devices > tbody tr td.action {
|
||||
font-weight: bold;
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody tr.actionUnchanged td:nth-child(n+3) {
|
||||
color: #cccccc;
|
||||
}
|
||||
#deviceImportReview #devices > tbody tr td.serialNumber {
|
||||
font-family: Consolas, "Courier New", monospace;
|
||||
font-weight: bold;
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody tr.actionModified td.action i:before {
|
||||
color: #1e6dab;
|
||||
content: "\f040";
|
||||
}
|
||||
#deviceImportReview #devices > tbody tr td.model img.modelImage {
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
margin-right: 2px;
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody tr.actionModified td {
|
||||
background-color: #f4f9fd;
|
||||
}
|
||||
#deviceImportReview #devices > tbody .error {
|
||||
font-weight: bold;
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody tr.actionAdded td.action i:before {
|
||||
color: #60a917;
|
||||
content: "\f067";
|
||||
}
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody tr.actionAdded td {
|
||||
background-color: #e7f9d5;
|
||||
}
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody tr:not(.actionUnchanged) td.actionUnchanged:nth-child(n+3):not(.headerDeviceSerialNumber) {
|
||||
color: #cccccc;
|
||||
}
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody td.actionError {
|
||||
color: #e51400;
|
||||
background-color: #fff1ef;
|
||||
}
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody td.actionError span.errorMessage {
|
||||
display: none;
|
||||
}
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody td.actionModified {
|
||||
background-color: #e2f0fa !important;
|
||||
}
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody td.headerDeviceSerialNumber,
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody td.headerDeviceDecommissionedDate,
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody td.headerDeviceDecommissionedReason,
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody td.headerModelId,
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody td.headerBatchId,
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody td.headerProfileId,
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody td.headerAssignedUserId {
|
||||
white-space: nowrap;
|
||||
}
|
||||
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody span.smallMessage {
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
@@ -357,118 +357,250 @@
|
||||
}
|
||||
}
|
||||
|
||||
#deviceImport {
|
||||
#Devices_Import {
|
||||
#ImportFile {
|
||||
width: 100%;
|
||||
width: 96%;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
#documentation {
|
||||
#Devices_Import_Documentation {
|
||||
width: 700px;
|
||||
margin: 20px auto;
|
||||
|
||||
& > table {
|
||||
& > thead > tr > th:first-child {
|
||||
width: 100px;
|
||||
& > table > tbody th:first-child {
|
||||
width: 220px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#Devices_Import_Completed_Dialog {
|
||||
padding: 50px 0;
|
||||
text-align: center;
|
||||
|
||||
h3 {
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
i {
|
||||
margin-right: 10px;
|
||||
color: @StatusSuccess;
|
||||
}
|
||||
}
|
||||
|
||||
#Devices_Import_Loading_Dialog {
|
||||
padding-top: 50px;
|
||||
text-align: center;
|
||||
|
||||
i {
|
||||
margin-right: 10px;
|
||||
color: @StatusInformation;
|
||||
}
|
||||
}
|
||||
|
||||
#Devices_Import_Headers {
|
||||
|
||||
#Devices_Import_Headers_TableContainer {
|
||||
margin: 18px 0;
|
||||
overflow-x: auto;
|
||||
border: 1px solid #ccc;
|
||||
|
||||
table {
|
||||
& > thead {
|
||||
white-space: nowrap;
|
||||
|
||||
ul.importHeaderType {
|
||||
& > li > a > span:not(.ui-menu-icon) {
|
||||
padding-right: 16px;
|
||||
}
|
||||
|
||||
ul {
|
||||
z-index: 1000;
|
||||
}
|
||||
}
|
||||
|
||||
td.headerIgnoreColumn {
|
||||
background-color: @StatusAlert;
|
||||
}
|
||||
|
||||
td:not(.headerIgnoreColumn) {
|
||||
background-color: @StatusInformation;
|
||||
}
|
||||
}
|
||||
|
||||
& > tbody {
|
||||
td.headerDeviceSerialNumber {
|
||||
border-top-color: lighten(@StatusInformation, 50%);
|
||||
border-bottom-color: lighten(@StatusInformation, 50%);
|
||||
background-color: lighten(@StatusInformation, 54%);
|
||||
}
|
||||
|
||||
td.headerIgnoreColumn {
|
||||
max-width: 150px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
-ms-text-overflow: ellipsis;
|
||||
-o-text-overflow: ellipsis;
|
||||
text-overflow: ellipsis;
|
||||
color: @SubtleBorderColour;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#deviceImportReview {
|
||||
#Devices_Import_Parsing_Dialog {
|
||||
padding-top: 50px;
|
||||
text-align: center;
|
||||
|
||||
#errorMessage {
|
||||
font-weight: bold;
|
||||
color: red;
|
||||
i {
|
||||
margin-right: 10px;
|
||||
color: @StatusInformation;
|
||||
}
|
||||
}
|
||||
|
||||
#devicesNavigation {
|
||||
// Icons used within Devices_Import_Review
|
||||
@import "FontAwesome\variables.less";
|
||||
|
||||
#Devices_Import_Review {
|
||||
|
||||
#Devices_Import_Review_Navigation {
|
||||
margin-top: 15px;
|
||||
text-align: right;
|
||||
|
||||
ul {
|
||||
display: inline-block;
|
||||
padding: 1px;
|
||||
padding: 0px;
|
||||
border: 1px solid #bbb;
|
||||
|
||||
li {
|
||||
display: inline-block;
|
||||
padding: 1px 6px;
|
||||
padding: 3px 10px;
|
||||
margin: 0;
|
||||
|
||||
&.statusError {
|
||||
background-color: #ffd3d3;
|
||||
&.actionDetached {
|
||||
background-color: lighten(@StatusError, 45%);
|
||||
}
|
||||
|
||||
&.statusUpdate {
|
||||
background-color: #d3f3ff;
|
||||
&.actionModified {
|
||||
background-color: lighten(@StatusInformation, 54%);
|
||||
}
|
||||
|
||||
&.statusNew {
|
||||
background-color: #d9ffb4;
|
||||
&.actionAdded {
|
||||
background-color: lighten(@StatusSuccess, 53%);
|
||||
}
|
||||
|
||||
&.actionUnchanged {
|
||||
background-color: @TableDataRowBackgroundColor;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#devices {
|
||||
.tableData;
|
||||
margin-top: 6px;
|
||||
#Devices_Import_Review_TableContainer {
|
||||
margin: 18px 0;
|
||||
overflow-x: auto;
|
||||
border: 1px solid #ccc;
|
||||
|
||||
& > tbody {
|
||||
table {
|
||||
& > thead {
|
||||
white-space: nowrap;
|
||||
|
||||
td {
|
||||
vertical-align: middle;
|
||||
min-height: 32px;
|
||||
tr:nth-child(2) th {
|
||||
padding-top: 0;
|
||||
font-weight: normal;
|
||||
font-size: 0.9em;
|
||||
}
|
||||
}
|
||||
|
||||
tr.statusError td {
|
||||
background-color: #ffd3d3;
|
||||
}
|
||||
& > tbody {
|
||||
|
||||
tr.statusUpdate td {
|
||||
background-color: #d3f3ff;
|
||||
}
|
||||
|
||||
tr.statusNew td {
|
||||
background-color: #d9ffb4;
|
||||
}
|
||||
|
||||
tr {
|
||||
td.action {
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
td.serialNumber {
|
||||
font-family: @FontFamilyMono;
|
||||
font-weight: bold;
|
||||
}
|
||||
tr.actionDetached {
|
||||
td.action {
|
||||
i:before {
|
||||
color: @StatusError;
|
||||
content: @fa-var-exclamation;
|
||||
}
|
||||
}
|
||||
|
||||
td.model {
|
||||
img.modelImage {
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
margin-right: 2px;
|
||||
td {
|
||||
background-color: lighten(@StatusError, 50%);
|
||||
}
|
||||
}
|
||||
|
||||
td.profile {
|
||||
tr.actionUnchanged {
|
||||
td.action {
|
||||
i:before {
|
||||
content: @fa-var-minus;
|
||||
}
|
||||
}
|
||||
|
||||
td {
|
||||
background-color: @TableDataRowBackgroundColor;
|
||||
}
|
||||
|
||||
td:nth-child(n+3) {
|
||||
color: @SubtleBorderColour;
|
||||
}
|
||||
}
|
||||
|
||||
td.batch {
|
||||
tr.actionModified {
|
||||
td.action {
|
||||
i:before {
|
||||
color: @StatusInformation;
|
||||
content: @fa-var-pencil;
|
||||
}
|
||||
}
|
||||
|
||||
td {
|
||||
background-color: lighten(@StatusInformation, 58%);
|
||||
}
|
||||
}
|
||||
|
||||
td.assignedUser {
|
||||
tr.actionAdded {
|
||||
td.action {
|
||||
i:before {
|
||||
color: @StatusSuccess;
|
||||
content: @fa-var-plus;
|
||||
}
|
||||
}
|
||||
|
||||
td {
|
||||
background-color: lighten(@StatusSuccess, 53%);
|
||||
}
|
||||
}
|
||||
|
||||
td.location {
|
||||
tr:not(.actionUnchanged) {
|
||||
td.actionUnchanged:nth-child(n+3):not(.headerDeviceSerialNumber) {
|
||||
color: @SubtleBorderColour;
|
||||
}
|
||||
}
|
||||
|
||||
td.assetNumber {
|
||||
}
|
||||
}
|
||||
td.actionError {
|
||||
color: @StatusError;
|
||||
background-color: lighten(@StatusError, 52%);
|
||||
|
||||
.error {
|
||||
font-weight: bold;
|
||||
span.errorMessage {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
td.actionModified {
|
||||
background-color: lighten(@StatusInformation, 54%) !important;
|
||||
}
|
||||
|
||||
td.headerDeviceSerialNumber, td.headerDeviceDecommissionedDate, td.headerDeviceDecommissionedReason,
|
||||
td.headerModelId, td.headerBatchId, td.headerProfileId,
|
||||
td.headerAssignedUserId {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
span.smallMessage {
|
||||
color: inherit;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
+1499
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -274,3 +274,8 @@ input:-moz-placeholder {
|
||||
text-transform: uppercase;
|
||||
padding: .6em 1em;
|
||||
}
|
||||
body .ui-tooltip {
|
||||
border-width: 1px;
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
@@ -156,65 +156,65 @@ input:-moz-placeholder {
|
||||
// Dialogs
|
||||
|
||||
.ui-dialog {
|
||||
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;
|
||||
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;
|
||||
}
|
||||
|
||||
@keyframes ui-dialog-show {
|
||||
0% {
|
||||
0% {
|
||||
transform: translateY(-30px);
|
||||
opacity: 0.0;
|
||||
}
|
||||
100% {
|
||||
transform: translateY(0);
|
||||
opacity: 1;
|
||||
}
|
||||
opacity: 0.0;
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: translateY(0);
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
@-webkit-keyframes ui-dialog-show {
|
||||
0% {
|
||||
-webkit-transform: translateY(-30px);
|
||||
opacity: 0.0;
|
||||
}
|
||||
100% {
|
||||
-webkit-transform: translateY(0);
|
||||
opacity: 1;
|
||||
}
|
||||
0% {
|
||||
-webkit-transform: translateY(-30px);
|
||||
opacity: 0.0;
|
||||
}
|
||||
|
||||
100% {
|
||||
-webkit-transform: translateY(0);
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.ui-widget-overlay.ui-front {
|
||||
animation-name: ui-dialog-fadeIn;
|
||||
-webkit-animation-name: ui-dialog-fadeIn;
|
||||
|
||||
animation-duration: .2s;
|
||||
-webkit-animation-duration: .2s;
|
||||
|
||||
animation-timing-function: ease-in-out;
|
||||
-webkit-animation-timing-function: ease-in-out;
|
||||
animation-name: ui-dialog-fadeIn;
|
||||
-webkit-animation-name: ui-dialog-fadeIn;
|
||||
animation-duration: .2s;
|
||||
-webkit-animation-duration: .2s;
|
||||
animation-timing-function: ease-in-out;
|
||||
-webkit-animation-timing-function: ease-in-out;
|
||||
}
|
||||
|
||||
@keyframes ui-dialog-fadeIn {
|
||||
0% {
|
||||
opacity: 0.0;
|
||||
}
|
||||
100% {
|
||||
opacity: 0.5;
|
||||
}
|
||||
0% {
|
||||
opacity: 0.0;
|
||||
}
|
||||
|
||||
100% {
|
||||
opacity: 0.5;
|
||||
}
|
||||
}
|
||||
|
||||
@-webkit-keyframes ui-dialog-fadeIn {
|
||||
0% {
|
||||
opacity: 0.0;
|
||||
}
|
||||
100% {
|
||||
opacity: 0.5;
|
||||
}
|
||||
0% {
|
||||
opacity: 0.0;
|
||||
}
|
||||
|
||||
100% {
|
||||
opacity: 0.5;
|
||||
}
|
||||
}
|
||||
|
||||
// Initially hide dialogs
|
||||
@@ -243,3 +243,10 @@ input:-moz-placeholder {
|
||||
text-transform: uppercase;
|
||||
padding: .6em 1em;
|
||||
}
|
||||
|
||||
// Tooltip
|
||||
body .ui-tooltip {
|
||||
border-width: 1px;
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user