3 files changed, 71 insertions, 9 deletions
diff --git a/modules-available/backup/templates/_page.html b/modules-available/backup/templates/_page.html
index 3e57c033..818f42cd 100644
--- a/modules-available/backup/templates/_page.html
+++ b/modules-available/backup/templates/_page.html
@@ -7,13 +7,20 @@
 		<div class="panel-heading">{{lang_backup}}</div>
 		<div class="panel-body {{perms.create.disabled}}">
 			<p>{{lang_backupDescription}}</p>
+			<div class="form-group">
+				<label for="passwd-in">{{lang_backupPasswordLabel}}</label>
+				<input id="passwd-in" type="{{password_type}}" class="form-control" name="passwd"
+						 placeholder="{{lang_backupPasswordPlaceholder}}">
+			</div>
+			<i>{{lang_backupPasswordHint}}</i>
 			<p class="text-right">
 				{{lang_lastBackup}}:
 				{{^last_backup}}{{lang_unknown}}{{/last_backup}}
 				{{last_backup}}
 			</p>
 			<button id="b-btn" {{perms.create.disabled}} class="btn btn-primary pull-right" type="submit">
-				<span class="glyphicon glyphicon-save"></span> {{lang_download}}
+				<span class="glyphicon glyphicon-save"></span>
+				{{lang_download}}
 			</button>
 		</div>
 	</div>
@@ -23,25 +30,31 @@
 	<input type="hidden" name="token" value="{{token}}">
 	<input type="hidden" name="action" value="restore">
 	<div class="panel panel-default">
-		<div class="panel-heading">{{lang_restore}}</div>
-		<div class="panel-body {{perms.restore.disabled}}">
+		<div class="panel-heading">{{id_prefix}} {{lang_restoreHeading}}</div>
+		<div class="panel-body {{perms.restore.disabled}}" {{#id_color}}style="border:5px solid {{.}}"{{/id_color}}>
 			<p>{{lang_restoreDescription}}</p>
+			<label for="file-out">{{lang_restoreFileLabel}}</label>
 			<div class="input-group upload-ex">
-				<input type="text" class="form-control" readonly placeholder="{{lang_selectFile}}">
+				<input id="file-out" type="text" class="form-control" readonly placeholder="{{lang_selectFile}}">
 				<span class="input-group-btn">
 					<span class="btn btn-default btn-file">
 						{{lang_browseForFile}}&hellip; <input type="file" name="backupfile" {{perms.restore.disabled}}>
 					</span>
 				</span>
 			</div>
-			<div>
+			<div class="form-group">
+				<label for="passwd-out">{{lang_restorePasswordLabel}}</label>
+				<input id="passwd-out" type="{{password_type}}" class="form-control" name="passwd"
+						 placeholder="{{lang_restorePasswordPlaceholder}}">
+			</div>
+			<div class="form-group">
 				<div class="checkbox">
 					<input type="checkbox" name="restore_openslx" checked="checked" id="id-sysonfig">
 					<label for="id-sysonfig"><b>{{lang_restoreSystemConfig}}</b></label>
 				</div>
 				<p><i>{{lang_systemExplanation}}</i></p>
 			</div>
-			<div>
+			<div class="form-group">
 				<div class="checkbox">
 					<input type="checkbox" name="restore_dozmod" checked="checked" id="id-dozmod">
 					<label for="id-dozmod"><b>{{lang_restoreDozmodConfig}}</b></label>
@@ -53,7 +66,44 @@
 				{{lang_runningUploads}}: <span class="uploads">??</span>,
 				{{lang_runningDownloads}}: <span class="downloads">??</span>
 			</div>
-			<button {{perms.restore.disabled}} class="btn btn-primary pull-right" type="submit"><span class="glyphicon glyphicon-open"></span> {{lang_restore}}</button>
+			<button {{perms.restore.disabled}} class="btn btn-primary pull-right" type="submit">
+				<span class="glyphicon glyphicon-open"></span>
+				{{id_prefix}}
+				{{lang_restoreButton}}
+			</button>
+		</div>
+	</div>
+</form>
+
+<form action="?do=Backup" method="post">
+	<input type="hidden" name="token" value="{{token}}">
+	<input type="hidden" name="action" value="config">
+	<div class="panel panel-default">
+		<div class="panel-heading">{{lang_autoBackupHeading}}</div>
+		<div class="panel-body {{perms.config.disabled}}">
+			<p>{{lang_autoBackupText}}</p>
+			<div class="radio">
+				<input id="auto-backup-OFF" type="radio" name="auto-backup-mode" value="OFF" {{backup_OFF_checked}}>
+				<label for="auto-backup-OFF">{{lang_autoBackupOFF}}</label>
+			</div>
+			<div class="radio">
+				<input id="auto-backup-ROOTHOME" type="radio" name="auto-backup-mode" value="ROOTHOME" {{backup_ROOTHOME_checked}}>
+				<label for="auto-backup-ROOTHOME">{{lang_autoBackupROOTHOME}}</label>
+			</div>
+			<div class="radio">
+				<input id="auto-backup-VMSTORE" type="radio" name="auto-backup-mode" value="VMSTORE" {{backup_VMSTORE_checked}}>
+				<label for="auto-backup-VMSTORE">{{lang_autoBackupVMSTORE}}</label>
+			</div>
+			<div class="form-group">
+				<label for="passwd-auto">{{lang_autoBackupPasswordLabel}}</label>
+				<input id="passwd-auto" type="{{password_type}}" class="form-control" name="passwd"
+						 value="{{autoBackupPw}}" placeholder="{{lang_autoBackupPasswordPlaceholder}}">
+			</div>
+			<i>{{lang_backupPasswordHint}}</i>
+			<button {{perms.config.disabled}} class="btn btn-primary pull-right" type="submit">
+				<span class="glyphicon glyphicon-floppy-disk"></span>
+				{{lang_save}}
+			</button>
 		</div>
 	</div>
 </form>
diff --git a/modules-available/backup/templates/restore.html b/modules-available/backup/templates/restore.html
index c9c19d2b..3e57a3ee 100644
--- a/modules-available/backup/templates/restore.html
+++ b/modules-available/backup/templates/restore.html
@@ -20,6 +20,7 @@
 
 <script type="text/javascript">
 	var slxDotInterval = false;
+	var restoreSuccess = false;
 	function restoreCb(task)
 	{
 		if (!task || !task.statusCode)
@@ -28,6 +29,7 @@
 			$('#restorefailed').show('slow');
 		}
 		if (task.statusCode === 'TASK_ERROR' || task.statusCode === 'TASK_FINISHED') {
+			restoreSuccess = (task.statusCode === 'TASK_FINISHED');
 			startRebootPoll();
 		}
 	}
@@ -48,14 +50,18 @@
 		}
 		$('#dots').text($('#dots').text() + '..');
 		slxTimeoutId = setTimeout(rebootPoll, 3500);
-		$.ajax({url: "index.php?do=Main", timeout: 3000}).success(function(data, textStatus, jqXHR) {
+		$.ajax({url: "?do=main", timeout: 3000}).success(function(data, textStatus, jqXHR) {
 			if (textStatus !== "success" && textStatus !== "notmodified")
 				return;
 			if (data.indexOf('Status: DB running') === -1)
 				return;
 			clearTimeout(slxTimeoutId);
 			setTimeout(function() {
-				window.location.replace("index.php?do=Main&message[]=success%7Cbackup.restore-done");
+				if (restoreSuccess) {
+					window.location.replace("?do=main&message[]=success%7Cbackup.restore-done");
+				} else {
+					window.location.replace("?do=main");
+				}
 			}, 3500);
 		});
 	}
diff --git a/modules-available/backup/templates/task-error.html b/modules-available/backup/templates/task-error.html
new file mode 100644
index 00000000..56837799
--- /dev/null
+++ b/modules-available/backup/templates/task-error.html
@@ -0,0 +1,6 @@
+<div class="panel panel-default">
+	<div class="panel-heading panel-danger">{{lang_error}}</div>
+	<div class="panel-body">
+		<div data-tm-id="{{taskid}}" data-tm-log="messages">{{lang_checkingArchive}}</div>
+	</div>
+</div>