Update instructions UI

This commit is contained in:
Atlante45 2016-09-29 15:42:25 -07:00
parent 701c710857
commit 165e609851
7 changed files with 197 additions and 41 deletions

View file

@ -28,7 +28,7 @@ body {
padding: 0; padding: 0;
color: #808785; color: #808785;
margin: 0 auto; margin: 0 auto;
text-align: center; text-align: left;
font-size: 13.5pt; font-size: 13.5pt;
-webkit-touch-callout: none; -webkit-user-select: none; -webkit-touch-callout: none; -webkit-user-select: none;
cursor: default; cursor: default;
@ -45,11 +45,6 @@ body {
cursor: text; cursor: text;
} }
h1 {
font-size: 29pt;
font-weight: normal;
}
a:link, a:link,
a:visited, a:visited,
a:hover, a:hover,
@ -60,3 +55,118 @@ a:active {
a:hover { a:hover {
color: #2D88A4; color: #2D88A4;
} }
.header{
width: 95%;
left: 2.5%
}
.colmask{
width: 95%;
left: 2.5%
}
.colmid{ right: 25% }
.colin{ right: 25% }
.colleft{ right: 25% }
.col1{
width: 23%;
left: 101%
}
.col2{
width: 23%;
left: 53%
}
.col3{
width: 23%;
left: 80%
}
.col4{
width: 23%;
left: 82%
}
.footer{
width: 95%;
left: 2.5%
}
.header{
clear: both;
float: left;
position: relative;
border-bottom: #000 1px solid;
background-color: #b4d2f7
}
.colmask{
clear: both;
float: left;
overflow: hidden;
position: relative;
}
.colmid{
float: left;
width: 100%;
position: relative;
}
.colin{
float: left;
width: 100%;
position: relative;
}
.colleft{
float: left;
width: 100%;
position: relative;
}
.col1{
padding: 0px 0px 1em 0px;
overflow: hidden;
float: left;
position: relative;
}
.col2{
padding: 0px 0px 1em 0px;
overflow: hidden;
float: left;
position: relative;
}
.col3{
padding: 0px 0px 1em 0px;
overflow: hidden;
float: left;
position: relative;
}
.col4{
padding: 0px 0px 1em 0px;
overflow: hidden;
float: left;
position: relative;
}
.footer{
clear: both;
float: left;
position: relative;
padding-top: 8px;
border-top: #000 1px solid;
}
.bottom{
clear: both;
width: 100%;
float: left;
position: relative;
}
body {
border-width: 0px;
padding: 0px;
margin: 0px;
font-size: 90%;
width: 100%;
min-width: 600px;
}

View file

@ -1,22 +1,57 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Server Backup</title> <title>Server Backup</title>
<script src="content-update.js"></script> <script src="content-update.js"></script>
<link rel="stylesheet" type="text/css" href="content-update.css"></link> <link rel="stylesheet" type="text/css" href="content-update.css"></link>
</head> </head>
<body onload="ready()"> <body onload="ready()">
<div> <div class="colmask">
<h3>We backed up your old server just in case.</br>If you wish to restore it, do the following:</h3> <h3>We backed up your old Sandbox content, just in case.</h3>
<p> <p><b>To restore it, follow these steps:</b>
1) Stop your server.</br>
2) Go to the backup directory bellow.</br> <div class="colmid">
3) Move the content in the parent directory.</br> <div class="colin">
4) Restart your server.</br>
</br> <div class="colleft">
Backup Directory:</br>
<span id=directory></span> <div class="col1">
</p>
<img src="images/step1.jpg" alt="Step 1">
<p><b>1.</b> Stop your Sandbox server.
</div>
<div class="col2">
<img src="images/step2.jpg" alt="Step 2">
<p><b>2.</b> Go to your backup directory:
<span id="directory"></span>
</div>
<div class="col3">
<img src="images/step3.jpg" alt="Step 3">
<p><b>3.</b> Copy the backed up content and paste it into the parent directory.
</div>
<div class="col4">
<img src="images/step4.jpg" alt="Step 4">
<p><b>4.</b> Restart your Sandbox server.
</div>
</div>
</div>
</div> </div>
</body>
<div class="footer">
<p>For more information about managing your high Fidelity Sandbox Server, check out our docs: <a href="https://wiki.highfidelity.com/wiki/Sandbox" target="_blank">wiki.highfidelity.com/wiki/Sandbox</a>
</div>
</div>
</body>
</html> </html>

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

View file

@ -408,6 +408,13 @@ var labels = {
logWindow.open(); logWindow.open();
} }
}, },
restoreBackup: {
label: 'Restore Backup Instructions',
click: function() {
var folder = getRootHifiDataDirectory() + "/Server Backup";
openBackupInstructions(folder);
}
},
share: { share: {
label: 'Share', label: 'Share',
click: function() { click: function() {
@ -443,6 +450,7 @@ function buildMenuArray(serverState) {
menuArray.push(labels.stopServer); menuArray.push(labels.stopServer);
menuArray.push(labels.settings); menuArray.push(labels.settings);
menuArray.push(labels.viewLogs); menuArray.push(labels.viewLogs);
menuArray.push(labels.restoreBackup);
menuArray.push(separator); menuArray.push(separator);
menuArray.push(labels.share); menuArray.push(labels.share);
menuArray.push(separator); menuArray.push(separator);
@ -510,29 +518,32 @@ 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);
});
}
function backupResourceDirectoriesAndRestart() { function backupResourceDirectoriesAndRestart() {
homeServer.stop(); homeServer.stop();
var folder = getRootHifiDataDirectory() + "/Server Backup - " + Date.now(); var folder = getRootHifiDataDirectory() + "/Server Backup - " + Date.now();
if (backupResourceDirectories(folder)) { if (backupResourceDirectories(folder)) {
maybeInstallDefaultContentSet(onContentLoaded); maybeInstallDefaultContentSet(onContentLoaded);
openBackupInstructions(folder);
// Explain user how to restore server
var window = new BrowserWindow({
icon: appIcon,
width: 500,
height: 350,
});
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);
});
} else { } else {
dialog.showMessageBox({ dialog.showMessageBox({
type: 'warning', type: 'warning',