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

Merge pull request #395 from bitjson/ref/design 

fix(all): the buttons
This commit is contained in:
Matias Alejo Garcia 2016-10-12 08:18:03 -03:00 committed by GitHub
parent fda1449666 2e6d394673
commit 796a5de122
25 changed files with 38 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/views/addressbook.add.html
View File

@ -29,7 +29,7 @@
<span class="input-label" translate>Email</span>
<input type="text"
id="email"
placeholder="name@example.com"
placeholder="name@example.com"
name="email"
ng-model="addressbookEntry.email">
</label>
@ -54,7 +54,7 @@
<div class="padding">
<button type="submit"
class="button button-block button-positive"
class="button button-standard button-primary"
ng-click="add(addressbookEntry)"
ng-disabled="!addressbookForm.$valid" translate>
Save

4
www/views/addressbook.html
View File

@ -52,9 +52,7 @@
You haven’t added any contacts to your address book yet. Get started by adding your first one.
</p>
</div>
<div class="row">
<button class="button button-block button-positive col" ui-sref="tabs.addressbook.add" translate>Add Contact</button>
</div>
<button class="button button-standard button-primary" ui-sref="tabs.addressbook.add" translate>Add Contact</button>
</div>
</div>
</ion-content>

2
www/views/addressbook.view.html
View File

@ -28,7 +28,7 @@
</div>
</div>
<button class="button button-block button-positive"
<button class="button button-standard button-primary"
ng-click="sendTo()" translate>
Send Money
</button>

2
www/views/amazon.html
View File

@ -18,7 +18,7 @@
<div ng-if="!giftCards" class="m20t padding text-center">
<button class="button button-block button-positive" ui-sref="tabs.giftcards.amazon.buy">
<button class="button button-standard button-primary" ui-sref="tabs.giftcards.amazon.buy">
Buy now
</button>

2
www/views/backup.html
View File

@ -64,7 +64,7 @@
<div class="input-label" translate>In order to verify your wallet backup, please type your password.</div>
<input type="text" id="passphrase" ng-model="data.passphrase" autocapitalize="off" spellcheck="false" autofocus/>
</label>
<button ng-disabled="!data.passphrase" class="button button-block button-positive" ng-click="goToStep(4);" translate>Confirm
<button ng-disabled="!data.passphrase" class="button button-standard button-primary" ng-click="goToStep(4);" translate>Confirm
</button>
</div>
</div>

4
www/views/buyAmazon.html
View File

@ -53,7 +53,7 @@
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
<div class="padding">
<button class="button button-block button-positive"
<button class="button button-standard button-primary"
ng-disabled="!formData.fiat"
type="submit">
Buy now
@ -79,7 +79,7 @@
<span ng-show="buy.giftCard.status == 'FAILURE'">
This failure could not be recoverable. Request your refund from your list of cards
</span>
<button class="button button-block button-positive" ng-click="$root.go('amazon')">
<button class="button button-standard button-primary" ng-click="$root.go('amazon')">
Back
</button>
</div>

6
www/views/buyGlidera.html
View File

@ -80,7 +80,7 @@
...
</div>
<button class="button button-block button-positive"
<button class="button button-standard button-primary"
type="submit"
ng-disabled="limits.transactDisabledPendingFirstTransaction || !buy.buyPrice.qty || buy.loading">
Continue
@ -101,7 +101,7 @@
<input type="number" ng-model="twoFaCode" placeholder="2FA Code" required ignore-mouse-wheel>
</label>
</div>
<button class="button button-block button-positive"
<button class="button button-standard button-primary"
type="submit" ng-disabled="buyForm.$invalid || buy.loading">
Buy
</button>
@ -117,7 +117,7 @@
A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business days.
</p>
<button class="button button-block button-positive" ui-sref="tabs.buyandsell.glidera">OK</button>
<button class="button button-standard button-primary" ui-sref="tabs.buyandsell.glidera">OK</button>
</div>
</ion-content>
</ion-view>

2
www/views/copayers.html
View File

@ -29,7 +29,7 @@
<div ng-show="secret">
<div class="text-center m10t" ng-if="isCordova">
<button class="button button-outline button-positive"
<button class="button button-outline button-primary"
ng-click="shareSecret()">
<i class="icon ion-ios-upload-outline"></i>
<span translate>Share invitation</span>

4
www/views/glidera.html
View File

@ -36,7 +36,7 @@
<p class="m20t text-gray size-12">Connect your Glidera account to get started</p>
<button class="button button-block button-positive"
<button class="button button-standard button-primary"
ng-click="openExternalLink(glidera.getAuthenticateUrl(), '_system'); showOauthForm = true">
Connect to Glidera
</button>
@ -65,7 +65,7 @@
</div>
<div class="col">
<input
class="button button-block button-positive"
class="button button-standard button-primary"
type="submit"
value="Get started"
ng-disabled="oauthCodeForm.$invalid">

2
www/views/includes/clickToAccept.html
View File

@ -1,4 +1,4 @@
<button class="button button-block button-positive" ng-disabled="sendStatus">
<button class="button button-standard button-primary" ng-disabled="sendStatus">
<span ng-if="!sendStatus">
<ng-transclude></ng-transclude>
</span>

2
www/views/join.html
View File

@ -122,7 +122,7 @@
</div> <!-- advanced -->
</div> <!-- list -->
<button type="submit" class="button button-block button-positive"
<button type="submit" class="button button-standard button-primary"
ng-disabled="joinForm.$invalid || ((encrypt && !passwordSaved) || encrypt && ((join.seedSourceId == 'new' && !createPassphrase) || (join.seedSourceId == 'set' && !passphrase)))"
translate>Join
</button>

6
www/views/paperWallet.html
View File

@ -58,7 +58,7 @@
<button type="submit"
ng-disabled="scanning || !scannedKey"
class="button button-block button-positive"
class="button button-standard button-primary"
ng-style="{'background-color': wallet.color}"
translate>Scan Wallet Funds
</button>
@ -74,7 +74,7 @@
<button
ng-show="balanceSat > 0"
ng-disabled="sending"
class="button button-block button-positive"
class="button button-standard button-primary"
ng-style="{'background-color': wallet.color}"
ng-click="sweepWallet()"
translate>Sweep Wallet
@ -82,7 +82,7 @@
<button
ng-show="balanceSat <= 0 && scanned"
class="button button-block button-positive"
class="button button-standard button-primary"
ng-style="{'background-color': wallet.color}"
ng-click="init()"
translate>Scan Again

2
www/views/preferencesAlias.html
View File

@ -15,7 +15,7 @@
</label>
</div>
<button type="submit"
class="button button-block button-positive"
class="button button-standard button-primary"
ng-disabled="aliasForm.$invalid" translate>
Save
</button>

2
www/views/preferencesBwsUrl.html
View File

@ -15,6 +15,6 @@
</a>
</label>
</div>
<button class="button button-block button-positive" ng-click="save()" translate>Save</button>
<button class="button button-standard button-primary" ng-click="save()" translate>Save</button>
</ion-content>
</ion-view>

2
www/views/preferencesEmail.html
View File

@ -15,7 +15,7 @@
</label>
</div>
<button type="submit"
class="button button-block button-positive"
class="button button-standard button-primary"
ng-disabled="emailForm.$invalid" translate>
Save
</button>

4
www/views/preferencesInformation.html
View File

@ -98,10 +98,10 @@
<div class="padding text-center" translate>
Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time.
</div>
<button class="button button-block button-positive" ng-click="scan()" translate>
<button class="button button-standard button-primary" ng-click="scan()" translate>
Scan addresses for funds
</button>
<button class="button button-block button-positive" ng-show="isCordova" ng-click="sendAddrs()" translate>
<button class="button button-standard button-primary" ng-show="isCordova" ng-click="sendAddrs()" translate>
Send addresses by email
</button>
</div>

6
www/views/sellGlidera.html
View File

@ -80,7 +80,7 @@
...
</div>
<button class="button button-block button-positive"
<button class="button button-standard button-primary"
type="submit"
ng-disabled="limits.transactDisabledPendingFirstTransaction || !sell.sellPrice.qty">
Continue
@ -101,7 +101,7 @@
<input type="number" ng-model="twoFaCode" placeholder="2FA Code" required ignore-mouse-wheel>
</label>
</div>
<button class="button button-block button-positive"
<button class="button button-standard button-primary"
type="submit"
ng-disabled="sellForm.$invalid ">
Sell
@ -118,7 +118,7 @@
A transfer has been initiated to your bank account and should arrive in 4-6 business days.
</p>
<button class="button button-block button-positive" ui-sref="tabs.buyandsell.glidera">OK</button>
<button class="button button-standard button-primary" ui-sref="tabs.buyandsell.glidera">OK</button>
</div>
</ion-content>
</ion-view>

3
www/views/tab-create-personal.html
View File

@ -98,11 +98,10 @@
</div> <!-- advanced -->
</div> <!-- list -->
<button type="submit" class="button button-block button-positive"
<button type="submit" class="button button-standard button-primary"
ng-disabled="setupForm.$invalid || ((encrypt && !formData.passwordSaved) || encrypt && ((seedSource.id == 'new' && !formData.createPassphrase) || (seedSource.id == 'set' && !formData.passphrase)))">
<span translate>Create new wallet</span>
</button>
</form>
</ion-content>
</ion-view>

4
www/views/tab-create-shared.html
View File

@ -128,12 +128,10 @@
</div> <!-- advanced -->
</div> <!-- list -->
<button type="submit" class="button button-block button-positive"
<button type="submit" class="button button-standard button-primary"
ng-disabled="setupForm.$invalid || ((encrypt && !formData.passwordSaved) || encrypt && ((seedSource.id == 'new' && !formData.createPassphrase) || (seedSource.id == 'set' && !formData.passphrase)))">
<span translate>Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet</span>
</button>
</form>
</ion-content>
</ion-view>

8
www/views/tab-export-file.html
View File

@ -49,7 +49,7 @@
<button
ng-click="downloadWalletBackup()"
class="button button-block button-positive"
class="button button-standard button-primary"
ng-disabled="(!formData.password || formData.password != formData.repeatpassword)"
ng-style="{'background-color':wallet.color}"
ng-show="!isSafari && !isCordova">
@ -59,7 +59,7 @@
<button
ng-click="viewWalletBackup()"
class="button button-block button-positive"
class="button button-standard button-primary"
ng-disabled="(!formData.password || formData.password != formData.repeatpassword)"
ng-style="{'background-color':wallet.color}"
ng-show="isSafari && !isCordova">
@ -69,13 +69,13 @@
<div ng-show="isCordova">
<h4 translate>Export options</h4>
<button class="button button-block button-positive"
<button class="button button-standard button-primary"
ng-disabled="(!formData.password || formData.password != formData.repeatpassword)"
ng-style="{'background-color':wallet.color}"
ng-click="copyWalletBackup()">
<i class="fi-clipboard-pencil"></i>
<span translate>Copy to clipboard</span></button>
<button class="button button-block button-positive" ng-disabled="(!formData.password || formData.password != formData.repeatpassword)"
<button class="button button-standard button-primary" ng-disabled="(!formData.password || formData.password != formData.repeatpassword)"
ng-style="{'background-color':wallet.color}"
ng-click="sendWalletBackup()"><i class="fi-mail"></i>
<span translate>Send by email</span></button>

2
www/views/tab-import-file.html
View File

@ -34,7 +34,7 @@
</div>
</div>
<button type="submit" class="button button-block button-positive" ng-disabled="importForm.$invalid || !formData.password" translate>
<button type="submit" class="button button-standard button-primary" ng-disabled="importForm.$invalid || !formData.password" translate>
Import backup
</button>
</form>

2
www/views/tab-import-hardware.html
View File

@ -37,7 +37,7 @@
</div>
</div>
<button translate type="submit" class="button button-block button-positive">
<button translate type="submit" class="button button-standard button-primary">
Import
</button>
</div> <!-- seedoptions show -->

2
www/views/tab-import-phrase.html
View File

@ -60,7 +60,7 @@
</div>
<button type="submit"
class="button button-block button-positive"
class="button button-standard button-primary"
ng-disabled="importForm12.$invalid" translate>Import
</button>
</form>

2
www/views/tab-receive.html
View File

@ -33,7 +33,7 @@
<span translate>All signing devices must be added to this multisig wallet before bitcoin addresses can be created.</span>
</div>
<div>
<button class="button button-block button-positive" ng-click="goCopayers()" translate>Open wallet</button>
<button class="button button-standard button-primary" ng-click="goCopayers()" translate>Open wallet</button>
</div>
</div>
<div class="row border-top">

2
www/views/termsOfUse.html
View File

@ -9,7 +9,7 @@
<div class="card">
<div class="item item-text-wrap" ng-include="'views/includes/terms.html'"></div>
</div>
<button class="button button-block button-positive"
<button class="button button-standard button-primary"
ng-show="lang != 'en'"
ng-click="openExternalLink(disclaimerUrl)" translate>
Official English Disclaimer