diff --git a/server-console/src/content-update.css b/server-console/src/content-update.css index 8c9a7c159b..ebfd8aeba0 100644 --- a/server-console/src/content-update.css +++ b/server-console/src/content-update.css @@ -28,7 +28,7 @@ body { padding: 0; color: #808785; margin: 0 auto; - text-align: center; + text-align: left; font-size: 13.5pt; -webkit-touch-callout: none; -webkit-user-select: none; cursor: default; @@ -45,11 +45,6 @@ body { cursor: text; } -h1 { - font-size: 29pt; - font-weight: normal; -} - a:link, a:visited, a:hover, @@ -60,3 +55,118 @@ a:active { a:hover { 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; +} diff --git a/server-console/src/content-update.html b/server-console/src/content-update.html index 7b3d1f343d..3c0eff2fa0 100644 --- a/server-console/src/content-update.html +++ b/server-console/src/content-update.html @@ -1,22 +1,57 @@ - - Server Backup - - - - -
-

We backed up your old server just in case.
If you wish to restore it, do the following:

-

- 1) Stop your server.
- 2) Go to the backup directory bellow.
- 3) Move the content in the parent directory.
- 4) Restart your server.
-
- Backup Directory:
- -

+ + Server Backup + + + + +
+

We backed up your old Sandbox content, just in case.

+

To restore it, follow these steps: + +

+
+ +
+ +
+ + Step 1 +

1. Stop your Sandbox server. + +

+ +
+ + Step 2 +

2. Go to your backup directory: + + +

+ +
+ + Step 3 +

3. Copy the backed up content and paste it into the parent directory. +

+ +
+ + Step 4 +

4. Restart your Sandbox server. +

+ +
+ +
+
- + +
+ +

For more information about managing your high Fidelity Sandbox Server, check out our docs: wiki.highfidelity.com/wiki/Sandbox +

+
+ diff --git a/server-console/src/images/step1.jpg b/server-console/src/images/step1.jpg new file mode 100644 index 0000000000..cd80ae5537 Binary files /dev/null and b/server-console/src/images/step1.jpg differ diff --git a/server-console/src/images/step2.jpg b/server-console/src/images/step2.jpg new file mode 100644 index 0000000000..6bc285ac47 Binary files /dev/null and b/server-console/src/images/step2.jpg differ diff --git a/server-console/src/images/step3.jpg b/server-console/src/images/step3.jpg new file mode 100644 index 0000000000..a819dd2cdb Binary files /dev/null and b/server-console/src/images/step3.jpg differ diff --git a/server-console/src/images/step4.jpg b/server-console/src/images/step4.jpg new file mode 100644 index 0000000000..27694aee74 Binary files /dev/null and b/server-console/src/images/step4.jpg differ diff --git a/server-console/src/main.js b/server-console/src/main.js index b442d28855..ea8ba6337e 100644 --- a/server-console/src/main.js +++ b/server-console/src/main.js @@ -408,6 +408,13 @@ var labels = { logWindow.open(); } }, + restoreBackup: { + label: 'Restore Backup Instructions', + click: function() { + var folder = getRootHifiDataDirectory() + "/Server Backup"; + openBackupInstructions(folder); + } + }, share: { label: 'Share', click: function() { @@ -443,6 +450,7 @@ function buildMenuArray(serverState) { menuArray.push(labels.stopServer); menuArray.push(labels.settings); menuArray.push(labels.viewLogs); + menuArray.push(labels.restoreBackup); menuArray.push(separator); menuArray.push(labels.share); 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() { homeServer.stop(); var folder = getRootHifiDataDirectory() + "/Server Backup - " + Date.now(); if (backupResourceDirectories(folder)) { maybeInstallDefaultContentSet(onContentLoaded); - - // 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); - }); + openBackupInstructions(folder); } else { dialog.showMessageBox({ type: 'warning',