Skip to content
This repository was archived by the owner on Nov 21, 2019. It is now read-only.

Commit f31aeba

Browse files
tayvanotayvano
committed
the dao.
1 parent a388d7c commit f31aeba

File tree

6 files changed

+33
-31
lines changed

6 files changed

+33
-31
lines changed

‎app/scripts/controllers/thedaoCtrl.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var theDaoCtrl = function($scope, $sce, walletService) {
55
walletService.password = '';
66
$scope.showAdvance = false;
77
$scope.showRaw = false;
8-
$scope.slockitContract = "0xd838f9c9792bf8398e1f5fbfbd3b43c5a86445aa";
8+
$scope.slockitContract = "0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413";
99
$scope.slockitBalance = "0x70a08231";
1010
$scope.slockitSupply = "0x18160ddd";
1111
$scope.tx = {
@@ -79,4 +79,4 @@ var theDaoCtrl = function($scope, $sce, walletService) {
7979
uiFuncs.sendTx($scope,$sce);
8080
}
8181
};
82-
module.exports = theDaoCtrl;
82+
module.exports = theDaoCtrl;

‎app/scripts/services/globalService.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ var globalService = function($http, $httpParamSerializerJQLike) {
2828
name: "Offline Transaction",
2929
url:"offline-transaction"
3030
},
31-
// thedao: {
32-
// id: 5,
33-
// name: "\"The DAO\"",
34-
// url: "the-dao"
35-
// },
36-
digix: {
31+
thedao: {
3732
id: 5,
33+
name: "\"The DAO\"",
34+
url: "the-dao"
35+
},
36+
digix: {
37+
id: 6,
3838
name: "Digix",
3939
url: "digix"
4040
},
@@ -44,7 +44,7 @@ var globalService = function($http, $httpParamSerializerJQLike) {
4444
// url: "contracts"
4545
// },
4646
help: {
47-
id: 6,
47+
id: 7,
4848
name: "Help",
4949
url: "help"
5050
}

‎app/views/thedao.tpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<section class="row">
44
<div class="col-md-9 col-sm-8">
55
<h2> "The DAO" </h2>
6-
<p>The best way to participate in the DAO Creation is to send a transaction to The DAO Address from the account you want to do the voting with in the future. You can do that here! Simply access the account, enter the amount of ETH you would like, and press send. Wait a minute, refresh the page, and your tokens will be displayed in the lower left.</p>
6+
<p>The best way to participate in the DAO Creation is to send a transaction to The DAO Address from the account you want to do the voting with in the future. You can do that here! Simply access the account, enter the amount of ETH you would like, and press send. Your tokens will be displayed in the lower left almost immediately.</p>
77
<p>It should be noted that in order to participate in the voting process later, you will need a <em>small</em> amount of ETH to cover the cost of gas.</p>
88
<p>Helpful links: <a href="http://daohub.org/" target="_blank">DAOHub</a> &middot; <a href="https://blog.slock.it/the-art-of-the-dao-experiments-with-the-generic-dao-framework-4782f7862131#.bibozinlb" target="_blank">The Art of the DAO</a> &middot; <a href="https://forum.daohub.org/c/theDAO" target="_blank">DAO Hub Forums (Support, too!)</a></p>
99
</div>
@@ -32,7 +32,7 @@
3232
<strong class="text-success" style="margin-left: 1em"> {{btcBalance}} BTC </strong>
3333
</p>
3434
<p> "The DAO" Details: <br />
35-
<strong class="text-primary" style="margin-left: 1em"> Your Tokens: <br /> {{token.balance}}</strong>
35+
<strong class="text-primary" style="margin-left: 1em"> Your Tokens: {{token.balance}}</strong>
3636
</p>
3737

3838
</p>
@@ -44,7 +44,7 @@
4444
<h4>Get DAO Tokens</h4>
4545
<div class="form-group col-xs-10">
4646
<label> To Address: </label>
47-
<input class="form-control readonly" type="text" placeholder="0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8" ng-model="tx.to" ng-change="validateAddress()" readonly/>
47+
<input class="form-control readonly" type="text" placeholder="0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413" ng-model="tx.to" ng-change="validateAddress()" readonly/>
4848
<div ng-bind-html="validateAddressStatus"></div>
4949
</div>
5050
<div class="col-xs-2 address-identicon-container">

‎dist/index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ <h4> Are you <span class="text-underline">sure</span> you want to do this?</h4>
853853
<section class="row">
854854
<div class="col-md-9 col-sm-8">
855855
<h2> "The DAO" </h2>
856-
<p>The best way to participate in the DAO Creation is to send a transaction to The DAO Address from the account you want to do the voting with in the future. You can do that here! Simply access the account, enter the amount of ETH you would like, and press send. Wait a minute, refresh the page, and your tokens will be displayed in the lower left.</p>
856+
<p>The best way to participate in the DAO Creation is to send a transaction to The DAO Address from the account you want to do the voting with in the future. You can do that here! Simply access the account, enter the amount of ETH you would like, and press send. Your tokens will be displayed in the lower left almost immediately.</p>
857857
<p>It should be noted that in order to participate in the voting process later, you will need a <em>small</em> amount of ETH to cover the cost of gas.</p>
858858
<p>Helpful links: <a href="http://daohub.org/" target="_blank">DAOHub</a> &middot; <a href="https://blog.slock.it/the-art-of-the-dao-experiments-with-the-generic-dao-framework-4782f7862131#.bibozinlb" target="_blank">The Art of the DAO</a> &middot; <a href="https://forum.daohub.org/c/theDAO" target="_blank">DAO Hub Forums (Support, too!)</a></p>
859859
</div>
@@ -882,7 +882,7 @@ <h4> Account Information </h4>
882882
<strong class="text-success" style="margin-left: 1em"> {{btcBalance}} BTC </strong>
883883
</p>
884884
<p> "The DAO" Details: <br />
885-
<strong class="text-primary" style="margin-left: 1em"> Your Tokens: <br /> {{token.balance}}</strong>
885+
<strong class="text-primary" style="margin-left: 1em"> Your Tokens: {{token.balance}}</strong>
886886
</p>
887887

888888
</p>
@@ -894,7 +894,7 @@ <h4> Account Information </h4>
894894
<h4>Get DAO Tokens</h4>
895895
<div class="form-group col-xs-10">
896896
<label> To Address: </label>
897-
<input class="form-control readonly" type="text" placeholder="0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8" ng-model="tx.to" ng-change="validateAddress()" readonly/>
897+
<input class="form-control readonly" type="text" placeholder="0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413" ng-model="tx.to" ng-change="validateAddress()" readonly/>
898898
<div ng-bind-html="validateAddressStatus"></div>
899899
</div>
900900
<div class="col-xs-2 address-identicon-container">

‎dist/js/etherwallet-master-min.js

+9-8
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ var theDaoCtrl = function($scope, $sce, walletService) {
507507
walletService.password = '';
508508
$scope.showAdvance = false;
509509
$scope.showRaw = false;
510-
$scope.slockitContract = "0xd838f9c9792bf8398e1f5fbfbd3b43c5a86445aa";
510+
$scope.slockitContract = "0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413";
511511
$scope.slockitBalance = "0x70a08231";
512512
$scope.slockitSupply = "0x18160ddd";
513513
$scope.tx = {
@@ -582,6 +582,7 @@ var theDaoCtrl = function($scope, $sce, walletService) {
582582
}
583583
};
584584
module.exports = theDaoCtrl;
585+
585586
},{}],9:[function(require,module,exports){
586587
'use strict';
587588
var viewCtrl = function($scope, globalService) {
@@ -1331,13 +1332,13 @@ var globalService = function($http, $httpParamSerializerJQLike) {
13311332
name: "Offline Transaction",
13321333
url:"offline-transaction"
13331334
},
1334-
// thedao: {
1335-
// id: 5,
1336-
// name: "\"The DAO\"",
1337-
// url: "the-dao"
1338-
// },
1339-
digix: {
1335+
thedao: {
13401336
id: 5,
1337+
name: "\"The DAO\"",
1338+
url: "the-dao"
1339+
},
1340+
digix: {
1341+
id: 6,
13411342
name: "Digix",
13421343
url: "digix"
13431344
},
@@ -1347,7 +1348,7 @@ var globalService = function($http, $httpParamSerializerJQLike) {
13471348
// url: "contracts"
13481349
// },
13491350
help: {
1350-
id: 6,
1351+
id: 7,
13511352
name: "Help",
13521353
url: "help"
13531354
}

‎dist/js/etherwallet-master.js

+9-8
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ var theDaoCtrl = function($scope, $sce, walletService) {
507507
walletService.password = '';
508508
$scope.showAdvance = false;
509509
$scope.showRaw = false;
510-
$scope.slockitContract = "0xd838f9c9792bf8398e1f5fbfbd3b43c5a86445aa";
510+
$scope.slockitContract = "0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413";
511511
$scope.slockitBalance = "0x70a08231";
512512
$scope.slockitSupply = "0x18160ddd";
513513
$scope.tx = {
@@ -582,6 +582,7 @@ var theDaoCtrl = function($scope, $sce, walletService) {
582582
}
583583
};
584584
module.exports = theDaoCtrl;
585+
585586
},{}],9:[function(require,module,exports){
586587
'use strict';
587588
var viewCtrl = function($scope, globalService) {
@@ -1331,13 +1332,13 @@ var globalService = function($http, $httpParamSerializerJQLike) {
13311332
name: "Offline Transaction",
13321333
url:"offline-transaction"
13331334
},
1334-
// thedao: {
1335-
// id: 5,
1336-
// name: "\"The DAO\"",
1337-
// url: "the-dao"
1338-
// },
1339-
digix: {
1335+
thedao: {
13401336
id: 5,
1337+
name: "\"The DAO\"",
1338+
url: "the-dao"
1339+
},
1340+
digix: {
1341+
id: 6,
13411342
name: "Digix",
13421343
url: "digix"
13431344
},
@@ -1347,7 +1348,7 @@ var globalService = function($http, $httpParamSerializerJQLike) {
13471348
// url: "contracts"
13481349
// },
13491350
help: {
1350-
id: 6,
1351+
id: 7,
13511352
name: "Help",
13521353
url: "help"
13531354
}

0 commit comments

Comments
 (0)