Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR

Browse source
This commit is contained in:
Atlante45 2016-09-29 17:08:34 -07:00
parent b83243d65d
commit f17a062399
2 changed files with 43 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
server-console/src/content-update.css
View file

@ -56,98 +56,98 @@ a:hover {
color: #2D88A4;
}
.header{
.header {
width: 95%;
left: 2.5%
}
.colmask{
.colmask {
width: 95%;
left: 2.5%
}
.colmid{ right: 25% }
.colin{ right: 25% }
.colleft{ right: 25% }
.col1{
.colmid { right: 25% }
.colin { right: 25% }
.colleft { right: 25% }
.col1 {
width: 23%;
left: 101%
}
.col2{
.col2 {
width: 23%;
left: 53%
}
.col3{
.col3 {
width: 23%;
left: 80%
}
.col4{
.col4 {
width: 23%;
left: 82%
}
.footer{
.footer {
width: 95%;
left: 2.5%
}
.header{
.header {
clear: both;
float: left;
position: relative;
border-bottom: #000 1px solid;
background-color: #b4d2f7
}
.colmask{
.colmask {
clear: both;
float: left;
overflow: hidden;
position: relative;
}
.colmid{
.colmid {
float: left;
width: 100%;
position: relative;
}
.colin{
.colin {
float: left;
width: 100%;
position: relative;
}
.colleft{
.colleft {
float: left;
width: 100%;
position: relative;
}
.col1{
.col1 {
padding: 0px 0px 1em 0px;
overflow: hidden;
float: left;
position: relative;
}
.col2{
.col2 {
padding: 0px 0px 1em 0px;
overflow: hidden;
float: left;
position: relative;
}
.col3{
.col3 {
padding: 0px 0px 1em 0px;
overflow: hidden;
float: left;
position: relative;
}
.col4{
.col4 {
padding: 0px 0px 1em 0px;
overflow: hidden;
float: left;
position: relative;
}
.footer{
.footer {
clear: both;
float: left;
position: relative;
@ -155,7 +155,7 @@ a:hover {
border-top: #000 1px solid;
}
.bottom{
.bottom {
clear: both;
width: 100%;
float: left;

46
server-console/src/main.js
View file

@ -501,16 +501,15 @@ function backupResourceDirectories(folder) {
fs.mkdirSync(folder);
console.log("Created directory " + folder);
var dsBackup = path.join(folder, '/domain-server');
fs.renameSync(getDomainServerClientResourcesDirectory(), dsBackup);
console.log("Moved directory " + getDomainServerClientResourcesDirectory());
console.log("to " + dsBackup);
var acBackup = path.join(folder, '/assignment-client');
fs.renameSync(getAssignmentClientResourcesDirectory(), acBackup);
console.log("Moved directory " + getDomainServerClientResourcesDirectory());
console.log("to " + acBackup);
fs.copySync(getDomainServerClientResourcesDirectory(), dsBackup);
fs.copySync(getAssignmentClientResourcesDirectory(), acBackup);
fs.removeSync(getDomainServerClientResourcesDirectory());
fs.removeSync(getAssignmentClientResourcesDirectory());
return true;
} catch (e) {
console.log(e);
@ -519,23 +518,22 @@ function backupResourceDirectories(folder) {
}
function openBackupInstructions(folder) {
// Explain user how to restore server
var window = new BrowserWindow({
icon: appIcon,
width: 800,
height: 520,
});
window.loadURL('file://' + __dirname + '/content-update.html');
if (!debug) {
window.setMenu(null);
}
window.show();
electron.ipcMain.on('ready', function() {
console.log("got ready");
window.webContents.send('update', folder);
});
// Explain user how to restore server
var window = new BrowserWindow({
icon: appIcon,
width: 800,
height: 520,
});
window.loadURL('file://' + __dirname + '/content-update.html');
if (!debug) {
window.setMenu(null);
}
window.show();
electron.ipcMain.on('ready', function() {
console.log("got ready");
window.webContents.send('update', folder);
});
}
function backupResourceDirectoriesAndRestart() {
homeServer.stop();