settings: refactor views

js/controllers/settings.js

@@ -4,11 +4,9 @@ angular.module('copayApp.controllers').controller('SettingsController', function
 
   controllerUtils.redirIfLogged();
   $scope.title = 'Settings';
-  $scope.networkName = config.networkName;
   $scope.insightHost = config.blockchain.host;
   $scope.insightPort = config.blockchain.port;
   $scope.insightSecure = config.blockchain.schema === 'https';
-  $scope.forceNetwork = config.forceNetwork;
   $scope.defaultLanguage = config.defaultLanguage || 'en';
 
   $scope.availableLanguages = [{

views/more.html

@@ -8,14 +8,31 @@
     </div>
   </div>
   <div class="large-12 columns line-dashed-h m15b"></div>
+  <form name="settingsForm">
+    <fieldset>
+      <legend translate>Wallet Unit</legend>
+      <select class="form-control" ng-model="selectedUnit" ng-options="o.name for o in unitOpts" required>
+      </select>
+    </fieldset>
+    <fieldset>
+      <legend translate>Alternative Currency</legend>
+      <select class="form-control" ng-model="selectedAlternative" ng-options="alternative.name for alternative in alternativeOpts" required>
+      </select>
+    </fieldset>
+
+    <div class="text-right">
+      <button translate type="submit" class="button primary m0 ng-binding" ng-disabled="setupForm.$invalid || loading" disabled="disabled" ng-click="save()">
+        Save
+      </button>
+    </div>
+  </form>
+  <div class="large-12 columns line-dashed-h m15b"></div>
   <div>
     <div class="oh large-12 columns panel">
-      <h3><i class="fi-minus-circle m10r"></i> 
+      <h3><i class="fi-minus-circle m10r"></i> <span translate> Delete Wallet </span></h3>
-        <span translate>Delete Wallet</span> </h3>
       <p translate class="large-8 columns text-gray">If all funds have been removed from your wallet and you do not wish to have the wallet data stored on your computer anymore, you can delete your wallet.</p>
       <div class="large-4 columns">
-        <a translate class="button warning expand" 
+        <a translate class="button warning expand" ng-really-message="'Are you sure to delete this wallet from this computer?'|translate" ng-really-click="deleteWallet()"> Delete</a>
-          ng-really-message="'Are you sure to delete this wallet from this computer?'|translate" ng-really-click="deleteWallet()"> Delete</a>
       </div>
     </div>
   </div>
@@ -78,4 +95,3 @@
   </div>
 
 </div>
-

views/settings.html

@@ -10,32 +10,9 @@
         <form name="settingsForm">
           <fieldset>
             <legend translate>Language</legend>
-            <select class="form-control" ng-model="selectedLanguage"
+            <select class="form-control" ng-model="selectedLanguage" ng-options="o.name for o in availableLanguages" required>
-              ng-options="o.name for o in availableLanguages" required>
             </select>
           </fieldset>
-          <fieldset>
-            <legend translate>Bitcoin Network</legend>
-            <input id="network-name" type="checkbox" ng-model="networkName"
-            ng-true-value="livenet" ng-false-value="testnet" class="form-control" ng-click="changeNetwork()"
-            ng-disabled="forceNetwork" 
-            ng-checked="networkName == 'livenet' ? true : false">
-            <label for="network-name">Livenet</label>
-            <div translate ng-show="forceNetwork">
-              Network has been fixed to <strong>{{networkName}}</strong> in this setup. See <a href="https://copay.io">copay.io</a> for options to use Copay on both livenet and testnet.
-            </div>
-          </fieldset>
-          <fieldset>
-            <legend translate>Wallet Unit</legend>
-            <select class="form-control" ng-model="selectedUnit" ng-options="o.name for o in unitOpts" required>
-            </select>
-          </fieldset>
-          <fieldset>
-            <legend translate>Alternative Currency</legend>
-            <select class="form-control" ng-model="selectedAlternative" ng-options="alternative.name for alternative in alternativeOpts" required>
-            </select>
-          </fieldset>
-          <fieldset>
           <legend translate>Insight API server</legend>
           <label for="insight-host">Host</label>
           <input type="text" ng-model="insightHost" class="form-control" name="insight-host">
@@ -45,10 +22,10 @@
           <label for="insight-secure" translate>Use SSL</label>
 
           <p translate class="small">
-            Insight API server is open-source software.  You can run your own instance, check <a href="http://insight.is" target="_blank">Insight API Homepage</a></p>
+            Insight API server is open-source software. You can run your own instance, check <a href="http://insight.is" target="_blank">Insight API Homepage</a>
+          </p>
 
           </fieldset>
-
           <div class="text-right">
             <a class="back-button text-white m20r" href="#!/">&laquo; <span translate>Back</span></a>
             <button translate type="submit" class="button primary m0 ng-binding" ng-disabled="setupForm.$invalid || loading" disabled="disabled" ng-click="save()">
@@ -60,4 +37,3 @@
     </div>
   </div>
 </div>
-