add changeNode dropdown to header

MyEtherWallet · Dec 4, 2016 · d426365 · d426365
1 parent 575f243
commit d426365
Show file tree

Hide file tree

Showing 12 changed files with 101 additions and 17 deletions.
diff --git a/app/includes/footer.tpl b/app/includes/footer.tpl
@@ -5,7 +5,7 @@
     </p>
 
     <p>
-      <span translate="FOOTER_1">An open source, javascript, client-side tool for generating Ethererum Wallets & sending transactions.</span>
+      <span translate="FOOTER_1">Open-Source, client-side tool for easily & securely interacting with the Ethereum network.</span>
       <span translate="FOOTER_1b">Created by</span> <a href="https://github.com/kvhnuke" target="_blank">kvhnuke</a> & <a href="https://github.com/tayvano" target="_blank">tayvano</a>.
     </p>
 

diff --git a/app/includes/header.tpl b/app/includes/header.tpl
@@ -39,7 +39,7 @@
       <section class="container">
         <a class="brand" href="https://www.myetherwallet.com/"><img src="images/etherwallet-logo.svg" height="64px" width="auto" alt="My Ether Wallet" /></a>
         <div class="tagline">
-          <span style="max-width: 375px" translate="MEW_Tagline">Open Source JavaScript Client-Side Ether Wallet</span>
+          <span style="max-width: 375px">Open-Source & Client-Side Ether Wallet</span>
 }
 
 @@if (site === 'cx' ) {
@@ -53,7 +53,21 @@
         <div class="tagline">
           <span style="max-width: 375px" translate="CX_Tagline">Open Source JavaScript Client-Side Ether Wallet Chrome Extension</span>
 }
-        &middot; v3.3.4 &middot;
+        &middot; v3.3.4
+
+        &nbsp;&nbsp;
+
+        <span class="dropdown">
+          <a class="dropdown-toggle" ng-click="dropdownNode = !dropdownNode"> {{curNode}} <span class="caret"></span></a>
+          <ul class="dropdown-menu" ng-show="dropdownNode">
+            <li><a ng-class="{true:'active'}[curNode=='mainnet']" ng-click="changeNode('mainnet', 'Mainnet')">Mainnet</a></li>
+            <li><a ng-class="{true:'active'}[curNode=='testnet']" ng-click="changeNode('testnet', 'Testnet (Ropsten)')">Testnet (Ropsten)</a></li>
+            <li><a ng-class="{true:'active'}[curNode=='local']" ng-click="changeNode('local', 'Local')">Local</a></li>
+          </ul>
+        </span>
+
+        &nbsp;&nbsp;
+
         <span class="dropdown">
           <a class="dropdown-toggle" ng-click="dropdown = !dropdown"> {{curLang}} <span class="caret"></span></a>
           <ul class="dropdown-menu" ng-show="dropdown">
@@ -82,6 +96,9 @@
             <li><a data-toggle="modal" data-target="#disclaimerModal" translate="FOOTER_4"> Disclaimer </a></li>
           </ul>
         </span>
+
+
+
       </div>
     </section>
   </section>

diff --git a/app/scripts/controllers/tabsCtrl.js b/app/scripts/controllers/tabsCtrl.js
@@ -2,6 +2,7 @@
 var tabsCtrl = function($scope, globalService, $translate) {
 	$scope.tabNames = globalService.tabs;
 	$scope.curLang = "English";
+	$scope.curNode = "Mainnet"; //todo = fetch from localstorage
 	var hval = window.location.hash;
 
 	$scope.setArrowVisibility = function() {
@@ -85,6 +86,16 @@ var tabsCtrl = function($scope, globalService, $translate) {
 		}));
 	}
 
+	$scope.changeNode = function(key, value) {
+		$scope.curNode = value;
+		$scope.setArrowVisibility();
+		$scope.dropdownNode = false;
+		localStorage.setItem("node", JSON.stringify({
+			key: key,
+			value: value
+		}));
+	}
+
 	$scope.setLanguageFromStorage = function() {
 		var lang = localStorage.getItem('language');
 		if (lang == null) return;

diff --git a/app/scripts/translations/en.js b/app/scripts/translations/en.js
@@ -64,7 +64,7 @@ en.data = {
   CX_Tagline:           'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
 
   /* Footer */
-  FOOTER_1:             'An open source, javascript, client-side tool for generating Ethereum Wallets & sending transactions.',
+  FOOTER_1:             'Open-Source, client-side tool for easily &amp; securely interacting with the Ethereum network.',
   FOOTER_1b:            'Created by',
   FOOTER_2:             'Donations greatly appreciated:',
   FOOTER_3:             'Client-side wallet generation by',

diff --git a/app/scripts/translations/sk.js b/app/scripts/translations/sk.js
@@ -66,7 +66,7 @@ sk.data = {
   CX_Tagline:           'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
 
   /* Footer */
-  FOOTER_1:             'An open source, javascript, client-side tool for generating Ethererum Wallets & sending transactions.',
+  FOOTER_1:             'Open-Source, client-side tool for easily &amp; securely interacting with the Ethereum network.',
   FOOTER_1b:            'Vytvorené',
   FOOTER_2:             'Dotácie srdečne vítane:',
   FOOTER_3:             'Client-side wallet generation by',

diff --git a/app/scripts/translations/sl.js b/app/scripts/translations/sl.js
@@ -40,7 +40,7 @@ sl.data = {
   ADD_Ledger_0b:        'Re-open MyEtherWallet using [Chrome](https://www.google.com/chrome/browser/desktop/) or [Opera](https://www.opera.com/)',
   ADD_Ledger_scan:      'Connect to Ledger Nano S',
 
-  FOOTER_1:             'An open source, javascript, client-side tool for generating Ethereum Wallets & sending transactions.',
+  FOOTER_1:             'Open-Source, client-side tool for easily &amp; securely interacting with the Ethereum network.',
   FOOTER_4:             'Disclaimer',
   NAV_DeployContract:   'Deploy Contract',
   NAV_InteractContract: 'Interact with Contract',

diff --git a/app/scripts/translations/sv.js b/app/scripts/translations/sv.js
@@ -90,7 +90,7 @@ sv.data = {
 	CX_Tagline:           'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
 
   /* Footer */
-  FOOTER_1:             'An open source, javascript, client-side tool for generating Ethereum Wallets & sending transactions.',
+  FOOTER_1:             'Open-Source, client-side tool for easily &amp; securely interacting with the Ethereum network.',
   FOOTER_1b:            'Created by',
   FOOTER_2:             'Donations greatly appreciated:',
   FOOTER_3:             'Client-side wallet generation by',

diff --git a/app/scripts/translations/vi.js b/app/scripts/translations/vi.js
@@ -78,7 +78,7 @@ vi.data = {
   CX_Tagline:           'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
 
   /* Footer */
-  FOOTER_1:             'An open source, javascript, client-side tool for generating Ethereum Wallets &amp; sending transactions.',
+  FOOTER_1:             'Open-Source, client-side tool for easily &amp; securely interacting with the Ethereum network.',
   FOOTER_1b:            'Nhà Phát Triển:',
   FOOTER_2:             'Quyên Góp & Ủng Hộ Vào "Quỹ Phát Triển" Từ Bạn Là Một Hành Động Đáng Trân Trọng:',
   FOOTER_3:             'Client-side wallet generation by',

diff --git a/chrome-extension/cx-wallet.html b/chrome-extension/cx-wallet.html
@@ -43,7 +43,21 @@
         <div class="tagline">
           <span style="max-width: 375px" translate="CX_Tagline">Open Source JavaScript Client-Side Ether Wallet Chrome Extension</span>
 
-        &middot; v3.3.4 &middot;
+        &middot; v3.3.4
+
+        &nbsp;&nbsp;
+
+        <span class="dropdown">
+          <a class="dropdown-toggle" ng-click="dropdownNode = !dropdownNode"> {{curNode}} <span class="caret"></span></a>
+          <ul class="dropdown-menu" ng-show="dropdownNode">
+            <li><a ng-class="{true:'active'}[curNode=='mainnet']" ng-click="changeNode('mainnet', 'Mainnet')">Mainnet</a></li>
+            <li><a ng-class="{true:'active'}[curNode=='testnet']" ng-click="changeNode('testnet', 'Testnet (Ropsten)')">Testnet (Ropsten)</a></li>
+            <li><a ng-class="{true:'active'}[curNode=='local']" ng-click="changeNode('local', 'Local')">Local</a></li>
+          </ul>
+        </span>
+
+        &nbsp;&nbsp;
+
         <span class="dropdown">
           <a class="dropdown-toggle" ng-click="dropdown = !dropdown"> {{curLang}} <span class="caret"></span></a>
           <ul class="dropdown-menu" ng-show="dropdown">
@@ -72,6 +86,9 @@
             <li><a data-toggle="modal" data-target="#disclaimerModal" translate="FOOTER_4"> Disclaimer </a></li>
           </ul>
         </span>
+
+
+
       </div>
     </section>
   </section>
@@ -2345,7 +2362,7 @@ <h4 translate="HELP_FAQ_Title">More Helpful Answers to Frequent Questions </h4>
     </p>
 
     <p>
-      <span translate="FOOTER_1">An open source, javascript, client-side tool for generating Ethererum Wallets & sending transactions.</span>
+      <span translate="FOOTER_1">Open-Source, client-side tool for easily & securely interacting with the Ethereum network.</span>
       <span translate="FOOTER_1b">Created by</span> <a href="https://github.com/kvhnuke" target="_blank">kvhnuke</a> & <a href="https://github.com/tayvano" target="_blank">tayvano</a>.
     </p>
 

diff --git a/chrome-extension/js/etherwallet-master.js b/chrome-extension/js/etherwallet-master.js
@@ -1471,6 +1471,7 @@ module.exports = signMsgCtrl;
 var tabsCtrl = function ($scope, globalService, $translate) {
 	$scope.tabNames = globalService.tabs;
 	$scope.curLang = "English";
+	$scope.curNode = "Mainnet"; //todo = fetch from localstorage
 	var hval = window.location.hash;
 
 	$scope.setArrowVisibility = function () {
@@ -1551,6 +1552,16 @@ var tabsCtrl = function ($scope, globalService, $translate) {
 		}));
 	};
 
+	$scope.changeNode = function (key, value) {
+		$scope.curNode = value;
+		$scope.setArrowVisibility();
+		$scope.dropdownNode = false;
+		localStorage.setItem("node", JSON.stringify({
+			key: key,
+			value: value
+		}));
+	};
+
 	$scope.setLanguageFromStorage = function () {
 		var lang = localStorage.getItem('language');
 		if (lang == null) return;
@@ -5622,7 +5633,7 @@ en.data = {
   CX_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
 
   /* Footer */
-  FOOTER_1: 'An open source, javascript, client-side tool for generating Ethereum Wallets & sending transactions.',
+  FOOTER_1: 'Open-Source, client-side tool for easily &amp; securely interacting with the Ethereum network.',
   FOOTER_1b: 'Created by',
   FOOTER_2: 'Donations greatly appreciated:',
   FOOTER_3: 'Client-side wallet generation by',
@@ -14001,7 +14012,7 @@ vi.data = {
   CX_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
 
   /* Footer */
-  FOOTER_1: 'An open source, javascript, client-side tool for generating Ethereum Wallets &amp; sending transactions.',
+  FOOTER_1: 'Open-Source, client-side tool for easily &amp; securely interacting with the Ethereum network.',
   FOOTER_1b: 'Nhà Phát Triển:',
   FOOTER_2: 'Quyên Góp & Ủng Hộ Vào "Quỹ Phát Triển" Từ Bạn Là Một Hành Động Đáng Trân Trọng:',
   FOOTER_3: 'Client-side wallet generation by',

diff --git a/dist/index.html b/dist/index.html
@@ -39,11 +39,25 @@
       <section class="container">
         <a class="brand" href="https://www.myetherwallet.com/"><img src="images/etherwallet-logo.svg" height="64px" width="auto" alt="My Ether Wallet" /></a>
         <div class="tagline">
-          <span style="max-width: 375px" translate="MEW_Tagline">Open Source JavaScript Client-Side Ether Wallet</span>
+          <span style="max-width: 375px">Open-Source & Client-Side Ether Wallet</span>
 
 
 
-        &middot; v3.3.4 &middot;
+        &middot; v3.3.4
+
+        &nbsp;&nbsp;
+
+        <span class="dropdown">
+          <a class="dropdown-toggle" ng-click="dropdownNode = !dropdownNode"> {{curNode}} <span class="caret"></span></a>
+          <ul class="dropdown-menu" ng-show="dropdownNode">
+            <li><a ng-class="{true:'active'}[curNode=='mainnet']" ng-click="changeNode('mainnet', 'Mainnet')">Mainnet</a></li>
+            <li><a ng-class="{true:'active'}[curNode=='testnet']" ng-click="changeNode('testnet', 'Testnet (Ropsten)')">Testnet (Ropsten)</a></li>
+            <li><a ng-class="{true:'active'}[curNode=='local']" ng-click="changeNode('local', 'Local')">Local</a></li>
+          </ul>
+        </span>
+
+        &nbsp;&nbsp;
+
         <span class="dropdown">
           <a class="dropdown-toggle" ng-click="dropdown = !dropdown"> {{curLang}} <span class="caret"></span></a>
           <ul class="dropdown-menu" ng-show="dropdown">
@@ -72,6 +86,9 @@
             <li><a data-toggle="modal" data-target="#disclaimerModal" translate="FOOTER_4"> Disclaimer </a></li>
           </ul>
         </span>
+
+
+
       </div>
     </section>
   </section>
@@ -2241,7 +2258,7 @@ <h2 translate="BULK_SuccessMsg">Success! Your wallets have been generated.</h2>
     </p>
 
     <p>
-      <span translate="FOOTER_1">An open source, javascript, client-side tool for generating Ethererum Wallets & sending transactions.</span>
+      <span translate="FOOTER_1">Open-Source, client-side tool for easily & securely interacting with the Ethereum network.</span>
       <span translate="FOOTER_1b">Created by</span> <a href="https://github.com/kvhnuke" target="_blank">kvhnuke</a> & <a href="https://github.com/tayvano" target="_blank">tayvano</a>.
     </p>
 

diff --git a/dist/js/etherwallet-master.js b/dist/js/etherwallet-master.js
@@ -1471,6 +1471,7 @@ module.exports = signMsgCtrl;
 var tabsCtrl = function ($scope, globalService, $translate) {
 	$scope.tabNames = globalService.tabs;
 	$scope.curLang = "English";
+	$scope.curNode = "Mainnet"; //todo = fetch from localstorage
 	var hval = window.location.hash;
 
 	$scope.setArrowVisibility = function () {
@@ -1551,6 +1552,16 @@ var tabsCtrl = function ($scope, globalService, $translate) {
 		}));
 	};
 
+	$scope.changeNode = function (key, value) {
+		$scope.curNode = value;
+		$scope.setArrowVisibility();
+		$scope.dropdownNode = false;
+		localStorage.setItem("node", JSON.stringify({
+			key: key,
+			value: value
+		}));
+	};
+
 	$scope.setLanguageFromStorage = function () {
 		var lang = localStorage.getItem('language');
 		if (lang == null) return;
@@ -5622,7 +5633,7 @@ en.data = {
   CX_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
 
   /* Footer */
-  FOOTER_1: 'An open source, javascript, client-side tool for generating Ethereum Wallets & sending transactions.',
+  FOOTER_1: 'Open-Source, client-side tool for easily &amp; securely interacting with the Ethereum network.',
   FOOTER_1b: 'Created by',
   FOOTER_2: 'Donations greatly appreciated:',
   FOOTER_3: 'Client-side wallet generation by',
@@ -14001,7 +14012,7 @@ vi.data = {
   CX_Tagline: 'Open Source JavaScript Client-Side Ether Wallet Chrome Extension',
 
   /* Footer */
-  FOOTER_1: 'An open source, javascript, client-side tool for generating Ethereum Wallets &amp; sending transactions.',
+  FOOTER_1: 'Open-Source, client-side tool for easily &amp; securely interacting with the Ethereum network.',
   FOOTER_1b: 'Nhà Phát Triển:',
   FOOTER_2: 'Quyên Góp & Ủng Hộ Vào "Quỹ Phát Triển" Từ Bạn Là Một Hành Động Đáng Trân Trọng:',
   FOOTER_3: 'Client-side wallet generation by',