Skip to content

Commit

Permalink
navigation now works for CX & MEW
Browse files Browse the repository at this point in the history
  • Loading branch information
@tayvano
tayvano committed May 2, 2016
1 parent 99cef5a commit 0caf54b
Show file tree
Hide file tree
Showing 12 changed files with 210 additions and 91 deletions.
3 changes: 3 additions & 0 deletions app/includes/generateWallet.tpl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<section class="tab-pane active" ng-if="globalService.currentTab==globalService.tabs.generateWallet.id" ng-controller='walletGenCtrl'>

<h2> Generate Wallet </h2>
@@if (site === 'mew' ) {
<p>We removed the <a ng-click="globalService.currentTab=globalService.tabs.bulkGenerate.id"> Bulk Generate tab </a> from the nav as it wasn't very widely used, but feel free to still use it if you want.</p>
}
<div class="row">
<div class="col-sm-6">
<div class="form-group">
Expand Down
2 changes: 1 addition & 1 deletion app/layouts/cx-wallet.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<section class="container" ng-controller='tabsCtrl'>
<ul class="nav nav-tabs">
<li ng-repeat="tab in tabNames track by $index" ng-class="{active: $index==activeTab}" ng-click="tabClick($index)"> <a>{{tab.name}}</a></li>
<li ng-repeat="tab in tabNames track by $index" ng-class="{active: $index==activeTab}" ng-show="{{tab.cx}}" ng-click="tabClick($index)"> <a>{{tab.name}}</a></li>
</ul>
</section>
<br />
Expand Down
2 changes: 1 addition & 1 deletion app/layouts/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<section class="container" ng-controller='tabsCtrl'>
<ul class="nav nav-tabs">
<li ng-repeat="tab in tabNames track by $index" ng-class="{active: $index==activeTab}" ng-click="tabClick($index)"> <a>{{tab.name}}</a></li>
<li ng-repeat="tab in tabNames track by $index" ng-class="{active: $index==activeTab}" ng-show="{{tab.mew}}" ng-click="tabClick($index)"> <a>{{tab.name}} </a></li>
</ul>
</section>
<br />
Expand Down
56 changes: 39 additions & 17 deletions app/scripts/services/globalService.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,57 +7,79 @@ var globalService = function($http, $httpParamSerializerJQLike) {
generateWallet: {
id: 0,
name: "Generate Wallet",
url: "generate-wallet"
url: "generate-wallet",
mew: true,
cx: false
},
bulkGenerate: {
id: 1,
name: "Bulk Generate",
url: "bulk-generate"
url: "bulk-generate",
mew: false,
cx: false
},
myWallet: {
viewWalletInfo: {
id: 2,
name: "My Wallets",
url: "my-wallet"
name: "View Wallet Info",
url: "view-wallet-info",
mew: true,
cx: false
},
addWallet: {
myWallet: {
id: 3,
name: "Add Wallet",
url: "add-wallet"
name: "My Wallets",
url: "my-wallet",
mew: false,
cx: true
},
viewWalletInfo: {
addWallet: {
id: 4,
name: "View Wallet Info",
url: "view-wallet-info"
name: "Add Wallet",
url: "add-wallet",
mew: false,
cx: true
},
sendTransaction: {
id: 5,
name: "Send Transaction",
url: "send-transaction"
url: "send-transaction",
mew: true,
cx: true
},
offlineTransaction: {
id: 6,
name: "Offline Transaction",
url:"offline-transaction"
url:"offline-transaction",
mew: true,
cx: false
},
contracts: {
id: 7,
name: "Contracts",
url:"contracts"
url:"contracts",
mew: false,
cx: false
},
thedao: {
id: 8,
name: "\"The DAO\"",
url: "the-dao"
url: "the-dao",
mew: true,
cx: true
},
digix: {
id: 9,
name: "Digix",
url: "digix"
url: "digix",
mew: true,
cx: true
},
help: {
id: 10,
name: "Help",
url: "help"
url: "help",
mew: true,
cx: true
}
};

Expand Down
2 changes: 1 addition & 1 deletion chrome-extension/cx-wallet.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

<section class="container" ng-controller='tabsCtrl'>
<ul class="nav nav-tabs">
<li ng-repeat="tab in tabNames track by $index" ng-class="{active: $index==activeTab}" ng-click="tabClick($index)"> <a>{{tab.name}}</a></li>
<li ng-repeat="tab in tabNames track by $index" ng-class="{active: $index==activeTab}" ng-show="{{tab.cx}}" ng-click="tabClick($index)"> <a>{{tab.name}}</a></li>
</ul>
</section>
<br />
Expand Down
5 changes: 4 additions & 1 deletion chrome-extension/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

<section class="container" ng-controller='tabsCtrl'>
<ul class="nav nav-tabs">
<li ng-repeat="tab in tabNames track by $index" ng-class="{active: $index==activeTab}" ng-click="tabClick($index)"> <a>{{tab.name}}</a></li>
<li ng-repeat="tab in tabNames track by $index" ng-class="{active: $index==activeTab}" ng-show="{{tab.mew}}" ng-click="tabClick($index)"> <a>{{tab.name}} </a></li>
</ul>
</section>
<br />
Expand All @@ -65,6 +65,9 @@
<section class="tab-pane active" ng-if="globalService.currentTab==globalService.tabs.generateWallet.id" ng-controller='walletGenCtrl'>

<h2> Generate Wallet </h2>

<p>We removed the <a ng-click="globalService.currentTab=globalService.tabs.bulkGenerate.id"> Bulk Generate tab </a> from the nav as it wasn't very widely used, but feel free to still use it if you want.</p>

<div class="row">
<div class="col-sm-6">
<div class="form-group">
Expand Down
56 changes: 39 additions & 17 deletions chrome-extension/js/etherwallet-master-min.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1344,57 +1344,79 @@ var globalService = function($http, $httpParamSerializerJQLike) {
generateWallet: {
id: 0,
name: "Generate Wallet",
url: "generate-wallet"
url: "generate-wallet",
mew: true,
cx: false
},
bulkGenerate: {
id: 1,
name: "Bulk Generate",
url: "bulk-generate"
url: "bulk-generate",
mew: false,
cx: false
},
myWallet: {
viewWalletInfo: {
id: 2,
name: "My Wallets",
url: "my-wallet"
name: "View Wallet Info",
url: "view-wallet-info",
mew: true,
cx: false
},
addWallet: {
myWallet: {
id: 3,
name: "Add Wallet",
url: "add-wallet"
name: "My Wallets",
url: "my-wallet",
mew: false,
cx: true
},
viewWalletInfo: {
addWallet: {
id: 4,
name: "View Wallet Info",
url: "view-wallet-info"
name: "Add Wallet",
url: "add-wallet",
mew: false,
cx: true
},
sendTransaction: {
id: 5,
name: "Send Transaction",
url: "send-transaction"
url: "send-transaction",
mew: true,
cx: true
},
offlineTransaction: {
id: 6,
name: "Offline Transaction",
url:"offline-transaction"
url:"offline-transaction",
mew: true,
cx: false
},
contracts: {
id: 7,
name: "Contracts",
url:"contracts"
url:"contracts",
mew: false,
cx: false
},
thedao: {
id: 8,
name: "\"The DAO\"",
url: "the-dao"
url: "the-dao",
mew: true,
cx: true
},
digix: {
id: 9,
name: "Digix",
url: "digix"
url: "digix",
mew: true,
cx: true
},
help: {
id: 10,
name: "Help",
url: "help"
url: "help",
mew: true,
cx: true
}
};

Expand Down
56 changes: 39 additions & 17 deletions chrome-extension/js/etherwallet-master.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1344,57 +1344,79 @@ var globalService = function($http, $httpParamSerializerJQLike) {
generateWallet: {
id: 0,
name: "Generate Wallet",
url: "generate-wallet"
url: "generate-wallet",
mew: true,
cx: false
},
bulkGenerate: {
id: 1,
name: "Bulk Generate",
url: "bulk-generate"
url: "bulk-generate",
mew: false,
cx: false
},
myWallet: {
viewWalletInfo: {
id: 2,
name: "My Wallets",
url: "my-wallet"
name: "View Wallet Info",
url: "view-wallet-info",
mew: true,
cx: false
},
addWallet: {
myWallet: {
id: 3,
name: "Add Wallet",
url: "add-wallet"
name: "My Wallets",
url: "my-wallet",
mew: false,
cx: true
},
viewWalletInfo: {
addWallet: {
id: 4,
name: "View Wallet Info",
url: "view-wallet-info"
name: "Add Wallet",
url: "add-wallet",
mew: false,
cx: true
},
sendTransaction: {
id: 5,
name: "Send Transaction",
url: "send-transaction"
url: "send-transaction",
mew: true,
cx: true
},
offlineTransaction: {
id: 6,
name: "Offline Transaction",
url:"offline-transaction"
url:"offline-transaction",
mew: true,
cx: false
},
contracts: {
id: 7,
name: "Contracts",
url:"contracts"
url:"contracts",
mew: false,
cx: false
},
thedao: {
id: 8,
name: "\"The DAO\"",
url: "the-dao"
url: "the-dao",
mew: true,
cx: true
},
digix: {
id: 9,
name: "Digix",
url: "digix"
url: "digix",
mew: true,
cx: true
},
help: {
id: 10,
name: "Help",
url: "help"
url: "help",
mew: true,
cx: true
}
};

Expand Down
2 changes: 1 addition & 1 deletion dist/cx-wallet.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

<section class="container" ng-controller='tabsCtrl'>
<ul class="nav nav-tabs">
<li ng-repeat="tab in tabNames track by $index" ng-class="{active: $index==activeTab}" ng-click="tabClick($index)"> <a>{{tab.name}}</a></li>
<li ng-repeat="tab in tabNames track by $index" ng-class="{active: $index==activeTab}" ng-show="{{tab.cx}}" ng-click="tabClick($index)"> <a>{{tab.name}}</a></li>
</ul>
</section>
<br />
Expand Down
5 changes: 4 additions & 1 deletion dist/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

<section class="container" ng-controller='tabsCtrl'>
<ul class="nav nav-tabs">
<li ng-repeat="tab in tabNames track by $index" ng-class="{active: $index==activeTab}" ng-click="tabClick($index)"> <a>{{tab.name}}</a></li>
<li ng-repeat="tab in tabNames track by $index" ng-class="{active: $index==activeTab}" ng-show="{{tab.mew}}" ng-click="tabClick($index)"> <a>{{tab.name}} </a></li>
</ul>
</section>
<br />
Expand All @@ -65,6 +65,9 @@
<section class="tab-pane active" ng-if="globalService.currentTab==globalService.tabs.generateWallet.id" ng-controller='walletGenCtrl'>

<h2> Generate Wallet </h2>

<p>We removed the <a ng-click="globalService.currentTab=globalService.tabs.bulkGenerate.id"> Bulk Generate tab </a> from the nav as it wasn't very widely used, but feel free to still use it if you want.</p>

<div class="row">
<div class="col-sm-6">
<div class="form-group">
Expand Down
Loading

0 comments on commit 0caf54b

Please sign in to comment.