merge with upstream

This commit is contained in:
Senad Uka
2017-12-20 20:27:55 +01:00
parent 8beef5faea
commit 2ea9e2e702
12 changed files with 237 additions and 81 deletions

View File

@@ -832,6 +832,41 @@ h1 {
flex-grow: 1;
}
/* line 63 */
.spinner-panel {
position: fixed;
margin: 0 auto;
top: 0;
left: 0;
width: 0;
/* It will be updated to 100% in JS. Workaround for Safari issue with display:none; */
height: 100%;
background-color: rgba(0, 0, 0, 0.8);
z-index: 1;
display: flex;
flex-flow: column nowrap;
align-items: center;
justify-content: center;
color: #fff;
font-weight: bold;
font-size: 24px;
overflow: hidden;
}
/* line 84 */
.msg-container {
background-color: #FDFDFD;
border: 1px solid #D8D8D8;
margin: 20px;
padding: 10px;
padding-left: 30px;
}
/* line 91 */
.msg-container li {
padding-left: 0 !important;
}
/* line 3 */
.navigation_header {
display: flex;
@@ -1023,21 +1058,3 @@ table .right_border_cell {
margin-bottom: 25px;
}
.spinner-panel {
position: fixed;
margin: 0 auto;
top: 0;
left: 0;
width: 0; /* It will be updated to 100% in JS. Workaround for Safari issue with display:none; */
height: 100%;
background-color: rgba(0, 0, 0, 0.8);
z-index: 1;
display: flex;
flex-flow: column nowrap;
align-items: center;
justify-content: center;
color: #fff;
font-weight: bold;
font-size: 24px;
}

View File

@@ -0,0 +1,22 @@
"use strict";
$(document).ready(function () {
$("#sf_msg_container").empty();
$("#sf_msg_container").show();
$('#sf-spinner-panel').css('width', '100%'); // Workaround for Safari issue
$.ajax({
type: 'POST',
url: '/load_dxf/'
}).done(function(r) {
console.log(r)
$("#sf_msg_container").append('<li class="">DXF from Sales Force loaded successfully.</li>');
setTimeout(function() { window.location.reload() }, 500);
}).fail(function(r) {
// console.log(r.status)
r.responseJSON.errors.forEach((msg) => {
$("#sf_msg_container").append('<li class="error_message">' + msg + '</li>');
})
}).always(function() {
$('#sf-spinner-panel').css('width', '0%'); // Workaround for Safari issue
});
});