Merge pull request #1852 from Vaporizer8/master

Fix a few minor GUI issues

5 files changed, 8 insertions, 11 deletions

diff --git a/Duplicati/Library/Utility/Uri.cs b/Duplicati/Library/Utility/Uri.cs
index 541fbed9d..e655ffd3b 100644
--- a/Duplicati/Library/Utility/Uri.cs
+++ b/Duplicati/Library/Utility/Uri.cs
@@ -260,7 +260,7 @@ namespace Duplicati.Library.Utility
             

             if (!string.IsNullOrEmpty(path))

             {

-                if (!string.IsNullOrEmpty(host))

+                if (!string.IsNullOrEmpty(host) && !path.StartsWith("/"))

                     s += "/";

                 s += path;

             }

diff --git a/Duplicati/Server/webroot/ngax/scripts/services/EditUriBuiltins.js b/Duplicati/Server/webroot/ngax/scripts/services/EditUriBuiltins.js
index 14b1a5862..0f4fee136 100644
--- a/Duplicati/Server/webroot/ngax/scripts/services/EditUriBuiltins.js
+++ b/Duplicati/Server/webroot/ngax/scripts/services/EditUriBuiltins.js
@@ -689,4 +689,4 @@ backupApp.service('EditUriBuiltins', function(AppService, AppUtils, SystemInfo,
 	};
 
 
-});
\ No newline at end of file
+});
diff --git a/Duplicati/Server/webroot/ngax/templates/addoredit.html b/Duplicati/Server/webroot/ngax/templates/addoredit.html
index 775ab16e9..4922ee689 100755
--- a/Duplicati/Server/webroot/ngax/templates/addoredit.html
+++ b/Duplicati/Server/webroot/ngax/templates/addoredit.html
@@ -220,10 +220,7 @@
                 <div class="input multiple text select maxSize">
                     <label for="dblockSizeNumber">Max backup file size</label>
                     <input type="number" class="number" parse-size-number="uppercase" id="dblockSizeNumber" ng-model="Options['dblock-size']" />
-                    <select parse-size-multiplier="uppercase" id="dblockSizeMultiplier" ng-model="Options['dblock-size']" ng-options="item.value as item.name for item in AppUtils.fileSizeMultipliers"></select>
-                        <option value="MB">MByte</option>
-                        <option value="GB">GByte</option>
-                        <option value="TB">TByte</option>
+                    <select parse-size-multiplier="uppercase" id="dblockSizeMultiplier" ng-model="Options['dblock-size']" ng-options="item.value as item.name for item in AppUtils.fileSizeMultipliers">
                     </select>
                 </div>
                 <div class="input multiple text select keepBackups">
@@ -268,4 +265,4 @@
     </div>
     <!-- .steps-boxes -->
 </div>
-<!-- .add -->
\ No newline at end of file
+<!-- .add -->
diff --git a/Duplicati/Server/webroot/ngax/templates/backends/generic.html b/Duplicati/Server/webroot/ngax/templates/backends/generic.html
index 69eb4e1c8..62366a44c 100644
--- a/Duplicati/Server/webroot/ngax/templates/backends/generic.html
+++ b/Duplicati/Server/webroot/ngax/templates/backends/generic.html
@@ -1,6 +1,6 @@
-<div ng-show="SupportsSSL" class="input checkbox multple">
-    <input type="checkbox" id="s3_ssl" ng-model="$parent.UseSSL" />
+<div ng-show="SupportsSSL" class="input checkbox">
     <label for="generic_ssl">Use SSL</label>
+    <input type="checkbox" style="width: 15px; margin-right: 65%;" name="generic_ssl" id="generic_ssl" ng-model="$parent.UseSSL" />
 </div >
 
 <div class="input text">
diff --git a/Duplicati/Server/webroot/ngax/templates/backends/s3.html b/Duplicati/Server/webroot/ngax/templates/backends/s3.html
index 671d874a8..7dbda893d 100644
--- a/Duplicati/Server/webroot/ngax/templates/backends/s3.html
+++ b/Duplicati/Server/webroot/ngax/templates/backends/s3.html
@@ -1,6 +1,6 @@
-<div class="input checkbox multple">
-    <input type="checkbox" id="s3_ssl" ng-model="$parent.UseSSL" />
+<div ng-show="SupportsSSL" class="input checkbox">
     <label for="s3_ssl">Use SSL</label>
+    <input type="checkbox" style="width: 15px; margin-right: 65%;" name="s3_ssl" id="s3_ssl" ng-model="$parent.UseSSL" />
 </div >
 
 <div class="input select">