Rearrange settings slightly

auto/gui.files.go

@@ -73,7 +73,7 @@ func init() {
 	bs, _ = ioutil.ReadAll(gr)
 	Assets["favicon.png"] = bs
 
-	bs, _ = hex.DecodeString("1f8b080000096e8800ffec7d6b7bdb3696f0f7fe0a44d38b3daf29d9499ae9ebdadaf5259dba97c48fed4cb7dba73b0f4442126a926000d08ec6f5fcf63d07e0fd225296ed7876fa21b14882c03907e70ee070efd9f1dba38b9f4f5f93b90efcf1277bcf1ce793d1881c896821f96caec9c6d12679bebdf3927c472fc5841c0a392334f4a045a8259fc45a484536146344cf19397afbe6e2ece4f0ddc5dbb37332e53edb1c627707be4f4c778a48a698bc62de90bc538c8829bcc6155122962e23aef01881cb99b86232641e992c6030f2e3c985a3f4c267d897cf5d162a1c8e6ae2c2d30923531103483c3430fc7072f4facdf96b33fcf013c701ac1039e2d370b63f60e18084338746d1fe402d4217860f67e6968b1809df67727f709e3e39d2d21f10d7a74aed0fb0912fe8e500bb64d41b7f42c85ec03425ee9c4ac5f4fe20d653e7ab41fe60ae75e4b0f731bfda1ffc97f3eec039124144359ff80cba851159086f9dbcde67de8c15de0b69c0f607579c5d4742ea42d36beee9f9bec7ae800c8eb9d802c4b9e6d477944b7db6bf33dcae75e431e54a1e692ec2425fb56634d673216b2d7c1e5ec2c4f9403178acdd5813ee624f73c9a6fb8329bdc2cb6104841c7f822f68ae7d36ce88487e27373738cf6f607edfc0481b9bb7b77b23db2a1bc0763611422b2d693472951a6557c3808743b83348e0406e5073c6b485d05c13bd880009cd3e687cd93c216422bc05b9313f0989a8e70140ce44682d825df297ede8c3d7c9b32920ed4c69c0fdc52e197ccbfc2ba6b94bc91b16b3c116c96e6c910309d4de228a86ca016ee653dbc5ed27e64fecffbff997d9880195331e3a5a44bb6467f8250b4a6d8708ac138850a8888200dc34c1f2230b7db1457e142175e12f489e12c0905b64700462c3990410af01c2ac9bca1014980db9db43b9f1c6dab0ae9663649dfa53a457fbd3294c48fbd3ac676f69cf8d4fb39ebd8c0a13213d262ded421156f0f2c54c54c8bc4bb6bf2ecf74e18ee9c6f9329ff048288e12b18b3c053279551d802bed84c299c4a014743694b96d18ce4186b3a0555e04c4fc3808b3773cae229fc25cf210789d39135fb897291cc0da5692811f53fec818c7a84d609dfcc184ba9733891a0f471112c09f4d369ebf78b5459ebfdcc6ff7636bf2e5350528fc76a97bc28209fd26727fa405ee6f753423e87dbcfd3dbb755bc80cdc2a147417154f8dc675380763b67f4127a3bdbf96dc3f9d4e733a43f22f97537ad5202a78ab84e5f9c0bf28c07a83569a81b24016c44f6daf59c6be61899c157af41d194b4c135b3d47fb9bdddd89357532c16ffe7a056baa0f0862aa0beef94a8d80a50f2f27f06cce3946c04f44342d3bfbcfa4bf46133eb20912bb0b211a80960e9b1bd5394beac3121a33f03ef83add584924cd712b0641ad5361bce86bb595bf267208a042d3301c34aa239505a81501140425c139caa8964f452a11df605bc2e592405bce3030b8e14584830e8d75ccf8b3d5a7e5243f2e75176bb420409644a67e53663c7bd911141b0c4236b8a3fd93318e2238f5f550dfaeb2bb067c6988ff746f0dcda29f076c8858840a424414701ef85f42ab3f7f40a9fd83fa886d29f1e9bd2d807b30cdd33d38ecfa831aed6e61808924e100a0ac491c933b456203de5319c8904a70a60e3c12c7d82fa6d409474d1dc3978e5ec3cffca585962bd80c18be760830d8fdadfa331c98cee9e61afb4b339f740d13a1fc02a96c7b70628d60c46ff1d880a8fc68dd6da74374e5aa498c47e018f943a859f46b033c48da5c799e160e8e368066a899d8453310cd975813ea62178965a848949b717991f36d1613a00fe847ff98c582fc23a74e02a5e66036d6c9607281261e62fa239fa3024fbe5b8737625e16f1c0d52ac3f6781ca1444de09c84ca8c080b0fc977345fd18fe67520157ec0f6e6e8ae8620ba56f6f07e377f62e3021b9f92c69fdd96d99c866a09125418192239f97e99ae0e2491179e23a2c634b13c2fc69506d077c3d9ba1378a8a28b928f652c171fcdae3da02f8fef37002f4d89b64ac0e22ae915a13f8474be3e78c928d1bb0302e0169d01867a016e710b4eb198b04ce61e7c4cd3daf326355140e3c8f607760fe855c244d11e23251bb2042f9e8051150e59a59ca7440855d76c19311925f710fc56605a8c17ae873abdd552fd05d31eb003bedee6e64e4fda9f85e6278d805cd1c6cd1c9f143d250cd638d0cdc0b68319d76426cbbbb1bfdc0d06b2a754f369c42f379073c67b6c787a4209d88b81fc860daa5765810e94597f4609f4b80de1bc57eb3f6cc9f249e01fe00f362dd81164b6edba3fff00d974a832370bd4544e82f0884c8d721e1531232972945e5e26b92d0945c5319a26395f81ab9ab8206f119f43fe5b393104d78a6a6a1e3dc712801e33b81071e41d1ba169e031d984fccff4e326cd92254db22ad3dd36a6ffea260d34a6d4cc83e487904e24ee6310f3cb017e38c76ed03a07f5655f851610a2fe69801421ac4d27853644e15993006f106bdc26c50acc11f045fd585600ddef086b9bb438218a721010cddd2a491c909818351ee7ab8378acaecd1093e06a8152fa5879f82ce890a8a3e0a89209e4c3ca34795e4aa0b5163291fa46dca3f0c1a26b37ca37459b8c85debb270b059ec83230dbc5c61fd1293a7fde18bb97936f136d940ef1b83abcdbc87468178b54c1e1c8c9ba301e11ed23b198133b55c321229bab9c1578ef0c106fe1a9e1c83636ca6102e19d5b64f0c7ff0ef0f0076c5e75c2a75a576d01284b049f42acd8c6b57f2dc800e3e8d54ead045e0936126ef4f257c536f106f02629ff2d0631fd021ad75dfc3532e3a5cc4526978cc2573cdf4fd4e4cd2f094eaf9ed6d57f7b968903c62410a2b081cddb9a5f0b9a63acee7a011e8ba6f9e75e25ccf19b8e47178191a07f79dfd5177bafbf7a5803b238ca0ceed8fb5fa726968b5f579f2abbbb75a1fa0159b98aa050693a9ed1888908d9b1becf7944917388ace58410a3edb6c866e65c8b9d7c8e4cd609f40e34784b9ed4925d6b1b7c0249625bfaa52136590aaa2a21496053f15689249766db43ea6b6dab09a286a967d9bac2abe422a99dbe45a69c98d08341355a7c999e6a7b2ed113e9c771b4498da4e639819944278007d2f19d82b2549925c46a2e04e8ecd1286d78ad3a81da9f5f1b5493547442cecc0fb1bd3f21e10ce34fa5a78a7ce6e00a19cff4b42c95f873cbca23e6fe39ede64491c5d47f159175d5e4b29d6244b330e1f932d66be987445c87f8536d46fca7fdc071166a6f76fb8cf14587eea5fd3857a130713266f6f6bfa9b6b8030197e8bb4f475b8d0a6af090f2932dfe1c723ef5c045dd4fd41b80f475c1f3bbf1fda9aae9e10695d5fc49e8379105fd0aefcdd5b8803df4e4decb70e7ddbdbd316351542bc6be93f26dbe59c90b8c66038774ad3b4477d16f34ed69d44eca9610e6bde4801Line truncated
+	bs, _ = hex.DecodeString("1f8b080000096e8800ffec7d697bdc36d2e0f7fc0ab82787342b764b8ee3995524edea7026ca61eb91e4c966f3e49d074da29b8848820640c93d8ae6b7bf5500efa3c9564bb6e69d7cb0d524ae42a16e00c5bd67276f8e2f7f3e7b457c1d06079fec3d739c4f2613722ce285e4735f938de34df27c7be705f98e5e89293912724e68e4418d484b3e4db4908a6c28c688f619397ef3faf2fcf4e8ede59bf30b32e301db1c63778741404c778a48a698bc66de98bc558c881934e38a289148971157788cc0e35c5c3319318f4c173018f9f1f4d2517a1130ec2be02e8b140e473571a174cac84c2400128f0c0c3f9c1ebf7a7df1ca0c3ffec4716056383912d068be3f62d188447387c6f1fe482d2217868fe6e6958b331241c0e4fee8222b39d632181137a04aed8fb05220e8d508bb64d43bf88490bd90694a5c9f4ac5f4fe28d133e7afa3a2c0d73a76d8bb845fef8ffe9ff3f6d03916614c359f060cba85115904ad4e5fed336fce4aed221ab2fdd1356737b190ba54f5867bdadff7d835a0c1310f5b3071ae390d1ce5d280edef8cb71b1d794cb992c79a8ba8d457a31a4db42f64a346c0a32b58b8003006c5da4d34e12ef6e44b36db1fcde8353e8e6340e4c127d840731db0831c89e477727b8bebfc1ad6f7358cb4b17977b737b1b5f2016c675321b4d292c61357a949fe340e79348637a3140ea406e533a62d84e699e8450c93d0ecbdc6c6a68490a9f016e4d6fc2424a69e07003953a1b50877c95fb6e3f75fa7653398b433a3210f16bb64f42d0bae99e62e25af59c2465b247fb1450e25607b8b281a2907a899cf6c17779f983f49f0bffcaff211432ae73c72b48877c9cef82b1656ea8e115827149150310506b86d83e5471605628bfc2822eac25fe03c258020b7c8e818d886330920de00847937b52128101b52b7877ce31d6843ba5a1e20e9344b115fdda5335890eed2bc676f69cfada579cf5e8e85a9901e93167791886af30ac45cd4d0bc4bb6bfaeae74e98de9c6f9aa58f058288e1cb18b34053c795d1f802bed44c299262014743e94796d08ce4182b3a0d51ac2c482248cf2361e577140612d7904b4ce9c6920dcab0c0e206dcbc9408f197de48463c426904e5130a5eed55ca2c4c3518404f0e7d38de75fbedc22cf5f6ce37f3b9b5f573128a9c713b54bbe2c4d3ec3cf4efc9ebc28de67887c0eaf9f67afefeaf302328bc61e05c151a3f380cd00daed82d02bd3dbd92e5e1bcaa7019f23fe71925ff7e32a437026889bf8c5b520cf7888529346ba85134047e4cd6e7cae996378069bde80a0a948831b66b1ff627bbbb527af2158ecfc9f8358e983c21bab90068153c162274069e3ff1b328f53b211d2f7294efff2f22ff1fbcdbc8394af40cbc6202680a40fec9b32f7e5950999fc19681f74ad2694e4b2968026d328b6d9783edecdeb923f035224489929285612fb8069054c456012e286e0524d25a3570af57020a0b964b114d02600129c28d090a0d06fb8f6cb3d5a7a5263f2e749feba86040968ca56e52e27c7bd896141d0c413ab8a3fd93333c4228f5fd715faab6bd06746991fec4da0dcea29b076c8a58881a524414301df45f43ad7f7f41a4bec1f1443d94f8fcd6812805a86ee99a9c7e7d42857ab730c046927080505e4c8b40cb515704f750c672ac1a802d87838cf4a50be8d88922eaa3b079f9c9de77f355a96582b60f4e573d0c18646edefc901c995ee9e21afac339f7b20689df7a015abe35b05946806a3ff0e4885a283566d6dba3b486b64334982d23c32ec947e1ac6ce276e343dae0c07459fc473104bec349a8971c46e4af83115c1b2d4224a55ba7dc8edb0a98eb201f027fc2b56c45a11d6a00353f12a1f6863b33a401909f36011fb68c390fc97e3faec5ac2df241e65b3fe9c852a17104527c033910205c28a5fce350d12f89f490554b13fbabd2d4f176b287d77373a786bdf021192dbcfd2da9fdd55916c069a5814943039097815afe95c3c29624fdc44d5d9d214317f1ad5eb015dcfe7688da2204a1fcabdd4e678f0cae3da02f8eef3680af8d89be6a40e2cae115b53f8472be31784928f1bb228a90069a67190835a5e4390aee72c16b886bd0be77b5e6dc5ea5338f43c82dd81fa177291564588ab48ed8308f963104480951b6631d3031576d9074f8e487ecd3d649b15a006eda12fac7457834077c5bc07ecacbbfba1910fc7e23b89ee611f343ee8a2d393c7c4a1f2138d043c0868319bf5426cbbbb1ffe40d16b2af540329c4175bf079e73dbe36362904e45320c6450ed523b2c8cf5a28f7bb0cf2540ef4d92a05d7a1625a965803f40bd5873a04393dbfa683f7cc3a5d26008dc6c1111050b022ef24d44f88c44cc654a51b9f89aa438253754466858a5b64661aaa0427c06fdcff8fc3442159e8b69e8b8301c2ac0044ee8814550d6aea572c0030b88f9df4987ad6a847a5dc4b5676aedf95f96745aa58e71d947198d80dfc93ce68105f6e5418ebbee01d03eab0bfcb8b484973e468010078934d614f1a92253c6c0dfa0d7180d4a34d88360abbae0ac410b6f5c983b244c701952c0d02c4d2b9998101818d5aec77b93b84a1ebde0a3835ab35206d829689ca8b06ca39018fcc9d432faa09c5c37211a241500b7cdf8fb51cb62565f541e4b0f85695d650e364f0230a481966ba45f21f2ac3f6c58a867e36f930db4bed1b9da2c7a68658897cbf8c141bf391e11ee21bed3113853cb3923e5a2db5b6c728c051bf86b7c7a0286b15942786454db3ed1fdc1bf3f00d8359b7329d755ea414d60c236d6ab5533a65dc572033c043456994117834d8691bc3f55e69b5983f81226f6298f3cf61e0dd246f7032ce5b2c1452c96c6275c32d72cdfefc4040dcfa8f6efeefaba2f5883141e0b625881e3e8fa16c3179aeaa4588356a09bb679de8973e33330c993e82a3206ee5bfba369740fef4b0175c6e8415dd81f6bf5e5d2c84aeb8bf4577f6f8d3e402ab61155070c2652db3310211bb7b7d8ef19932e50149db312177cb6d90eddca9073af95c8dbc13e85ca1f10e6ae929aaf635f814aac727e5da4a6c2201345652eac327ec6d024e7ecc66843546dbd623d50d4cefb3658556e426a91dbf45969c90d0bb4235567c199f652d95584857ebf4284a5ed5586b94229b907d0f79281bd4a90248d65a402eef4c46c61789d739a744f6afdf9daa09a236216f5ccfb1b53f301269c4bf4b5e69d19bb21b872c12f29267f1df3e89a06bc8b7a06a32535741dc5e77d787925a558132ded73f89864310fc4b4cf43fe1bd4a1415bfce321903037bd7fc303a640f3d3e0862ed4eb249c327977d790df5c0384e9f05ba4a3afa385367d4d794491f88e3e1e7a7d11f661f707e13e1e7203ecfc61706bba7a42a8750391780ec6410241fbe2776fc00f7c3333bedf3af8edae4f3bc45404feaec5ff01d9aec684c40d3ac385519a853d9aab5874b2ee22624f2d6bd8b0464a33cbLine truncated
 	gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
 	bs, _ = ioutil.ReadAll(gr)
 	Assets["index.html"] = bs

gui/index.html

@@ -571,6 +571,7 @@
                   <label translate for="RescanIntervalS">Rescan Interval (s)</label>
                   <input id="RescanIntervalS" class="form-control" type="number" ng-model="tmpOptions.RescanIntervalS">
                 </div>
+                <!--
                 <div class="form-group">
                   <label translate for="ReconnectIntervalS">Reconnect Interval (s)</label>
                   <input id="ReconnectIntervalS" class="form-control" type="number" ng-model="tmpOptions.ReconnectIntervalS">
@@ -583,6 +584,15 @@
                   <label translate for="MaxChangeKbps">Max File Change Rate (KiB/s)</label>
                   <input id="MaxChangeKbps" class="form-control" type="number" ng-model="tmpOptions.MaxChangeKbps">
                 </div>
+                -->
+                <div class="form-group">
+                  <div class="checkbox">
+                    <label>
+                      <span translate>Enable UPnP</span> <input id="UPnPEnabled" type="checkbox" ng-model="tmpOptions.UPnPEnabled">
+                    </label>
+                  </div>
+                </div>
+
                 <div class="form-group">
                   <div class="checkbox">
                     <label>
@@ -602,11 +612,8 @@
                   </div>
                 </div>
                 <div class="form-group">
-                  <div class="checkbox">
-                    <label>
-                      <span translate>Enable UPnP</span> <input id="UPnPEnabled" type="checkbox" ng-model="tmpOptions.UPnPEnabled">
-                    </label>
-                  </div>
+                  <label translate for="GlobalAnnServer">Global Discovery Server</label>
+                  <input ng-disabled="!tmpOptions.GlobalAnnEnabled" id="GlobalAnnServer" class="form-control" type="text" ng-model="tmpOptions.GlobalAnnServer">
                 </div>
               </div>
 
@@ -637,17 +644,6 @@
                     </label>
                   </div>
                 </div>
-
-                <hr/>
-
-                <div class="form-group">
-                  <label><span translate>API Key</span> (<a translate href="http://discourse.syncthing.net/t/v0-8-14-api-keys/335">Usage</a>)</label>
-                  <div class="well well-sm text-monospace">{{tmpGUI.APIKey || "-"}}</div>
-                  <button translate type="button" class="btn btn-sm btn-default" ng-click="setAPIKey(tmpGUI)">Generate</button>
-                </div>
-
-                <hr/>
-
                 <div class="form-group">
                   <div class="checkbox">
                     <label>
@@ -655,6 +651,14 @@
                     </label>
                   </div>
                 </div>
+
+                <hr />
+
+                <div class="form-group">
+                  <label><span translate>API Key</span></label>
+                  <div class="well well-sm text-monospace">{{tmpGUI.APIKey || "-"}}</div>
+                  <button translate type="button" class="btn btn-sm btn-default" ng-click="setAPIKey(tmpGUI)">Generate</button>
+                </div>
               </div>
 
             </div>