anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Moves Glidera link to sidebar

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-09-11 13:11:41 -03:00
commit 67e2cb1d6c
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
13 changed files with 263 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

19
public/views/buyGlidera.html
View file

@ -47,8 +47,24 @@
</div>
<div ng-show="!buy.show2faCodeInput && !buy.success">
<form name="buyPriceForm"
ng-submit="buy.get2faCode(index.glideraToken)" novalidate>
<div ng-if="index.glideraToken"
ng-init="otherWallets = buy.otherWallets(index.glideraTestnet)"
ng-click="openWalletsModal(otherWallets)">
<label translate>Wallet</label>
<div class="input">
<input type="text" id="address" name="address" ng-disabled="buy.selectedWalletId"
ng-attr-placeholder="{{'Choose your destination wallet'|translate}}"
ng-model="buy.selectedWalletName" required>
<a class="postfix size-12 m0 text-gray">
<i class="icon-wallet size-18"></i>
</a>
</div>
</div>
<label><span translate>Amount in</span> {{showAlternative ? 'USD' : 'BTC'}}</label>
<div class="input">
<input ng-show="!showAlternative" type="number" id="qty"
@ -82,7 +98,8 @@
<input class="button black expand round"
ng-style="{'background-color':index.backgroundColor}"
type="submit" value="{{'Continue'|translate}}"
ng-disabled="index.glideraLimits.transactDisabledPendingFirstTransaction || !buy.buyPrice.qty || buy.loading">
ng-disabled="index.glideraLimits.transactDisabledPendingFirstTransaction || !buy.buyPrice.qty ||
!buy.selectedWalletAddr || buy.loading">
</div>
</form>
</div>

4
public/views/glidera.html
View file

@ -61,7 +61,7 @@
<p translate>You can buy and sell Bitcoin with a US bank account directly in Copay.</p>
<div class="m10b text-gray size-12" translate>Connect your Glidera account to get started</div>
<div class="box-notification size-12 text-warning" ng-show="index.network == 'testnet'">
<div class="box-notification size-12 text-warning" ng-show="index.glideraTestnet">
<i class="fi-info"></i>
Testnet wallets only work with Glidera Sandbox Accounts
</div>
@ -113,7 +113,7 @@
|| (!index.glideraStatus.userBankAccountIsSetup && index.glideraStatus.bankAccountState != 'VERIFIED'))">
<span translate>Your Glidera account is not ready to transact. Please, verify it at</span>
<a href
ng-init="glideraUrl = index.network == 'testnet' ? 'https://sandbox.glidera.io/login' :
ng-init="glideraUrl = index.glideraTestnet ? 'https://sandbox.glidera.io/login' :
'https://glidera.io/login'"
ng-click="$root.openExternalLink(glideraUrl)">Glidera.io</a>
</div>

10
public/views/includes/sidebar.html
View file

@ -25,5 +25,15 @@
<div translate>Create, join or import</div>
</a>
</li>
<li ng-show="index.glideraEnabled">
<a ng-click="$root.go('glidera')" class="oh">
<i class="icon-arrow-right3 size-18 right m10t"></i>
<i class="icon-bank size-24 db left m20r m5t"></i>
<div class="tu text-bold">
<span class="size-12" translate>Buy &amp; Sell Bitcoin</span>
</div>
<div translate>Glidera</div>
</a>
</li>
</ul>
</nav>

8
public/views/preferences.html
View file

@ -95,6 +95,14 @@
{{preferences.bwsurl}}
</span>
</li>
<li class="line-b p20" ng-show="!index.noFocusedWallet">
<span translate>Enable Glidera Service</span>
<switch id="glidera-enabled" name="glideraEnabled" ng-model="glideraEnabled" class="green right"></switch>
</li>
<li class="line-b p20" ng-show="!index.noFocusedWallet && glideraEnabled">
<span translate>Glidera Sandbox</span>
<switch id="glidera-testnet" name="glideraTestnet" ng-model="glideraTestnet" class="green right"></switch>
</li>
<li class="line-b p20" ng-click="$root.go('about')">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<span translate>About Copay</span>

18
public/views/sellGlidera.html
View file

@ -49,6 +49,21 @@
<div ng-show="!sell.show2faCodeInput && !sell.success">
<form name="sellPriceForm"
ng-submit="sell.get2faCode(index.glideraToken)" novalidate>
<div ng-if="index.glideraToken"
ng-init="otherWallets = sell.otherWallets(index.glideraTestnet)"
ng-click="openWalletsModal(otherWallets)">
<label translate>Wallet</label>
<div class="input">
<input type="text" id="address" name="address" ng-disabled="sell.selectedWalletId"
ng-attr-placeholder="{{'Choose your destination wallet'|translate}}"
ng-model="sell.selectedWalletName" required>
<a class="postfix size-12 m0 text-gray">
<i class="icon-wallet size-18"></i>
</a>
</div>
</div>
<label><span translate>Amount in</span> {{showAlternative ? 'USD' : 'BTC'}}</label>
<div class="input">
<input ng-show="!showAlternative" type="number" id="qty"
@ -83,7 +98,8 @@
<input class="button black expand round"
ng-style="{'background-color':index.backgroundColor}"
type="submit" value="{{'Continue'|translate}}"
ng-disabled="index.glideraLimits.transactDisabledPendingFirstTransaction || !sell.sellPrice.qty || sell.loading">
ng-disabled="index.glideraLimits.transactDisabledPendingFirstTransaction || !sell.sellPrice.qty ||
!sell.selectedWalletId || sell.loading">
</div>
</form>
</div>

7
public/views/walletHome.html
View file

@ -112,13 +112,6 @@
ng-style="{'background-color':index.backgroundColor}">{{ (index.alias || index.walletName) | limitTo: 1}}
</div>
<div class="right">
<a ng-show="!index.isShared" class="button outline round light-gray tiny preferences-icon m10r"
ng-click="$root.go('glidera')">
<i class="icon-bank size-18 vm"></i>
<span class="show-for-medium-up">Glidera</span>
</a>
<a ng-click="$root.go('preferences')" class="button outline round light-gray tiny preferences-icon m0">
<i class="fi-widget size-18 vm"></i>
<span class="show-for-medium-up" translate>Preferences</span>