Minor changes

README.md

@@ -57,6 +57,7 @@ The following functionalities are modified looking for a better user experience
  - Add "Manual upgrade" section
  - Decrease initial requests (from 8 to 3)
  - Use Universal Wifi pineapple hardware cloner downloads as update feed
+ - Add "Keep settings and retain the current configuration" checkbox
 
 ## Modules:
  - Refactor in Modules.php

src/pineapple/modules/Advanced/js/module.js

@@ -164,8 +164,8 @@ registerController("AdvancedUpgradeController", ['$api', '$scope', '$interval',
     $scope.performUpgradeStart = false;
     $scope.isManualUpgrade = false;
     $scope.manualUpgradeUrl = "";
-    $scope.showManualUpgradeUrlError = false;
-    $scope.keepSettings = false;
+    $scope.showManualUpgradeError = false;
+    $scope.keepSettings = true;
 
     $scope.reloadData = (function() {
         $api.request({
@@ -215,9 +215,9 @@ registerController("AdvancedUpgradeController", ['$api', '$scope', '$interval',
             /(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g
         );
         if (isValid === null) {
-            $scope.showManualUpgradeUrlError = true;
+            $scope.showManualUpgradeError = true;
             $interval(function(){
-                $scope.showManualUpgradeUrlError = false;
+                $scope.showManualUpgradeError = false;
             }, 2000);
             return;
         }

src/pineapple/modules/Advanced/module.html

@@ -218,7 +218,7 @@
                     </div>
                     <div class="panel-body">
                         <div ng-hide="isManualUpgrade && upgradeFound">
-                            <p class="alert well-sm alert-danger" ng-show="showManualUpgradeUrlError">Please check the url entered are correct.</p>
+                            <p class="alert well-sm alert-danger" ng-show="showManualUpgradeError">Please check the url entered are correct.</p>
                             <div class="input-group">
                                 <span class="input-group-addon">Firmware URL</span>
                                 <input type="text" class="form-control" ng-model="manualUpgradeUrl">