Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-16 09:40:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

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

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