From 560122cbc365e11d7e4663190e12cd160cbf5cc5 Mon Sep 17 00:00:00 2001
From: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
Date: Thu, 14 Jan 2016 20:49:09 +0000
Subject: [PATCH] Various web UI fixes

- fixed user field being shadowed ;
- fixed settings reading comparaison ;
- fixed forgotten min-age field.

Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
---
 management/templates/system-backup.html | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/management/templates/system-backup.html b/management/templates/system-backup.html
index e7dc0620..04c2c8e0 100644
--- a/management/templates/system-backup.html
+++ b/management/templates/system-backup.html
@@ -56,9 +56,9 @@
     </div>
   </div>
   <div class="form-group backup-target-rsync">
-    <label for="backup-target-user" class="col-sm-2 control-label">Username</label>
+    <label for="backup-target-rsync-user" class="col-sm-2 control-label">Username</label>
     <div class="col-sm-8">
-      <input type="text" class="form-control" rows="1" id="backup-target-user">
+      <input type="text" class="form-control" rows="1" id="backup-target-rsync-user">
     </div>
   </div>
   <!-- S3 BACKUP -->
@@ -96,7 +96,8 @@
       <input type="text" class="form-control" rows="1" id="backup-target-pass">
     </div>
   </div>
-  <div class="form-group backup-target-local backup-target-s3">
+  <!-- Common -->
+  <div class="form-group backup-target-local backup-target-rsync backup-target-s3">
     <label for="min-age" class="col-sm-2 control-label">Days:</label>
     <div class="col-sm-8">
       <input type="number" class="form-control" rows="1" id="min-age">
@@ -212,11 +213,11 @@ function show_custom_backup() {
           $("#backup-target-type").val("local");
         } else if (r.target == "off") {
           $("#backup-target-type").val("off");
-        } else if (r.target.substring(0, 5) == "rsync://") {
+        } else if (r.target.substring(0, 8) == "rsync://") {
           $("#backup-target-type").val("rsync");
           var path = r.target.substring(8).split('//');
           var [ user, host ] = path.shift().split('@');
-          $("#backup-target-rsync").val(user);
+          $("#backup-target-rsync-user").val(user);
           $("#backup-target-rsync-host").val(host);
           $("#backup-target-rsync-path").val('/'+path);
         } else if (r.target.substring(0, 5) == "s3://") {
@@ -241,7 +242,7 @@ function set_custom_backup() {
   else if (target_type == "s3")
     target = "s3://" + $("#backup-target-s3-host").val() + "/" + $("#backup-target-s3-path").val();
   else if (target_type == "rsync") {
-    target = "rsync://" + $("#backup-target-user").val() + "@" + $("#backup-target-rsync-host").val()
+    target = "rsync://" + $("#backup-target-rsync-user").val() + "@" + $("#backup-target-rsync-host").val()
                                                                 + "/" + $("#backup-target-rsync-path").val();
     target_user = '';
   }