BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3592 from cmgustavo/bug/home-history-buttons 

Bug/home history buttons
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-04 11:32:41 -03:00
parent 1adf61198c 17584c3ae4
commit 07d7ef23ef
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bower.json
View File

@ -9,7 +9,7 @@
"dependencies": { "dependencies": {
"angular": "1.4.6", "angular": "1.4.6",
"angular-bitcore-wallet-client": "1.1.7", "angular-bitcore-wallet-client": "1.1.7",
"angular-foundation": "0.8.0", "angular-foundation": "0.7.0",
"angular-gettext": "2.1.2", "angular-gettext": "2.1.2",
"angular-moment": "0.10.1", "angular-moment": "0.10.1",
"angular-qrcode": "monospaced/angular-qrcode#~6.0.3", "angular-qrcode": "monospaced/angular-qrcode#~6.0.3",
@ -17,7 +17,7 @@
"angular-ui-switch": "0.1.1", "angular-ui-switch": "0.1.1",
"animate.css": "3.4.0", "animate.css": "3.4.0",
"fastclick": "1.0.6", "fastclick": "1.0.6",
"foundation": "5.5.3", "foundation": "5.5.2",
"foundation-icon-fonts": "*", "foundation-icon-fonts": "*",
"moment": "2.10.3", "moment": "2.10.3",
"ng-lodash": "0.2.3", "ng-lodash": "0.2.3",

17
public/views/preferencesHistory.html
View File

@ -5,13 +5,12 @@
</div> </div>
<div class="content preferences" ng-controller="preferencesHistory as history"> <div class="content preferences" ng-controller="preferencesHistory as history">
<h4></h4> <h4></h4>
<ul class="no-bullet m0 size-14"> <ul class="no-bullet m0">
<li class="line-b p20 oh" ng-show="!index.isCordova" id="export_file" type="file" nwsaveas="Copay-{{index.alias || index.walletName}}.csv" accept=".csv" ng-click="index.csvHistory();"> <li ng-show="!index.isCordova" id="export_file" type="file" nwsaveas="Copay-{{index.alias || index.walletName}}.csv" accept=".csv" ng-click="index.csvHistory();">
<i class="fi-page-export-csv"></i> <span translate>Export to file</span>
<a translate>Export to file</a> </li>
</li> <li ng-click="history.clearTransactionHistory();">
<li class="line-b p20 oh" ng-click="history.clearTransactionHistory();"> <span translate>Clear cache</span>
<a translate>Clear cache</a> </li>
</li> </ul>
</ul>
</div> </div>

18
public/views/walletHome.html
View File

@ -198,9 +198,8 @@
</div> </div>
</div> </div>
<div class="size-12 text-gray m20t"> <div class="size-12 text-gray m20t">
{{index.txProgress}} <div translate>{{index.txProgress}} transactions downloaded</div>
<span translate>Transactions Downloaded</span> <br> <div translate>Updating transaction history. Please stand by.</div>
<b translate>Wait some minutes...</b>
</div> </div>
</div> </div>
</div> </div>
@ -268,12 +267,13 @@
</div> </div>
</div> </div>
<div class="row m20t"> <div class="m20t text-center">
<button type="submit" class="outline round small expand m0" ng-show="index.historyShowShowAll" ng-click="index.showAllHistory()" ng-style="{'background-color':index.backgroundColor}"> <a class="text-gray size-12"
<i class="icon-arrow-down4 ng-scope"></i> ng-show="index.historyShowShowAll"
<span translate>Show all</span> ng-click="index.showAllHistory()">
</button> <span translate>Show all</span>
</div> </a>
</div>
</div> </div>